diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/cleanup mysql-5.5-5.5.43/BUILD/cleanup
--- mysql-5.5-5.5.35+dfsg/BUILD/cleanup	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/cleanup	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-alpha mysql-5.5-5.5.43/BUILD/compile-alpha
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-alpha	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-alpha	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-debug-max-no-ndb mysql-5.5-5.5.43/BUILD/compile-amd64-debug-max-no-ndb
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-debug-max-no-ndb	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-amd64-debug-max-no-ndb	2015-02-27 08:30:34.000000000 +0000
@@ -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
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-gcov mysql-5.5-5.5.43/BUILD/compile-amd64-gcov
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-gcov	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-amd64-gcov	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-gprof mysql-5.5-5.5.43/BUILD/compile-amd64-gprof
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-gprof	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-amd64-gprof	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-max-sci mysql-5.5-5.5.43/BUILD/compile-amd64-max-sci
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-amd64-max-sci	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-amd64-max-sci	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64 mysql-5.5-5.5.43/BUILD/compile-pentium64
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium64	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-gcov mysql-5.5-5.5.43/BUILD/compile-pentium64-gcov
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-gcov	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium64-gcov	2015-02-27 08:30:34.000000000 +0000
@@ -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
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-gprof mysql-5.5-5.5.43/BUILD/compile-pentium64-gprof
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-gprof	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium64-gprof	2015-02-27 08:30:34.000000000 +0000
@@ -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
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-max mysql-5.5-5.5.43/BUILD/compile-pentium64-max
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-max	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium64-max	2015-02-27 08:30:34.000000000 +0000
@@ -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
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-max-sci mysql-5.5-5.5.43/BUILD/compile-pentium64-max-sci
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium64-max-sci	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium64-max-sci	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-cybozu mysql-5.5-5.5.43/BUILD/compile-pentium-cybozu
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-cybozu	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium-cybozu	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-gcov mysql-5.5-5.5.43/BUILD/compile-pentium-gcov
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-gcov	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium-gcov	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-gprof mysql-5.5-5.5.43/BUILD/compile-pentium-gprof
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-gprof	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium-gprof	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-icc mysql-5.5-5.5.43/BUILD/compile-pentium-icc
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-icc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium-icc	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-icc-yassl mysql-5.5-5.5.43/BUILD/compile-pentium-icc-yassl
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-icc-yassl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium-icc-yassl	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-myodbc mysql-5.5-5.5.43/BUILD/compile-pentium-myodbc
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-pentium-myodbc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-pentium-myodbc	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-ppc mysql-5.5-5.5.43/BUILD/compile-ppc
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-ppc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-ppc	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-solaris-amd64 mysql-5.5-5.5.43/BUILD/compile-solaris-amd64
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-solaris-amd64	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-solaris-amd64	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/bash
 
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/BUILD/compile-solaris-amd64-debug mysql-5.5-5.5.43/BUILD/compile-solaris-amd64-debug
--- mysql-5.5-5.5.35+dfsg/BUILD/compile-solaris-amd64-debug	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/BUILD/compile-solaris-amd64-debug	2015-02-27 08:30:34.000000000 +0000
@@ -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.
diff -Nru mysql-5.5-5.5.35+dfsg/client/CMakeLists.txt mysql-5.5-5.5.43/client/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/client/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -35,6 +35,12 @@
 
 MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
 SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+# mysqltest has unused result errors, so we skip Werror
+CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
+IF(HAVE_WERROR_FLAG)
+  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+  ADD_COMPILE_FLAGS(mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ENDIF()
 TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/client/mysqladmin.cc mysql-5.5-5.5.43/client/mysqladmin.cc
--- mysql-5.5-5.5.35+dfsg/client/mysqladmin.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysqladmin.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -71,6 +71,7 @@
                                   char *argument);
 static my_bool sql_connect(MYSQL *mysql, uint wait);
 static int execute_commands(MYSQL *mysql,int argc, char **argv);
+static char **mask_password(int argc, char ***argv);
 static int drop_db(MYSQL *mysql,const char *db);
 extern "C" sig_handler endprog(int signal_number);
 static void nice_time(ulong sec,char *buff);
@@ -304,9 +305,9 @@
 
 int main(int argc,char *argv[])
 {
-  int error= 0, ho_error;
+  int error= 0, ho_error, temp_argc;
   MYSQL mysql;
-  char **commands, **save_argv;
+  char **commands, **save_argv, **temp_argv;
 
   MY_INIT(argv[0]);
   mysql_init(&mysql);
@@ -318,6 +319,9 @@
     free_defaults(save_argv);
     exit(ho_error);
   }
+  temp_argv= mask_password(argc, &argv);
+  temp_argc= argc;
+
   if (debug_info_flag)
     my_end_arg= MY_CHECK_ERROR | MY_GIVE_INFO;
   if (debug_check_flag)
@@ -328,7 +332,7 @@
     usage();
     exit(1);
   }
-  commands = argv;
+  commands = temp_argv;
   if (tty_password)
     opt_password = get_tty_password(NullS);
 
@@ -476,6 +480,13 @@
   my_free(shared_memory_base_name);
 #endif
   free_defaults(save_argv);
+  temp_argc--;
+  while(temp_argc >= 0)
+  {
+    my_free(temp_argv[temp_argc]);
+    temp_argc--;
+  }
+  my_free(temp_argv);
   my_end(my_end_arg);
   exit(error ? 1 : 0);
   return 0;
@@ -1089,6 +1100,47 @@
   return 0;
 }
 
+/**
+   @brief Masking the password if it is passed as command line argument.
+
+   @details It works in Linux and changes cmdline in ps and /proc/pid/cmdline,
+            but it won't work for history file of shell.
+            The command line arguments are copied to another array and the
+            password in the argv is masked. This function is called just after
+            "handle_options" because in "handle_options", the agrv pointers
+            are altered which makes freeing of dynamically allocated memory
+            difficult. The password masking is done before all other operations
+            in order to minimise the time frame of password visibility via cmdline.
+
+   @param argc            command line options (count)
+   @param argv            command line options (values)
+
+   @return temp_argv      copy of argv
+*/
+
+static char **mask_password(int argc, char ***argv)
+{
+  char **temp_argv;
+  temp_argv= (char **)(my_malloc(sizeof(char *) * argc, MYF(MY_WME)));
+  argc--;
+  while (argc > 0)
+  {
+    temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+    if (find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_PASSWORD ||
+        find_type((*argv)[argc - 1],&command_typelib, FIND_TYPE_BASIC) == ADMIN_OLD_PASSWORD)
+    {
+      char *start= (*argv)[argc];
+      while (*start)
+        *start++= 'x';
+      start= (*argv)[argc];
+      if (*start)
+        start[1]= 0;                         /* Cut length of argument */
+     }
+    argc--;
+  }
+  temp_argv[argc]= my_strdup((*argv)[argc], MYF(MY_FAE));
+  return(temp_argv);
+}
 
 static void print_version(void)
 {
diff -Nru mysql-5.5-5.5.35+dfsg/client/mysqlbinlog.cc mysql-5.5-5.5.43/client/mysqlbinlog.cc
--- mysql-5.5-5.5.35+dfsg/client/mysqlbinlog.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysqlbinlog.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -2102,6 +2102,7 @@
   DBUG_PROCESS(argv[0]);
 
   my_init_time(); // for time functions
+  tzset(); // set tzname
 
   if (load_defaults("my", load_default_groups, &argc, &argv))
     exit(1);
diff -Nru mysql-5.5-5.5.35+dfsg/client/mysql.cc mysql-5.5-5.5.43/client/mysql.cc
--- mysql-5.5-5.5.35+dfsg/client/mysql.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysql.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1176,9 +1176,9 @@
 
   put_info("Welcome to the MySQL monitor.  Commands end with ; or \\g.",
 	   INFO_INFO);
-  sprintf((char*) glob_buffer.ptr(),
-	  "Your MySQL connection id is %lu\nServer version: %s\n",
-	  mysql_thread_id(&mysql), server_version_string(&mysql));
+  snprintf((char*) glob_buffer.ptr(), glob_buffer.alloced_length(),
+	   "Your MySQL connection id is %lu\nServer version: %s\n",
+	   mysql_thread_id(&mysql), server_version_string(&mysql));
   put_info((char*) glob_buffer.ptr(),INFO_INFO);
 
   put_info(ORACLE_WELCOME_COPYRIGHT_NOTICE("2000"), INFO_INFO);
@@ -1242,6 +1242,16 @@
 
 sig_handler mysql_end(int sig)
 {
+#ifndef _WIN32
+  /*
+    Ingnoring SIGQUIT and SIGINT signals when cleanup process starts.
+    This will help in resolving the double free issues, which occures in case
+    the signal handler function is started in between the clean up function.
+  */
+  signal(SIGQUIT, SIG_IGN);
+  signal(SIGINT, SIG_IGN);
+#endif
+
   mysql_close(&mysql);
 #ifdef HAVE_READLINE
   if (!status.batch && !quick && !opt_html && !opt_xml &&
diff -Nru mysql-5.5-5.5.35+dfsg/client/mysqlcheck.c mysql-5.5-5.5.43/client/mysqlcheck.c
--- mysql-5.5-5.5.35+dfsg/client/mysqlcheck.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysqlcheck.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2001, 2011, 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 -Nru mysql-5.5-5.5.35+dfsg/client/mysqldump.c mysql-5.5-5.5.43/client/mysqldump.c
--- mysql-5.5-5.5.35+dfsg/client/mysqldump.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysqldump.c	2015-02-27 08:30:34.000000000 +0000
@@ -5538,19 +5538,36 @@
       dump_all_tablespaces();
     dump_all_databases();
   }
-  else if (argc > 1 && !opt_databases)
-  {
-    /* Only one database and selected table(s) */
-    if (!opt_alltspcs && !opt_notspcs)
-      dump_tablespaces_for_tables(*argv, (argv + 1), (argc -1));
-    dump_selected_tables(*argv, (argv + 1), (argc - 1));
-  }
   else
   {
-    /* One or more databases, all tables */
-    if (!opt_alltspcs && !opt_notspcs)
-      dump_tablespaces_for_databases(argv);
-    dump_databases(argv);
+    // Check all arguments meet length condition. Currently database and table
+    // names are limited to NAME_LEN bytes and stack-based buffers assumes
+    // that escaped name will be not longer than NAME_LEN*2 + 2 bytes long.
+    int argument;
+    for (argument= 0; argument < argc; argument++)
+    {
+      size_t argument_length= strlen(argv[argument]);
+      if (argument_length > NAME_LEN)
+      {
+        die(EX_CONSCHECK, "[ERROR] Argument '%s' is too long, it cannot be "
+          "name for any table or database.\n", argv[argument]);
+      }
+    }
+
+    if (argc > 1 && !opt_databases)
+    {
+      /* Only one database and selected table(s) */
+      if (!opt_alltspcs && !opt_notspcs)
+        dump_tablespaces_for_tables(*argv, (argv + 1), (argc - 1));
+      dump_selected_tables(*argv, (argv + 1), (argc - 1));
+    }
+    else
+    {
+      /* One or more databases, all tables */
+      if (!opt_alltspcs && !opt_notspcs)
+        dump_tablespaces_for_databases(argv);
+      dump_databases(argv);
+    }
   }
 
   /* if --dump-slave , start the slave sql thread */
diff -Nru mysql-5.5-5.5.35+dfsg/client/mysql_plugin.c mysql-5.5-5.5.43/client/mysql_plugin.c
--- mysql-5.5-5.5.35+dfsg/client/mysql_plugin.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysql_plugin.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2011, 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
@@ -856,7 +856,7 @@
       strncat(buff, FN_DIRSEP, sizeof(buff) - strlen(buff) - 1);
 #endif
       buff[sizeof(buff) - 1]= 0;
-      my_delete(opt_basedir, MYF(0));
+      my_free(opt_basedir);
       opt_basedir= my_strdup(buff, MYF(MY_FAE));
     }
   }
diff -Nru mysql-5.5-5.5.35+dfsg/client/mysql_upgrade.c mysql-5.5-5.5.43/client/mysql_upgrade.c
--- mysql-5.5-5.5.35+dfsg/client/mysql_upgrade.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/client/mysql_upgrade.c	2015-02-27 08:30:34.000000000 +0000
@@ -462,6 +462,7 @@
   */
   if (run_tool(tool_executable_name,
                &ds_tmp, /* Get output from command, discard*/
+               "--no-defaults",
                "--help",
                "2>&1",
                IF_WIN("> NUL", "> /dev/null"),
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/build_configurations/mysql_release.cmake mysql-5.5-5.5.43/cmake/build_configurations/mysql_release.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/build_configurations/mysql_release.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/build_configurations/mysql_release.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -189,15 +189,16 @@
     ENDIF()
   ENDIF()
 
-  # OSX flags
-  IF(APPLE)
-    SET(COMMON_C_FLAGS                 "-g -fno-common -fno-strict-aliasing")
-    # XXX: why are we using -felide-constructors on OSX?
-    SET(COMMON_CXX_FLAGS               "-g -fno-common -felide-constructors -fno-strict-aliasing")
-    SET(CMAKE_C_FLAGS_DEBUG            "-O ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_DEBUG          "-O ${COMMON_CXX_FLAGS}")
-    SET(CMAKE_C_FLAGS_RELWITHDEBINFO   "-Os ${COMMON_C_FLAGS}")
-    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Os ${COMMON_CXX_FLAGS}")
+  # Default Clang flags
+  IF(CMAKE_C_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_C_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_C_FLAGS_DEBUG          "${COMMON_C_FLAGS}")
+    SET(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_C_FLAGS}")
+  ENDIF()
+  IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+    SET(COMMON_CXX_FLAGS               "-g -fno-omit-frame-pointer -fno-strict-aliasing")
+    SET(CMAKE_CXX_FLAGS_DEBUG          "${COMMON_CXX_FLAGS}")
+    SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${COMMON_CXX_FLAGS}")
   ENDIF()
 
   # Solaris flags
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/compile_flags.cmake mysql-5.5-5.5.43/cmake/compile_flags.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/compile_flags.cmake	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/compile_flags.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,44 @@
+# Copyright (c) 2014, 2015, 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
+
+
+## ADD_COMPILE_FLAGS(<source files> COMPILE_FLAGS <flags>)
+MACRO(ADD_COMPILE_FLAGS)
+  SET(FILES "")
+  SET(FLAGS "")
+  SET(COMPILE_FLAGS_SEEN)
+  FOREACH(ARG ${ARGV})
+    IF(ARG STREQUAL "COMPILE_FLAGS")
+      SET(COMPILE_FLAGS_SEEN 1)
+    ELSEIF(COMPILE_FLAGS_SEEN)
+      LIST(APPEND FLAGS ${ARG})
+    ELSE()
+      LIST(APPEND FILES ${ARG})
+    ENDIF()
+  ENDFOREACH()
+  FOREACH(FILE ${FILES})
+    FOREACH(FLAG ${FLAGS})
+      GET_SOURCE_FILE_PROPERTY(PROP ${FILE} COMPILE_FLAGS)
+      IF(NOT PROP)
+        SET(PROP ${FLAG})
+      ELSE()
+        SET(PROP "${PROP} ${FLAG}")
+      ENDIF()
+      SET_SOURCE_FILES_PROPERTIES(
+        ${FILE} PROPERTIES COMPILE_FLAGS "${PROP}"
+        )
+    ENDFOREACH()
+  ENDFOREACH()
+ENDMACRO()
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/cpack_source_ignore_files.cmake mysql-5.5-5.5.43/cmake/cpack_source_ignore_files.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/cpack_source_ignore_files.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/cpack_source_ignore_files.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -14,9 +14,6 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
 
 SET(CPACK_SOURCE_IGNORE_FILES
-\\\\.bzr/
-\\\\.bzr-mysql
-\\\\.bzrignore
 CMakeCache\\\\.txt
 cmake_dist\\\\.cmake
 CPackSourceConfig\\\\.cmake
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/dtrace.cmake mysql-5.5-5.5.43/cmake/dtrace.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/dtrace.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/dtrace.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -37,7 +37,15 @@
  # On FreeBSD, dtrace does not handle userland tracing yet
  IF(DTRACE AND NOT CMAKE_SYSTEM_NAME MATCHES "FreeBSD"
      AND NOT BUGGY_GCC_NO_DTRACE_MODULES)
-   SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
+   # 5.5 not able to do Sun dtrace on linux, just disable it
+   EXECUTE_PROCESS(
+     COMMAND ${DTRACE} -V
+     OUTPUT_VARIABLE out)
+   IF(out MATCHES "Sun D" AND CMAKE_SYSTEM_NAME MATCHES "Linux")
+     SET(ENABLE_DTRACE OFF CACHE BOOL "Sun DTrace on Linux not supported")
+   ELSE()
+     SET(ENABLE_DTRACE ON CACHE BOOL "Enable dtrace")
+   ENDIF()
  ENDIF()
  SET(HAVE_DTRACE ${ENABLE_DTRACE})
  IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
@@ -74,13 +82,6 @@
    ${CMAKE_BINARY_DIR}/include/probes_mysql_dtrace.h
    ${CMAKE_BINARY_DIR}/include/probes_mysql_nodtrace.h
   )
-  IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-   # Systemtap object
-   EXECUTE_PROCESS(
-     COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
-     -o ${CMAKE_BINARY_DIR}/probes_mysql.o
-   )
-  ENDIF()
   ADD_CUSTOM_TARGET(gen_dtrace_header
   DEPENDS  
   ${CMAKE_BINARY_DIR}/include/probes_mysql.d
@@ -99,12 +100,7 @@
   IF(ENABLE_DTRACE)
     ADD_DEPENDENCIES(${target} gen_dtrace_header)
 
-    IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
-      TARGET_LINK_LIBRARIES(${target}  ${CMAKE_BINARY_DIR}/probes_mysql.o)
-    ENDIF()
-
-    # On Solaris, invoke dtrace -G to generate object file and
-    # link it together with target.
+    # Invoke dtrace to generate object file and link it together with target.
     IF(CMAKE_SYSTEM_NAME MATCHES "SunOS")
       SET(objdir ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/${target}.dir)
       SET(outfile ${objdir}/${target}_dtrace.o)
@@ -121,6 +117,21 @@
           -P ${CMAKE_SOURCE_DIR}/cmake/dtrace_prelink.cmake
         WORKING_DIRECTORY ${objdir}
       )
+    ELSEIF(CMAKE_SYSTEM_NAME MATCHES "Linux")
+      # dtrace on Linux runs gcc and uses flags from environment
+      SET(CFLAGS_SAVED $ENV{CFLAGS})
+      SET(ENV{CFLAGS} ${CMAKE_C_FLAGS})
+      SET(outfile "${CMAKE_BINARY_DIR}/probes_mysql.o")
+      # Systemtap object
+      EXECUTE_PROCESS(
+        COMMAND ${DTRACE} -G -s ${CMAKE_SOURCE_DIR}/include/probes_mysql.d.base
+        -o ${outfile}
+        )
+      SET(ENV{CFLAGS} ${CFLAGS_SAVED})
+    ENDIF()
+
+    # Do not try to extend the library if we have not built the .o file
+    IF(outfile)
       # Add full  object path to linker flags
       GET_TARGET_PROPERTY(target_type ${target} TYPE)
       IF(NOT target_type MATCHES "STATIC")
@@ -132,12 +143,12 @@
         # but maybe one day this will be fixed.
         GET_TARGET_PROPERTY(target_location ${target} LOCATION)
         ADD_CUSTOM_COMMAND(
-         TARGET ${target} POST_BUILD
-         COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
-	 COMMAND ${CMAKE_RANLIB} ${target_location}
-        )
-       # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
-       SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
+          TARGET ${target} POST_BUILD
+          COMMAND ${CMAKE_AR} r  ${target_location} ${outfile}
+	  COMMAND ${CMAKE_RANLIB} ${target_location}
+          )
+        # Used in DTRACE_INSTRUMENT_WITH_STATIC_LIBS
+        SET(TARGET_OBJECT_DIRECTORY_${target}  ${objdir} CACHE INTERNAL "")
       ENDIF()
     ENDIF()
   ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/info_macros.cmake.in mysql-5.5-5.5.43/cmake/info_macros.cmake.in
--- mysql-5.5-5.5.35+dfsg/cmake/info_macros.cmake.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/info_macros.cmake.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -23,11 +23,14 @@
 # If further variables are used in this file, add them to this list.
 
 SET(VERSION "@VERSION@")
+SET(MAJOR_VERSION "@MAJOR_VERSION@")
+SET(MINOR_VERSION "@MINOR_VERSION@")
+SET(PATCH_VERSION "@PATCH_VERSION@")
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
 SET(CMAKE_BINARY_DIR "@CMAKE_BINARY_DIR@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_SIZEOF_VOID_P "@CMAKE_SIZEOF_VOID_P@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
+SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(CMAKE_CROSSCOMPILING "@CMAKE_CROSSCOMPILING@")
 SET(CMAKE_HOST_SYSTEM "@CMAKE_HOST_SYSTEM@")
 SET(CMAKE_HOST_SYSTEM_PROCESSOR "@CMAKE_HOST_SYSTEM_PROCESSOR@")
@@ -36,27 +39,51 @@
  
  
 # Create an "INFO_SRC" file with information about the source (only).
-# We use "bzr version-info", if possible, and the "VERSION" contents.
+# We use "git log", if possible, and the "VERSION" contents.
 #
-# Outside development (BZR tree), the "INFO_SRC" file will not be modified
+# Outside development (git tree), the "INFO_SRC" file will not be modified
 # provided it exists (from "make dist" or a source tarball creation).
 
 MACRO(CREATE_INFO_SRC target_dir)
   SET(INFO_SRC "${target_dir}/INFO_SRC")
 
-  IF(EXISTS ${CMAKE_SOURCE_DIR}/.bzr)
-    # Sources are in a BZR repository: Always update.
+  SET(PERLSCRIPT
+    "use warnings; use POSIX qw(strftime); "
+    "print strftime \"%F %T %z\", localtime;")
+  EXECUTE_PROCESS(
+    COMMAND perl -e "${PERLSCRIPT}"
+    RESULT_VARIABLE result
+    OUTPUT_VARIABLE bdate
+    ERROR_VARIABLE error
+  )
+  IF(error)
+    MESSAGE(STATUS "Could not determine build-date: <${error}>")
+  ENDIF()
+
+  IF(GIT_EXECUTABLE AND EXISTS ${CMAKE_SOURCE_DIR}/.git)
+    # Sources are in a GIT repository: Always update.
     EXECUTE_PROCESS(
-      COMMAND ${BZR_EXECUTABLE} version-info ${CMAKE_SOURCE_DIR}
+      COMMAND ${GIT_EXECUTABLE} rev-parse --abbrev-ref HEAD
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+      OUTPUT_VARIABLE bname
+    )
+
+    EXECUTE_PROCESS(
+      COMMAND ${GIT_EXECUTABLE} log -1
+      --pretty="commit: %H%ndate: %ci%nbuild-date: ${bdate} %nshort: %h%nbranch: ${bname}"
+      WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
       OUTPUT_VARIABLE VERSION_INFO
-      RESULT_VARIABLE RESULT
     )
+
+    ## Output from git is quoted with "", remove them.
+    STRING(REPLACE "\"" "" VERSION_INFO "${VERSION_INFO}")
     FILE(WRITE ${INFO_SRC} "${VERSION_INFO}\n")
     # to debug, add: FILE(APPEND ${INFO_SRC} "\nResult ${RESULT}\n")
     # For better readability ...
-    FILE(APPEND ${INFO_SRC} "\nMySQL source ${VERSION}\n")
+    FILE(APPEND ${INFO_SRC}
+      "MySQL source ${MAJOR_VERSION}.${MINOR_VERSION}.${PATCH_VERSION}\n")
   ELSEIF(EXISTS ${INFO_SRC})
-    # Outside a BZR tree, there is no need to change an existing "INFO_SRC",
+    # Outside a git tree, there is no need to change an existing "INFO_SRC",
     # it cannot be improved.
   ELSEIF(EXISTS ${CMAKE_SOURCE_DIR}/Docs/INFO_SRC)
     # If we are building from a source distribution, it also contains "INFO_SRC".
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/info_src.cmake mysql-5.5-5.5.43/cmake/info_src.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/info_src.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/info_src.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -16,11 +16,11 @@
 
 # The sole purpose of this cmake control file is to create the "INFO_SRC" file.
 
-# As long as and "bzr pull" (or "bzr commit") is followed by a "cmake",
+# As long as and "git pull" (or "git commit") is followed by a "cmake",
 # the call in top level "CMakeLists.txt" is sufficient.
 # This file is to provide a separate target for the "make" phase,
-# to ensure the BZR revision-id is correct even after a sequence
-#   cmake ; make ; bzr pull ; make
+# to ensure the git commit hash is correct even after a sequence
+#   cmake ; make ; git pull ; make
 
 
 # Get the macros which handle the "INFO_*" files.
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/install_macros.cmake mysql-5.5-5.5.43/cmake/install_macros.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/install_macros.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/install_macros.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -21,26 +21,35 @@
     GET_TARGET_PROPERTY(location ${target} LOCATION)
     GET_TARGET_PROPERTY(type ${target} TYPE)
     IF(NOT INSTALL_LOCATION)
-      IF(type MATCHES "STATIC_LIBRARY" OR type MATCHES "MODULE_LIBRARY" OR type MATCHES "SHARED_LIBRARY")
+      IF(type MATCHES "STATIC_LIBRARY"
+          OR type MATCHES "MODULE_LIBRARY"
+          OR type MATCHES "SHARED_LIBRARY")
         SET(INSTALL_LOCATION "lib")
       ELSEIF(type MATCHES "EXECUTABLE")
         SET(INSTALL_LOCATION "bin")
       ELSE()
-        MESSAGE(FATAL_ERROR "cannot determine type of ${target}. Don't now where to install")
+        MESSAGE(FATAL_ERROR
+          "cannot determine type of ${target}. Don't now where to install")
      ENDIF()
     ENDIF()
     STRING(REPLACE ".exe" ".pdb" pdb_location ${location})
     STRING(REPLACE ".dll" ".pdb" pdb_location ${pdb_location})
     STRING(REPLACE ".lib" ".pdb" pdb_location ${pdb_location})
     IF(CMAKE_GENERATOR MATCHES "Visual Studio")
-      STRING(REPLACE "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}" pdb_location ${pdb_location})
+      STRING(REPLACE
+        "${CMAKE_CFG_INTDIR}" "\${CMAKE_INSTALL_CONFIG_NAME}"
+        pdb_location ${pdb_location})
     ENDIF()
     IF(target STREQUAL "mysqld")
 	  SET(comp Server)
     ELSE()
       SET(comp Debuginfo)
     ENDIF()	  
-    INSTALL(FILES ${pdb_location} DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
+    # No .pdb file for static libraries.
+    IF(NOT type MATCHES "STATIC_LIBRARY")
+      INSTALL(FILES ${pdb_location}
+        DESTINATION ${INSTALL_LOCATION} COMPONENT ${comp})
+    ENDIF()
   ENDFOREACH()
   ENDIF()
 ENDMACRO()
@@ -111,28 +120,28 @@
 ENDFUNCTION()
 
 # Install symbolic link to CMake target. 
-# the link is created in the same directory as target
-# and extension will be the same as for target file.
-MACRO(INSTALL_SYMLINK linkname target destination component)
+# We do 'cd path; ln -s target_name link_name'
+# We also add an INSTALL target for "${path}/${link_name}"
+MACRO(INSTALL_SYMLINK target target_name link_name destination component)
 IF(UNIX)
   GET_TARGET_PROPERTY(location ${target} LOCATION)
   GET_FILENAME_COMPONENT(path ${location} PATH)
-  GET_FILENAME_COMPONENT(name ${location} NAME)
-  SET(output ${path}/${linkname})
+
+  SET(output ${path}/${link_name})
   ADD_CUSTOM_COMMAND(
     OUTPUT ${output}
     COMMAND ${CMAKE_COMMAND} ARGS -E remove -f ${output}
     COMMAND ${CMAKE_COMMAND} ARGS -E create_symlink 
-      ${name} 
-      ${linkname}
+      ${target_name} 
+      ${link_name}
     WORKING_DIRECTORY ${path}
     DEPENDS ${target}
     )
   
-  ADD_CUSTOM_TARGET(symlink_${linkname}
+  ADD_CUSTOM_TARGET(symlink_${link_name}
     ALL
     DEPENDS ${output})
-  SET_TARGET_PROPERTIES(symlink_${linkname} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  SET_TARGET_PROPERTIES(symlink_${link_name} PROPERTIES CLEAN_DIRECT_OUTPUT 1)
   IF(CMAKE_GENERATOR MATCHES "Xcode")
     # For Xcode, replace project config with install config
     STRING(REPLACE "${CMAKE_CFG_INTDIR}" 
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/libutils.cmake mysql-5.5-5.5.43/cmake/libutils.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/libutils.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/libutils.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -158,6 +158,7 @@
   IF(OSLIBS)
     LIST(REMOVE_DUPLICATES OSLIBS)
     TARGET_LINK_LIBRARIES(${TARGET} ${OSLIBS})
+    MESSAGE(STATUS "Library ${TARGET} depends on OSLIBS ${OSLIBS}")
   ENDIF()
 
   # Make the generated dummy source file depended on all static input
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/maintainer.cmake mysql-5.5-5.5.43/cmake/maintainer.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/maintainer.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/maintainer.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -13,42 +13,39 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
 
-INCLUDE(CheckCCompilerFlag)
-
-# Setup GCC (GNU C compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS
-      "-Wall -Wextra -Wunused -Wwrite-strings -Wno-strict-aliasing -Werror")
-  CHECK_C_COMPILER_FLAG("-Wdeclaration-after-statement"
-                        HAVE_DECLARATION_AFTER_STATEMENT)
-  IF(HAVE_DECLARATION_AFTER_STATEMENT)
-    SET(MY_MAINTAINER_DECLARATION_AFTER_STATEMENT
-        "-Wdeclaration-after-statement")
-  ENDIF()
-  SET(MY_MAINTAINER_C_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} ${MY_MAINTAINER_DECLARATION_AFTER_STATEMENT}"
-      CACHE STRING "C warning options used in maintainer builds.")
-  # Do not make warnings in checks into errors.
-  SET(CMAKE_REQUIRED_FLAGS "${CMAKE_REQUIRED_FLAGS} -Wno-error")
-ENDMACRO()
-
-# Setup G++ (GNU C++ compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS
-      "${MY_MAINTAINER_WARNINGS} -Wno-unused-parameter -Woverloaded-virtual"
-      CACHE STRING "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICC (Intel C Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS)
-  SET(MY_MAINTAINER_WARNINGS "-Wcheck")
-  SET(MY_MAINTAINER_C_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-      CACHE STRING "C warning options used in maintainer builds.")
-ENDMACRO()
-
-# Setup ICPC (Intel C++ Compiler) warning options.
-MACRO(SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS)
-  SET(MY_MAINTAINER_CXX_WARNINGS "${MY_MAINTAINER_WARNINGS}"
-      CACHE STRING "C++ warning options used in maintainer builds.")
-ENDMACRO()
-
+# Common warning flags for GCC, G++, Clang and Clang++
+SET(MY_WARNING_FLAGS "-Wall -Wextra -Wformat-security")
+MY_CHECK_C_COMPILER_FLAG("-Wvla" HAVE_WVLA) # Requires GCC 4.3+ or Clang
+IF(HAVE_WVLA)
+  SET(MY_WARNING_FLAGS "${MY_WARNING_FLAGS} -Wvla")
+ENDIF()
+
+# Common warning flags for GCC and Clang
+SET(MY_C_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Wwrite-strings -Wdeclaration-after-statement")
+
+# Common warning flags for G++ and Clang++
+SET(MY_CXX_WARNING_FLAGS
+    "${MY_WARNING_FLAGS} -Woverloaded-virtual -Wno-unused-parameter")
+
+# Extra warning flags for Clang++
+IF(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(MY_CXX_WARNING_FLAGS
+      "${MY_CXX_WARNING_FLAGS} -Wno-null-conversion -Wno-unused-private-field")
+ENDIF()
+
+# Turn on Werror (warning => error) when using maintainer mode.
+IF(MYSQL_MAINTAINER_MODE)
+  SET(MY_C_WARNING_FLAGS "${MY_C_WARNING_FLAGS} -Werror")
+  SET(MY_CXX_WARNING_FLAGS "${MY_CXX_WARNING_FLAGS} -Werror")
+  SET(COMPILE_FLAG_WERROR 1)
+ENDIF()
+
+# Set warning flags for GCC/Clang
+IF(CMAKE_COMPILER_IS_GNUCC OR CMAKE_C_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_C_WARNING_FLAGS}")
+ENDIF()
+# Set warning flags for G++/Clang++
+IF(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_CXX_WARNING_FLAGS}")
+ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/make_dist.cmake.in mysql-5.5-5.5.43/cmake/make_dist.cmake.in
--- mysql-5.5-5.5.35+dfsg/cmake/make_dist.cmake.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/make_dist.cmake.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -14,7 +14,7 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # Make source distribution
-# If bzr is present, run bzr export.
+# If git is present, run git archive.
 # Otherwise, just run cpack with source configuration.
 
 SET(CMAKE_SOURCE_DIR "@CMAKE_SOURCE_DIR@")
@@ -22,13 +22,12 @@
 SET(CPACK_SOURCE_PACKAGE_FILE_NAME "@CPACK_SOURCE_PACKAGE_FILE_NAME@")
 SET(CMAKE_CPACK_COMMAND  "@CMAKE_CPACK_COMMAND@")
 SET(CMAKE_COMMAND  "@CMAKE_COMMAND@")
-SET(BZR_EXECUTABLE "@BZR_EXECUTABLE@")
+SET(GIT_EXECUTABLE "@GIT_EXECUTABLE@")
 SET(GTAR_EXECUTABLE "@GTAR_EXECUTABLE@")
 SET(TAR_EXECUTABLE "@TAR_EXECUTABLE@")
 SET(CMAKE_GENERATOR "@CMAKE_GENERATOR@")
 SET(CMAKE_MAKE_PROGRAM "@CMAKE_MAKE_PROGRAM@")
 SET(CMAKE_SYSTEM_NAME "@CMAKE_SYSTEM_NAME@")
-SET(PLUGIN_REPOS "@PLUGIN_REPOS@")
 
 SET(VERSION "@VERSION@")
 
@@ -40,38 +39,54 @@
 FILE(REMOVE_RECURSE ${PACKAGE_DIR})
 FILE(REMOVE ${PACKAGE_DIR}.tar.gz )
 
-IF(BZR_EXECUTABLE)
-  MESSAGE(STATUS "Running bzr export")
+# Only allow git if source dir itself is a git repository
+IF(GIT_EXECUTABLE)
   EXECUTE_PROCESS(
-    COMMAND "${BZR_EXECUTABLE}" export 
-    ${PACKAGE_DIR}
+    COMMAND "${GIT_EXECUTABLE}" rev-parse --show-toplevel
+    OUTPUT_VARIABLE GIT_ROOT
+    ERROR_VARIABLE GIT_ROOT_ERROR
+    OUTPUT_STRIP_TRAILING_WHITESPACE
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
     RESULT_VARIABLE RESULT
   )
 
-  IF(NOT RESULT EQUAL 0)
-   SET(BZR_EXECUTABLE)
+  IF(NOT RESULT EQUAL 0 OR NOT GIT_ROOT STREQUAL ${CMAKE_SOURCE_DIR})
+    MESSAGE(STATUS "This is not a git repository")
+    SET(GIT_EXECUTABLE)
   ENDIF()
 ENDIF()
 
-IF(BZR_EXECUTABLE)
-  FOREACH(REPO ${PLUGIN_REPOS})
-    GET_FILENAME_COMPONENT(PLUGIN_NAME ${REPO} NAME)
-    SET(DEST ${PACKAGE_DIR}/plugin/${PLUGIN_NAME})
-    MESSAGE(STATUS "Running bzr export for plugin/${PLUGIN_NAME}")
+IF(GIT_EXECUTABLE)
+  MESSAGE(STATUS "Running git archive -o ${PACKAGE_DIR}.tar")
+  EXECUTE_PROCESS(
+    COMMAND "${GIT_EXECUTABLE}" archive --format=tar
+    --prefix=${CPACK_SOURCE_PACKAGE_FILE_NAME}/ -o ${PACKAGE_DIR}.tar HEAD
+    WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
+    RESULT_VARIABLE RESULT
+  )
+  IF(NOT RESULT EQUAL 0)
+    SET(GIT_EXECUTABLE)
+  ELSE()
+    # Unpack tarball
     EXECUTE_PROCESS(
-      COMMAND "${BZR_EXECUTABLE}" export ${DEST}
-      WORKING_DIRECTORY ${REPO}
-      RESULT_VARIABLE RESULT
+      COMMAND ${CMAKE_COMMAND} -E tar xf ${PACKAGE_DIR}.tar
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE TAR_RESULT
     )
-    IF(NOT RESULT EQUAL 0)
-      MESSAGE(STATUS "bzr export failed")
+    IF(NOT TAR_RESULT EQUAL 0)
+      SET(GIT_EXECUTABLE)
+    ELSE()
+      # Remove tarball after unpacking
+      EXECUTE_PROCESS(
+        COMMAND ${CMAKE_COMMAND} -E remove ${PACKAGE_DIR}.tar
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      )
     ENDIF()
-  ENDFOREACH()
+  ENDIF()
 ENDIF()
 
-IF(NOT BZR_EXECUTABLE)
-  MESSAGE(STATUS "bzr not found or source dir is not a repo, use CPack")
+IF(NOT GIT_EXECUTABLE)
+  MESSAGE(STATUS "git not found or source dir is not a repo, use CPack")
   
   IF(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
     # In-source build is the worst option, we have to cleanup source tree.
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/mysql_version.cmake mysql-5.5-5.5.43/cmake/mysql_version.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/mysql_version.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/mysql_version.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, 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
@@ -18,6 +18,7 @@
 #
 
 SET(SHARED_LIB_MAJOR_VERSION "18")
+SET(SHARED_LIB_MINOR_VERSION "0")
 SET(PROTOCOL_VERSION "10")
 SET(DOT_FRM_VERSION "6")
 
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/os/Darwin.cmake mysql-5.5-5.5.43/cmake/os/Darwin.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/os/Darwin.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/os/Darwin.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2010 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2010, 2014, 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
@@ -15,21 +14,3 @@
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA 
 
 # This file includes OSX specific options and quirks, related to system checks
-
-# Workaround for CMake bug#9051
-# (CMake does not pass CMAKE_OSX_SYSROOT and CMAKE_OSX_DEPLOYMENT_TARGET when 
-# running TRY_COMPILE)
-
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{CMAKE_OSX_SYSROOT} ${CMAKE_OSX_SYSROOT})
-ENDIF()
-IF(CMAKE_OSX_SYSROOT)
- SET(ENV{MACOSX_DEPLOYMENT_TARGET} ${OSX_DEPLOYMENT_TARGET})
-ENDIF()
-
-IF(CMAKE_OSX_DEPLOYMENT_TARGET)
-  # Workaround linker problems  on OSX 10.4
-  IF(CMAKE_OSX_DEPLOYMENT_TARGET VERSION_LESS "10.5")
-    ADD_DEFINITIONS(-fno-common)
-  ENDIF()
-ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/os/WindowsCache.cmake mysql-5.5-5.5.43/cmake/os/WindowsCache.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/os/WindowsCache.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/os/WindowsCache.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -88,7 +88,7 @@
 SET(HAVE_GETRUSAGE CACHE  INTERNAL "")
 SET(HAVE_GETTIMEOFDAY CACHE  INTERNAL "")
 SET(HAVE_GETWD CACHE  INTERNAL "")
-SET(HAVE_GMTIME_R CACHE  INTERNAL "")
+SET(HAVE_GMTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_GRP_H CACHE  INTERNAL "")
 SET(HAVE_IA64INTRIN_H CACHE  INTERNAL "")
 SET(HAVE_IEEEFP_H CACHE  INTERNAL "")
@@ -109,7 +109,7 @@
 SET(HAVE_LDIV 1 CACHE  INTERNAL "")
 SET(HAVE_LIMITS_H 1 CACHE  INTERNAL "")
 SET(HAVE_LOCALE_H 1 CACHE  INTERNAL "")
-SET(HAVE_LOCALTIME_R CACHE  INTERNAL "")
+SET(HAVE_LOCALTIME_R 1 CACHE  INTERNAL "")
 SET(HAVE_LOG2 CACHE  INTERNAL "")
 SET(HAVE_LONGJMP 1 CACHE  INTERNAL "")
 SET(HAVE_LRAND48 CACHE  INTERNAL "")
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/os/Windows.cmake mysql-5.5-5.5.43/cmake/os/Windows.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/os/Windows.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/os/Windows.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2014, 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
@@ -62,22 +62,30 @@
 ENDIF()
 
 IF(MSVC)
-  # Enable debug info also in Release build, and create PDB to be able to analyze 
-  # crashes
-  FOREACH(lang C CXX)
-    SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Zi")
-  ENDFOREACH()
+  # Enable debug info also in Release build,
+  # and create PDB to be able to analyze crashes.
   FOREACH(type EXE SHARED MODULE)
-   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
+   SET(CMAKE_{type}_LINKER_FLAGS_RELEASE
+     "${CMAKE_${type}_LINKER_FLAGS_RELEASE} /debug")
   ENDFOREACH()
   
   # Force static runtime libraries
+  # - Choose debugging information:
+  #     /Z7
+  #     Produces an .obj file containing full symbolic debugging
+  #     information for use with the debugger. The symbolic debugging
+  #     information includes the names and types of variables, as well as
+  #     functions and line numbers. No .pdb file is produced by the compiler.
+  FOREACH(lang C CXX)
+    SET(CMAKE_${lang}_FLAGS_RELEASE "${CMAKE_${lang}_FLAGS_RELEASE} /Z7")
+  ENDFOREACH()
   FOREACH(flag 
-   CMAKE_C_FLAGS_RELEASE CMAKE_C_FLAGS_RELWITHDEBINFO 
-   CMAKE_C_FLAGS_DEBUG CMAKE_C_FLAGS_DEBUG_INIT 
+   CMAKE_C_FLAGS_RELEASE    CMAKE_C_FLAGS_RELWITHDEBINFO 
+   CMAKE_C_FLAGS_DEBUG      CMAKE_C_FLAGS_DEBUG_INIT 
    CMAKE_CXX_FLAGS_RELEASE  CMAKE_CXX_FLAGS_RELWITHDEBINFO
-   CMAKE_CXX_FLAGS_DEBUG  CMAKE_CXX_FLAGS_DEBUG_INIT)
+   CMAKE_CXX_FLAGS_DEBUG    CMAKE_CXX_FLAGS_DEBUG_INIT)
    STRING(REPLACE "/MD"  "/MT" "${flag}" "${${flag}}")
+   STRING(REPLACE "/Zi"  "/Z7" "${flag}" "${${flag}}")
   ENDFOREACH()
   
   # Remove support for exceptions
@@ -107,7 +115,6 @@
   SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} /wd4800 /wd4805 /wd4996")
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /wd4800 /wd4805 /wd4996 /we4099")
 
-
   IF(CMAKE_SIZEOF_VOID_P MATCHES 8)
     # _WIN64 is defined by the compiler itself. 
     # Yet, we define it here again   to work around a bug with  Intellisense 
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/plugin.cmake mysql-5.5-5.5.43/cmake/plugin.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/plugin.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/plugin.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -232,11 +232,4 @@
       ADD_SUBDIRECTORY(${dir})
     ENDIF()
   ENDFOREACH()
-  FOREACH(dir ${dirs_plugin})
-    IF (EXISTS ${dir}/.bzr)
-      MESSAGE(STATUS "Found repo ${dir}/.bzr")
-      LIST(APPEND PLUGIN_BZR_REPOS "${dir}")
-    ENDIF()
-  ENDFOREACH()
-  SET(PLUGIN_REPOS "${PLUGIN_BZR_REPOS}" CACHE INTERNAL "")
 ENDMACRO()
diff -Nru mysql-5.5-5.5.35+dfsg/cmake/zlib.cmake mysql-5.5-5.5.43/cmake/zlib.cmake
--- mysql-5.5-5.5.35+dfsg/cmake/zlib.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/cmake/zlib.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,4 @@
-# Copyright (c) 2009 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2009, 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 -Nru mysql-5.5-5.5.35+dfsg/CMakeLists.txt mysql-5.5-5.5.43/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -19,8 +19,27 @@
  CMAKE_POLICY(VERSION 2.8)
 endif()
 
+# We use PROPERTIES LINK_INTERFACE_LIBRARIES. See cmake --help-policy CMP0022
+IF(CMAKE_VERSION VERSION_EQUAL "2.8.12" OR
+   CMAKE_VERSION VERSION_GREATER "2.8.12")
+ CMAKE_POLICY(SET CMP0022 OLD)
+ENDIF()
+
+# We use the LOCATION target property (CMP0026)
+# and get_target_property() for non-existent targets (CMP0045)
+# and INSTALL_NAME_DIR (CMP0042)
+IF(CMAKE_VERSION VERSION_EQUAL "3.0.0" OR
+   CMAKE_VERSION VERSION_GREATER "3.0.0")
+ CMAKE_POLICY(SET CMP0026 OLD)
+ CMAKE_POLICY(SET CMP0045 OLD)
+ CMAKE_POLICY(SET CMP0042 OLD)
+ENDIF()
+
 MESSAGE(STATUS "Running cmake version ${CMAKE_VERSION}")
 
+# Will set GIT_EXECUTABLE and GIT_FOUND
+FIND_PACKAGE(Git)
+
 SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_SOURCE_DIR}/cmake)
 
 # First, decide about build type (debug or release)
@@ -59,11 +78,9 @@
 SET(BUILDTYPE_DOCSTRING
  "Choose the type of build, options are: None(CMAKE_CXX_FLAGS or
  CMAKE_C_FLAGS used) Debug Release RelWithDebInfo MinSizeRel")
- 
+
 IF(WITH_DEBUG)
   SET(CMAKE_BUILD_TYPE "Debug" CACHE STRING ${BUILDTYPE_DOCSTRING} FORCE)
-  SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
-      "MySQL maintainer-specific development environment")
   IF(UNIX AND NOT APPLE)
     # Compiling with PIC speeds up embedded build, on PIC sensitive systems 
     # Predefine it to ON, in case user chooses to build embedded. 
@@ -93,6 +110,15 @@
 ENDIF()
 PROJECT(${MYSQL_PROJECT_NAME})
 
+# Maintainer mode is default on only for Linux debug builds using GCC/G++
+IF(CMAKE_BUILD_TYPE MATCHES "Debug" OR WITH_DEBUG)
+  IF(CMAKE_SYSTEM_NAME MATCHES "Linux" AND
+     CMAKE_COMPILER_IS_GNUCC AND CMAKE_COMPILER_IS_GNUCXX)
+    SET(MYSQL_MAINTAINER_MODE ON CACHE BOOL
+        "MySQL maintainer-specific development environment")
+  ENDIF()
+ENDIF()
+
 IF(BUILD_CONFIG)
   INCLUDE(
   ${CMAKE_SOURCE_DIR}/cmake/build_configurations/${BUILD_CONFIG}.cmake)
@@ -116,38 +142,12 @@
 ENDFOREACH()
 
 
-
 # Following autotools tradition, add preprocessor definitions
 # specified in environment variable CPPFLAGS
 IF(DEFINED ENV{CPPFLAGS})
   ADD_DEFINITIONS($ENV{CPPFLAGS})
 ENDIF()
 
-#
-# Control aspects of the development environment which are
-# specific to MySQL maintainers and developers.
-#
-INCLUDE(maintainer)
-
-OPTION(MYSQL_MAINTAINER_MODE
-       "MySQL maintainer-specific development environment" OFF)
-
-# Whether the maintainer mode compiler options should be enabled.
-IF(MYSQL_MAINTAINER_MODE)
-  IF(CMAKE_C_COMPILER_ID MATCHES "GNU")
-    SET_MYSQL_MAINTAINER_GNU_C_OPTIONS()
-  ENDIF()
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "GNU")
-    SET_MYSQL_MAINTAINER_GNU_CXX_OPTIONS()
-  ENDIF()
-  IF(CMAKE_C_COMPILER_ID MATCHES "Intel")
-    SET_MYSQL_MAINTAINER_INTEL_C_OPTIONS()
-  ENDIF()
-  IF(CMAKE_CXX_COMPILER_ID MATCHES "Intel")
-    SET_MYSQL_MAINTAINER_INTEL_CXX_OPTIONS()
-  ENDIF()
-ENDIF()
-
 # Add macros
 INCLUDE(character_sets)
 INCLUDE(zlib)
@@ -178,7 +178,6 @@
 MARK_AS_ADVANCED(CYBOZU BACKUP_TEST WITHOUT_SERVER DISABLE_SHARED)
 
 
-
 include(CheckCSourceCompiles)
 include(CheckCXXSourceCompiles)
 # We need some extra FAIL_REGEX patterns
@@ -329,6 +328,16 @@
   SET(DEFAULT_SYSCONFDIR "${SYSCONFDIR}")
 ENDIF()
 
+SET(TMPDIR "P_tmpdir"
+  CACHE PATH
+  "PATH to MySQL TMP dir. Defaults to the P_tmpdir macro in <stdio.h>")
+IF(TMPDIR STREQUAL "P_tmpdir")
+  # 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}\"")
+ENDIF()
 
 # Run platform tests
 INCLUDE(configure.cmake)
@@ -349,13 +358,13 @@
 # not run with the warning options as to not perturb fragile checks
 # (i.e. do not make warnings into errors).
 #
-IF(MYSQL_MAINTAINER_MODE)
-  # Set compiler flags required under maintainer mode.
-  MESSAGE(STATUS "C warning options: ${MY_MAINTAINER_C_WARNINGS}")
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${MY_MAINTAINER_C_WARNINGS}")
-  MESSAGE(STATUS "C++ warning options: ${MY_MAINTAINER_CXX_WARNINGS}")
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${MY_MAINTAINER_CXX_WARNINGS}")
-ENDIF()
+# Why doesn't these flags affect the entire build?
+# Because things may already have been included with ADD_SUBDIRECTORY
+#
+OPTION(MYSQL_MAINTAINER_MODE
+       "MySQL maintainer-specific development environment" OFF)
+
+INCLUDE(maintainer)
 
 IF(NOT WITHOUT_SERVER)
 SET (MYSQLD_STATIC_PLUGIN_LIBS "" CACHE INTERNAL "")
@@ -371,7 +380,6 @@
 ADD_SUBDIRECTORY(mysys)
 ADD_SUBDIRECTORY(libmysql)
 
-
 IF(WITH_UNIT_TESTS)
  ENABLE_TESTING()
 ENDIF()
@@ -405,7 +413,8 @@
   IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
     ADD_SUBDIRECTORY(internal)
   ENDIF()
-  ADD_SUBDIRECTORY(packaging/rpm-uln)
+  ADD_SUBDIRECTORY(packaging/rpm-oel)
+  ADD_SUBDIRECTORY(packaging/rpm-sles)
 ENDIF()
 
 INCLUDE(cmake/abi_check.cmake)
@@ -418,13 +427,14 @@
 CONFIGURE_FILE(${CMAKE_SOURCE_DIR}/sql/sql_builtin.cc.in
     ${CMAKE_BINARY_DIR}/sql/sql_builtin.cc)
 CONFIGURE_FILE(
-    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
+    ${CMAKE_SOURCE_DIR}/cmake/info_macros.cmake.in
+    ${CMAKE_BINARY_DIR}/info_macros.cmake @ONLY)
 
 # Handle the "INFO_*" files.
 INCLUDE(${CMAKE_BINARY_DIR}/info_macros.cmake)
 # Source: This can be done during the cmake phase, all information is
 # available, but should be repeated on each "make" just in case someone
-# does "cmake ; make ; bzr pull ; make".
+# does "cmake ; make ; git pull ; make".
 CREATE_INFO_SRC(${CMAKE_BINARY_DIR}/Docs)
 ADD_CUSTOM_TARGET(INFO_SRC ALL
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_SOURCE_DIR}/cmake/info_src.cmake
@@ -463,7 +473,6 @@
   )
   INSTALL(FILES README DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   INSTALL(FILES ${CMAKE_BINARY_DIR}/Docs/INFO_SRC ${CMAKE_BINARY_DIR}/Docs/INFO_BIN DESTINATION ${INSTALL_DOCDIR})
-  
   IF(UNIX)
     INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
   ENDIF()
@@ -483,3 +492,37 @@
 ENDIF()
 
 INCLUDE(CPack)
+
+# C compiler flags consist of:
+# CPPFLAGS        Taken from environment, see above.
+# ADD_DEFINITIONS In each individual CMakeLists.txt
+# CMAKE_C_FLAGS   From command line.
+#                 We extend these in maintainer.cmake
+# ENV{CFLAGS}     From environment, but environment is ignored if
+#                 CMAKE_C_FLAGS is also given on command line
+# CMAKE_C_FLAGS_${CMAKE_BUILD_TYPE}
+#                 We extend these in compiler_options.cmake
+#
+# Note that CMakeCache.txt contains cmake builtins for these variables,
+# *not* the values that will actually be used:
+
+IF(CMAKE_GENERATOR MATCHES "Makefiles")
+  MESSAGE(STATUS "CMAKE_BUILD_TYPE: ${CMAKE_BUILD_TYPE}")
+ENDIF()
+GET_PROPERTY(cwd_definitions DIRECTORY PROPERTY COMPILE_DEFINITIONS)
+MESSAGE(STATUS "COMPILE_DEFINITIONS: ${cwd_definitions}")
+MESSAGE(STATUS "CMAKE_C_FLAGS: ${CMAKE_C_FLAGS}")
+MESSAGE(STATUS "CMAKE_CXX_FLAGS: ${CMAKE_CXX_FLAGS}")
+IF(CMAKE_BUILD_TYPE AND CMAKE_GENERATOR MATCHES "Makefiles")
+  STRING(TOUPPER "${CMAKE_BUILD_TYPE}" CMAKEBT)
+  MESSAGE(STATUS "CMAKE_C_FLAGS_${CMAKEBT}: ${CMAKE_C_FLAGS_${CMAKEBT}}")
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS_${CMAKEBT}: ${CMAKE_CXX_FLAGS_${CMAKEBT}}")
+ENDIF()
+IF(NOT CMAKE_GENERATOR MATCHES "Makefiles")
+  MESSAGE(STATUS "CMAKE_C_FLAGS_DEBUG: ${CMAKE_C_FLAGS_DEBUG}")
+  MESSAGE(STATUS "CMAKE_CXX_FLAGS_DEBUG: ${CMAKE_CXX_FLAGS_DEBUG}")
+  MESSAGE(STATUS
+    "CMAKE_C_FLAGS_RELWITHDEBINFO: ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  MESSAGE(STATUS
+    "CMAKE_CXX_FLAGS_RELWITHDEBINFO: ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/config.h.cmake mysql-5.5-5.5.43/config.h.cmake
--- mysql-5.5-5.5.35+dfsg/config.h.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/config.h.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 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
@@ -600,6 +600,7 @@
 #cmakedefine DEFAULT_CHARSET_HOME "@DEFAULT_CHARSET_HOME@"
 #cmakedefine PLUGINDIR "@PLUGINDIR@"
 #cmakedefine DEFAULT_SYSCONFDIR "@DEFAULT_SYSCONFDIR@"
+#cmakedefine DEFAULT_TMPDIR @DEFAULT_TMPDIR@
 
 #cmakedefine SO_EXT "@CMAKE_SHARED_MODULE_SUFFIX@"
 
diff -Nru mysql-5.5-5.5.35+dfsg/configure.cmake mysql-5.5-5.5.43/configure.cmake
--- mysql-5.5-5.5.35+dfsg/configure.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/configure.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -53,15 +53,6 @@
 ENDIF()
 
 
-# Always enable -Wall for gnu C/C++
-IF(CMAKE_COMPILER_IS_GNUCXX)
-  SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wno-unused-parameter")
-ENDIF()
-IF(CMAKE_COMPILER_IS_GNUCC)
-  SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall")
-ENDIF()
-
-
 IF(CMAKE_COMPILER_IS_GNUCXX)
   # MySQL "canonical" GCC flags. At least -fno-rtti flag affects
   # ABI and cannot be simply removed. 
diff -Nru mysql-5.5-5.5.35+dfsg/debian/changelog mysql-5.5-5.5.43/debian/changelog
--- mysql-5.5-5.5.35+dfsg/debian/changelog	2014-02-19 21:19:52.000000000 +0000
+++ mysql-5.5-5.5.43/debian/changelog	2015-06-15 18:11:41.000000000 +0000
@@ -1,3 +1,71 @@
+mysql-5.5 (5.5.43-0ubuntu0.14.04.2) trusty-proposed; urgency=medium
+
+  * Introduce full memory barrier support for arm64 and ppc64el to fix
+    corruption/hang issues (LP: #1427406).
+
+ -- dann frazier <dannf@ubuntu.com>  Mon, 15 Jun 2015 12:11:36 -0600
+
+mysql-5.5 (5.5.43-0ubuntu0.14.04.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 5.5.43 to fix security issues (LP: #1444616)
+    - http://www.oracle.com/technetwork/topics/security/cpuapr2015-2365600.html
+    - CVE-2015-0433
+    - CVE-2015-0441
+    - CVE-2015-0499
+    - CVE-2015-0501
+    - CVE-2015-0505
+    - CVE-2015-2568
+    - CVE-2015-2571
+    - CVE-2015-2573
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 20 Apr 2015 09:30:47 -0400
+
+mysql-5.5 (5.5.41-0ubuntu0.14.04.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 5.5.41 to fix security issues (LP: #1413188)
+    - http://www.oracle.com/technetwork/topics/security/cpujan2015-1972971.html
+    - CVE-2014-6568
+    - CVE-2015-0374
+    - CVE-2015-0381
+    - CVE-2015-0382
+    - CVE-2015-0411
+    - CVE-2015-0432
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 21 Jan 2015 11:49:48 -0500
+
+mysql-5.5 (5.5.40-0ubuntu0.14.04.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 5.5.40 to fix security issues (LP: #1379903)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 10 Oct 2014 14:57:34 -0400
+
+mysql-5.5 (5.5.38-0ubuntu0.14.04.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 5.5.38 to fix security issues (LP: #1342709)
+    - http://www.oracle.com/technetwork/topics/security/cpujul2014-1972956.html
+    - CVE-2014-2494
+    - CVE-2014-4207
+    - CVE-2014-4258
+    - CVE-2014-4260
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Wed, 16 Jul 2014 11:39:56 -0400
+
+mysql-5.5 (5.5.37-0ubuntu0.14.04.1) trusty-security; urgency=medium
+
+  * SECURITY UPDATE: Update to 5.5.37 to fix security issues (LP: #1309662)
+    - http://www.oracle.com/technetwork/topics/security/cpuapr2014-1972952.html
+    - CVE-2014-0001
+    - CVE-2014-0384
+    - CVE-2014-2419
+    - CVE-2014-2430
+    - CVE-2014-2431
+    - CVE-2014-2432
+    - CVE-2014-2436
+    - CVE-2014-2438
+    - CVE-2014-2440
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Fri, 18 Apr 2014 13:37:55 -0400
+
 mysql-5.5 (5.5.35+dfsg-1ubuntu1) trusty; urgency=low
 
   * Merge from Debian unstable.
diff -Nru mysql-5.5-5.5.35+dfsg/debian/control mysql-5.5-5.5.43/debian/control
--- mysql-5.5-5.5.35+dfsg/debian/control	2014-02-19 21:19:52.000000000 +0000
+++ mysql-5.5-5.5.43/debian/control	2015-06-15 18:11:08.000000000 +0000
@@ -25,6 +25,7 @@
  perl,
  po-debconf,
  psmisc,
+ quilt,
  zlib1g-dev (>= 1:1.1.3-5)
 Standards-Version: 3.9.5
 Homepage: http://dev.mysql.com/
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/Bug-11755438-Bug-47213-INNODB-MUTEX-RW_LOCK-SHOULD-B.patch mysql-5.5-5.5.43/debian/patches/arch-specific/Bug-11755438-Bug-47213-INNODB-MUTEX-RW_LOCK-SHOULD-B.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/Bug-11755438-Bug-47213-INNODB-MUTEX-RW_LOCK-SHOULD-B.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/Bug-11755438-Bug-47213-INNODB-MUTEX-RW_LOCK-SHOULD-B.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,438 @@
+From: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
+Subject: [PATCH] Bug#11755438: Bug#47213: INNODB MUTEX/RW_LOCK SHOULD BE
+ CONSCIOUS ABOUT MEMORY ORDERING OTHER THAN INTEL
+
+Because of difference about memory ordering, some critical flags of mutex/rw_lock might be missed to read on non-Intel CPUs.
+Even for Intel-CPUs, the explicit memory barrier instruction might cause positive effects for performance.
+
+Approved by Kevin Lewis in rb#5561
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Origin: https://github.com/mysql/mysql-server/commit/19b3f570fcd91be13eb8e29256a458f4d45942c5
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/CMakeLists.txt b/storage/innobase/CMakeLists.txt
+--- a/storage/innobase/CMakeLists.txt	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/CMakeLists.txt	2015-06-12 14:17:07.952227810 -0600
+@@ -54,7 +54,6 @@ IF(NOT CMAKE_CROSSCOMPILING)
+     long	x;
+     long	y;
+     long	res;
+-    char	c;
+ 
+     x = 10;
+     y = 123;
+@@ -75,6 +74,16 @@ IF(NOT CMAKE_CROSSCOMPILING)
+     if (res != 123 + 10 || x != 123 + 10) {
+       return(1);
+     }
++    return(0);
++  }"
++  HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
++  )
++  CHECK_C_SOURCE_RUNS(
++  "
++  int main()
++  {
++    long	res;
++    char	c;
+ 
+     c = 10;
+     res = __sync_lock_test_and_set(&c, 123);
+@@ -85,12 +94,43 @@ IF(NOT CMAKE_CROSSCOMPILING)
+   }"
+   HAVE_IB_GCC_ATOMIC_BUILTINS
+   )
++  CHECK_C_SOURCE_RUNS(
++  "#include<stdint.h>
++  int main()
++  {
++    __sync_synchronize();
++    return(0);
++  }"
++  HAVE_IB_GCC_SYNC_SYNCHRONISE
++  )
++  CHECK_C_SOURCE_RUNS(
++  "#include<stdint.h>
++  int main()
++  {
++    __atomic_thread_fence(__ATOMIC_ACQUIRE);
++    __atomic_thread_fence(__ATOMIC_RELEASE);
++    return(0);
++  }"
++  HAVE_IB_GCC_ATOMIC_THREAD_FENCE
++  )
+ ENDIF()
+ 
+ IF(HAVE_IB_GCC_ATOMIC_BUILTINS)
+  ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS=1)
+ ENDIF()
+ 
++IF(HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE)
++ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_BUILTINS_BYTE=1)
++ENDIF()
++
++IF(HAVE_IB_GCC_SYNC_SYNCHRONISE)
++ ADD_DEFINITIONS(-DHAVE_IB_GCC_SYNC_SYNCHRONISE=1)
++ENDIF()
++
++IF(HAVE_IB_GCC_ATOMIC_THREAD_FENCE)
++ ADD_DEFINITIONS(-DHAVE_IB_GCC_ATOMIC_THREAD_FENCE=1)
++ENDIF()
++
+  # either define HAVE_IB_ATOMIC_PTHREAD_T_GCC or not
+ IF(NOT CMAKE_CROSSCOMPILING)
+   CHECK_C_SOURCE_RUNS(
+@@ -169,10 +209,21 @@ IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+       return(0);
+     }
+   " HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS)
++  CHECK_C_SOURCE_COMPILES(
++  "#include <mbarrier.h>
++  int main() {
++    __machine_r_barrier();
++    __machine_w_barrier();
++    return(0);
++  }"
++  HAVE_IB_MACHINE_BARRIER_SOLARIS)
+   ENDIF()
+   IF(HAVE_IB_ATOMIC_PTHREAD_T_SOLARIS)
+     ADD_DEFINITIONS(-DHAVE_IB_ATOMIC_PTHREAD_T_SOLARIS=1)
+   ENDIF()
++  IF(HAVE_IB_MACHINE_BARRIER_SOLARIS)
++    ADD_DEFINITIONS(-DHAVE_IB_MACHINE_BARRIER_SOLARIS=1)
++  ENDIF()
+ ENDIF()
+ 
+ 
+@@ -190,6 +241,7 @@ ENDIF()
+ 
+ IF(MSVC)
+   ADD_DEFINITIONS(-DHAVE_WINDOWS_ATOMICS)
++  ADD_DEFINITIONS(-DHAVE_WINDOWS_MM_FENCE)
+ ENDIF()
+ 
+ 
+diff -urpN a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+--- a/storage/innobase/include/os0sync.h	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/include/os0sync.h	2015-06-12 14:20:25.448406822 -0600
+@@ -267,6 +267,10 @@ Atomic compare-and-swap and increment fo
+ 
+ #define HAVE_ATOMIC_BUILTINS
+ 
++#ifdef HAVE_IB_GCC_ATOMIC_BUILTINS_BYTE
++# define HAVE_ATOMIC_BUILTINS_BYTE
++#endif
++
+ /**********************************************************//**
+ Returns true if swapped, ptr is pointer to target, old_val is value to
+ compare to, new_val is the value to swap in. */
+@@ -313,6 +317,7 @@ Returns the old value of *ptr, atomicall
+ #elif defined(HAVE_IB_SOLARIS_ATOMICS)
+ 
+ #define HAVE_ATOMIC_BUILTINS
++#define HAVE_ATOMIC_BUILTINS_BYTE
+ 
+ /* If not compiling with GCC or GCC doesn't support the atomic
+ intrinsics and running on Solaris >= 10 use Solaris atomics */
+@@ -366,6 +371,7 @@ Returns the old value of *ptr, atomicall
+ #elif defined(HAVE_WINDOWS_ATOMICS)
+ 
+ #define HAVE_ATOMIC_BUILTINS
++#define HAVE_ATOMIC_BUILTINS_BYTE
+ 
+ /* On Windows, use Windows atomics / interlocked */
+ # ifdef _WIN64
+@@ -416,6 +422,52 @@ clobbered */
+ 	"Mutexes and rw_locks use InnoDB's own implementation"
+ #endif
+ 
++/** barrier definitions for memory ordering */
++#ifdef HAVE_IB_GCC_ATOMIC_THREAD_FENCE
++# define HAVE_MEMORY_BARRIER
++# define os_rmb	__atomic_thread_fence(__ATOMIC_ACQUIRE)
++# define os_wmb	__atomic_thread_fence(__ATOMIC_RELEASE)
++# define IB_MEMORY_BARRIER_STARTUP_MSG \
++	"GCC builtin __atomic_thread_fence() is used for memory barrier"
++
++#elif defined(HAVE_IB_GCC_SYNC_SYNCHRONISE)
++# define HAVE_MEMORY_BARRIER
++# define os_rmb	__sync_synchronize()
++# define os_wmb	__sync_synchronize()
++# define IB_MEMORY_BARRIER_STARTUP_MSG \
++	"GCC builtin __sync_synchronize() is used for memory barrier"
++
++#elif defined(HAVE_IB_MACHINE_BARRIER_SOLARIS)
++# define HAVE_MEMORY_BARRIER
++# include <mbarrier.h>
++# define os_rmb	__machine_r_barrier()
++# define os_wmb	__machine_w_barrier()
++# define IB_MEMORY_BARRIER_STARTUP_MSG \
++	"Solaris memory ordering functions are used for memory barrier"
++
++#elif defined(HAVE_WINDOWS_MM_FENCE)
++# define HAVE_MEMORY_BARRIER
++# include <mmintrin.h>
++# define os_rmb	_mm_lfence()
++# define os_wmb	_mm_sfence()
++# define IB_MEMORY_BARRIER_STARTUP_MSG \
++	"_mm_lfence() and _mm_sfence() are used for memory barrier"
++
++#else
++# define os_rmb
++# define os_wmb
++# define IB_MEMORY_BARRIER_STARTUP_MSG \
++	"Memory barrier is not used"
++#endif
++
++/* internal counter for innodb_sync_spin_loops is adjusted
++because memory barrier is more expensive than an empty loop. */
++#ifdef HAVE_MEMORY_BARRIER
++# define SPIN_WAIT_INCREMENT 2
++#else
++# define SPIN_WAIT_INCREMENT 1
++#endif /* HAVE_MEMORY_BARRIER */
++
+ #ifndef UNIV_NONINL
+ #include "os0sync.ic"
+ #endif
+diff -urpN a/storage/innobase/include/sync0rw.ic b/storage/innobase/include/sync0rw.ic
+--- a/storage/innobase/include/sync0rw.ic	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/include/sync0rw.ic	2015-06-12 14:21:41.593405957 -0600
+@@ -93,6 +93,7 @@ rw_lock_set_waiter_flag(
+ 	(void) os_compare_and_swap_ulint(&lock->waiters, 0, 1);
+ #else /* INNODB_RW_LOCKS_USE_ATOMICS */
+ 	lock->waiters = 1;
++	os_wmb;
+ #endif /* INNODB_RW_LOCKS_USE_ATOMICS */
+ }
+ 
+@@ -110,6 +111,7 @@ rw_lock_reset_waiter_flag(
+ 	(void) os_compare_and_swap_ulint(&lock->waiters, 1, 0);
+ #else /* INNODB_RW_LOCKS_USE_ATOMICS */
+ 	lock->waiters = 0;
++	os_wmb;
+ #endif /* INNODB_RW_LOCKS_USE_ATOMICS */
+ }
+ 
+@@ -200,7 +202,10 @@ rw_lock_lock_word_decr(
+ 	ulint		amount)		/*!< in: amount to decrement */
+ {
+ #ifdef INNODB_RW_LOCKS_USE_ATOMICS
+-        lint local_lock_word = lock->lock_word;
++	lint local_lock_word;
++
++	os_rmb;
++	local_lock_word = lock->lock_word;
+ 	while (local_lock_word > 0) {
+ 		if (os_compare_and_swap_lint(&lock->lock_word,
+ 					     local_lock_word,
+diff -urpN a/storage/innobase/include/sync0sync.h b/storage/innobase/include/sync0sync.h
+--- a/storage/innobase/include/sync0sync.h	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/include/sync0sync.h	2015-06-12 14:28:13.297014889 -0600
+@@ -48,6 +48,8 @@ extern my_bool	timed_mutexes;
+ #ifdef HAVE_WINDOWS_ATOMICS
+ typedef LONG lock_word_t;	/*!< On Windows, InterlockedExchange operates
+ 				on LONG variable */
++#elif defined(HAVE_ATOMIC_BUILTINS) && !defined(HAVE_ATOMIC_BUILTINS_BYTE)
++typedef ulint lock_word_t;
+ #else
+ typedef byte lock_word_t;
+ #endif
+diff -urpN a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
+--- a/storage/innobase/include/sync0sync.ic	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/include/sync0sync.ic	2015-06-12 14:29:58.239813599 -0600
+@@ -80,7 +80,11 @@ mutex_test_and_set(
+ 	mutex_t*	mutex)	/*!< in: mutex */
+ {
+ #if defined(HAVE_ATOMIC_BUILTINS)
++# if defined(HAVE_ATOMIC_BUILTINS_BYTE)
+ 	return(os_atomic_test_and_set_byte(&mutex->lock_word, 1));
++# else
++	return(os_atomic_test_and_set_ulint(&mutex->lock_word, 1));
++# endif
+ #else
+ 	ibool	ret;
+ 
+@@ -92,6 +96,7 @@ mutex_test_and_set(
+ 		ut_a(mutex->lock_word == 0);
+ 
+ 		mutex->lock_word = 1;
++		os_wmb;
+ 	}
+ 
+ 	return((byte)ret);
+@@ -111,7 +116,11 @@ mutex_reset_lock_word(
+ 	/* In theory __sync_lock_release should be used to release the lock.
+ 	Unfortunately, it does not work properly alone. The workaround is
+ 	that more conservative __sync_lock_test_and_set is used instead. */
++# if defined(HAVE_ATOMIC_BUILTINS_BYTE)
+ 	os_atomic_test_and_set_byte(&mutex->lock_word, 0);
++# else
++	os_atomic_test_and_set_ulint(&mutex->lock_word, 0);
++# endif
+ #else
+ 	mutex->lock_word = 0;
+ 
+diff -urpN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
+--- a/storage/innobase/srv/srv0start.c	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/srv/srv0start.c	2015-06-12 14:33:14.906224837 -0600
+@@ -1153,6 +1153,18 @@ innobase_start_or_create_for_mysql(void)
+ 	ut_print_timestamp(stderr);
+ 	fputs(" InnoDB: " IB_ATOMICS_STARTUP_MSG "\n", stderr);
+ 
++ 	fputs(" InnoDB: " IB_MEMORY_BARRIER_STARTUP_MSG "\n", stderr);
++
++#ifndef HAVE_MEMORY_BARRIER
++#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64
++#else
++	ib_logf(IB_LOG_LEVEL_WARN,
++		"MySQL was built without a memory barrier capability on this"
++		" architecture, which might allow a mutex/rw_lock violation"
++		" under high thread concurrency. This may cause a hang.");
++#endif /* IA32 or AMD64 */
++#endif /* HAVE_MEMORY_BARRIER */
++
+ 	ut_print_timestamp(stderr);
+ 	fputs(" InnoDB: Compressed tables use zlib " ZLIB_VERSION
+ #ifdef UNIV_ZIP_DEBUG
+diff -urpN a/storage/innobase/sync/sync0arr.c b/storage/innobase/sync/sync0arr.c
+--- a/storage/innobase/sync/sync0arr.c	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/sync/sync0arr.c	2015-06-12 14:41:38.481091057 -0600
+@@ -776,6 +776,7 @@ sync_arr_cell_can_wake_up(
+ 
+ 		mutex = cell->wait_object;
+ 
++		os_rmb;
+ 		if (mutex_get_lock_word(mutex) == 0) {
+ 
+ 			return(TRUE);
+@@ -785,6 +786,7 @@ sync_arr_cell_can_wake_up(
+ 
+ 		lock = cell->wait_object;
+ 
++		os_rmb;
+ 		if (lock->lock_word > 0) {
+ 		/* Either unlocked or only read locked. */
+ 
+@@ -796,6 +798,7 @@ sync_arr_cell_can_wake_up(
+ 		lock = cell->wait_object;
+ 
+                 /* lock_word == 0 means all readers have left */
++		os_rmb;
+ 		if (lock->lock_word == 0) {
+ 
+ 			return(TRUE);
+@@ -804,6 +807,7 @@ sync_arr_cell_can_wake_up(
+ 		lock = cell->wait_object;
+ 
+                 /* lock_word > 0 means no writer or reserved writer */
++		os_rmb;
+ 		if (lock->lock_word > 0) {
+ 
+ 			return(TRUE);
+diff -urpN a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
+--- a/storage/innobase/sync/sync0rw.c	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/sync/sync0rw.c	2015-06-12 14:45:26.785074328 -0600
+@@ -390,15 +390,17 @@ rw_lock_s_lock_spin(
+ lock_loop:
+ 
+ 	/* Spin waiting for the writer field to become free */
++	os_rmb;
+ 	while (i < SYNC_SPIN_ROUNDS && lock->lock_word <= 0) {
+ 		if (srv_spin_wait_delay) {
+ 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
+ 		}
+ 
+-		i++;
++		i += SPIN_WAIT_INCREMENT;
++		os_rmb;
+ 	}
+ 
+-	if (i == SYNC_SPIN_ROUNDS) {
++	if (i >= SYNC_SPIN_ROUNDS) {
+ 		os_thread_yield();
+ 	}
+ 
+@@ -498,6 +500,7 @@ rw_lock_x_lock_wait(
+ 	ulint index;
+ 	ulint i = 0;
+ 
++	os_rmb;
+ 	ut_ad(lock->lock_word <= 0);
+ 
+ 	while (lock->lock_word < 0) {
+@@ -505,7 +508,8 @@ rw_lock_x_lock_wait(
+ 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
+ 		}
+ 		if(i < SYNC_SPIN_ROUNDS) {
+-			i++;
++			i += SPIN_WAIT_INCREMENT;
++			os_rmb;
+ 			continue;
+ 		}
+ 
+@@ -582,6 +586,10 @@ rw_lock_x_lock_low(
+                                     file_name, line);
+ 
+ 	} else {
++		if (!pass) {
++			os_rmb;
++		}
++
+ 		/* Decrement failed: relock or failed lock */
+ 		if (!pass && lock->recursive
+ 		    && os_thread_eq(lock->writer_thread, curr_thread)) {
+@@ -647,6 +655,7 @@ lock_loop:
+ 		}
+ 
+ 		/* Spin waiting for the lock_word to become free */
++		os_rmb;
+ 		while (i < SYNC_SPIN_ROUNDS
+ 		       && lock->lock_word <= 0) {
+ 			if (srv_spin_wait_delay) {
+@@ -654,9 +663,10 @@ lock_loop:
+ 							 srv_spin_wait_delay));
+ 			}
+ 
+-			i++;
++			i += SPIN_WAIT_INCREMENT;
++			os_rmb;
+ 		}
+-		if (i == SYNC_SPIN_ROUNDS) {
++		if (i >= SYNC_SPIN_ROUNDS) {
+ 			os_thread_yield();
+ 		} else {
+ 			goto lock_loop;
+diff -urpN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
+--- a/storage/innobase/sync/sync0sync.c	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/sync/sync0sync.c	2015-06-12 14:47:23.196895662 -0600
+@@ -472,6 +472,7 @@ mutex_set_waiters(
+ 
+ 	*ptr = n;		/* Here we assume that the write of a single
+ 				word in memory is atomic */
++	os_wmb;
+ }
+ 
+ /******************************************************************//**
+@@ -516,16 +517,17 @@ mutex_loop:
+ 
+ spin_loop:
+ 	ut_d(mutex->count_spin_loop++);
+-
++	os_rmb;
+ 	while (mutex_get_lock_word(mutex) != 0 && i < SYNC_SPIN_ROUNDS) {
+ 		if (srv_spin_wait_delay) {
+ 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
+ 		}
+ 
+-		i++;
++		i += SPIN_WAIT_INCREMENT;
++		os_rmb;
+ 	}
+ 
+-	if (i == SYNC_SPIN_ROUNDS) {
++	if (i >= SYNC_SPIN_ROUNDS) {
+ #ifdef UNIV_DEBUG
+ 		mutex->count_os_yield++;
+ #ifndef UNIV_HOTBACKUP
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/Bug-19048563-PERFORMANCE-REGRESSION-IN-UPDATE-OPS-CA.patch mysql-5.5-5.5.43/debian/patches/arch-specific/Bug-19048563-PERFORMANCE-REGRESSION-IN-UPDATE-OPS-CA.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/Bug-19048563-PERFORMANCE-REGRESSION-IN-UPDATE-OPS-CA.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/Bug-19048563-PERFORMANCE-REGRESSION-IN-UPDATE-OPS-CA.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,87 @@
+From: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
+Subject: [PATCH] Bug #19048563 : PERFORMANCE REGRESSION IN UPDATE OPS CAUSED
+ BY TRUNK REVNO 8242 (BUG#11755438)
+
+Some of the added memory barrier (internal of spin loops of mutex/rw_lock) was too expensive. Removed.
+This is partial reverting of the fix for Bug#11755438.
+
+------------------------------------------------------------
+revno: 6004
+committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
+branch nick: mysql-5.6
+timestamp: Thu 2014-06-19 07:33:57 +0200
+message:
+  Bug#11755438: Bug#47213: INNODB MUTEX/RW_LOCK SHOULD BE CONSCIOUS ABOUT MEMORY ORDERING OTHER THAN INTEL
+
+  Because of difference about memory ordering, some critical flags of mutex/rw_lock might be missed to read on non-Intel CPUs.
+  Even for Intel-CPUs, the explicit memory barrier instruction might cause positive effects for performance.
+
+  Approved by Kevin Lewis in rb#5561
+------------------------------------------------------------
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Origin: https://github.com/mysql/mysql-server/commit/518f1d0cb7d369ada859af768acbfcdd4168cf3e
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+--- a/storage/innobase/include/os0sync.h	2015-06-12 14:20:25.448406822 -0600
++++ b/storage/innobase/include/os0sync.h	2015-06-12 14:57:07.784876623 -0600
+@@ -460,14 +460,6 @@ clobbered */
+ 	"Memory barrier is not used"
+ #endif
+ 
+-/* internal counter for innodb_sync_spin_loops is adjusted
+-because memory barrier is more expensive than an empty loop. */
+-#ifdef HAVE_MEMORY_BARRIER
+-# define SPIN_WAIT_INCREMENT 2
+-#else
+-# define SPIN_WAIT_INCREMENT 1
+-#endif /* HAVE_MEMORY_BARRIER */
+-
+ #ifndef UNIV_NONINL
+ #include "os0sync.ic"
+ #endif
+diff -urpN a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
+--- a/storage/innobase/sync/sync0rw.c	2015-06-12 14:45:26.785074328 -0600
++++ b/storage/innobase/sync/sync0rw.c	2015-06-12 14:57:59.881017791 -0600
+@@ -396,8 +396,7 @@ lock_loop:
+ 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
+ 		}
+ 
+-		i += SPIN_WAIT_INCREMENT;
+-		os_rmb;
++		i++;
+ 	}
+ 
+ 	if (i >= SYNC_SPIN_ROUNDS) {
+@@ -508,7 +507,7 @@ rw_lock_x_lock_wait(
+ 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
+ 		}
+ 		if(i < SYNC_SPIN_ROUNDS) {
+-			i += SPIN_WAIT_INCREMENT;
++			i++;
+ 			os_rmb;
+ 			continue;
+ 		}
+@@ -663,8 +662,7 @@ lock_loop:
+ 							 srv_spin_wait_delay));
+ 			}
+ 
+-			i += SPIN_WAIT_INCREMENT;
+-			os_rmb;
++			i++;
+ 		}
+ 		if (i >= SYNC_SPIN_ROUNDS) {
+ 			os_thread_yield();
+diff -urpN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
+--- a/storage/innobase/sync/sync0sync.c	2015-06-12 14:47:23.196895662 -0600
++++ b/storage/innobase/sync/sync0sync.c	2015-06-12 14:58:18.989606255 -0600
+@@ -523,8 +523,7 @@ spin_loop:
+ 			ut_delay(ut_rnd_interval(0, srv_spin_wait_delay));
+ 		}
+ 
+-		i += SPIN_WAIT_INCREMENT;
+-		os_rmb;
++		i++;
+ 	}
+ 
+ 	if (i >= SYNC_SPIN_ROUNDS) {
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/Disable-memory-barrier-only-for-Intel-CPU-because-pe.patch mysql-5.5-5.5.43/debian/patches/arch-specific/Disable-memory-barrier-only-for-Intel-CPU-because-pe.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/Disable-memory-barrier-only-for-Intel-CPU-because-pe.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/Disable-memory-barrier-only-for-Intel-CPU-because-pe.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,41 @@
+From: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
+Subject: [PATCH] Disable memory barrier only for Intel CPU, because
+ performance regression was observed at some conditions for Intel CPU. follow
+ up for Bug#11755438: Bug#47213: INNODB MUTEX/RW_LOCK SHOULD BE CONSCIOUS
+ ABOUT MEMORY ORDERING OTHER THAN INTEL
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Origin: https://github.com/mysql/mysql-server/commit/5f280dd21dd4b4ceefacf412932ac4b706c98bb5
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+--- a/storage/innobase/include/os0sync.h	2015-06-12 15:00:22.350537718 -0600
++++ b/storage/innobase/include/os0sync.h	2015-06-12 15:02:19.981950485 -0600
+@@ -423,7 +423,14 @@ clobbered */
+ #endif
+ 
+ /** barrier definitions for memory ordering */
+-#ifdef HAVE_IB_GCC_ATOMIC_THREAD_FENCE
++#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64 || defined __WIN__
++/* Performance regression was observed at some conditions for Intel
++architecture. Disable memory barrier for Intel architecture for now. */
++# define os_rmb
++# define os_wmb
++# define IB_MEMORY_BARRIER_STARTUP_MSG \
++	"Memory barrier is not used"
++#elif defined(HAVE_IB_GCC_ATOMIC_THREAD_FENCE)
+ # define HAVE_MEMORY_BARRIER
+ # define os_rmb	__atomic_thread_fence(__ATOMIC_ACQUIRE)
+ # define os_wmb	__atomic_thread_fence(__ATOMIC_RELEASE)
+diff -urpN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
+--- a/storage/innobase/srv/srv0start.c	2015-06-12 15:00:59.117848000 -0600
++++ b/storage/innobase/srv/srv0start.c	2015-06-12 15:02:46.949988712 -0600
+@@ -1156,7 +1156,7 @@ innobase_start_or_create_for_mysql(void)
+  	fputs(" InnoDB: " IB_MEMORY_BARRIER_STARTUP_MSG "\n", stderr);
+ 
+ #ifndef HAVE_MEMORY_BARRIER
+-#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64 || defined _WIN32
++#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64 || defined __WIN__
+ #else
+ 	ib_logf(IB_LOG_LEVEL_WARN,
+ 		"MySQL was built without a memory barrier capability on this"
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/fix-build-fail-for-win32.patch mysql-5.5-5.5.43/debian/patches/arch-specific/fix-build-fail-for-win32.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/fix-build-fail-for-win32.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/fix-build-fail-for-win32.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,33 @@
+From: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
+Subject: [PATCH] fix build fail for win32. follow up for Bug#11755438:
+ Bug#47213: INNODB MUTEX/RW_LOCK SHOULD BE CONSCIOUS ABOUT MEMORY ORDERING
+ OTHER THAN INTEL
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Origin: https://github.com/mysql/mysql-server/commit/c3ef01981a645cf27b0a697e72bc606200fa58a8
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+--- a/storage/innobase/include/os0sync.h	2015-06-12 14:57:07.784876623 -0600
++++ b/storage/innobase/include/os0sync.h	2015-06-12 15:00:22.350537718 -0600
+@@ -445,7 +445,7 @@ clobbered */
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"Solaris memory ordering functions are used for memory barrier"
+ 
+-#elif defined(HAVE_WINDOWS_MM_FENCE)
++#elif defined(HAVE_WINDOWS_MM_FENCE) && defined(_WIN64)
+ # define HAVE_MEMORY_BARRIER
+ # include <mmintrin.h>
+ # define os_rmb	_mm_lfence()
+diff -urpN a/storage/innobase/srv/srv0start.c b/storage/innobase/srv/srv0start.c
+--- a/storage/innobase/srv/srv0start.c	2015-06-12 14:33:14.906224837 -0600
++++ b/storage/innobase/srv/srv0start.c	2015-06-12 15:00:59.117848000 -0600
+@@ -1156,7 +1156,7 @@ innobase_start_or_create_for_mysql(void)
+  	fputs(" InnoDB: " IB_MEMORY_BARRIER_STARTUP_MSG "\n", stderr);
+ 
+ #ifndef HAVE_MEMORY_BARRIER
+-#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64
++#if defined __i386__ || defined __x86_64__ || defined _M_IX86 || defined _M_X64 || defined _WIN32
+ #else
+ 	ib_logf(IB_LOG_LEVEL_WARN,
+ 		"MySQL was built without a memory barrier capability on this"
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-6450-MariaDB-crash-on-Power8-when-built-with-advance-tool-chain.patch mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-6450-MariaDB-crash-on-Power8-when-built-with-advance-tool-chain.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-6450-MariaDB-crash-on-Power8-when-built-with-advance-tool-chain.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-6450-MariaDB-crash-on-Power8-when-built-with-advance-tool-chain.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,58 @@
+Description: Fix crash on Power8 when built with advanced tool chain
+ This was later discovered to also fix a corruption issue on AArch64:
+   https://mariadb.atlassian.net/browse/MDEV-6615
+Origin: https://github.com/MariaDB/server/commit/40497577ffd9f85557b15e08ad913f627b2e9530
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Forwarded: http://bugs.mysql.com/bug.php?id=76135; blocked by Oracle Contributor Agreement requirement
+Author: Sergey Vojtovich <svoj@mariadb.org>
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+--- a/storage/innobase/include/os0sync.h	2015-06-12 15:02:19.981950485 -0600
++++ b/storage/innobase/include/os0sync.h	2015-06-12 15:05:45.087082920 -0600
+@@ -314,6 +314,9 @@ Returns the old value of *ptr, atomicall
+ # define os_atomic_test_and_set_byte(ptr, new_val) \
+ 	__sync_lock_test_and_set(ptr, (byte) new_val)
+ 
++# define os_atomic_lock_release_byte(ptr) \
++	__sync_lock_release(ptr)
++
+ #elif defined(HAVE_IB_SOLARIS_ATOMICS)
+ 
+ #define HAVE_ATOMIC_BUILTINS
+@@ -368,6 +371,9 @@ Returns the old value of *ptr, atomicall
+ # define os_atomic_test_and_set_byte(ptr, new_val) \
+ 	atomic_swap_uchar(ptr, new_val)
+ 
++# define os_atomic_lock_release_byte(ptr) \
++	(void) atomic_swap_uchar(ptr, 0)
++
+ #elif defined(HAVE_WINDOWS_ATOMICS)
+ 
+ #define HAVE_ATOMIC_BUILTINS
+@@ -460,6 +466,9 @@ architecture. Disable memory barrier for
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"_mm_lfence() and _mm_sfence() are used for memory barrier"
+ 
++# define os_atomic_lock_release_byte(ptr) \
++	(void) InterlockedExchange(ptr, 0)
++
+ #else
+ # define os_rmb
+ # define os_wmb
+diff -urpN a/storage/innobase/include/sync0sync.ic b/storage/innobase/include/sync0sync.ic
+--- a/storage/innobase/include/sync0sync.ic	2015-06-12 14:29:58.239813599 -0600
++++ b/storage/innobase/include/sync0sync.ic	2015-06-12 15:06:15.494887760 -0600
+@@ -113,11 +113,8 @@ mutex_reset_lock_word(
+ 	mutex_t*	mutex)	/*!< in: mutex */
+ {
+ #if defined(HAVE_ATOMIC_BUILTINS)
+-	/* In theory __sync_lock_release should be used to release the lock.
+-	Unfortunately, it does not work properly alone. The workaround is
+-	that more conservative __sync_lock_test_and_set is used instead. */
+ # if defined(HAVE_ATOMIC_BUILTINS_BYTE)
+-	os_atomic_test_and_set_byte(&mutex->lock_word, 0);
++	os_atomic_lock_release_byte(&mutex->lock_word);
+ # else
+ 	os_atomic_test_and_set_ulint(&mutex->lock_word, 0);
+ # endif
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-6483-Deadlock_around_rw_lock_debug_mutex_on_PPC64.patch mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-6483-Deadlock_around_rw_lock_debug_mutex_on_PPC64.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-6483-Deadlock_around_rw_lock_debug_mutex_on_PPC64.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-6483-Deadlock_around_rw_lock_debug_mutex_on_PPC64.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,113 @@
+Description: Deadlock around rw_lock_debug_mutex on PPC64
+ This was later discovered to also fix a corruption issue on AArch64:
+   https://mariadb.atlassian.net/browse/MDEV-6615
+Origin: https://github.com/MariaDB/server/commit/c01c819209fdf09b4ba95f34d87d0617776f47cd
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Forwarded: http://bugs.mysql.com/bug.php?id=76135; blocked by Oracle Contributor Agreement requirement
+Author: Sergey Vojtovich <svoj@mariadb.org>
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/include/sync0rw.h b/storage/innobase/include/sync0rw.h
+--- a/storage/innobase/include/sync0rw.h	2015-02-27 01:30:34.000000000 -0700
++++ b/storage/innobase/include/sync0rw.h	2015-06-12 15:10:01.388634410 -0600
+@@ -70,14 +70,8 @@ extern mutex_t		rw_lock_list_mutex;
+ #ifdef UNIV_SYNC_DEBUG
+ /* The global mutex which protects debug info lists of all rw-locks.
+ To modify the debug info list of an rw-lock, this mutex has to be
+-
+ acquired in addition to the mutex protecting the lock. */
+-extern mutex_t		rw_lock_debug_mutex;
+-extern os_event_t	rw_lock_debug_event;	/*!< If deadlock detection does
+-					not get immediately the mutex it
+-					may wait for this event */
+-extern ibool		rw_lock_debug_waiters;	/*!< This is set to TRUE, if
+-					there may be waiters for the event */
++extern os_fast_mutex_t		rw_lock_debug_mutex;
+ #endif /* UNIV_SYNC_DEBUG */
+ 
+ /** number of spin waits on rw-latches,
+diff -urpN a/storage/innobase/sync/sync0rw.c b/storage/innobase/sync/sync0rw.c
+--- a/storage/innobase/sync/sync0rw.c	2015-06-12 14:57:59.881017791 -0600
++++ b/storage/innobase/sync/sync0rw.c	2015-06-12 15:11:02.614242513 -0600
+@@ -179,18 +179,12 @@ UNIV_INTERN mysql_pfs_key_t	rw_lock_mute
+ To modify the debug info list of an rw-lock, this mutex has to be
+ acquired in addition to the mutex protecting the lock. */
+ 
+-UNIV_INTERN mutex_t		rw_lock_debug_mutex;
++UNIV_INTERN os_fast_mutex_t		rw_lock_debug_mutex;
+ 
+ # ifdef UNIV_PFS_MUTEX
+ UNIV_INTERN mysql_pfs_key_t	rw_lock_debug_mutex_key;
+ # endif
+ 
+-/* If deadlock detection does not get immediately the mutex,
+-it may wait for this event */
+-UNIV_INTERN os_event_t		rw_lock_debug_event;
+-/* This is set to TRUE, if there may be waiters for the event */
+-UNIV_INTERN ibool		rw_lock_debug_waiters;
+-
+ /******************************************************************//**
+ Creates a debug info struct. */
+ static
+@@ -728,22 +722,7 @@ void
+ rw_lock_debug_mutex_enter(void)
+ /*===========================*/
+ {
+-loop:
+-	if (0 == mutex_enter_nowait(&rw_lock_debug_mutex)) {
+-		return;
+-	}
+-
+-	os_event_reset(rw_lock_debug_event);
+-
+-	rw_lock_debug_waiters = TRUE;
+-
+-	if (0 == mutex_enter_nowait(&rw_lock_debug_mutex)) {
+-		return;
+-	}
+-
+-	os_event_wait(rw_lock_debug_event);
+-
+-	goto loop;
++	os_fast_mutex_lock(&rw_lock_debug_mutex);
+ }
+ 
+ /******************************************************************//**
+@@ -753,12 +732,7 @@ void
+ rw_lock_debug_mutex_exit(void)
+ /*==========================*/
+ {
+-	mutex_exit(&rw_lock_debug_mutex);
+-
+-	if (rw_lock_debug_waiters) {
+-		rw_lock_debug_waiters = FALSE;
+-		os_event_set(rw_lock_debug_event);
+-	}
++	os_fast_mutex_unlock(&rw_lock_debug_mutex);
+ }
+ 
+ /******************************************************************//**
+diff -urpN a/storage/innobase/sync/sync0sync.c b/storage/innobase/sync/sync0sync.c
+--- a/storage/innobase/sync/sync0sync.c	2015-06-12 14:58:18.989606255 -0600
++++ b/storage/innobase/sync/sync0sync.c	2015-06-12 15:11:53.410602187 -0600
+@@ -1528,11 +1528,7 @@ sync_init(void)
+ 		     SYNC_NO_ORDER_CHECK);
+ 
+ #ifdef UNIV_SYNC_DEBUG
+-	mutex_create(rw_lock_debug_mutex_key, &rw_lock_debug_mutex,
+-		     SYNC_NO_ORDER_CHECK);
+-
+-	rw_lock_debug_event = os_event_create(NULL);
+-	rw_lock_debug_waiters = FALSE;
++	os_fast_mutex_init(rw_lock_debug_mutex_key, &rw_lock_debug_mutex);
+ #endif /* UNIV_SYNC_DEBUG */
+ }
+ 
+@@ -1600,6 +1596,7 @@ sync_close(void)
+ 	sync_order_checks_on = FALSE;
+ 
+ 	sync_thread_level_arrays_free();
++	os_fast_mutex_free(&rw_lock_debug_mutex);
+ #endif /* UNIV_SYNC_DEBUG */
+ 
+ 	sync_initialized = FALSE;	
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-7026-Race-in-InnoDB-XtraDB-mutex-implementation.patch mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-7026-Race-in-InnoDB-XtraDB-mutex-implementation.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-7026-Race-in-InnoDB-XtraDB-mutex-implementation.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-7026-Race-in-InnoDB-XtraDB-mutex-implementation.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,265 @@
+Description: Add full memory barrier to ensure proper StoreLoad order on Power
+ The fixes for MDEV-6450 and MDEV-6483 introduced a regression on x86, so
+ the solution was reworked with full barrier support added for Power in
+ architectures specific ifdefs. This patch brought back a data corruption issue
+ on AArch64:
+   https://mariadb.atlassian.net/browse/MDEV-7658
+ This is fixed up in a patch later in the series.
+Origin: https://github.com/MariaDB/server/commit/6ea41f1e84eb6b864cac17ad0b862bde9820dc33
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Forwarded: no; blocked by Oracle Contributor Agreement requirement
+Author: Kristian Nielsen <knielsen@knielsen-hq.org>
+Last-Update: 2015-06-12
+
+Index: mysql-5.5-5.5.43/storage/innobase/include/os0sync.h
+===================================================================
+--- mysql-5.5-5.5.43.orig/storage/innobase/include/os0sync.h
++++ mysql-5.5-5.5.43/storage/innobase/include/os0sync.h
+@@ -232,12 +232,29 @@ os_fast_mutex_trylock(
+ /*==================*/
+ 	os_fast_mutex_t*	fast_mutex);	/*!< in: mutex to acquire */
+ /**********************************************************//**
++Acquires ownership of a fast mutex. Implies a full memory barrier even on
++platforms such as PowerPC where this is not normally required.
++@return	0 if success, != 0 if was reserved by another thread */
++UNIV_INLINE
++ulint
++os_fast_mutex_trylock_full_barrier(
++/*==================*/
++	os_fast_mutex_t*	fast_mutex);	/*!< in: mutex to acquire */
++/**********************************************************//**
+ Releases ownership of a fast mutex. */
+ UNIV_INTERN
+ void
+ os_fast_mutex_unlock(
+ /*=================*/
+ 	os_fast_mutex_t*	fast_mutex);	/*!< in: mutex to release */
++/**********************************************************//**
++Releases ownership of a fast mutex. Implies a full memory barrier even on
++platforms such as PowerPC where this is not normally required. */
++UNIV_INTERN
++void
++os_fast_mutex_unlock_full_barrier(
++/*=================*/
++	os_fast_mutex_t*	fast_mutex);	/*!< in: mutex to release */
+ /*********************************************************//**
+ Initializes an operating system fast mutex semaphore. */
+ UNIV_INTERN
+@@ -311,11 +328,28 @@ amount of increment. */
+ /**********************************************************//**
+ Returns the old value of *ptr, atomically sets *ptr to new_val */
+ 
+-# define os_atomic_test_and_set_byte(ptr, new_val) \
++#ifdef __powerpc__
++/*
++  os_atomic_test_and_set_byte_release() should imply a release barrier before
++  setting, and a full barrier after. But __sync_lock_test_and_set() is only
++  documented as an aquire barrier. So on PowerPC we need to add the full
++  barrier explicitly.  */
++# define os_atomic_test_and_set_byte_release(ptr, new_val) \
++        do { __sync_lock_release(ptr); \
++             __sync_synchronize(); } while (0)
++#else
++/*
++  On x86, __sync_lock_test_and_set() happens to be full barrier, due to
++  LOCK prefix.
++*/
++# define os_atomic_test_and_set_byte_release(ptr, new_val) \
++	__sync_lock_test_and_set(ptr, (byte) new_val)
++#endif
++/*
++  os_atomic_test_and_set_byte_acquire() is a full memory barrier on x86. But
++  in general, just an aquire barrier should be sufficient. */
++# define os_atomic_test_and_set_byte_acquire(ptr, new_val) \
+ 	__sync_lock_test_and_set(ptr, (byte) new_val)
+-
+-# define os_atomic_lock_release_byte(ptr) \
+-	__sync_lock_release(ptr)
+ 
+ #elif defined(HAVE_IB_SOLARIS_ATOMICS)
+ 
+@@ -368,11 +402,10 @@ amount of increment. */
+ /**********************************************************//**
+ Returns the old value of *ptr, atomically sets *ptr to new_val */
+ 
+-# define os_atomic_test_and_set_byte(ptr, new_val) \
++# define os_atomic_test_and_set_byte_acquire(ptr, new_val) \
++	atomic_swap_uchar(ptr, new_val)
++# define os_atomic_test_and_set_byte_release(ptr, new_val) \
+ 	atomic_swap_uchar(ptr, new_val)
+-
+-# define os_atomic_lock_release_byte(ptr) \
+-	(void) atomic_swap_uchar(ptr, 0)
+ 
+ #elif defined(HAVE_WINDOWS_ATOMICS)
+ 
+@@ -420,7 +453,9 @@ Returns the old value of *ptr, atomicall
+ InterlockedExchange() operates on LONG, and the LONG will be
+ clobbered */
+ 
+-# define os_atomic_test_and_set_byte(ptr, new_val) \
++# define os_atomic_test_and_set_byte_acquire(ptr, new_val) \
++	((byte) InterlockedExchange(ptr, new_val))
++# define os_atomic_test_and_set_byte_release(ptr, new_val) \
+ 	((byte) InterlockedExchange(ptr, new_val))
+ 
+ #else
+@@ -440,6 +475,7 @@ architecture. Disable memory barrier for
+ # define HAVE_MEMORY_BARRIER
+ # define os_rmb	__atomic_thread_fence(__ATOMIC_ACQUIRE)
+ # define os_wmb	__atomic_thread_fence(__ATOMIC_RELEASE)
++# define os_mb __atomic_thread_fence(__ATOMIC_SEQ_CST)
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"GCC builtin __atomic_thread_fence() is used for memory barrier"
+ 
+@@ -455,6 +491,7 @@ architecture. Disable memory barrier for
+ # include <mbarrier.h>
+ # define os_rmb	__machine_r_barrier()
+ # define os_wmb	__machine_w_barrier()
++# define os_mb __machine_rw_barrier()
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"Solaris memory ordering functions are used for memory barrier"
+ 
+@@ -463,15 +500,14 @@ architecture. Disable memory barrier for
+ # include <mmintrin.h>
+ # define os_rmb	_mm_lfence()
+ # define os_wmb	_mm_sfence()
++# define os_mb	_mm_mfence()
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"_mm_lfence() and _mm_sfence() are used for memory barrier"
+ 
+-# define os_atomic_lock_release_byte(ptr) \
+-	(void) InterlockedExchange(ptr, 0)
+-
+ #else
+ # define os_rmb
+ # define os_wmb
++# define os_mb
+ # define IB_MEMORY_BARRIER_STARTUP_MSG \
+ 	"Memory barrier is not used"
+ #endif
+Index: mysql-5.5-5.5.43/storage/innobase/include/os0sync.ic
+===================================================================
+--- mysql-5.5-5.5.43.orig/storage/innobase/include/os0sync.ic
++++ mysql-5.5-5.5.43/storage/innobase/include/os0sync.ic
+@@ -54,3 +54,29 @@ os_fast_mutex_trylock(
+ 	return((ulint) pthread_mutex_trylock(fast_mutex));
+ #endif
+ }
++
++/**********************************************************//**
++Acquires ownership of a fast mutex. Implies a full memory barrier even on
++platforms such as PowerPC where this is not normally required.
++@return	0 if success, != 0 if was reserved by another thread */
++UNIV_INLINE
++ulint
++os_fast_mutex_trylock_full_barrier(
++/*==================*/
++	os_fast_mutex_t*	fast_mutex)	/*!< in: mutex to acquire */
++{
++#ifdef __WIN__
++	return(!TryEnterCriticalSection(fast_mutex));
++#else
++	/* NOTE that the MySQL my_pthread.h redefines pthread_mutex_trylock
++	so that it returns 0 on success. In the operating system
++	libraries, HP-UX-10.20 follows the old Posix 1003.4a Draft 4 and
++	returns 1 on success (but MySQL remaps that to 0), while Linux,
++	FreeBSD, Solaris, AIX, Tru64 Unix, HP-UX-11.0 return 0 on success. */
++
++#ifdef __powerpc__
++	os_mb;
++#endif
++	return((ulint) pthread_mutex_trylock(fast_mutex));
++#endif
++}
+Index: mysql-5.5-5.5.43/storage/innobase/include/sync0sync.ic
+===================================================================
+--- mysql-5.5-5.5.43.orig/storage/innobase/include/sync0sync.ic
++++ mysql-5.5-5.5.43/storage/innobase/include/sync0sync.ic
+@@ -81,14 +81,14 @@ mutex_test_and_set(
+ {
+ #if defined(HAVE_ATOMIC_BUILTINS)
+ # if defined(HAVE_ATOMIC_BUILTINS_BYTE)
+-	return(os_atomic_test_and_set_byte(&mutex->lock_word, 1));
++	return(os_atomic_test_and_set_byte_acquire(&mutex->lock_word, 1));
+ # else
+ 	return(os_atomic_test_and_set_ulint(&mutex->lock_word, 1));
+ # endif
+ #else
+ 	ibool	ret;
+ 
+-	ret = os_fast_mutex_trylock(&(mutex->os_fast_mutex));
++	ret = os_fast_mutex_trylock_full_barrier(&(mutex->os_fast_mutex));
+ 
+ 	if (ret == 0) {
+ 		/* We check that os_fast_mutex_trylock does not leak
+@@ -96,7 +96,6 @@ mutex_test_and_set(
+ 		ut_a(mutex->lock_word == 0);
+ 
+ 		mutex->lock_word = 1;
+-		os_wmb;
+ 	}
+ 
+ 	return((byte)ret);
+@@ -114,14 +113,17 @@ mutex_reset_lock_word(
+ {
+ #if defined(HAVE_ATOMIC_BUILTINS)
+ # if defined(HAVE_ATOMIC_BUILTINS_BYTE)
+-	os_atomic_lock_release_byte(&mutex->lock_word);
++	/* In theory __sync_lock_release should be used to release the lock.
++	Unfortunately, it does not work properly alone. The workaround is
++	that more conservative __sync_lock_test_and_set is used instead. */
++	os_atomic_test_and_set_byte_release(&mutex->lock_word, 0);
+ # else
+ 	os_atomic_test_and_set_ulint(&mutex->lock_word, 0);
+ # endif
+ #else
+ 	mutex->lock_word = 0;
+ 
+-	os_fast_mutex_unlock(&(mutex->os_fast_mutex));
++	os_fast_mutex_unlock_full_barrier(&(mutex->os_fast_mutex));
+ #endif
+ }
+ 
+Index: mysql-5.5-5.5.43/storage/innobase/os/os0sync.c
+===================================================================
+--- mysql-5.5-5.5.43.orig/storage/innobase/os/os0sync.c
++++ mysql-5.5-5.5.43/storage/innobase/os/os0sync.c
+@@ -798,6 +798,25 @@ os_mutex_exit(
+ }
+ 
+ /**********************************************************//**
++Releases ownership of a fast mutex. Implies a full memory barrier even on
++platforms such as PowerPC where this is not normally required. */
++UNIV_INTERN
++void
++os_fast_mutex_unlock_full_barrier(
++/*=================*/
++	os_fast_mutex_t*	fast_mutex)	/*!< in: mutex to release */
++{
++#ifdef __WIN__
++	LeaveCriticalSection(fast_mutex);
++#else
++	pthread_mutex_unlock(fast_mutex);
++#ifdef __powerpc__
++	os_mb;
++#endif
++#endif
++}
++
++/**********************************************************//**
+ Frees a mutex object. */
+ UNIV_INTERN
+ void
+Index: mysql-5.5-5.5.43/storage/innobase/sync/sync0sync.c
+===================================================================
+--- mysql-5.5-5.5.43.orig/storage/innobase/sync/sync0sync.c
++++ mysql-5.5-5.5.43/storage/innobase/sync/sync0sync.c
+@@ -472,7 +472,6 @@ mutex_set_waiters(
+ 
+ 	*ptr = n;		/* Here we assume that the write of a single
+ 				word in memory is atomic */
+-	os_wmb;
+ }
+ 
+ /******************************************************************//**
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-7658-fix-AArch64-MDEV-6615-regression.patch mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-7658-fix-AArch64-MDEV-6615-regression.patch
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/MDEV-7658-fix-AArch64-MDEV-6615-regression.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/MDEV-7658-fix-AArch64-MDEV-6615-regression.patch	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,47 @@
+Description: Enable full memory barrier usage on AArch64
+ The fix for MDEV-7026 reworked a corruption fix for PowerPC using
+ #ifdef __powerpc__ guards. AArch64 is also impacted by that corruption
+ issue, so this introduced a regression. Follow suit by placing __aarch64__
+ in the guard as well. The author isn't a fan of using arch #ifdefs in this
+ way, but he also isn't familiar enough with the code to rearchitect it.
+Author: dann frazier <dann.frazier@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1427406
+Forwarded: no; dependent on earlier patches which are blocked by the Oracle Contributor Agreement requirement
+Last-Update: 2015-06-12
+
+diff -urpN a/storage/innobase/include/os0sync.h b/storage/innobase/include/os0sync.h
+--- a/storage/innobase/include/os0sync.h	2015-06-12 15:31:39.786245779 -0600
++++ b/storage/innobase/include/os0sync.h	2015-06-12 15:31:09.318386449 -0600
+@@ -328,7 +328,7 @@ amount of increment. */
+ /**********************************************************//**
+ Returns the old value of *ptr, atomically sets *ptr to new_val */
+ 
+-#ifdef __powerpc__
++#if defined(__aarch64__) || defined(__powerpc__)
+ /*
+   os_atomic_test_and_set_byte_release() should imply a release barrier before
+   setting, and a full barrier after. But __sync_lock_test_and_set() is only
+diff -urpN a/storage/innobase/include/os0sync.ic b/storage/innobase/include/os0sync.ic
+--- a/storage/innobase/include/os0sync.ic	2015-06-12 15:31:39.786245779 -0600
++++ b/storage/innobase/include/os0sync.ic	2015-06-12 15:31:09.318386449 -0600
+@@ -76,7 +76,7 @@ os_fast_mutex_trylock_full_barrier(
+ 	returns 1 on success (but MySQL remaps that to 0), while Linux,
+ 	FreeBSD, Solaris, AIX, Tru64 Unix, HP-UX-11.0 return 0 on success. */
+ 
+-#ifdef __powerpc__
++#if defined( __aarch64__) || defined(__powerpc__)
+ 	os_mb;
+ #endif
+ 	return((ulint) pthread_mutex_trylock(mutex));
+diff -urpN a/storage/innobase/os/os0sync.c b/storage/innobase/os/os0sync.c
+--- a/storage/innobase/os/os0sync.c	2015-06-12 15:31:39.786245779 -0600
++++ b/storage/innobase/os/os0sync.c	2015-06-12 15:31:15.637942541 -0600
+@@ -810,7 +810,7 @@ os_fast_mutex_unlock_full_barrier_func(
+ 	LeaveCriticalSection(fast_mutex);
+ #else
+ 	pthread_mutex_unlock(fast_mutex);
+-#ifdef __powerpc__
++#if defined(__aarch64__) || defined(__powerpc__)
+ 	os_mb;
+ #endif
+ #endif
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/series-arm64 mysql-5.5-5.5.43/debian/patches/arch-specific/series-arm64
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/series-arm64	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/series-arm64	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,8 @@
+Bug-11755438-Bug-47213-INNODB-MUTEX-RW_LOCK-SHOULD-B.patch
+Bug-19048563-PERFORMANCE-REGRESSION-IN-UPDATE-OPS-CA.patch
+fix-build-fail-for-win32.patch
+Disable-memory-barrier-only-for-Intel-CPU-because-pe.patch
+MDEV-6450-MariaDB-crash-on-Power8-when-built-with-advance-tool-chain.patch
+MDEV-6483-Deadlock_around_rw_lock_debug_mutex_on_PPC64.patch
+MDEV-7026-Race-in-InnoDB-XtraDB-mutex-implementation.patch
+MDEV-7658-fix-AArch64-MDEV-6615-regression.patch
diff -Nru mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/series-ppc64el mysql-5.5-5.5.43/debian/patches/arch-specific/series-ppc64el
--- mysql-5.5-5.5.35+dfsg/debian/patches/arch-specific/series-ppc64el	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/debian/patches/arch-specific/series-ppc64el	2015-06-15 18:11:08.000000000 +0000
@@ -0,0 +1,8 @@
+Bug-11755438-Bug-47213-INNODB-MUTEX-RW_LOCK-SHOULD-B.patch
+Bug-19048563-PERFORMANCE-REGRESSION-IN-UPDATE-OPS-CA.patch
+fix-build-fail-for-win32.patch
+Disable-memory-barrier-only-for-Intel-CPU-because-pe.patch
+MDEV-6450-MariaDB-crash-on-Power8-when-built-with-advance-tool-chain.patch
+MDEV-6483-Deadlock_around_rw_lock_debug_mutex_on_PPC64.patch
+MDEV-7026-Race-in-InnoDB-XtraDB-mutex-implementation.patch
+MDEV-7658-fix-AArch64-MDEV-6615-regression.patch
diff -Nru mysql-5.5-5.5.35+dfsg/debian/rules mysql-5.5-5.5.43/debian/rules
--- mysql-5.5-5.5.35+dfsg/debian/rules	2014-02-19 21:19:52.000000000 +0000
+++ mysql-5.5-5.5.43/debian/rules	2015-06-15 18:11:08.000000000 +0000
@@ -76,6 +76,10 @@
 	rm -rf $(BUILDDIR) $(BUILDDIR_PIC)
 	debconf-updatepo
 	rm -f $(EXPORTED_SOURCE_TARBALL)
+	QUILT_PC=.pc-arch-specific \
+	  QUILT_PATCHES=debian/patches/arch-specific \
+	  QUILT_SERIES=series-$(ARCH) quilt pop -a || [ $$? = 2 ]
+	rm -rf .pc-arch-specific arch-patch-stamp
 
 override_dh_prep: 
 
@@ -84,7 +88,19 @@
 configure-pic-stamp: FORCE_FPIC_CFLAGS=-fPIC
 configure-pic-stamp: FORCE_FPIC=-DWITH_PIC=On
 
-configure-stamp configure-pic-stamp:
+# arch-specific patches are used here to deal with a data corruption
+# issue that impacts Power and ARM64:
+#   http://bugs.launchpad.net/bugs/1427406
+# Though we didn't observe any regressions when testing these patches on x86,
+# we decided to minimize the regression risk by only applying these patches
+# on affected architectures until we can replace it with an upstream fix.
+arch-patch-stamp:
+	QUILT_PC=.pc-arch-specific \
+	  QUILT_PATCHES=debian/patches/arch-specific \
+	  QUILT_SERIES=series-$(ARCH) quilt push -a || [ $$? = 2 ]
+	touch $@
+
+configure-stamp configure-pic-stamp: arch-patch-stamp
 	@echo "RULES.$@"
 	dh_testdir
 	( test -d $(builddir) || mkdir $(builddir) ) && cd $(builddir) && \
diff -Nru mysql-5.5-5.5.35+dfsg/Docs/ChangeLog mysql-5.5-5.5.43/Docs/ChangeLog
--- mysql-5.5-5.5.35+dfsg/Docs/ChangeLog	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/Docs/ChangeLog	2015-02-27 08:30:42.000000000 +0000
@@ -1,993 +1 @@
-------------------------------------------------------------
-revno: 4535
-committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-branch nick: mysql-5.5.35-release
-timestamp: Tue 2013-11-05 08:03:43 +0100
-message:
-  Removed non gpl file mysql.info from uln community package
-------------------------------------------------------------
-revno: 4534 [merge]
-tags: clone-5.5.35-build
-committer: Tor Didriksen <tor.didriksen@oracle.com>
-branch nick: 5.5-merge
-timestamp: Fri 2013-11-01 16:52:21 +0100
-message:
-  merge 5.1 => 5.5
-    ------------------------------------------------------------
-    revno: 2661.844.85
-    tags: clone-5.1.73-build
-    committer: Tor Didriksen <tor.didriksen@oracle.com>
-    branch nick: 5.1
-    timestamp: Fri 2013-11-01 16:39:19 +0100
-    message:
-      Bug#17617945 BUFFER OVERFLOW IN GET_MERGE_MANY_BUFFS_COST WITH SMALL SORT_BUFFER_SIZE
-      
-      get_cost_calc_buff_size() could return wrong value for the size of imerge_cost_buff.
-------------------------------------------------------------
-revno: 4533
-committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-branch nick: 5.5
-timestamp: Fri 2013-11-01 13:48:24 +0530
-message:
-  Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
-      UPPER CASE HOST NAME ANYMORE
-  Fixing the testcase failure
-------------------------------------------------------------
-revno: 4532 [merge]
-committer: Nuno Carvalho <nuno.carvalho@oracle.com>
-branch nick: mysql-5.5
-timestamp: Thu 2013-10-31 22:58:07 +0000
-message:
-  BUG#17662398: REMOVE DUPLICATE TEST CASES
-  
-  Merge from mysql-5.1 into mysql-5.5.
-    ------------------------------------------------------------
-    revno: 2661.844.84
-    committer: Nuno Carvalho <nuno.carvalho@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Thu 2013-10-31 22:53:56 +0000
-    message:
-      BUG#17662398: REMOVE DUPLICATE TEST CASES
-      
-      Remove duplicate test cases.
-------------------------------------------------------------
-revno: 4531 [merge]
-committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-branch nick: 5.5
-timestamp: Thu 2013-10-31 23:14:33 +0530
-message:
-  Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
-      UPPER CASE HOST NAME ANYMORE
-  Merging from mysql-5.1 to mysql-5.5
-    ------------------------------------------------------------
-    revno: 2661.844.83
-    committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-    branch nick: 5.1
-    timestamp: Thu 2013-10-31 23:02:44 +0530
-    message:
-      Bug #12917164 DROP USER CAN'T DROP USERS WITH LEGACY 
-          UPPER CASE HOST NAME ANYMORE
-      
-      Description:
-      It is not possible to drop users with host names with upper case
-      letters in them. i.e DROP USER 'root'@'Tmp_Host_Name'; is failing
-      with error.
-      
-      Analysis: Since the fix 11748570 we came up with lower case hostnames
-      as standard. But in the current bug the hostname is created by
-      mysql_install_db script is still having upper case hostnames. 
-      So, if we have the hostname with upper case letters like(Tmp_Host_Name)
-      then we will have as it is stored in the mysql.user table. 
-      In this case if use "'DROP USER 'root'@'Tmp_Host_Name';" it gives 
-      error because we do compare with the lower case of hostname since the 
-      11748570 fix.
-      
-      Fix: We need to convert the hostname to lower case before storing into 
-      the mysql.user table when we run the mysql_install_db script.
-------------------------------------------------------------
-revno: 4530
-committer: Saikumar V <saikumar.v@oracle.com>
-branch nick: mysql-5.5
-timestamp: Thu 2013-10-31 09:01:09 +0530
-message:
-  Synching rqg grammars/redefines to mysql-repos internal.
-------------------------------------------------------------
-revno: 4529 [merge]
-committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-30 04:12:24 +0100
-message:
-  Merge 5.1 => 5.5
-    ------------------------------------------------------------
-    revno: 2661.844.82
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Wed 2013-10-30 04:07:07 +0100
-    message:
-      Removed non gpl file docs/mysql.info from community packages
-------------------------------------------------------------
-revno: 4528 [merge]
-committer: Tor Didriksen <tor.didriksen@oracle.com>
-branch nick: 5.5-merge
-timestamp: Tue 2013-10-29 19:55:38 +0100
-message:
-  remerge 5.1 => 5.5
-    ------------------------------------------------------------
-    revno: 2661.844.81
-    committer: Tor Didriksen <tor.didriksen@oracle.com>
-    branch nick: 5.1
-    timestamp: Tue 2013-10-29 17:26:20 +0100
-    message:
-      Bug#17326567 MYSQL SERVER FILESORT IMPLEMENTATION HAS A VERY SERIOUS BUG
-      
-      The filesort implementation needs space for at least 15 records
-      (plus some internal overhead) in its main sort buffer.
-------------------------------------------------------------
-revno: 4527
-committer: kevin.lewis@oracle.com
-branch nick: mysql-5.5
-timestamp: Tue 2013-10-29 11:39:04 -0500
-message:
-  Testcase i_innodb.innodb-alter-restart.test fails on some Windows platforms
-  possibly since it was introduced in the patch for Bug#16720368 around 
-  2013-04-30.  This fix is simply to adjust the mtr.add_suppression() lines
-  in the testcase and to add a missing "\n" in the error message.
-  
-  Approved by Marko in RB 3746
-------------------------------------------------------------
-revno: 4526
-committer: Mattias Jonsson <mattias.jonsson@oracle.com>
-branch nick: test-5.5
-timestamp: Mon 2013-10-28 17:08:31 +0100
-message:
-  post-push fix for bug#17565888/bug#14621190
-------------------------------------------------------------
-revno: 4525
-committer: Luis Soares <luis.soares@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-10-25 09:42:59 +0100
-message:
-  BUG#17460821: ASSERTION ERROR WHEN STOPPING SLAVE AFTER SEMI-SYNC ON MASTER IS DISABLED
-  
-  In the test case, make sure that the IO thread is not stopped 
-  during the binlog  dump request.
-------------------------------------------------------------
-revno: 4524
-committer: sayantan dutta <sayantan.dutta@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-10-25 11:38:34 +0530
-message:
-  Bug #17654275 - MTR EXTRACT_WARNING_LINES IS NOT REMOVING TIMESTAMP IN UTC FORMAT WITH TIMEZONES
-------------------------------------------------------------
-revno: 4523
-committer: Jon Olav Hauglid <jon.hauglid@oracle.com>
-branch nick: mysql-5.5-bug17632386
-timestamp: Mon 2013-10-21 13:14:46 +0200
-message:
-  Bug#17632386: WITH_ASAN CONFLICTS WITH -WL,--NO-UNDEFINED
-  
-  -Wl,--no-undefined (=-z defs) gives linking errors when used with WITH_ASAN.
-  According to the documentation:
-  "When linking shared libraries, the AddressSanitizer run-time is not linked,
-  so -Wl,-z,defs may cause link errors (don?t use it with AddressSanitizer)."
-  
-  This patch turns off -Wl,--no-undefined if WITH_ASAN is used.
-------------------------------------------------------------
-revno: 4522
-committer: Aditya A <aditya.a@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-10-21 12:07:02 +0530
-message:
-  Bug #16051817  GOT ERROR 124 FROM STORAGE ENGINE 
-                 ON DELETE FROM A PARTITIONED TABLE
-  
-  PROBLEM
-  -------
-  
-  The user first disables all the non unique indexes
-  in the table and then rebuilds one partition.
-  During rebuild the indexes on that particular
-  partition are enabled. Now when we give a query 
-  the optimizer is unaware that on one partition 
-  indexes are enabled and if the optimizer selects
-  that index,myisam thinks that the index is not 
-  active and gives an error.
-  
-  FIX
-  ---
-  
-  Before rebuilding a partition check whether non
-  unique indexes are disabled on the partitons.
-  If they are disabled then after rebuild disable
-  the index on the partition. 
-  
-  [Approved by Mattiasj #rb3469]
-------------------------------------------------------------
-revno: 4521
-committer: Mattias Jonsson <mattias.jonsson@oracle.com>
-branch nick: test-5.5
-timestamp: Sat 2013-10-19 15:29:51 +0200
-message:
-  post-push fix for bug17565888.
-------------------------------------------------------------
-revno: 4520
-committer: Mattias Jonsson <mattias.jonsson@oracle.com>
-branch nick: test-5.5
-timestamp: Fri 2013-10-18 23:49:35 +0200
-message:
-  post-push fix for bug17565888.
-  
-  Too restrictive assertion, failing during purge
-------------------------------------------------------------
-revno: 4519
-committer: Mattias Jonsson <mattias.jonsson@oracle.com>
-branch nick: test-5.5
-timestamp: Fri 2013-10-18 23:39:15 +0200
-message:
-  post-push fix for bug17565888.
-  
-  Too restrictive assertion, can fail during purge
-------------------------------------------------------------
-revno: 4518
-committer: Mattias Jonsson <mattias.jonsson@oracle.com>
-branch nick: test-5.5
-timestamp: Fri 2013-10-18 19:25:59 +0200
-message:
-  Bug#17565888: UP TO 75% INCREASE IN DBT3 QUERY (Q7) EXECUTION TIME
-  
-  Regression from bug#14621190 due to disabled optimistic restoration
-  of cursor, which required full key lookup instead of verifying
-  if previously positioned btree cursor could be reused.
-  
-  Fixed by enable optimistic restore and adjust cursor afterward.
-  
-  rb#3324 approved by Marko.
-------------------------------------------------------------
-revno: 4517
-committer: Anirudh Mangipudi <anirudh.mangipudi@oracle.com>
-branch nick: 5.5
-timestamp: Fri 2013-10-18 17:14:39 +0530
-message:
-  Bug #17357535 BACKPORT BUG#16241992 TO 5.5
-  Problem:
-  COM_CHANGE_USER allows brute-force attempts to crack a password at a very high
-  rate as it does not cause any significant delay after a login attempt has
-  failed. This issue was reproduced using John-The-Ripper password
-  cracking tool through which about 5000 passwords per second could be attempted.
-  
-  Solution:
-  The non-GA version's solution was to disconnect the connection when a login
-  attempt failed. Now since our aim to to reduce the rate at which passwords 
-  are tested, we introduced a sleep(1) after every login attempt failed. This
-  significantly increased the delay with which the password was cracked.
-------------------------------------------------------------
-revno: 4516 [merge]
-committer: Luis Soares <luis.soares@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-10-18 10:50:49 +0100
-message:
-  BUG#17460821
-  
-  Automerged from mysql-5.5 bug branch into latest mysql-5.5.
-    ------------------------------------------------------------
-    revno: 4512.1.1
-    committer: Luis Soares <luis.soares@oracle.com>
-    branch nick: mysql-5.5
-    timestamp: Thu 2013-10-17 17:48:26 +0100
-    message:
-      BUG#17460821: ASSERTION ERROR WHEN STOPPING SLAVE AFTER SEMI-SYNC ON MASTER IS DISABLED
-      
-      The assertion happens when: (i) the master and slave are configured to
-      use the semisync plugin; (ii) the DBA disables semisync on the master;
-      (iii) and he also unsets the option to wait for slaves ACK even if the
-      semisync slave count reaches 0 during the waiting period. This
-      combination of factors makes the server run into an assertion as soon
-      as the last semisync slave disconnects and its dump thread exits.
-        
-      The root of the problem is the fact that when the dump thread
-      disconnects and calls the observer hook transmit_stop, which ends up
-      calling ReplSemiSyncMaster::remove_slave, there is no check whether
-      the master has already disabled semisync or not. If it has, the then a
-      second call to the switch_off member function must be avoided.
-        
-      The quick fix is to avoid calling switch_off if the DBA has disabled
-      the semisync plugin interactively on the master. Also, the switch_off
-      member function should only be called if the plugin has not been
-      switched off already. This is basically the pattern throughout the
-      rest of the semisync plugin and no other calls seem vulnerable to
-      similar crashes/assertions.
-      
-      (This a backport of the patch to 5.5, which is also vulnerable.)
-------------------------------------------------------------
-revno: 4515 [merge]
-committer: Aditya A <aditya.a@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-10-18 13:49:03 +0530
-message:
-  Bug#17559867 AFTER REBUILDING , A MYISAM PARTITION ENDS UP 
-               AS A INNODB PARTITTION.
-  [Merged from 5.1]             
-    ------------------------------------------------------------
-    revno: 2661.844.80
-    committer: Aditya A <aditya.a@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Fri 2013-10-18 12:26:28 +0530
-    message:
-      Bug#17559867 AFTER REBUILDING,A MYISAM PARTITION ENDS UP 
-                   AS A INNODB PARTITTION.
-      
-      PROBLEM
-      -------
-      The correct engine_type was not being set during 
-      rebuild of the partition due to which the handler
-      was always created with the default engine,
-      which is innodb for 5.5+ ,therefore even if the
-      table was myisam, after rebuilding the partitions
-      ended up as innodb partitions.
-      
-      FIX
-      ---
-      Set the correct engine type during rebuild.  
-      
-      [Approved by mattiasj #rb3599]
-------------------------------------------------------------
-revno: 4514
-committer: Anil Toshniwal <anil.toshniwal@oracle.com>
-branch nick: mysql-5.5
-timestamp: Thu 2013-10-17 18:09:04 +0530
-message:
-  Bug#17513737  INTRODUCE CHECK TABLE...QUICK
-  
-  --Implemented CHECK TABLE...QUICK.
-    Introduce CHECK TABLE...QUICK that would skip the btr_validate_index()
-    and btr_search_validate() call, and count the no. of records in each index.
-  
-  Approved by Marko and Kevin. (rb#3567).
-------------------------------------------------------------
-revno: 4513
-committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
-branch nick: mysql-5.5
-timestamp: Thu 2013-10-17 17:59:45 +0530
-message:
-  Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
-                 AND 'KILL SESSION' LEAD TO CRASH     
-  
-  Fixing pb2 failure on embedded version.
-------------------------------------------------------------
-revno: 4512 [merge]
-committer: Luis Soares <luis.soares@oracle.com>
-branch nick: mysql-5.5
-timestamp: Thu 2013-10-17 12:27:45 +0100
-message:
-  BUG#17508351
-  
-  Merging mysql-5.5 bug branch into latest mysql-5.5.
-    ------------------------------------------------------------
-    revno: 4488.1.1
-    committer: Luis Soares <luis.soares@oracle.com>
-    branch nick: mysql-5.5
-    timestamp: Tue 2013-10-08 18:37:43 +0100
-    message:
-      BUG#17508351: REDUNDANT CODE IN REPLSEMISYNCMASTER::UPDATESYNCHEADER
-      
-      ReplSemiSyncMaster::updateSyncHeader contains redundant assignments
-      to the local variable sync.
-      
-      This patch removes them.
-------------------------------------------------------------
-revno: 4511 [merge]
-committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-16 22:15:59 +0530
-message:
-  Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF
-  REPLICATION FILTERS ARE USED.
-  Merging fix from mysql-5.1
-    ------------------------------------------------------------
-    revno: 2661.844.79
-    committer: Venkatesh Duggirala<venkatesh.duggirala@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Wed 2013-10-16 22:12:23 +0530
-    message:
-      Bug#17234370 LAST_INSERT_ID IS REPLICATED INCORRECTLY IF
-      REPLICATION FILTERS ARE USED.
-      
-      Problem:
-      When Filtered-slave applies Int_var_log_event and when it
-      tries to write the event to its own binlog, LAST_INSERT_ID
-      value is written wrongly.
-      
-      Analysis:
-      THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
-      is a variable which is set when LAST_INSERT_ID() is used by
-      a statement. If it is set, first_successful_insert_id_in_
-      prev_stmt_for_binlog will be stored in the statement-based
-      binlog. This variable is CUMULATIVE along the execution of
-      a stored function or trigger: if one substatement sets it
-      to 1 it will stay 1 until the function/trigger ends,
-      thus making sure that first_successful_insert_id_in_
-      prev_stmt_for_binlog does not change anymore and is
-      propagated to the caller for binlogging. This is achieved
-      using the following code
-      if(!stmt_depends_on_first_successful_insert_id_in_prev_stmt)               
-      {                                                                           
-        /* It's the first time we read it */                                      
-        first_successful_insert_id_in_prev_stmt_for_binlog=                       
-        first_successful_insert_id_in_prev_stmt;                                
-        stmt_depends_on_first_successful_insert_id_in_prev_stmt= 1;               
-      }
-      
-      Slave server, after receiving Int_var_log_event event from
-      master, it is setting
-      stmt_depends_on_first_successful_insert_id_in_prev_stmt
-      to true(*which is wrong*) and not setting
-      first_successful_insert_id_in_prev_stmt_for_binlog. Because
-      of this problem, when the actual DML statement with
-      LAST_INSERT_ID() is parsed by slave SQL thread,
-      first_successful_insert_id_in_prev_stmt_for_binlog is not
-      set. Hence the value zero (default value) is written to
-      slave's binlog.
-      
-      Why only *Filtered slave* is effected when the code is
-      in common place:
-      -------------------------------------------------------
-      In Query_log_event::do_apply_event,
-      THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
-      is reset to zero at the end of the function. In case of
-      normal slave (No Filters), this variable will be reset. 
-      In Filtered slave, Slave SQL thread defers all IRU events's
-      execution until IRU's Query_log event is received. Once it
-      receives Query_log_event it executes all pending IRU events
-      and then it executes Query_log_event. Hence the variable is
-      not getting reset to 0, causing this bug.
-      
-      Fix: As described above, the root cause was setting 
-      THD::stmt_depends_on_first_successful_insert_id_in_prev_stmt
-      when Int_var_log_event was executed by a SQL thread. Hence
-      removing the problematic line from the code.
-------------------------------------------------------------
-revno: 4510 [merge]
-committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-branch nick: 5.5
-timestamp: Wed 2013-10-16 14:16:32 +0530
-message:
-  Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE
-  
-  Merging from mysql-5.1 to mysql-5.5
-    ------------------------------------------------------------
-    revno: 2661.844.78
-    committer: Venkata Sidagam <venkata.sidagam@oracle.com>
-    branch nick: 5.1
-    timestamp: Wed 2013-10-16 14:14:44 +0530
-    message:
-      Bug#16900358 FIX FOR CVE-2012-5611 IS INCOMPLETE
-      
-      Description: Fix for bug CVE-2012-5611 (bug 67685) is 
-      incomplete. The ACL_KEY_LENGTH-sized buffers in acl_get() and 
-      check_grant_db() can be overflown by up to two bytes. That's 
-      probably not enough to do anything more serious than crashing 
-      mysqld.
-      Analysis: In acl_get() when "copy_length" is calculated it 
-      just adding the variable lengths. But when we are using them 
-      with strmov() we are adding +1 to each. This will lead to a 
-      three byte buffer overflow (i.e two +1's at strmov() and one 
-      byte for the null added by strmov() function). Similarly it 
-      happens for check_grant_db() function as well.
-      Fix: We need to add "+2" to "copy_length" in acl_get() 
-      and "+1" to "copy_length" in check_grant_db(). 
-------------------------------------------------------------
-revno: 4509
-committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
-branch nick: Bug17429677_mysql-5.5
-timestamp: Wed 2013-10-16 11:49:00 +0530
-message:
-  Bug#17429677:LAST ARGUMENT OF LOAD DATA ...SET ...STATEMENT
-  REPEATED TWICE IN BINLOG
-  
-  Problem:
-  =======
-  If LOAD DATA ... SET ... is used the last argument of SET is
-  repeated twice in replication binlog.
-  
-  Analysis:
-  ========
-  LOAD DATA statements are reconstructed once again before
-  they are written to the binary log. When SET clauses are
-  specified as part of LOAD DATA statement, these SET clause
-  user command strings need to be stored in order to rebuild
-  the original user command. During parsing each column and
-  the value in the SET command are stored in two differenet
-  lists. All the values are stored in a string list.
-  
-  When SET expression has more than one value as shown in the
-  following example:
-  SET a = @a, b = CONCAT(@b, '| 123456789');
-  
-  Parser extracts values in the following manner i.e Item name
-  , value string, actual length of the value of the item with
-  in the string.
-  
-  Item a:
-  Value for a:"= @a, b = CONCAT(@b, '| 123456789')
-  str_length = 4
-  Item b:
-  Value for b:"= CONCAT(@b, '| 123456789')
-  str_length = 27
-  
-  During reconstructing the LOAD DATA command the above
-  strings are retrived as it is and appended to the LOAD DATA
-  statement. Hence it becomes as shown below.
-  
-  SET `a`= @a, b = CONCAT(@b, '| 123456789'),
-  `b`= CONCAT(@b, '| 123456789')
-  
-  Fix:
-  ===
-  During reconstruction of SET command, retrieve exact item
-  value string rather than reading the entire string.
-------------------------------------------------------------
-revno: 4508
-committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-16 11:05:20 +0530
-message:
-  Fix for Bug 17584523 - LICENSE AND DOCUMENTATION FILES MISSING FROM WINDOWS MSI PACKAGE
-------------------------------------------------------------
-revno: 4507 [merge]
-committer: Nuno Carvalho <nuno.carvalho@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-10-14 15:51:09 +0100
-message:
-  WL#7266: Dump-thread additional concurrency tests
-  
-  Merge from mysql-5.1 into mysql-5.5.
-    ------------------------------------------------------------
-    revno: 2661.844.77
-    committer: Nuno Carvalho <nuno.carvalho@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Mon 2013-10-14 15:45:12 +0100
-    message:
-      WL#7266: Dump-thread additional concurrency tests                                                                                                                           
-      
-      This worklog aims at testing the two following scenarios:
-      
-      1) Whenever the mysql_binlog_send method (dump thread)
-      reaches the end of file when reading events from the binlog, before
-      checking if it should wait for more events, there was a test to
-      check if the file being read was still active, i.e, it was the last
-      known binlog. However, it was possible that something was written to
-      the binary log and then a rotation would happen, after EOF was
-      detected and before the check for active was performed. In this
-      case, the end of the binary log would not be read by the dump
-      thread, and this would cause the slave to lose updates.
-      This test verifies that the problem has been fixed. It waits during
-      this window while forcing a rotation in the binlog.
-      
-      2) Verify dump thread can send events in active file, correctly after
-      encountering an IO error.
-------------------------------------------------------------
-revno: 4506
-committer: Satya Bodapati <satya.bodapati@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-09 18:42:27 +0530
-message:
-  BUG#17446090 - TESTCASE INNODB_BUG16752251.TEST FAILS RANDOMLY ON PB2
-  
-  DBUG_SUICIDE() hangs valgrind. Disable the test under valgrind
-------------------------------------------------------------
-revno: 4505
-committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-09 17:08:45 +0530
-message:
-  BUG 17560050 - MYSQL_INSTALL_DB SCRIPT FAILING WITH RESOLVEIP ISSUES.
-------------------------------------------------------------
-revno: 4504
-committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-09 13:32:31 +0530
-message:
-  Bug#17474166 - EXECUTING STATEMENT LIKE 'SHOW ENGINE INNODB'
-                 AND 'KILL SESSION' LEAD TO CRASH               
-  
-  Analysis:
-  --------
-  This situation occurs when the connection executes query 
-  "show engine innodb status" and this connection is killed by
-  executing statement "kill <con>" by another connection.
-  
-  In function "innodb_show_status", function "stat_print"
-  is called to print the status but return value of function
-  is not checked.  After killing connection, if write to 
-  connection fails then error is returned and same is set
-  in Diagnostic area. Since FALSE is returned from
-  "innodb_show_status" now, assert to check no error
-  is set in function "set_eof_status" (called from
-  my_eof) is failing. 
-  
-  Fix:
-  ----
-  Changed code to check return value of function "stat_print"
-  in "innodb_show_status".
-------------------------------------------------------------
-revno: 4503
-committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
-branch nick: mysql-5.5
-timestamp: Wed 2013-10-09 11:10:46 +0530
-message:
-  Bug 13878021 - WINDOWS PACKAGE THAT INCLUDES .PDB FILES FOR INTERMEDIATE LIBRARIES USED
-------------------------------------------------------------
-revno: 4502
-committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
-branch nick: mysql_5_5
-timestamp: Mon 2013-10-07 18:17:26 +0530
-message:
-  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
-        
-  Fixing pb2 test failure for 5.5 version on solaris platform.
-------------------------------------------------------------
-revno: 4501 [merge]
-committer: Kent Boortz <kent.boortz@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-10-07 13:05:49 +0200
-message:
-  Corrections of copyright headers (RE-request 45781)
-    ------------------------------------------------------------
-    revno: 2661.844.76 [merge]
-    committer: Kent Boortz <kent.boortz@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Mon 2013-10-07 12:44:38 +0200
-    message:
-      Corrections of copyright headers (RE-request 45781)
-------------------------------------------------------------
-revno: 4500 [merge]
-committer: Kent Boortz <kent.boortz@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-10-07 12:45:05 +0200
-message:
-  Corrections of copyright headers (RE-request 45781)
-    ------------------------------------------------------------
-    revno: 4495.1.1 [merge]
-    committer: Kent Boortz <kent.boortz@oracle.com>
-    branch nick: mysql-5.5
-    timestamp: Sun 2013-10-06 18:16:09 +0200
-    message:
-      Corretions of copyright headers (RE-request 45781)
-        ------------------------------------------------------------
-        revno: 2661.851.1
-        committer: Kent Boortz <kent.boortz@oracle.com>
-        branch nick: mysql-5.1
-        timestamp: Fri 2013-10-04 13:51:13 +0200
-        message:
-          Corretions of copyright headers (RE-request 45781)
-------------------------------------------------------------
-revno: 4499
-committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
-branch nick: mysql_5_5
-timestamp: Mon 2013-10-07 14:03:57 +0530
-message:
-  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
-            
-  Fixing pb2 test failure.
-------------------------------------------------------------
-revno: 4498 [merge]
-committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-10-07 15:17:56 +0900
-message:
-  Merge mysql-5.1 to mysql-5.5.
-    ------------------------------------------------------------
-    revno: 2661.844.75
-    committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Mon 2013-10-07 15:16:31 +0900
-    message:
-      Bug#17431533 : FAILING ASSERTION: INDEX->PAGE != 0XFFFFFFFF AFTER DISCARDING TABLESPACE
-      
-      ha_innobase::records_in_range() should return HA_POS_ERROR for the table during discarded without requesting pages.
-      The later other handler method should treat the error correctly.
-      
-      Approved by Sunny in rb#3433
-------------------------------------------------------------
-revno: 4497
-committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
-branch nick: mysql_5_5
-timestamp: Mon 2013-10-07 09:49:32 +0530
-message:
-  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
-  
-  Fixing pb2 test failure for 5.5 version on solaris platform.
-------------------------------------------------------------
-revno: 4496
-committer: Praveenkumar Hulakund <praveenkumar.hulakund@oracle.com>
-branch nick: mysql_5_5
-timestamp: Sat 2013-10-05 15:29:02 +0530
-message:
-  Bug#11745656 - KILL THREAD -> ERROR: "SERVER SHUTDOWN IN PROGRESS"
-  
-  Description:
-  ------------
-  There are 2 issues reported in the bug report,
-  
-  1. One session running a "long" select, then, from the other
-  session, you kill that first one, while select is
-  running, and it receives that message "Server shutdown in
-  progress".
-  Reported Date: 02-Apr-2006
-  
-  => Looks like this isuse is already fixed in 2009 by the patch
-     pushed for bug28141. 
-  
-  2. Killing query which goes to filesort, logs error entries like:
-  
-  120416  9:17:28 [ERROR] mysqld: Sort aborted: Server shutdown in
-                                                progress 
-  120416  9:18:48 [ERROR] mysqld: Sort aborted: Server shutdown in
-                                                progress 
-  120416  9:19:39 [ERROR] mysqld: Sort aborted: Server shutdown in
-                                                progress 
-  Reported Date: 16-Apr-2012                                              
-  
-  => This issue is introduced in 5.5+ versions. Fixing this issue
-     in this patch.
-  
-  
-  Analysis:
-  ---------
-  In function "filesort()", on error we are logging error message.
-  To the error message, the message related THD::killed_errno is
-  also appeneded, if it is set.(THD::kill_errno value is obtained
-  by calling member function THD::killed_errno)
-  
-  In the scenario mentioned in this bug report, when we kill the
-  connection, THD::kill_errno is set to the THD::KILL_CONNECTION.
-  Enum type THD::KILL_CONNECTION corressponds to value 
-  ER_SERVER_SHUTDOWN. Because of this, "Server shutdown in ...." is
-  appended to the message logged.
-  
-  Fix:
-  ----
-  Modified code of "filesort()" function to append "KILL_QUERY"
-  status to error message when thread is killed and server
-  shutdown is not in progress.
-------------------------------------------------------------
-revno: 4495
-committer: Marko M?kel? <marko.makela@oracle.com>
-branch nick: mysql-5.5
-timestamp: Tue 2013-10-01 14:17:35 +0300
-message:
-  Followup to Bug#17446090 fix:
-  
-  Now that ibuf_change_buffering_debug a.k.a. ibuf_debug should work
-  reliably (no "surprise" merges), make some tests stricter
-  (require that the server crashes where we expect it to).
-------------------------------------------------------------
-revno: 4494
-committer: Mattias Jonsson <mattias.jonsson@oracle.com>
-branch nick: b14621190-55
-timestamp: Tue 2013-10-01 10:05:45 +0200
-message:
-  Bug#14621190: HA_INNOBASE::INDEX_NEXT SKIPS A RECORD IF PREVIOUS
-  INDEX_READ_MAP HAD NO MATCH
-  
-  If index_read_map is called for exact search and no matching records
-  exists it will position the cursor on the next record, but still having the
-  relative position to BTR_PCUR_ON.
-  This will make a call for index_next to read yet another next record,
-  instead of returning the record the cursor points to.
-  
-  Fixed by setting pcur->rel_pos = BTR_PCUR_BEFORE if an exact
-  [prefix] search is done, but failed.
-  
-  Also avoids optimistic restoration if rel_pos != BTR_PCUR_ON,
-  since btr_cur may be different than old_rec.
-  
-  rb#3324, approved by Marko and Jimmy
-------------------------------------------------------------
-revno: 4493
-committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-09-30 13:01:17 +0530
-message:
-  Bug #16619754 - MYSQL_INSTALL_DB.PL FAILS TO CREATE DATABASE ON WINDOWS.
-  
-  As this mysql_install_db.pl file has always generated lots of confusion on Windows.  This fix will make sure to get it removed only from Windows
-------------------------------------------------------------
-revno: 4492
-committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-09-30 12:41:22 +0530
-message:
-  Fix for Bug:16053094
-        Registry redirection was improper and hence not able to pick the value for the OLDERVERSION property. as a result in the install upgrade dialog null value wa being passed.
-------------------------------------------------------------
-revno: 4491
-committer: Sreedhar.S <sreedhar.sreedhargadda@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-09-30 12:29:10 +0530
-message:
-  Fix to copy missing pdb files BUG 13878021
-------------------------------------------------------------
-revno: 4490
-committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-09-30 15:02:54 +0900
-message:
-  Adjustment for fix for Bug#11758196
-  
-  log_buffer_extend() should fill the new buffer with 0.
-------------------------------------------------------------
-revno: 4489
-committer: Yasufumi Kinoshita <yasufumi.kinoshita@oracle.com>
-branch nick: mysql-5.5
-timestamp: Mon 2013-09-30 13:41:48 +0900
-message:
-  Bug#11758196 : INNODB ASSERTION FAILURE WHEN CONVERTING FROM MYISAM TO INNODB
-  
-  Changed to try to extend log buffer instead of crash, when log size is too large for the size.
-  
-  Approved by Marko in rb#3229
-------------------------------------------------------------
-revno: 4488 [merge]
-committer: Satya Bodapati <satya.bodapati@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-09-27 18:32:13 +0530
-message:
-  Merge fix for BUG#17446090 from mysql-5.1 to mysql-5.5
-  
-  The testcase for this bug fails randomly due to two reasons.
-  1. Due to ibuf merge happening background
-  2. Due to dict stats update which brings the evicted page back into
-     buffer pool.
-  
-  Fix ibuf_contract_ext() to not do any merges with ibuf_debug enabled and
-  also changed dict_stats_update() to return fake statistics without
-  bringing the secondary index pages into buffer pool.
-  
-  Approved by Marko. rb#3419
-    ------------------------------------------------------------
-    revno: 2661.844.74
-    committer: Satya Bodapati <satya.bodapati@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Fri 2013-09-27 18:30:46 +0530
-    message:
-      BUG#17446090 - TESTCASE INNODB_BUG16752251.TEST FAILS RANDOMLY ON PB2
-      
-      Enable disabled testcases.
-------------------------------------------------------------
-revno: 4487
-committer: Shivji Kumar Jha <shivji.jha@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-09-27 01:24:16 +0530
-message:
-  BUG#16580366- MTR TESTS FAILING SPORADICALLY ON PB2 (5.5, 5.6 AND 5.7)
-                DURING INNODB RECOVERY
-  
-  Problem:
-  =======
-  The connection 'master' is dropped by mysqltest after
-  rpl_end.inc. At this point, dropping temporary tables
-  at the connection 'master' are not synced at slave.
-  So, the temporary tables replicated from master remain
-  on slave leading to an inconsistent close of the test.
-  The following test thus complains about the presence of
-  temporary table(s) left over from the previous test.
-  
-  Fix:
-  ===
-  - Put explicit drop commands in replication tests so
-    that the temporary tables are dropped at slave as well.
-  - Added the check for Slave_open_temp_tables in
-    mtr_check.sql to warn about the remaining temporary
-    table, if any, at the close of a test.
-------------------------------------------------------------
-revno: 4486
-committer: Sujatha Sivakumar <sujatha.sivakumar@oracle.com>
-branch nick: Bug17327454_mysql-5.5
-timestamp: Mon 2013-09-23 12:13:37 +0530
-message:
-  Bug#17327454:SEMI-SYNC REPLICATION MASTER CRASH WHEN SET
-  RPL_SEMI_SYNC_MASTER_ENABLED OFF.
-  
-  Problem:
-  =======
-  If master is waiting for a reply from slave, at this time
-  set global rpl_semi_sync_master_enabled=OFF, the master
-  server will crash.
-  
-  Analysis:
-  ========
-  When master is waiting for a reply from slave, at this time
-  if semi sync is switched off on master, during switch off if
-  active transactions are present the transactions will be
-  cleared and "active_tranxs_" variable will be set to NULL.
-  
-  When the waiting master connection finds that semi sync is
-  switched of it tries to access "active_tranxs_" without
-  checking if the transaction list exists or not. Accessing
-  NULL transaction list causes the crash.
-  
-  Fix:
-  ===
-  A check has been added to see a valid list exists before
-  accessing the "active_tranxs_".
-------------------------------------------------------------
-revno: 4485 [merge]
-committer: Hery Ramilison <hery.ramilison@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-09-20 21:42:40 +0200
-message:
-  Upmerge of the 5.1.72 build
-    ------------------------------------------------------------
-    revno: 2661.844.73 [merge]
-    author: hery.ramilison@oracle.com
-    committer: Hery Ramilison <hery.ramilison@oracle.com>
-    branch nick: mysql-5.1
-    timestamp: Fri 2013-09-20 21:08:08 +0200
-    message:
-      Merge from mysql-5.1.72-release
-        ------------------------------------------------------------
-        revno: 2661.850.5
-        tags: mysql-5.1.72
-        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-        branch nick: mysql-5.1.72-release
-        timestamp: Mon 2013-09-09 20:07:12 +0200
-        message:
-           Reverted the changes to spec file to ignore mysqld_safe.pid file, updated the logic to get the correct count of PID files
-        ------------------------------------------------------------
-        revno: 2661.850.4
-        committer: Hery Ramilison <hery.ramilison@oracle.com>
-        branch nick: mysql-5.1.72-release
-        timestamp: Mon 2013-09-09 18:58:08 +0200
-        message:
-          Committing patch from venkata.sidagam@oracle.com for Bug#16776528 
-        ------------------------------------------------------------
-        revno: 2661.850.3
-        committer: Hery Ramilison <hery.ramilison@oracle.com>
-        branch nick: mysql-5.1.72-release
-        timestamp: Tue 2013-09-03 18:37:46 +0200
-        message:
-          Fixing sles11 build that /usr/lib/mysql/plugin is not owned by a package
-        ------------------------------------------------------------
-        revno: 2661.850.2
-        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-        branch nick: mysql-5.1.72-release
-        timestamp: Fri 2013-08-30 17:14:46 +0200
-        message:
-          Fix to ignore mysqld_safe.pid
-        ------------------------------------------------------------
-        revno: 2661.850.1
-        committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-        branch nick: mysql-5.1.72-release
-        timestamp: Thu 2013-08-29 14:42:55 +0200
-        message:
-          Fix for Bug#17377159, ignore mysqld_safe.pid file created by mysqld_safe script
-------------------------------------------------------------
-revno: 4484
-committer: Tor Didriksen <tor.didriksen@oracle.com>
-branch nick: 5.5
-timestamp: Fri 2013-09-20 16:10:31 +0200
-message:
-  Bug#17435338 ADD A -DWITH_ASAN SWITCH/OPTION TO OUR CMAKE SCRIPTS
-  
-  Tested with:
-  gcc (GCC) 4.8.1 20130603 (Red Hat 4.8.1-1)
-  
-  clang version 3.1 (tags/RELEASE_31/final)
-  Target: x86_64-apple-darwin10.8.0
-------------------------------------------------------------
-revno: 4483 [merge]
-author: balasubramanian.kandasamy@oracle.com
-committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-branch nick: mysql-5.5
-timestamp: Fri 2013-09-20 11:34:06 +0200
-message:
-  Merge from mysql-5.5.34-release
-    ------------------------------------------------------------
-    revno: 4457.1.5
-    tags: mysql-5.5.34
-    committer: Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-    branch nick: mysql-5.5.34-release
-    timestamp: Mon 2013-09-09 19:49:44 +0200
-    message:
-      Reverted the changes to spec file, updated the logic to get the correct count of PID files
+This is a first release, this file is supposed to be empty
diff -Nru mysql-5.5-5.5.35+dfsg/Docs/INFO_SRC mysql-5.5-5.5.43/Docs/INFO_SRC
--- mysql-5.5-5.5.35+dfsg/Docs/INFO_SRC	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/Docs/INFO_SRC	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
-revision-id: balasubramanian.kandasamy@oracle.com-20131105070343-fgb4ljwrh1hzgaeh
-date: 2013-11-05 08:03:43 +0100
-build-date: 2013-11-05 08:12:45 +0100
-revno: 4535
-branch-nick: mysql-5.5.35-release
+commit: 367802ceef18088c24fcda705440e0d87930188b
+date: 2015-02-27 09:14:35 +0100
+build-date: 2015-02-27 09:18:18 +0100
+short: 367802c
+branch: mysql-5.5.43-release
 
-MySQL source 5.5.35
+MySQL source 5.5.43
diff -Nru mysql-5.5-5.5.35+dfsg/Docs/INSTALL-BINARY mysql-5.5-5.5.43/Docs/INSTALL-BINARY
--- mysql-5.5-5.5.35+dfsg/Docs/INSTALL-BINARY	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/Docs/INSTALL-BINARY	2015-02-27 08:30:42.000000000 +0000
@@ -1,60 +1,76 @@
-
-2.2. Installing MySQL on Unix/Linux Using Generic Binaries
+2.2 Installing MySQL on Unix/Linux Using Generic Binaries
 
    Oracle provides a set of binary distributions of MySQL. These
-   include binary distributions in the form of compressed tar files
-   (files with a .tar.gz extension) for a number of platforms, as
-   well as binaries in platform-specific package formats for selected
-   platforms.
-
-   This section covers the installation of MySQL from a compressed
-   tar file binary distribution. For other platform-specific package
-   formats, see the other platform-specific sections. For example,
-   for Windows distributions, see Section 2.3, "Installing MySQL on
+   include binary distributions in the form of compressed tar
+   files (files with a .tar.gz extension) for a number of
+   platforms, as well as binaries in platform-specific package
+   formats for selected platforms.
+
+   This section covers the installation of MySQL from a
+   compressed tar file binary distribution. For other
+   platform-specific package formats, see the other
+   platform-specific sections. For example, for Windows
+   distributions, see Section 2.3, "Installing MySQL on
    Microsoft Windows."
 
-   To obtain MySQL, see Section 2.1.3, "How to Get MySQL."
+   To obtain MySQL, see Section 2.1.2, "How to Get MySQL."
 
-   MySQL compressed tar file binary distributions have names of the
-   form mysql-VERSION-OS.tar.gz, where VERSION is a number (for
-   example, 5.5.36), and OS indicates the type of operating system
-   for which the distribution is intended (for example, pc-linux-i686
-   or winx64).
-
-   To install MySQL from a compressed tar file binary distribution,
-   your system must have GNU gunzip to uncompress the distribution
-   and a reasonable tar to unpack it. If your tar program supports
-   the z option, it can both uncompress and unpack the file.
+   MySQL compressed tar file binary distributions have names of
+   the form mysql-VERSION-OS.tar.gz, where VERSION is a number
+   (for example, 5.5.44), and OS indicates the type of operating
+   system for which the distribution is intended (for example,
+   pc-linux-i686 or winx64).
+
+   To install MySQL from a compressed tar file binary
+   distribution, your system must have GNU gunzip to uncompress
+   the distribution and a reasonable tar to unpack it. If your
+   tar program supports the z option, it can both uncompress and
+   unpack the file.
 
    GNU tar is known to work. The standard tar provided with some
-   operating systems is not able to unpack the long file names in the
-   MySQL distribution. You should download and install GNU tar, or if
-   available, use a preinstalled version of GNU tar. Usually this is
-   available as gnutar, gtar, or as tar within a GNU or Free Software
-   directory, such as /usr/sfw/bin or /usr/local/bin. GNU tar is
-   available from http://www.gnu.org/software/tar/.
+   operating systems is not able to unpack the long file names
+   in the MySQL distribution. You should download and install
+   GNU tar, or if available, use a preinstalled version of GNU
+   tar. Usually this is available as gnutar, gtar, or as tar
+   within a GNU or Free Software directory, such as /usr/sfw/bin
+   or /usr/local/bin. GNU tar is available from
+   http://www.gnu.org/software/tar/.
+   Warning
+
+   If you have previously installed MySQL using your operating
+   system native package management system, such as yum or
+   apt-get, you may experience problems installing using a
+   native binary. Make sure your previous MySQL installation has
+   been removed entirely (using your package management system),
+   and that any additional files, such as old versions of your
+   data files, have also been removed. You should also check the
+   existence of configuration files such as /etc/my.cnf or the
+   /etc/mysql directory have been deleted.
    Warning
 
-   If you have previously installed MySQL using your operating system
-   native package management system, such as yum or apt-get, you may
-   experience problems installing using a native binary. Make sure
-   your previous MySQL previous installation has been removed
-   entirely (using your package management system), and that any
-   additional files, such as old versions of your data files, have
-   also been removed. You should also check the existence of
-   configuration files such as /etc/my.cnf or the /etc/mysql
-   directory have been deleted.
-
-   If you run into problems and need to file a bug report, please use
-   the instructions in Section 1.7, "How to Report Bugs or Problems."
-
-   On Unix, to install a compressed tar file binary distribution,
-   unpack it at the installation location you choose (typically
-   /usr/local/mysql). This creates the directories shown in the
-   following table.
+   MySQL has a dependency on the libaio library. The
+   mysql_install_db and subsequent mysqld_safe steps will fail
+   if this library is not installed locally. If necessary,
+   install it using the appropriate package manager. For
+   example, on Yum-based systems:
+shell> yum search libaio  # search for info
+shell> yum install libaio # install library
+
+   Or, on APT-based systems:
+shell> apt-cache search libaio # search for info
+shell> apt-get install libaio1 # install library
+
+   If you run into problems and need to file a bug report,
+   please use the instructions in Section 1.7, "How to Report
+   Bugs or Problems."
+
+   On Unix, to install a compressed tar file binary
+   distribution, unpack it at the installation location you
+   choose (typically /usr/local/mysql). This creates the
+   directories shown in the following table.
 
-   Table 2.3. MySQL Installation Layout for Generic Unix/Linux Binary
-   Package
+   Table 2.3 MySQL Installation Layout for Generic Unix/Linux
+   Binary Package
    Directory Contents of Directory
    bin Client programs and the mysqld server
    data Log files, databases
@@ -67,25 +83,25 @@
    sample configuration files, SQL for database installation
    sql-bench Benchmarks
 
-   Debug versions of the mysqld binary are available as mysqld-debug.
-   To compile your own debug version of MySQL from a source
-   distribution, use the appropriate configuration options to enable
-   debugging support. For more information on compiling from source,
-   see Section 2.10, "Installing MySQL from Source."
+   Debug versions of the mysqld binary are available as
+   mysqld-debug. To compile your own debug version of MySQL from
+   a source distribution, use the appropriate configuration
+   options to enable debugging support. For more information on
+   compiling from source, see Section 2.9, "Installing MySQL
+   from Source."
 
-   To install and use a MySQL binary distribution, the basic command
-   sequence looks like this:
+   To install and use a MySQL binary distribution, the basic
+   command sequence looks like this:
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 shell> cd /usr/local
 shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
 shell> ln -s full-path-to-mysql-VERSION-OS mysql
 shell> cd mysql
-shell> chown -R mysql .
-shell> chgrp -R mysql .
-shell> scripts/mysql_install_db --user=mysql
 shell> chown -R root .
 shell> chown -R mysql data
+shell> chgrp -R mysql .
+shell> scripts/mysql_install_db --user=mysql
 # Next command is optional
 shell> cp support-files/my-medium.cnf /etc/my.cnf
 shell> bin/mysqld_safe --user=mysql &
@@ -96,697 +112,1091 @@
    installing a binary distribution follows.
    Note
 
-   This procedure assumes that you have root (administrator) access
-   to your system. Alternatively, you can prefix each command using
-   the sudo (Linux) or pfexec (OpenSolaris) command.
-
-   The procedure does not set up any passwords for MySQL accounts.
-   After following the procedure, proceed to Section 2.11.2,
-   "Securing the Initial MySQL Accounts."
+   This procedure assumes that you have root (administrator)
+   access to your system. Alternatively, you can prefix each
+   command using the sudo (Linux) or pfexec (OpenSolaris)
+   command.
+
+   The procedure does not set up any passwords for MySQL
+   accounts. After following the procedure, proceed to Section
+   2.10.2, "Securing the Initial MySQL Accounts."
 
 Create a mysql User and Group
 
-   If your system does not already have a user and group for mysqld
-   to run as, you may need to create one. The following commands add
-   the mysql group and the mysql user. You might want to call the
-   user and group something else instead of mysql. If so, substitute
-   the appropriate name in the following instructions. The syntax for
-   useradd and groupadd may differ slightly on different versions of
-   Unix, or they may have different names such as adduser and
-   addgroup.
+   If your system does not already have a user and group for
+   mysqld to run as, you may need to create one. The following
+   commands add the mysql group and the mysql user. You might
+   want to call the user and group something else instead of
+   mysql. If so, substitute the appropriate name in the
+   following instructions. The syntax for useradd and groupadd
+   may differ slightly on different versions of Unix, or they
+   may have different names such as adduser and addgroup.
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 
    Note
 
    Because the user is required only for ownership purposes, not
-   login purposes, the useradd command uses the -r option to create a
-   user that does not have login permissions to your server host.
-   Omit this option to permit logins for the user (or if your useradd
-   does not support the option).
+   login purposes, the useradd command uses the -r option to
+   create a user that does not have login permissions to your
+   server host. Omit this option to permit logins for the user
+   (or if your useradd does not support the option).
 
 Obtain and Unpack the Distribution
 
-   Pick the directory under which you want to unpack the distribution
-   and change location into it. The example here unpacks the
-   distribution under /usr/local. The instructions, therefore, assume
-   that you have permission to create files and directories in
-   /usr/local. If that directory is protected, you must perform the
-   installation as root.
+   Pick the directory under which you want to unpack the
+   distribution and change location into it. The example here
+   unpacks the distribution under /usr/local. The instructions,
+   therefore, assume that you have permission to create files
+   and directories in /usr/local. If that directory is
+   protected, you must perform the installation as root.
 shell> cd /usr/local
 
    Obtain a distribution file using the instructions in Section
-   2.1.3, "How to Get MySQL." For a given release, binary
+   2.1.2, "How to Get MySQL." For a given release, binary
    distributions for all platforms are built from the same MySQL
    source distribution.
 
-   Unpack the distribution, which creates the installation directory.
-   Then create a symbolic link to that directory. tar can uncompress
-   and unpack the distribution if it has z option support:
+   Unpack the distribution, which creates the installation
+   directory. Then create a symbolic link to that directory. tar
+   can uncompress and unpack the distribution if it has z option
+   support:
 shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
 shell> ln -s full-path-to-mysql-VERSION-OS mysql
 
-   The tar command creates a directory named mysql-VERSION-OS. The ln
-   command makes a symbolic link to that directory. This enables you
-   to refer more easily to the installation directory as
-   /usr/local/mysql.
-
-   If your tar does not have z option support, use gunzip to unpack
-   the distribution and tar to unpack it. Replace the preceding tar
-   command with the following alternative command to uncompress and
-   extract the distribution:
+   The tar command creates a directory named mysql-VERSION-OS.
+   The ln command makes a symbolic link to that directory. This
+   enables you to refer more easily to the installation
+   directory as /usr/local/mysql.
+
+   If your tar does not have z option support, use gunzip to
+   unpack the distribution and tar to unpack it. Replace the
+   preceding tar command with the following alternative command
+   to uncompress and extract the distribution:
 shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
 
 Perform Postinstallation Setup
 
-   The remainder of the installation process involves setting up the
-   configuration file, creating the core databases, and starting the
-   MySQL server. For next steps, see Section 2.11, "Postinstallation
-   Setup and Testing."
-   Note
-
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11.2,
-   "Securing the Initial MySQL Accounts."
-
-   Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights
-   reserved. Legal Notices
-
-2.3. Installing MySQL on Microsoft Windows
-
-   MySQL for Microsoft Windows is available in a number of different
-   forms. A Microsoft Windows operating system such as Windows XP,
-   Windows Vista, Windows 7, Windows 8, Windows Server 2003, Windows
-   Server 2008, or Windows Server 2012. Both 32-bit and 64-bit
-   versions are supported. For supported platform information, see
-   http://www.mysql.com/support/supportedplatforms/database.html.
-
-   In addition to running MySQL as a standard application, you can
-   also run the MySQL server as a Windows service. By using a service
-   you can monitor and control the operation of the server through
-   the standard Windows service management tools. For more
-   information, see Section 2.3.7.7, "Starting MySQL as a Windows
-   Service."
+   The remainder of the installation process involves setting up
+   the configuration file, creating the core databases, and
+   starting the MySQL server. For next steps, see Section 2.10,
+   "Postinstallation Setup and Testing."
+   Note
+
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
+2.3 Installing MySQL on Microsoft Windows
+
+   There are several different methods to install MySQL on
+   Microsoft Windows.
+
+Simple Installation Method
+
+   The simplest and recommended method is to download MySQL
+   Installer (for Windows) and let it install and configure all
+   of the MySQL products on your system. Here is how:
 
-   Generally, you should install MySQL on Windows using an account
-   that has administrator rights. Otherwise, you may encounter
-   problems with certain operations such as editing the PATH
-   environment variable or accessing the Service Control Manager.
-   Once installed, MySQL does not need to be executed using a user
-   with Administrator privileges.
+     * Download MySQL Installer from
+       http://dev.mysql.com/downloads/installer/ and execute it.
+       Note
+       Unlike the standard MySQL Installer, the smaller
+       "web-community" version does not bundle any MySQL
+       applications but it will download the MySQL products you
+       choose to install.
+
+     * Choose the appropriate Setup Type for your system.
+       Typically you will choose Developer Default to install
+       MySQL server and other MySQL tools related to MySQL
+       development, helpful tools like MySQL Workbench. Or,
+       choose the Custom setup type to manually select your
+       desired MySQL products.
+       Note
+       Multiple versions of MySQL server can exist on a single
+       system. You can choose one or multiple versions.
 
-   For a list of limitations within the Windows version of MySQL, see
-   Section E.10.6, "Windows Platform Limitations."
+     * Complete the installation process by following the MySQL
+       Installation wizard's instructions. This will install
+       several MySQL products and start the MySQL server.
+
+     * MySQL is now installed. You probably configured MySQL as
+       a service that will automatically start MySQL server
+       every time you restart your system.
+
+   Note
+
+   You probably also installed other helpful MySQL products like
+   MySQL Workbench and MySQL Notifier on your system. Consider
+   loading Chapter 26, "MySQL Workbench" to check your new MySQL
+   server connection, and Section 2.3.4, "MySQL Notifier" to
+   view the connection's status. By default, these two programs
+   automatically start after installing MySQL.
+
+   This process also installs the MySQL Installer application on
+   your system, and later you can use MySQL Installer to upgrade
+   or reconfigure your MySQL products.
+
+Additional Installation Information
+
+   MySQL is available for Microsoft Windows, for both 32-bit and
+   64-bit versions. For supported Windows platform information,
+   see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   It is possible to run MySQL as a standard application or as a
+   Windows service. By using a service, you can monitor and
+   control the operation of the server through the standard
+   Windows service management tools. For more information, see
+   Section 2.3.7.7, "Starting MySQL as a Windows Service."
+
+   Generally, you should install MySQL on Windows using an
+   account that has administrator rights. Otherwise, you may
+   encounter problems with certain operations such as editing
+   the PATH environment variable or accessing the Service
+   Control Manager. Once installed, MySQL does not need to be
+   executed using a user with Administrator privileges.
+
+   For a list of limitations on the use of MySQL on the Windows
+   platform, see Section D.10.6, "Windows Platform Limitations."
 
    In addition to the MySQL Server package, you may need or want
    additional components to use MySQL with your application or
-   development environment. These include, but are not limited to:
+   development environment. These include, but are not limited
+   to:
 
-     * If you plan to connect to the MySQL server using ODBC, you
-       need a Connector/ODBC driver. For more information, including
-       installation and configuration instructions, see Section 22.1,
-       "MySQL Connector/ODBC."
-
-     * If you plan to use MySQL server with .NET applications, you
-       need the Connector/Net driver. For more information, including
-       installation and configuration instructions, see Section 22.2,
-       "MySQL Connector/Net."
+     * To connect to the MySQL server using ODBC, you must have
+       a Connector/ODBC driver. For more information, including
+       installation and configuration instructions, see MySQL
+       Connector/ODBC Developer Guide
+       (http://dev.mysql.com/doc/connector-odbc/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/ODBC
+       for you.
+
+     * To use MySQL server with .NET applications, you must have
+       the Connector/Net driver. For more information, including
+       installation and configuration instructions, see MySQL
+       Connector/Net Developer Guide
+       (http://dev.mysql.com/doc/connector-net/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/NET
+       for you.
 
    MySQL distributions for Windows can be downloaded from
-   http://dev.mysql.com/downloads/. See Section 2.1.3, "How to Get
-   MySQL."
+   http://dev.mysql.com/downloads/. See Section 2.1.2, "How to
+   Get MySQL."
 
-   MySQL for Windows is available in several distribution formats,
-   detailed below. Generally speaking, you should use MySQL
-   Installer. It contains more features and MySQL products than the
-   older MSI, is simpler to use than the ZIP file, and you need no
-   additional tools to get MySQL up and running. MySQL Installer will
-   automatically install MySQL Server, install additional MySQL
-   products, create an options file, starts the server, and allow you
-   to create default user accounts. For more information on choosing
-   a package, see Section 2.3.2, "Choosing An Installation Package."
-
-   MySQL for Windows is available in several distribution formats,
-   detailed below. Generally speaking, you should use a binary
-   distribution that includes an installer. It is simpler to use than
-   the others, and you need no additional tools to get MySQL up and
-   running. The installer for the Windows version of MySQL, combined
-   with a GUI Config Wizard, automatically installs MySQL, creates an
-   option file, starts the server, and secures the default user
-   accounts.
-
-     * Binary installer distribution. There are two different
-       installable distributions that come packaged as a Microsoft
-       Windows Installer (MSI) package that you can install manually
-       or automatically on your systems. The older MSI package that
-       contains all the files you need to install and configure MySQL
-       server, but no additional components, and the preferred MySQL
-       Installer package that includes MySQL Server and additional
-       MySQL products including MySQL Workbench, MySQL Notifier, and
-       MySQL for Excel. And MySQL Installer can also be used to
-       upgrade these product in the future. For more information on
-       choosing a package, see Section 2.3.2, "Choosing An
-       Installation Package"
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
-
-     * Standard binary distribution format packaged as a Zip file
-       containing all of the necessary files that you unpack into
-       your chosen location. This package contains all of the files
-       in the full Windows MSI Installer package, but does not
-       include an installation program.
-       For instructions on installing MySQL using the Zip file, see
-       Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-       noinstall Zip Archive."
-
-     * The source distribution contains all the code and support
-       files for building the executables using the Visual Studio
-       compiler system.
-       For instructions on building MySQL from source on Windows, see
-       Section 2.10, "Installing MySQL from Source."
+   MySQL for Windows is available in several distribution
+   formats, detailed below. Generally speaking, you should use
+   MySQL Installer. It contains more features and MySQL products
+   than the older MSI, is simpler to use than the Zip file, and
+   you need no additional tools to get MySQL up and running.
+   MySQL Installer automatically installs MySQL Server and
+   additional MySQL products, creates an options file, starts
+   the server, and enables you to create default user accounts.
+   For more information on choosing a package, see Section
+   2.3.2, "Choosing An Installation Package."
+
+     * Binary installer distributions. There are two different
+       installable distributions that come packaged as a
+       Microsoft Windows Installer (MSI) package that you can
+       install manually or automatically on your systems. The
+       preferred MySQL Installer package includes MySQL Server
+       and additional MySQL products including MySQL Workbench,
+       MySQL Notifier, and MySQL for Excel. MySQL Installer can
+       also be used to upgrade these product in the future. The
+       older MSI package contains all the files you need to
+       install and configure MySQL server, but no additional
+       components.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+
+     * The standard binary distribution (packaged as a Zip file)
+       contains all of the necessary files that you unpack into
+       your chosen location. This package contains all of the
+       files in the full Windows MSI Installer package, but does
+       not include an installation program.
+       For instructions on installing MySQL using the Zip file,
+       see Section 2.3.7, "Installing MySQL on Microsoft Windows
+       Using a noinstall Zip Archive."
+
+     * The source distribution format contains all the code and
+       support files for building the executables using the
+       Visual Studio compiler system.
+       For instructions on building MySQL from source on
+       Windows, see Section 2.9, "Installing MySQL from Source."
 
    MySQL on Windows considerations:
 
      * Large Table Support
-       If you need tables with a size larger than 4GB, install MySQL
-       on an NTFS or newer file system. Do not forget to use MAX_ROWS
-       and AVG_ROW_LENGTH when you create tables. See Section
-       13.1.17, "CREATE TABLE Syntax."
+       If you need tables with a size larger than 4GB, install
+       MySQL on an NTFS or newer file system. Do not forget to
+       use MAX_ROWS and AVG_ROW_LENGTH when you create tables.
+       See Section 13.1.17, "CREATE TABLE Syntax."
 
      * MySQL and Virus Checking Software
-       Using virus scanning software such as Norton/Symantec
-       Anti-Virus on directories containing MySQL data and temporary
-       tables can cause issues, both in terms of the performance of
-       MySQL and the virus-scanning software mis-identifying the
-       contents of the files as containing spam. This is because of
-       the fingerprinting mechanism used by the virus scanning
-       software, and the way in which MySQL rapidly updates different
-       files, which may be identified as a potential security risk.
+       Virus-scanning software such as Norton/Symantec
+       Anti-Virus on directories containing MySQL data and
+       temporary tables can cause issues, both in terms of the
+       performance of MySQL and the virus-scanning software
+       misidentifying the contents of the files as containing
+       spam. This is due to the fingerprinting mechanism used by
+       the virus-scanning software, and the way in which MySQL
+       rapidly updates different files, which may be identified
+       as a potential security risk.
        After installing MySQL Server, it is recommended that you
-       disable virus scanning on the main directory (datadir) being
-       used to store your MySQL table data. There is usually a system
-       built into the virus scanning software to permit certain
-       directories to be specifically ignored during virus scanning.
-       In addition, by default, MySQL creates temporary files in the
-       standard Windows temporary directory. To prevent the temporary
-       files also being scanned, you should configure a separate
-       temporary directory for MySQL temporary files and add this to
-       the virus scanning exclusion list. To do this, add a
-       configuration option for the tmpdir parameter to your my.ini
-       configuration file. For more information, see Section 2.3.7.2,
-       "Creating an Option File."
-
-2.3.1. MySQL Installation Layout on Microsoft Windows
-
-   For MySQL 5.5 on Windows, the default installation directory is
-   C:\Program Files\MySQL\MySQL Server 5.5. Some Windows users prefer
-   to install in C:\mysql, the directory that formerly was used as
-   the default. However, the layout of the subdirectories remains the
-   same.
+       disable virus scanning on the main directory (datadir)
+       used to store your MySQL table data. There is usually a
+       system built into the virus-scanning software to enable
+       specific directories to be ignored.
+       In addition, by default, MySQL creates temporary files in
+       the standard Windows temporary directory. To prevent the
+       temporary files also being scanned, configure a separate
+       temporary directory for MySQL temporary files and add
+       this directory to the virus scanning exclusion list. To
+       do this, add a configuration option for the tmpdir
+       parameter to your my.ini configuration file. For more
+       information, see Section 2.3.7.2, "Creating an Option
+       File."
+
+2.3.1 MySQL Installation Layout on Microsoft Windows
+
+   For MySQL 5.5 on Windows, the default installation directory
+   is C:\Program Files\MySQL\MySQL Server 5.5. Some Windows
+   users prefer to install in C:\mysql, the directory that
+   formerly was used as the default. However, the layout of the
+   subdirectories remains the same.
 
-   All of the files are located within this parent directory, using
-   the structure shown in the following table.
+   All of the files are located within this parent directory,
+   using the structure shown in the following table.
 
-   Table 2.4. Default MySQL Installation Layout for Microsoft Windows
+   Table 2.4 Default MySQL Installation Layout for Microsoft
+   Windows
    Directory Contents of Directory Notes
    bin Client programs and the mysqld server
-   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files, databases
-   (Windows XP, Windows Server 2003) The Windows system variable
-   %ALLUSERSPROFILE% defaults to C:\Documents and Settings\All
-   Users\Application Data
-   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases (Vista,
-   Windows 7, Windows Server 2008, and newer) The Windows system
-   variable %PROGRAMDATA% defaults to C:\ProgramData
+   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files,
+   databases (Windows XP, Windows Server 2003) The Windows
+   system variable %ALLUSERSPROFILE% defaults to C:\Documents
+   and Settings\All Users\Application Data
+   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases
+   (Vista, Windows 7, Windows Server 2008, and newer) The
+   Windows system variable %PROGRAMDATA% defaults to
+   C:\ProgramData
    examples Example programs and scripts
    include Include (header) files
    lib Libraries
    scripts Utility scripts
    share Miscellaneous support files, including error messages,
-   character set files, sample configuration files, SQL for database
-   installation
+   character set files, sample configuration files, SQL for
+   database installation
 
-   If you install MySQL using a Windows MSI package, this package
-   creates and sets up the data directory that the installed server
-   will use, but as of MySQL 5.5.5, it also creates a pristine
-   "template" data directory named data under the installation
-   directory. This directory can be useful when the machine will be
-   used to run multiple instances of MySQL: After an installation has
-   been performed using an MSI package, the template data directory
-   can be copied to set up additional MySQL instances. See Section
-   5.3, "Running Multiple MySQL Instances on One Machine."
-
-2.3.2. Choosing An Installation Package
-
-   For MySQL 5.5, there are installation package formats to choose
-   from when installing MySQL on Windows:
-   Note
-
-   MySQL Installer and the "Complete Package" methods for installing
-   MySQL are similar, but different. The MySQL Installer is the newer
-   and more advanced option, and it includes all functionality found
-   within the "Complete Package."
+   If you install MySQL using a Windows MSI package, this
+   package creates and sets up the data directory that the
+   installed server will use, but as of MySQL 5.5.5, it also
+   creates a pristine "template" data directory named data under
+   the installation directory. This directory can be useful when
+   the machine will be used to run multiple instances of MySQL:
+   After an installation has been performed using an MSI
+   package, the template data directory can be copied to set up
+   additional MySQL instances. See Section 5.3, "Running
+   Multiple MySQL Instances on One Machine."
+
+2.3.2 Choosing An Installation Package
+
+   For MySQL 5.5, there are installation package formats to
+   choose from when installing MySQL on Windows:
+   Note
+
+   MySQL Installer and the "Complete Package" methods for
+   installing MySQL are similar, but different. The MySQL
+   Installer is the newer and more advanced option, and it
+   includes all functionality found within the "Complete
+   Package."
 
      * MySQL Installer: This package has a file name similar to
-       mysql-installer-community-5.5.36.0.msi or
-       mysql-installer-commercial-5.5.36.0.msi, and utilizes MSI's to
-       automatically install MySQL server and other products. It will
-       download and apply updates to itself, and for each of the
-       installed products. It also configures the additional
-       non-server products.
-       The installed products are configurable, and this includes:
-       documentation with samples and examples, connectors (such as
-       C, C++, J, NET, and ODBC), MySQL Workbench, MySQL Notifier for
-       Microsoft Windows, MySQL for Excel, and the MySQL Server with
-       its components.
-       MySQL Installer will run on all Windows platforms that are
-       supported by MySQL (see
-       http://www.mysql.com/support/supportedplatforms/database.html)
-       . Note: because MySQL is not a native component of Windows and
-       depends on .NET, it will not work on minimal installation
-       options like the "Server Core" version of Windows Server 2008.
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
-
-     * The Complete Package: This package has a file name similar to
-       mysql-5.5.36-win32.msi and contains all files needed for a
-       complete Windows installation, including the Configuration
-       Wizard. This package includes optional components such as the
-       embedded server and benchmark suite.
-
-     * The Noinstall Archive: This package has a file name similar to
-       mysql-5.5.36-win32.zip and contains all the files found in the
-       Complete install package, with the exception of the
-       Configuration Wizard. This package does not include an
-       automated installer, and must be manually installed and
-       configured.
-
-   MySQL Installer is recommended for most users. Both MySQL
-   Installer and the alternative "Complete distribution" versions are
-   available as .msi files for use with installations on Windows. The
-   Noinstall distribution is packaged as a Zip archive. To use a Zip
-   archive, you must have a tool that can unpack .zip files.
-
-   Your choice of install package affects the installation process
-   you must follow. If you choose to install using MySQL Installer,
-   see Section 2.3.3, "Installing MySQL on Microsoft Windows Using
-   MySQL Installer." If you choose to install a standard MSI package,
-   see Section 2.3.5, "Installing MySQL on Microsoft Windows Using an
-   MSI Package." If you choose to install a Noinstall archive, see
-   Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-   noinstall Zip Archive."
-
-2.3.3. Installing MySQL on Microsoft Windows Using MySQL Installer
-
-   MySQL Installer is an application that simplifies the installation
-   and updating process for a wide range of MySQL products, including
-   MySQL Notifier for Microsoft Windows, MySQL Workbench, and MySQL
-   for Excel. From this central application, you can see which MySQL
-   products are already installed, configure them, and update or
-   remove them if necessary. The installer can also install plugins,
-   documentation, tutorials, and example databases. The MySQL
-   Installer is only available for Microsoft Windows, and includes
-   both a GUI and command-line interface.
+       mysql-installer-community-5.5.44.0.msi or
+       mysql-installer-commercial-5.5.44.0.msi, and utilizes
+       MSIs to automatically install MySQL server and other
+       products. It will download and apply updates to itself,
+       and for each of the installed products. It also
+       configures the additional non-server products.
+       The installed products are configurable, and this
+       includes: documentation with samples and examples,
+       connectors (such as C, C++, J, NET, and ODBC), MySQL
+       Workbench, MySQL Notifier, MySQL for Excel, and the MySQL
+       Server with its components.
+       MySQL Installer will run on all Windows platforms that
+       are supported by MySQL (see
+       http://www.mysql.com/support/supportedplatforms/database.
+       html).
+       Note
+       Because MySQL Installer is not a native component of
+       Microsoft Windows and depends on .NET, it will not work
+       on minimal installation options like the "Server Core"
+       version of Windows Server 2008.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+
+     * The Complete Package: This package has a file name
+       similar to mysql-5.5.44-win32.msi or
+       mysql-5.5.44-winx64.zip, and contains all files needed
+       for a complete Windows installation, including the
+       Configuration Wizard. This package includes optional
+       components such as the embedded server and benchmark
+       suite.
+
+     * The Noinstall Archive: This package has a file name
+       similar to mysql-5.5.44-win32.zip or
+       mysql-5.5.44-winx64.zip, and contains all the files found
+       in the Complete install package, with the exception of
+       the GUI. This package does not include an automated
+       installer, and must be manually installed and configured.
+
+   MySQL Installer is recommended for most users.
+
+   Your choice of install package affects the installation
+   process you must follow. If you choose to use MySQL
+   Installer, see Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer." If you choose to install a
+   standard MSI package, see Section 2.3.5, "Installing MySQL on
+   Microsoft Windows Using an MSI Package." If you choose to
+   install a Noinstall archive, see Section 2.3.7, "Installing
+   MySQL on Microsoft Windows Using a noinstall Zip Archive."
+
+2.3.3 Installing MySQL on Microsoft Windows Using MySQL Installer
+
+   MySQL Installer simplifies the installation and updating
+   process for your MySQL products on Microsoft Windows. From
+   this central application, you can view, remove, update, and
+   reconfigure the existing MySQL products on your system. MySQL
+   Installer can also install plugins, documentation, tutorials,
+   and example databases. The MySQL Installer is only available
+   for Microsoft Windows, and includes both GUI and command-line
+   interfaces.
+
+   The supported products include:
+
+     * MySQL server (http://dev.mysql.com/doc/) (one or multiple
+       versions)
+
+     * MySQL Workbench
+
+     * MySQL Connectors
+       (http://dev.mysql.com/doc/index-connectors.html) (.Net /
+       Python / ODBC / Java / C / C++)
+
+     * MySQL Notifier
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html)
+
+     * MySQL for Visual Studio
+       (http://dev.mysql.com/doc/connector-net/en/connector-net-
+       visual-studio.html)
+
+     * MySQL Utilities and MySQL Fabric
+       (http://dev.mysql.com/doc/index-utils-fabric.html)
+
+     * MySQL Samples and Examples
+
+     * MySQL Documentation
+
+     * MySQL Installer is also installed and remains on the
+       system as its own application
 
 Installer package types
 
 
-     * Full: Bundles all of the MySQL products (including MySQL
-       Server). The file is over 160MB, and have names of the form
-       mysql-installer-community-VERSION.N.msi where VERSION is the
-       MySQL Server version number such as 5.6 and N is the package
-       number, which begins at 0.
-
-     * Web: Only contains the Installer and configuration files, and
-       it only downloads the MySQL products you choose to install.
-       The file is about 2MB, and have names of the form
-       mysql-installer-community-web-VERSION.N.msi where VERSION is
-       the MySQL Server version number such as 5.6 and N is the
-       package number, which begins at 0.
+     * Full: Bundles all of the MySQL products (including the
+       MySQL server). The file' size is over 200MB, and its name
+       has the form mysql-installer-community-VERSION.N.msi
+       where VERSION is the MySQL Server version number such as
+       5.6 and N is the package number, which begins at 0.
+
+     * Web: Only contains the Installer and configuration files,
+       and it only downloads the MySQL products you choose to
+       install. The size of this file is about 2MB; the name of
+       the file has the form
+       mysql-installer-community-web-VERSION.N.msi where VERSION
+       is the MySQL Server version number such as 5.6 and N is
+       the package number, which begins at 0.
 
 Installer editions
 
 
      * Community edition: Downloadable at
-       http://dev.mysql.com/downloads/installer/. It installs the
-       community edition of all MySQL products.
+       http://dev.mysql.com/downloads/installer/. It installs
+       the community edition of all MySQL products.
 
-     * Commercial edition: Downloadable at either My Oracle Support
-       (https://support.oracle.com/) (MOS) or
+     * Commercial edition: Downloadable at either My Oracle
+       Support (https://support.oracle.com/) (MOS) or
        https://edelivery.oracle.com/. It installs the commercial
-       version of all MySQL products, including Workbench SE. It also
-       integrates with your MOS account, so enter in your MOS
-       credentials to automatically receive updates for your
-       commercial MySQL products.
+       version of all MySQL products, including Workbench SE/EE.
+       It also integrates with your MOS account.
+       Note
+       Entering your MOS credentials is optional when installing
+       bundled MySQL products, but your credentials are required
+       when choosing non-bundled MySQL products that MySQL
+       Installer must download.
 
-   For release notes detailing the changes in each release of MySQL
+   For notes detailing the changes in each release of MySQL
    Installer, see MySQL Installer Release Notes
    (http://dev.mysql.com/doc/relnotes/mysql-installer/en/).
 
-   MySQL Installer is compatible with pre-existing installations, and
-   adds them to its list of installed components. And while the MySQL
-   Installer is bundled with a specific version of MySQL Server, a
-   single MySQL Installer instance can install and manage multiple
-   MySQL Server versions. For example, a single MySQL Installer
-   instance can install versions 5.1, 5.5, and 5.6. It can also
-   manage either commercial or community editions of the MySQL
-   Server.
+   MySQL Installer is compatible with pre-existing
+   installations, and adds them to its list of installed
+   components. While the standard MySQL Installer is bundled
+   with a specific version of MySQL Server, a single MySQL
+   Installer instance can install and manage multiple MySQL
+   Server versions. For example, a single MySQL Installer
+   instance can install (and update) versions 5.5, 5.6, and 5.7
+   on the host.
+   Note
+
+   A single host can not have both community and commercial
+   editions of MySQL Server installed. For example, if you want
+   both MySQL Server 5.5 and 5.6 installed on a single host,
+   then both must be the same edition.
+
+   MySQL Installer handles the initial configuration and set up
+   of the applications. For example:
+
+    1. It creates initial MySQL Server connections in MySQL
+       Workbench.
+
+    2. It creates the configuration file (my.ini) that is used
+       to configure the MySQL Server. The values written to this
+       file are influenced by choices you make during the
+       installation process.
+
+    3. It can optionally import example databases.
+
+    4. It can optionally create MySQL Server user accounts with
+       configurable permissions based on general roles, such as
+       DB Administrator, DB Designer, and Backup Admin. It
+       optionally creates a Windows user named MysqlSys with
+       limited privileges, which would then run the MySQL
+       Server.
+       User accounts may also be added and configured in MySQL
+       Workbench.
+
+    5. If the "Advanced Configuration" option is checked, then
+       the Logging Options are also configured. This includes
+       defining file paths for the error log, general log, slow
+       query log (including the configuration of seconds it
+       requires to execute a query), and the binary log.
+
+   MySQL Installer can optionally check for updated components
+   and download them for you.
+
+2.3.3.1 MySQL Installer GUI
+
+   Installing MySQL Installer adds a link to the Start menu
+   under the MySQL group. Click Start, All Programs MySQL, MySQL
+   Installer to reload the MySQL Installer GUI.
+   Note
+
+   Files that are generated by MySQL Installer grant full
+   permissions to the user that executes MySQL Installer,
+   including my.ini. This does not apply to files and
+   directories for specific products such as the MySQL Server
+   data directory in %ProgramData% that is owned by SYSTEM.
+
+   The initial execution of MySQL Installer requires you to
+   accept the license agreement before installing MySQL
+   products.
+
+   Figure 2.7 MySQL Installer - License Agreement
+   MySQL Installer - License Agreement
+
+Installing New Packages
+
+   Choose the appropriate Setup Type for your system. The
+   selected type determines which MySQL products are installed
+   on your system, or select Custom to manually choose
+   individual products.
+
+     * Developer: Install all products needed to develop
+       applications with MySQL. This is the default option.
+
+     * Server only: Only install the MySQL server.
+
+     * Client only: Only install the MySQL client products,
+       which does not include the MySQL server.
+
+     * Full: Install all MySQL products.
+
+     * Custom: Manually select the MySQL products to install.
+       Note
+       After the initial installation, you may use MySQL
+       Installer to manually select MySQL products to install or
+       remove. In other words, MySQL Installer becomes a MySQL
+       product management system.
+
+   Figure 2.8 MySQL Installer - Choosing a Setup Type
+   MySQL Installer - Choosing a Setup Type
+
+   After you select a setup type, the MySQL Installer will check
+   your system for the necessary external requirements for each
+   of the selected MySQL products. MySQL Installer will either
+   download and install the missing components onto your system,
+   or point you to the download location and set Status to
+   "Manual".
+
+   The next window lists the MySQL products that are scheduled
+   to be installed:
+
+   Figure 2.9 MySQL Installer - Installation Progress
+   MySQL Installer - Installation Progress
+
+   As components are installed, their Status changes from a
+   progress percentage to "Complete".
+
+   After all components are installed, the next step configures
+   some of the recently installed MySQL products. The
+   Configuration Overview window displays the progress and then
+   loads a configuration window, if required. Our example
+   configures MySQL Server 5.6.x.
+
+Configuring MySQL Server
+
+   Configuring the MySQL server begins with defining several
+   Type and Networking options.
+
+   Figure 2.10 MySQL Installer - Configuration Overview
+   MySQL Installer - Configuration Overview
+
+   Server Configuration Type
+
+   Choose the MySQL server configuration type that describes
+   your setup. This setting defines the amount of system
+   resources that will be assigned to your MySQL server
+   instance.
+
+     * Developer: A machine that will host many other
+       applications, and typically this is your personal
+       workstation. This option configures MySQL to use the
+       least amount of memory.
+
+     * Server: Several other applications will be running on
+       this machine, such as a web server. This option
+       configures MySQL to use a medium amount of memory.
+
+     * Dedicated: A machine that is dedicated to running the
+       MySQL server. Because no other major applications are
+       running on the server, such as web servers, this option
+       configures MySQL to use all available memory.
+
+   Connectivity
+
+   Connectivity options control how you will connect to MySQL.
+   Options include:
+
+     * TCP/IP: You may enable TCP/IP Networking here as
+       otherwise only localhost connections are allowed. Also
+       define the Port Number and whether to open the firewall
+       port for network access.
+
+     * Named Pipe: Enable and define the pipe name, similar to
+       using the --enable-named-pipe option.
+
+     * Shared Memory: Enable and then define the memory name,
+       similar to using the --shared-memory option.
+
+   Advanced Configuration
+
+   Checking the "Advanced Configuration" option provides
+   additional Logging Options to configure. This includes
+   defining file paths for the error log, general log, slow
+   query log (including the configuration of seconds it requires
+   to execute a query), and the binary log.
+
+   Figure 2.11 MySQL Installer - MySQL Server Configuration:
+   Type and Networking
+   MySQL Installer- MySQL Server Configuration: Type and
+   Networking
+
+Accounts and Roles
+
+   Next, define your MySQL account information. Assigning a root
+   password is required.
+
+   Optionally, you can add additional MySQL user accounts with
+   predefined user roles. Each predefined role, such as "DB
+   Admin", are configured with their own set of privileges. For
+   example, the "DB Admin" role has more privileges than the "DB
+   Designer" role. Click the Role dropdown for a list of role
+   descriptions.
    Note
 
-   A single host can not have both community and commercial editions
-   of MySQL Server installed. For example, if you want both MySQL
-   Server 5.5 and 5.6 installed on a single host, then both must be
-   the same commercial or community edition.
+   If the MySQL Server is already installed, then you must also
+   enter the Current Root Password.
+
+   Figure 2.12 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles
+
+   Figure 2.13 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles: Adding a User
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles: Adding a User
+
+Windows Service
+
+   Next, configure the Windows Service details. This includes
+   the service name, whether the MySQL Server should be loaded
+   at startup, and how the Windows Service for MySQL Server is
+   executed.
+
+   Figure 2.14 MySQL Installer - MySQL Server Configuration:
+   Windows Service
+   MySQL Installer - MySQL Server Configuration: Windows Service
+   Note
+
+   When configuring Run Windows Services as ... using a Custom
+   User, the custom user must have privileges to log on to
+   Microsoft Windows as a service. And the Next button will be
+   disabled until this user is configured with these user
+   rights.
+
+   On Microsoft Windows 7, this is configured by loading the
+   Start Menu, Control Panel, Administrative Tools, Local
+   Security Policy, Local Policies, User Rights Assignment, then
+   Log On As A Service. Choose Add User or Group here to add the
+   custom user, and then OK, OK to save.
+
+Advanced Options
+
+   The next configuration step is available if the Advanced
+   Configuration option was checked. This section includes
+   options that are related to the MySQL log files:
+
+   Figure 2.15 MySQL Installer - MySQL Server Configuration:
+   Logging Options
+   MySQL Installer - MySQL Server Configuration: Logging Options
+
+   Click Next to continue on to the final page before all of the
+   requested changes are applied. This Apply Server
+   Configuration page details the configuration steps that will
+   be performed.
 
-   MySQL Installer handles the initial configuration and setup of the
-   applications. For example:
+   Figure 2.16 MySQL Installer - MySQL Server Configuration:
+   Apply Server Configuration
+   MySQL Installer - MySQL Server Configuration: Apply Server
+   Configuration
 
-    1. It will create MySQL Server connections in MySQL Workbench.
+   Click Execute to execute the configuration steps. The icon
+   for each step toggles from white to green on success, or the
+   process stops on failure. Click the Log tab to view the log.
 
-    2. It creates the configuration file (my.ini) that is used to
-       configure the MySQL Server. The values written to this file
-       are influenced by choices you make during the installation
-       process.
+   After the MySQL Installer configuration process is finished,
+   MySQL Installer reloads the opening page where you can
+   execute other installation and configuration related actions.
 
-    3. It imports example databases.
+   MySQL Installer is added to the Microsoft Windows Start menu
+   under the MySQL group. Opening MySQL Installer loads its
+   dashboard where installed MySQL products are listed, and
+   other MySQL Installer actions are available:
 
-    4. It creates MySQL Server user accounts with configurable
-       permissions based on general roles, such as DB Administrator,
-       DB Designer, and Backup Admin. It optionally creates a Windows
-       user named MysqlSys with limited privileges, which would then
-       run the MySQL Server.
-       This feature is only available during the initial installation
-       of the MySQL Server, and not during future updates. User
-       accounts may also be added with MySQL Workbench.
+   Figure 2.17 MySQL Installer - Main Dashboard
+   MySQL Installer - Main Dashboard
 
-    5. If the "Advanced Configuration" option is checked, then the
-       Logging Options are also configured. This includes defining
-       file paths for the error log, general log, slow query log
-       (including the configuration of seconds it requires to execute
-       a query), and the binary log.
+Adding MySQL Products
 
-   MySQL Installer can optionally check for updated components and
-   download them for you automatically.
+   Click Add to add new products. This loads the Select Products
+   and Features page:
 
-2.3.3.1. MySQL Installer GUI
+   Figure 2.18 MySQL Installer - Select Products and Features
+   MySQL Installer - Select Products and Features
 
-   After installation of the GUI version, the installer will have add
-   its own Start Menu item under MySQL.
+   From here, choose the MySQL products you want to install from
+   the left Available Products pane, and then click the green
+   right arrow to queue products for installation.
+
+   Optionally, click Edit to open the product and features
+   search filter:
+
+   Figure 2.19 MySQL Installer - Select Products and Features
+   Filter
+   MySQL Installer - Select Products and Features Filter
+
+   For example, you might choose to include Pre-Release products
+   in your selections, such as a Beta product that has not yet
+   reached GA status.
    Note
 
-   Files that are generated by MySQL Installer grant full permissions
-   to the user that executes MySQL Installer, including my.ini. This
-   does not apply to files and directories for specific products such
-   as the MySQL Server data directory in ProgramData, that is owned
-   by SYSTEM.
+   The ability to install Pre-Release versions of MySQL products
+   was added in MySQL Installer 1.4.0.
 
-   After the installer itself has been installed and started, the
-   following screen is displayed:
+   Select all of the MySQL products you want to install, then
+   click Next to continue, and then Execute to execute the
+   installation process to install all of the selected products.
 
-   Figure 2.7. MySQL Installer - Welcome Screen
-   MySQL Installer - Welcome Screen
+2.3.3.1.1 MySQL Product Catalog
 
-   There are three main options:
+   MySQL Installer stores a MySQL product catalog. The catalog
+   can be updated either manually or automatically, and the
+   catalog change history is also available.
+   Note
 
-    1. Install MySQL Products - The Installation Wizard.
+   The MySQL product catalog was added in MySQL Installer 1.4.0.
 
-    2. About MySQL - Learn about MySQL products and features.
+   Manual updates
 
-    3. Resources - Information to help install and configure MySQL.
+   You can update the MySQL product catalog at any time by
+   clicking Catalog on the Installer dashboard.
 
-   To Install MySQL Products after executing MySQL Installer for the
-   first time, you must accept the license agreement before
-   proceeding with the installation process.
+   Figure 2.20 MySQL Installer - Open the MySQL Product Catalog
+   MySQL Installer - Open the MySQL Product Catalog
 
-   Figure 2.8. MySQL Installer - License Agreement
-   MySQL Installer - License Agreement
+   From there, click Execute to update the product catalog.
 
-   If you are connected to the Internet, then the Installer will
-   search for the latest MySQL components and add them to the
-   installation bundle. Click Connect to the Internet to complete
-   this step, or otherwise check the Skip checkbox and then Continue.
-
-   Figure 2.9. MySQL Installer - Find latest products
-   MySQL Installer - Find latest products
-
-   If you chose "Connect to the Internet," the next page will show
-   the progress of MySQL Installer's search for available updates.
-   When the search is complete (or if you opted to skip the search),
-   you will be taken to the Choose Setup Type page:
+   Automatic updates
 
-   Figure 2.10. MySQL Installer - Choosing a Setup Type
-   MySQL Installer - Choosing a Setup Type
+   You can configure MySQL Installer to automatically update the
+   MySQL product catalog once per day. To enable this feature
+   and set the update time, click the wrench icon on the
+   Installer dashboard.
 
-   Determine the option most compatible with your preferences by
-   reading the Setup Type Description descriptions.
+   The next window configures the Automatic Catalog Update.
+   Enable or disable this feature, and also set the hour.
 
-   The Installation and Data paths are also defined here, and a
-   caution flag will notify you if the data path you define already
-   exists.
+   Figure 2.21 MySQL Installer - Configure the Catalog Scheduler
+   MySQL Installer - Configure the Catalog Scheduler
 
-   After you select a setup type, the MySQL Installer will check your
-   system for the necessary external requirements and download then
-   install missing components onto your system.
+   This option uses the Windows Task Scheduler to schedule a
+   task named "ManifestUpdate".
 
-   Figure 2.11. MySQL Installer - Check Requirements
-   MySQL Installer - Check Requirements
+   Change History
 
-   The next window lists the MySQL products that are scheduled to be
-   installed:
+   MySQL Installer tracks the change history for all of the
+   MySQL products. Click Catalog from the dashboard, optionally
+   update the catalog (or, toggle the Do not update at this time
+   checkbox), click Next/Execute, and then view the change
+   history.
 
-   Figure 2.12. MySQL Installer - Installation Progress
-   MySQL Installer - Installation Progress
+   Figure 2.22 MySQL Installer - Catalog Change History
+   MySQL Installer - Catalog Change History
 
-   As components are installed, you'll see their status change from
-   "to be installed" to "install success."
+2.3.3.1.2 Remove MySQL Products
 
-   Figure 2.13. MySQL Installer - Installation Progress status
-   MySQL Installer - Installation Progress status
+   MySQL Installer can also remove MySQL products from your
+   system. To remove a MySQL product, click Remove from the
+   Installer dashboard. This opens a window with a list of
+   installed MySQL products. Select the MySQL products you want
+   to remove (uninstall), and then click Execute to begin the
+   removal process.
+   Note
 
-   After all components are installed, the next step involves
-   configuring the products. The Configuration Overview window
-   displays the progress and then loads a configuration window if it
-   is required.
+   To select all MySQL products, click the [ ] checkbox to the
+   left of the Product label.
 
-   Figure 2.14. MySQL Installer - Configuration Overview
-   MySQL Installer - Configuration Overview
+   Figure 2.23 MySQL Installer - Removing Products: Select
+   MySQL Installer - Removing Products: Select
+
+   Figure 2.24 MySQL Installer - Removing Products: Executed
+   MySQL Installer - Removing Products: Executed
+
+2.3.3.1.3 Alter MySQL Products
+
+   MySQL Installer offers several options to alter your MySQL
+   product installations.
+
+Upgrade
+
+   MySQL products with an available upgrade are highlighted on
+   the main dashboard. Products with available upgrades will
+   have an upgrade icon next to their version number.
+
+   Figure 2.25 MySQL Installer - Upgrade a MySQL Product
+   MySQL Installer - Upgrade a MySQL Product
+   Note
+
+   Available upgrades are determined by having a current
+   catalog. For information about keeping your MySQL product
+   catalog current, see Section 2.3.3.1.1, "MySQL Product
+   Catalog."
+
+   Click Upgrade to view a list upgradable products. Our example
+   indicates that MySQL server 5.6.19 can be upgraded to version
+   5.6.20.
+
+   Figure 2.26 MySQL Installer - Select Products To Upgrade
+   MySQL Installer - Select Products To Upgrade
+
+   Select (check) the products to upgrade, and optionally click
+   the changes link to view the product's release notes in your
+   browser. Click Next to begin the upgrade process.
+
+   Figure 2.27 MySQL Installer - Apply Updates
+   MySQL Installer - Apply Updates
+
+   A MySQL server upgrade will also check and upgrade the
+   server's database. Although optional, this step is
+   recommended.
+
+   Figure 2.28 MySQL Installer - Check and Upgrade Database
+   MySQL Installer - Check and Upgrade Database
+
+   Upon completion, your upgraded products will be upgraded and
+   available to use. A MySQL server upgrade also restarts the
+   MySQL server.
 
-   The ideal MySQL Server configuration depends on your intended use,
-   as explained in the next window. Choose the description that most
-   closely applies to your machine.
-
-   You may enable TCP/IP Networking here as otherwise only localhost
-   connections are allowed.
-
-   Checking the "Advanced Configuration" option provides additional
-   Logging Options to configure. This includes defining file paths
-   for the error log, general log, slow query log (including the
-   configuration of seconds it requires to execute a query), and the
-   binary log.
-
-   Figure 2.15. MySQL Installer - MySQL Server Configuration: Define
-   platform, networking, and logging options
-   MySQL Installer- MySQL Server Configuration: Define platform,
-   networking, and logging options
-
-   Next, choose your account information. Defining a root password is
-   required, whereas it's optional to create additional users. There
-   are several different predefined user roles that each have
-   different permission levels. For example, a "DB Admin" will have
-   more privileges than a "DB Designer.".
-
-   Figure 2.16. MySQL Installer - MySQL Server Configuration: User
-   accounts
-   MySQL Installer - MySQL Server Configuration: User accounts
-   Note
-
-   If the MySQL Server is already installed, then the Current Root
-   Password will also be needed.
-
-   Next, configure the Windows Service Details. This includes the
-   service name, how the MySQL Server should be loaded at startup,
-   and how the Windows Service for MySQL Server will be run.
-
-   Figure 2.17. MySQL Installer - MySQL Server Configuration: Windows
-   service details
-   MySQL Installer - MySQL Server Configuration: Windows service
-   details
-   Note
-
-   When configuring Run Windows Services as ... using a Custom User,
-   the custom user must have privileges to log on to Windows as a
-   service. And the Next button will be disabled until this user is
-   given these user rights.
-
-   On Microsoft Windows 7, this is configured by loading the Start
-   Menu, Control Panel, Administrative Tools, Local Security Policy,
-   Local Policies, User Rights Assignment, then Log On As A Service.
-   Choose Add User or Group here to add the custom user, and then OK,
-   OK to save.
-
-   The final configuration step is available if the Advanced
-   Configuration option was checked, and it includes configuration
-   options related to log file names:
-
-   Figure 2.18. MySQL Installer - MySQL Server Configuration: Logging
-   options
-   MySQL Installer - MySQL Server Configuration: Logging options
-
-   After the MySQL Installer configuration process is completed, you
-   may save the installation log, and then load MySQL Workbench if
-   the Start MySQL Workbench after Setup option is checked:
-
-   Figure 2.19. MySQL Installer - Installation Complete
-   MySQL Installer - Installation Complete
-
-   You can now open MySQL Installer from the Microsoft Windows Start
-   menu under the MySQL group, which will load the MySQL Installer
-   Maintenance Screen. This is used to add, update, and remove
-   features.
-
-   Figure 2.20. MySQL Installer - Maintenance Screen
-   MySQL Installer - Maintenance Screen
-   Note
-
-   An Update Screen screen is shown if MySQL Installer is used on a
-   machine with older products installed, as opposed to the
-   Maintenance Screen shown above. However, the functionality remains
-   the same.
-
-   Add/Modify Products and Features will list all installed and
-   available MySQL products.
-
-   Figure 2.21. MySQL Installer - Add/Modify Products and Features
-   MySQL Installer - Add/Modify Products and Features
-
-   The installation is now complete. MySQL Server should be running,
-   and most MySQL products installed and available for use.
-
-   See also the MySQL Workbench documentation
-   (http://dev.mysql.com/doc/workbench/en/).
-
-2.3.3.2. MySQL Installer Console
-
-   MySQLInstallerConsole provides functionality similar to the GUI
-   version of MySQL Installer, but from the command-line. It is
-   installed when MySQL Installer is initially executed, and then
-   available within the MySQL Installer directory. Typically that is
-   in C:\Program Files (x86)\MySQL\MySQL Installer\, and the console
-   must be executed with administrative privileges.
-
-   To use, invoke the Command Prompt with administrative privileges
-   by choosing Start, Accessories, then right-click on Command Prompt
-   and choose Run as administrator. And from the command-line,
-   optionally change the directory to where MySQLInstallerConsole is
-   located:
+Reconfigure
+
+   Some MySQL products, such as the MySQL server, include a
+   Reconfigure option. It opens the same configuration options
+   that were set when the MySQL product was installed, and is
+   pre-populated with the current values.
+
+   To execute, click the Reconfigure link under the Quick Action
+   column on the main dashboard for the MySQL product that you
+   want to reconfigure.
+
+   Figure 2.29 MySQL Installer - Reconfigure a MySQL Product
+   MySQL Installer - Reconfigure a MySQL Product
+
+   In the case of the MySQL server, this opens the familiar
+   configuration wizard.
+
+   Figure 2.30 MySQL Installer - Reconfiguration Wizard
+   MySQL Installer - Reconfiguration Wizard
+
+Modify
+
+   Many MySQL products contain feature components that can be
+   added or removed. For example, Debug binaries and Client
+   Programs are subcomponents of the MySQL server.
+
+   The modify the features of a product, click Modify on the
+   main dashboard.
+
+   Figure 2.31 MySQL Installer - Modify Product Features
+   MySQL Installer - Modify Product Features
+
+   Click Execute to execute the modification request.
+
+2.3.3.2 MySQL Installer Console
+
+   MySQLInstallerConsole provides functionality similar to the
+   GUI version of MySQL Installer, but from the command-line. It
+   is installed when MySQL Installer is initially executed, and
+   then available within the MySQL Installer directory.
+   Typically that is in C:\Program Files (x86)\MySQL\MySQL
+   Installer\, and the console must be executed with
+   administrative privileges.
+
+   To use, invoke the Command Prompt with administrative
+   privileges by choosing Start, Accessories, then right-click
+   on Command Prompt and choose Run as administrator. And from
+   the command-line, optionally change the directory to where
+   MySQLInstallerConsole is located:
 C:\> cd "C:\Program Files (x86)\MySQL\MySQL Installer"
+C:\> MySQLInstallerConsole.exe help
 
-   MySQLInstallerConsole supports the following options, which are
-   specified on the command line:
+C:\Program Files (x86)\MySQL\MySQL Installer for Windows>MySQLInstalle
+rConsole.exe help
 
-     * --help, -h, or -?
-       Displays a help message with usage examples, and then exits.
-C:\> MySQLInstallerConsole --help
-
-     * --updates (or -u)
-       Checks for new products before any further action is taken.
-       Disabled by default.
-
-     * --nowait
-       Skips the final pause when the program finishes. Otherwise, a
-       "Press Enter to continue." dialogue is generated. It is used
-       in conjunction with other options.
-
-     * --catalog=catalog_name (or -c)
-       Sets the default catalog. Use --list to view a list of
-       available catalogs.
-
-     * --type=installation_type (or -t)
-       Sets the installation type.
-       The possible values for installation_type are: developer,
-       server, client, full, and custom.
-
-     * --action=action_name
-       The action being performed.
-       The possible values are: install, remove, upgrade, list, and
-       status.
-
-          + install: Installs a product or products, as defined by
-            --products
-
-          + upgrade: Upgrades a product or products, as defined by
-            --products.
-
-          + remove: Removes a product or products, as defined by
-            --products.
-
-          + list: Lists the product manifest, both installed and
-            available products.
-
-          + status: Shows the status after another action is
-            performed.
-
-     * --product=product_name[:feature1],[feature2], [...] (or -p)
-       Set the feature list of a product. Use --list to view
-       available products, or pass in --product=* (an asterisk) to
-       install all available products.
-
-     * --config=product_name:passwd=root_password[;parameter1=value],
-       [;parameter2=value], ...
-       The configuration parameters for the most recently listed
-       products.
+The following commands are available:
+
+Configure - Configures one or more of your installed programs.
+Help      - Provides list of available commands.
+Install   - Install and configure one or more available MySQL programs
+.
+List      - Provides an interactive way to list all products available
+.
+Modify    - Modifies the features of installed products.
+Remove    - Removes one or more products from your system.
+Status    - Shows the status of all installed products.
+Update    - Update the current product catalog.
+Upgrade   - Upgrades one or more of your installed programs.
+
+   MySQLInstallerConsole supports the following options, which
+   are specified on the command line:
+
+     * configure [product1]:[setting]=[value];
+       [product2]:[setting]=[value]; [...]
+       Configure one or more MySQL products on your system.
+       Switches include:
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole configure -showsettings server
+C:\> MySQLInstallerConsole configure server:port=3307
+
+
+     * help [command]
+       Displays a help message with usage examples, and then
+       exits. Pass in an additional command to receive help
+       specific to that command.
+C:\> MySQLInstallerConsole help
+C:\> MySQLInstallerConsole help install
+
+
+     * install [product]:[features]:[config block]:[config
+       block]:[config block]; [...]
+       Install one or more MySQL products on your system.
+       Switches and syntax options include:
+
+          + -type=[SetupType] : Installs a predefined set of
+            software. The "SetupType" can be one of the
+            following:
+            Note
+            Non-custom setup types can only be chosen if no
+            other MySQL products are installed.
+               o Developer: Installs a complete development
+                 environment.
+               o Server: Installs a single MySQL server
+               o Client: Installs client programs and libraries
+               o Full: Installs everything
+               o Custom: Installs user selected products. This
+                 is the default option.
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+
+          + [config block]: One or more configuration blocks can
+            be specified. Each configuration block is a
+            semicolon separated list of key value pairs. A block
+            can include either a "config" or "user" type key,
+            where "config" is the default type if one is not
+            defined.
+            Only one "config" type block can be defined per
+            product. A "user" block should be defined for each
+            user that should be created during the product's
+            installation.
+            Note
+            Adding users is not supported when a product is
+            being reconfigured.
+
+          + [feature]: The feature block is a semicolon
+            separated list of features, or '*' to select all
+            features.
+C:\> MySQLInstallerConsole install server;5.6.22:*:port=3307;serverid=
+2:type=user;username=foo;password=bar;role=DBManager
+C:\> MySQLInstallerConsole install server;5.6.22;x64 -silent
+
+
+     * list
+       Lists an interactive console where all of the available
+       MySQL products can be searched. Execute
+       MySQLInstallerConsole list to launch the console, and
+       enter in a substring to search.
+C:\> MySQLInstallerConsole list
+
+
+     * modify [product1:-removelist|+addlist]
+       [product2:-removelist|+addlist] [...]
+       Modifies or displays features of a previously installed
+       MySQL product.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole modify server
+C:\> MySQLInstallerConsole modify server:+documentation
+C:\> MySQLInstallerConsole modify server:-debug
+
+
+     * remove [product1] [product2] [...]
+       Removes one ore more products from your system.
+
+          + * : Pass in * to remove all of the MySQL products.
+
+          + -continue : Continue the operation even if an error
+            occurs.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole remove *
+C:\> MySQLInstallerConsole remove server
+
+
+     * status
+       Provides a quick overview of the MySQL products that are
+       installed on the system. Information includes product
+       name and version, architecture, date installed, and
+       install location.
+C:\> MySQLInstallerConsole status
+
+
+     * upgrade [product1:version] [product2:version], [...]
+       Upgrades one or more products on your system. Syntax
+       options include:
+
+          + * : Pass in * to upgrade all products to the latest
+            version, or pass in specific products.
+
+          + ! : Pass in ! as a version number to upgrade the
+            MySQL product to its latest version.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole upgrade *
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2
+C:\> MySQLInstallerConsole upgrade workbench:!
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2 excel:1.3.2
+
+
+     * update
+       Downloads the latest MySQL product catalog to your
+       system. On success, the download catalog will be applied
+       the next time either MySQLInstaller or
+       MySQLInstallerConsole is executed.
+C:\> MySQLInstallerConsole update
+
+       Note
+       The Automatic Catalog Update GUI option executes this
+       command from the Windows Task Scheduler.
+
+2.3.4 MySQL Notifier
 
-     * --user=product_name:name=username,host:hostname,role=rolename,
-       password=password or
-       --user=product_name:name=username,host:hostname,role=rolename,
-       tokens=tokens
-       Creates a new user.
-       Requires: name, host, role, and the password or tokens. Tokens
-       are separated by pipe ("|") characters.
-
-2.3.4. MySQL Notifier for Microsoft Windows
-
-   The MySQL Notifier for Microsoft Windows is a tool that enables
-   you to monitor and adjust the status of your local and remote
-   MySQL Server instances through an indicator that resides in the
-   system tray. The MySQL Notifier for Microsoft Windows also gives
-   quick access to several MySQL GUI tools (such as MySQL Workbench)
-   through its context menu.
-
-   The MySQL Notifier for Microsoft Windows is installed by MySQL
-   Installer, and (by default) will start-up when Microsoft Windows
-   is started.
+   The MySQL Notifier is a tool that enables you to monitor and
+   adjust the status of your local and remote MySQL Server
+   instances through an indicator that resides in the system
+   tray. The MySQL Notifier also gives quick access to several
+   MySQL GUI tools (such as MySQL Workbench) through its context
+   menu.
+
+   The MySQL Notifier is installed by MySQL Installer, and (by
+   default) will start-up when Microsoft Windows is started.
    Note
 
    To install, download and execute the MySQL Installer
-   (http://dev.mysql.com/downloads/installer/), be sure the MySQL
-   Notifier for Microsoft Windows product is selected, then proceed
-   with the installation. See the MySQL Installer manual for
-   additional details.
-
-   For release notes detailing the changes in each release of MySQL
-   Notifier for Microsoft Windows, see the MySQL Notifier Release
-   Notes (http://dev.mysql.com/doc/relnotes/mysql-notifier/en/).
+   (http://dev.mysql.com/downloads/installer/), be sure the
+   MySQL Notifier product is selected, then proceed with the
+   installation. See the MySQL Installer manual for additional
+   details.
+
+   For notes detailing the changes in each release of MySQL
+   Notifier, see the MySQL Notifier Release Notes
+   (http://dev.mysql.com/doc/relnotes/mysql-notifier/en/).
 
    Visit the MySQL Notifier forum
    (http://forums.mysql.com/list.php?173) for additional MySQL
-   Notifier for Microsoft Windows help and support.
+   Notifier help and support.
 
    Features include:
 
      * Start, Stop, and Restart instances of the MySQL Server.
 
-     * Automatically detects (and adds) new MySQL Server services.
-       These are listed under Manage Monitored Items, and may also be
-       configured.
-
-     * The Tray icon changes, depending on the status. It's green if
-       all monitored MySQL Server instances are running, or red if at
-       least one service is stopped. The Update MySQL Notifier tray
-       icon based on service status option, which dictates this
-       behavior, is enabled by default for each service.
+     * Automatically detects (and adds) new MySQL Server
+       services. These are listed under Manage Monitored Items,
+       and may also be configured.
+
+     * The Tray icon changes, depending on the status. It's
+       green if all monitored MySQL Server instances are
+       running, or red if at least one service is stopped. The
+       Update MySQL Notifier tray icon based on service status
+       option, which dictates this behavior, is enabled by
+       default for each service.
 
      * Links to other applications like MySQL Workbench, MySQL
        Installer, and the MySQL Utilities. For example, choosing
@@ -794,463 +1204,481 @@
        Administration window for that particular instance.
 
      * If MySQL Workbench is also installed, then the Configure
-       Instance and SQL Editor options are available for local (but
-       not remote) MySQL instances.
+       Instance and SQL Editor options are available for local
+       (but not remote) MySQL instances.
 
      * Monitoring of both local and remote MySQL instances.
 
    Note
 
-   Remote monitoring is available since MySQL Notifier for Microsoft
-   Windows 1.1.0.
+   Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   The MySQL Notifier for Microsoft Windows resides in the system
-   tray and provides visual status information for your MySQL Server
-   instances. A green icon is displayed at the top left corner of the
-   tray icon if the current MySQL Server is running, or a red icon if
+   The MySQL Notifier resides in the system tray and provides
+   visual status information for your MySQL Server instances. A
+   green icon is displayed at the top left corner of the tray
+   icon if the current MySQL Server is running, or a red icon if
    the service is stopped.
 
-   The MySQL Notifier for Microsoft Windows automatically adds
-   discovered MySQL Services on the local machine, and each service
-   is saved and configurable. By default, the Automatically add new
-   services whose name contains option is enabled and set to mysql.
+   The MySQL Notifier automatically adds discovered MySQL
+   Services on the local machine, and each service is saved and
+   configurable. By default, the Automatically add new services
+   whose name contains option is enabled and set to mysql.
    Related Notifications Options include being notified when new
-   services are either discovered or experience status changes, and
-   are also enabled by default. And uninstalling a service will also
-   remove the service from the MySQL Notifier for Microsoft Windows.
+   services are either discovered or experience status changes,
+   and are also enabled by default. And uninstalling a service
+   will also remove the service from the MySQL Notifier.
    Note
 
    The Automatically add new services whose name contains option
-   default changed from ".*mysqld.*" to "mysql" in Notifier 1.1.0.
-
-   Clicking the system tray icon will reveal several options, as seen
-   in the screenshots below:
+   default changed from ".*mysqld.*" to "mysql" in Notifier
+   1.1.0.
 
-   The Service Instance menu is the main MySQL Notifier for Microsoft
-   Windows window, and enables you to Stop, Start, and Restart the
-   MySQL Server.
+   Clicking the system tray icon will reveal several options, as
+   seen in the screenshots below:
 
-   Figure 2.22. MySQL Notifier for Microsoft Windows Service Instance
-   menu
-   MySQL Notifier for Microsoft Windows Service Instance menu
+   The Service Instance menu is the main MySQL Notifier window,
+   and enables you to Stop, Start, and Restart the MySQL Server.
 
-   The Actions menu includes several links to external applications
-   (if they are installed), and a a Refresh Status option to manually
-   refresh the status of all monitored services (in both local and
-   remote computers) and MySQL instances.
+   Figure 2.32 MySQL Notifier Service Instance menu
+   MySQL Notifier Service Instance menu
+
+   The Actions menu includes several links to external
+   applications (if they are installed), and a Refresh Status
+   option to manually refresh the status of all monitored
+   services (in both local and remote computers) and MySQL
+   instances.
    Note
 
-   The main menu will not show the Actions menu when there are no
-   services being monitored by MySQL Notifier for Microsoft Windows.
+   The main menu will not show the Actions menu when there are
+   no services being monitored by MySQL Notifier.
    Note
 
-   The Refresh Status feature is available since MySQL Notifier for
-   Microsoft Windows 1.1.0.
-
-   Figure 2.23. MySQL Notifier for Microsoft Windows Actions menu
-   MySQL Notifier for Microsoft Windows Actions menu
-
-   The Actions, Options menu configures MySQL Notifier for Microsoft
-   Windows and includes options to:
-
-     * Use colorful status icons: Enables a colorful style of icons
-       for the tray of the MySQL Notifier for Microsoft Windows.
-
-     * Run at Windows Startup: Allows the application to be loaded
-       when Microsoft Windows starts.
+   The Refresh Status feature is available since MySQL Notifier
+   1.1.0.
 
-     * Automatically Check For Updates Every # Weeks: Checks for a
-       new version of MySQL Notifier for Microsoft Windows, and runs
-       this check every # weeks.
-
-     * Automatically add new services whose name contains: The text
-       used to filter services and add them automatically to the
-       monitored list of the local computer running MySQL Notifier,
-       and on remote computers already monitoring Windows services.
-       monitored services, and also filters the list of the Microsoft
-       Windows services for the Add New Service dialog.
-       Prior to version 1.1.0, this option was named "Automatically
-       add new services that match this pattern."
-
-     * Notify me when a service is automatically added: Will display
-       a balloon notification from the taskbar when a newly
-       discovered service is added to the monitored services list.
+   Figure 2.33 MySQL Notifier Actions menu
+   MySQL Notifier Actions menu
+
+   The Actions, Options menu configures MySQL Notifier and
+   includes options to:
+
+     * Use colorful status icons: Enables a colorful style of
+       icons for the tray of the MySQL Notifier.
+
+     * Run at Windows Startup: Allows the application to be
+       loaded when Microsoft Windows starts.
+
+     * Automatically Check For Updates Every # Weeks: Checks for
+       a new version of MySQL Notifier, and runs this check
+       every # weeks.
+
+     * Automatically add new services whose name contains: The
+       text used to filter services and add them automatically
+       to the monitored list of the local computer running MySQL
+       Notifier, and on remote computers already monitoring
+       Windows services. monitored services, and also filters
+       the list of the Microsoft Windows services for the Add
+       New Service dialog.
+       Prior to version 1.1.0, this option was named
+       "Automatically add new services that match this pattern."
+
+     * Notify me when a service is automatically added: Will
+       display a balloon notification from the taskbar when a
+       newly discovered service is added to the monitored
+       services list.
 
      * Notify me when a service changes status: Will display a
-       balloon notification from the taskbar when a monitored service
-       changes its status.
+       balloon notification from the taskbar when a monitored
+       service changes its status.
+
+   Figure 2.34 MySQL Notifier Options menu
+   MySQL Notifier Options menu
 
-   Figure 2.24. MySQL Notifier for Microsoft Windows Options menu
-   MySQL Notifier for Microsoft Windows Options menu
+   The Actions, Manage Monitored Items menu enables you to
+   configure the monitored services and MySQL instances. First,
+   with the Services tab open:
 
-   The Actions, Manage Monitored Items menu enables you to configure
-   the monitored services and MySQL instances. First, with the
-   Services tab open:
-
-   Figure 2.25. MySQL Notifier for Microsoft Windows Manage Services
-   menu
-   MySQL Notifier for Microsoft Windows Manage Services menu
+   Figure 2.35 MySQL Notifier Manage Services menu
+   MySQL Notifier Manage Services menu
 
    The Instances tab is similar:
 
-   Figure 2.26. MySQL Notifier for Microsoft Windows Manage Instances
-   menu
-   MySQL Notifier for Microsoft Windows Manage Instances menu
-
-   Adding a service or instance (after clicking Add in the Manage
-   Monitored Items window) enables you to select a running Microsoft
-   Windows service or instance connection, and configure MySQL
-   Notifier for Microsoft Windows to monitor it. Add a new service or
+   Figure 2.36 MySQL Notifier Manage Instances menu
+   MySQL Notifier Manage Instances menu
+
+   Adding a service or instance (after clicking Add in the
+   Manage Monitored Items window) enables you to select a
+   running Microsoft Windows service or instance connection, and
+   configure MySQL Notifier to monitor it. Add a new service or
    instance by clicking service name from the list, then OK to
    accept. Multiple services and instances may be selected.
 
-   Figure 2.27. MySQL Notifier for Microsoft Windows Adding new
-   services
-   MySQL Notifier for Microsoft Windows Adding new services
+   Figure 2.37 MySQL Notifier Adding new services
+   MySQL Notifier Adding new services
 
    And instances:
 
-   Figure 2.28. MySQL Notifier for Microsoft Windows Adding new
-   instances
-   MySQL Notifier for Microsoft Windows Adding new instances
+   Figure 2.38 MySQL Notifier Adding new instances
+   MySQL Notifier Adding new instances
    Note
 
-   The Instances tab available since MySQL Notifier for Microsoft
-   Windows 1.1.0.
+   The Instances tab available since MySQL Notifier 1.1.0.
 
-2.3.4.1. Remote monitoring set up and installation instructions
+2.3.4.1 Remote monitoring set up and installation instructions
 
-   The MySQL Notifier for Microsoft Windows uses Windows Management
-   Instrumentation (WMI) to manage and monitor services in remote
-   computers running Windows XP or later. This guide explains how it
+   The MySQL Notifier uses Windows Management Instrumentation
+   (WMI) to manage and monitor services in remote computers
+   running Windows XP or later. This guide explains how it
    works, and how to set up your system to monitor remote MySQL
    instances.
    Note
 
-   Remote monitoring is available since MySQL Notifier for Microsoft
-   Windows 1.1.0.
+   Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   In order to configure WMI, it is important to understand that the
-   underlying Distributed Component Object Model (DCOM) architecture
-   is doing the WMI work. Specifically, MySQL Notifier for Microsoft
-   Windows is using asynchronous notification queries on remote
+   In order to configure WMI, it is important to understand that
+   the underlying Distributed Component Object Model (DCOM)
+   architecture is doing the WMI work. Specifically, MySQL
+   Notifier is using asynchronous notification queries on remote
    Microsoft Windows hosts as .NET events. These events send an
-   asynchronous callback to the computer running the MySQL Notifier
-   for Microsoft Windows so it knows when a service status has
-   changed on the remote computer. Asynchronous notifications offer
-   the best performance compared to semi-synchronous notifications or
+   asynchronous callback to the computer running the MySQL
+   Notifier so it knows when a service status has changed on the
+   remote computer. Asynchronous notifications offer the best
+   performance compared to semisynchronous notifications or
    synchronous notifications that use timers.
 
-   Asynchronous notifications requires the remote computer to send a
-   callback to the client computer (thus opening a reverse
-   connection), so the Windows Firewall and DCOM settings must be
-   properly configured for the communication to function properly.
-
-   Figure 2.29. MySQL Notifier for Microsoft Windows Distributed
-   Component Object Model (DCOM)
-   MySQL Notifier for Microsoft Windows Distributed Component Object
-   Model (DCOM)
-
-   Most of the common errors thrown by asynchronous WMI notifications
-   are related to Windows Firewall blocking the communication, or to
-   DCOM / WMI settings not being set up properly. For a list of
-   common errors with solutions, see Section 2.3.4.1, "."
-
-   The following steps are required to make WMI function. These steps
-   are divided between two machines. A single host computer that runs
-   MySQL Notifier for Microsoft Windows (Computer A), and multiple
+   Asynchronous notifications requires the remote computer to
+   send a callback to the client computer (thus opening a
+   reverse connection), so the Windows Firewall and DCOM
+   settings must be properly configured for the communication to
+   function properly.
+
+   Figure 2.39 MySQL Notifier Distributed Component Object Model
+   (DCOM)
+   MySQL Notifier Distributed Component Object Model (DCOM)
+
+   Most of the common errors thrown by asynchronous WMI
+   notifications are related to Windows Firewall blocking the
+   communication, or to DCOM / WMI settings not being set up
+   properly. For a list of common errors with solutions, see
+   Section 2.3.4.1, "."
+
+   The following steps are required to make WMI function. These
+   steps are divided between two machines. A single host
+   computer that runs MySQL Notifier (Computer A), and multiple
    remote machines that are being monitored (Computer B).
 
-Computer running MySQL Notifier for Microsoft Windows (Computer A)
+Computer running MySQL Notifier (Computer A)
 
 
-    1. Allow for remote administration by either editing the Group
-       Policy Editor, or using NETSH:
+    1. Allow for remote administration by either editing the
+       Group Policy Editor, or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
+
     2. Open the DCOM port TCP 135:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator) .
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator) .
          b. Execute the following command:
 NETSH firewall add portopening protocol=tcp port=135 name=DCOM_TCP135
 
-    3. Add the client application which contains the sink for the
-       callback (MySqlNotifier.exe) to the Windows Firewall
-       Exceptions List (use either the Windows Firewall configuration
-       or NETSH):
+
+    3. Add the client application which contains the sink for
+       the callback (MySqlNotifier.exe) to the Windows Firewall
+       Exceptions List (use either the Windows Firewall
+       configuration or NETSH):
        Using the Windows Firewall configuration:
          a. In the Control Panel, double-click Windows Firewall.
-         b. In the Windows Firewall window's left panel, click Allow
-            a program or feature through Windows Firewall.
-         c. In the Allowed Programs window, click Change Settings.
+         b. In the Windows Firewall window's left panel, click
+            Allow a program or feature through Windows Firewall.
+         c. In the Allowed Programs window, click Change
+            Settings.
          d. If MySqlNotifier.exe is in the Allowed programs and
-            features list, make sure it is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+            features list, make sure it is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
          e. If MySqlNotifier.exe is not in the list, click Allow
             another program....
-         f. In the Add a Program window, select the MySqlNotifier.exe
-            if it exists in the Programs list, otherwise click
-            Browse... and go to the directory where MySqlNotifier.exe
-            was installed to select it, then click Add.
-         g. Make sure MySqlNotifier.exe is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+         f. In the Add a Program window, select the
+            MySqlNotifier.exe if it exists in the Programs list,
+            otherwise click Browse... and go to the directory
+            where MySqlNotifier.exe was installed to select it,
+            then click Add.
+         g. Make sure MySqlNotifier.exe is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command, where you change
             "[YOUR_INSTALL_DIRECTORY]":
-NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\My
-SqlNotifier.exe name=MySqlNotifier
+NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\MyS
+qlNotifier.exe name=MySqlNotifier
+
 
     4. If Computer B is either a member of WORKGROUP or is in a
-       different domain that is untrusted by Computer A, then the
-       callback connection (Connection 2) is created as an Anonymous
-       connection. To grant Anonymous connections DCOM Remote Access
-       permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+       different domain that is untrusted by Computer A, then
+       the callback connection (Connection 2) is created as an
+       Anonymous connection. To grant Anonymous connections DCOM
+       Remote Access permissions:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
 Monitored Remote Computer (Computer B)
 
-   If the user account that is logged into the computer running the
-   MySQL Notifier for Microsoft Windows (Computer A) is a local
-   administrator on the remote computer (Computer B), such that the
-   same account is an administrator on Computer B, you can skip to
-   the "Allow for remote administration" step.
-
-   Setting DCOM security to allow a non-administrator user to access
-   a computer remotely:
-
-    1. Grant "DCOM remote launch" and activation permissions for a
-       user or group:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+   If the user account that is logged into the computer running
+   the MySQL Notifier (Computer A) is a local administrator on
+   the remote computer (Computer B), such that the same account
+   is an administrator on Computer B, you can skip to the "Allow
+   for remote administration" step.
+
+   Setting DCOM security to allow a non-administrator user to
+   access a computer remotely:
+
+    1. Grant "DCOM remote launch" and activation permissions for
+       a user or group:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Launch Permission dialog box, follow these steps
-            if your name or your group does not appear in the Groups
-            or user names list:
+         e. In the Launch Permission dialog box, follow these
+            steps if your name or your group does not appear in
+            the Groups or user names list:
               i. In the Launch Permission dialog box, click Add.
-             ii. In the Select Users, Computers, or Groups dialog
-                 box, add your name and the group in the "Enter the
-                 object names to select" box, and then click OK.
-         f. In the Launch Permission dialog box, select your user and
-            group in the Group or user names box. In the Allow column
-            under Permissions for User, select Remote Launch, select
-            Remote Activation, and then click OK.
+             ii. In the Select Users, Computers, or Groups
+                 dialog box, add your name and the group in the
+                 "Enter the object names to select" box, and
+                 then click OK.
+         f. In the Launch Permission dialog box, select your
+            user and group in the Group or user names box. In
+            the Allow column under Permissions for User, select
+            Remote Launch, select Remote Activation, and then
+            click OK.
        Grant DCOM remote access permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
     2. Allowing non-administrator users access to a specific WMI
        namespace:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
-         c. In the Computer Management window, expand the Services
-            and Applications tree and double-click the WMI Control.
-         d. Right-click the WMI Control icon and select Properties.
-         e. In the WMI Control Properties window, click the Security
-            tab.
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
+         c. In the Computer Management window, expand the
+            Services and Applications tree and double-click the
+            WMI Control.
+         d. Right-click the WMI Control icon and select
+            Properties.
+         e. In the WMI Control Properties window, click the
+            Security tab.
          f. In the Security tab, select the namespace and click
             Security.
-         g. Locate the appropriate account and check Remote Enable in
-            the Permissions list.
+         g. Locate the appropriate account and check Remote
+            Enable in the Permissions list.
 
-    3. Allow for remote administration by either editing the Group
-       Policy Editor or using NETSH:
+    3. Allow for remote administration by either editing the
+       Group Policy Editor or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
-    4. Now, be sure the user you are logging in with uses the Name
-       value and not the Full Name value:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
+
+    4. Now, be sure the user you are logging in with uses the
+       Name value and not the Full Name value:
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
          c. In the Computer Management window, expand the System
             Tools then Local Users and Groups.
-         d. Click the Users node, and on the right side panel locate
-            your user and make sure it uses the Name value to
-            connect, and not the Full Name value.
-
-    5. If the remote computer is running on Windows XP Professional,
-       make sure that remote logins are not being forcefully changed
-       to the guest account user (also known as ForceGuest), which is
-       enabled by default on computers that are not attached to a
-       domain.
-         a. Click Start, click Run, type SECPOL.MSC, and then click
-            OK.
+         d. Click the Users node, and on the right side panel
+            locate your user and make sure it uses the Name
+            value to connect, and not the Full Name value.
+
+    5. If the remote computer is running on Windows XP
+       Professional, make sure that remote logins are not being
+       forcefully changed to the guest account user (also known
+       as ForceGuest), which is enabled by default on computers
+       that are not attached to a domain.
+         a. Click Start, click Run, type SECPOL.MSC, and then
+            click OK.
          b. Under the Local Policies node, double-click Security
             Options.
-         c. Select Network Access: Sharing and security model for
-            local accounts and save.
+         c. Select Network Access: Sharing and security model
+            for local accounts and save.
 
 Common Errors
 
 
      * 0x80070005
 
-          + DCOM Security was not configured properly (see Computer
-            B, the Setting DCOM security... step).
+          + DCOM Security was not configured properly (see
+            Computer B, the Setting DCOM security... step).
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x8007000E
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x80041003
 
-          + Access to the remote WMI namespace was not configured
-            properly (see Computer B, the Allowing non-administrator
-            users access to a specific WMI namespace step).
+          + Access to the remote WMI namespace was not
+            configured properly (see Computer B, the Allowing
+            non-administrator users access to a specific WMI
+            namespace step).
 
      * 0x800706BA
 
           + The DCOM port is not open on the client computers
-            (Computer A) firewall. See the Open the DCOM port TCP 135
-            step for Computer A.
+            (Computer A) firewall. See the Open the DCOM port
+            TCP 135 step for Computer A.
 
-          + The remote computer (Computer B) is inaccessible because
-            its network location is set to Public. Make sure you can
-            access it through the Windows Explorer.
-
-2.3.5. Installing MySQL on Microsoft Windows Using an MSI Package
-
-   The MSI package is designed to install and configure MySQL in such
-   a way that you can immediately get started using MySQL.
-
-   The MySQL Installation Wizard and MySQL Configuration Wizard are
-   available in the Complete install package, which is recommended
-   for most standard MySQL installations. Exceptions include users
-   who need to install multiple instances of MySQL on a single server
-   host and advanced users who want complete control of server
-   configuration.
+          + The remote computer (Computer B) is inaccessible
+            because its network location is set to Public. Make
+            sure you can access it through the Windows Explorer.
+
+2.3.5 Installing MySQL on Microsoft Windows Using an MSI Package
+
+   The MSI package is designed to install and configure MySQL in
+   such a way that you can immediately get started using MySQL.
+
+   The MySQL Installation Wizard and MySQL Configuration Wizard
+   are available in the Complete install package, which is
+   recommended for most standard MySQL installations. Exceptions
+   include users who need to install multiple instances of MySQL
+   on a single server host and advanced users who want complete
+   control of server configuration.
 
      * For information on installing using the GUI MSI installer
-       process, see Section 2.3.5.1, "Using the MySQL Installation
-       Wizard."
+       process, see Section 2.3.5.1, "Using the MySQL
+       Installation Wizard."
 
-     * For information on installing using the command line using the
-       MSI package, see Section 2.3.5.2, "Automating MySQL
-       Installation on Microsoft Windows Using the MSI Package."
-
-     * If you have previously installed MySQL using the MSI package
-       and want to remove MySQL, see Section 2.3.5.3, "Removing MySQL
-       When Installed from the MSI Package."
+     * For information on installing using the command line
+       using the MSI package, see Section 2.3.5.2, "Automating
+       MySQL Installation on Microsoft Windows Using the MSI
+       Package."
+
+     * If you have previously installed MySQL using the MSI
+       package and want to remove MySQL, see Section 2.3.5.3,
+       "Removing MySQL When Installed from the MSI Package."
 
    The workflow sequence for using the installer is shown in the
    figure below:
 
-   Figure 2.30. Installation Workflow for Windows Using MSI Installer
+   Figure 2.40 Installation Workflow for Windows Using MSI
+   Installer
    Installation Workflow for Windows using MSI Installer
    Note
 
    Microsoft Windows XP and later include a firewall which
-   specifically blocks ports. If you plan on using MySQL through a
-   network port then you should open and create an exception for this
-   port before performing the installation. To check and if necessary
-   add an exception to the firewall settings:
+   specifically blocks ports. If you plan on using MySQL through
+   a network port then you should open and create an exception
+   for this port before performing the installation. To check
+   and if necessary add an exception to the firewall settings:
 
-    1. First ensure that you are logged in as an Administrator or a
-       user with Administrator privileges.
+    1. First ensure that you are logged in as an Administrator
+       or a user with Administrator privileges.
 
-    2. Go to the Control Panel, and double click the Windows Firewall
-       icon.
+    2. Go to the Control Panel, and double click the Windows
+       Firewall icon.
 
-    3. Choose the Allow a program through Windows Firewall option and
-       click the Add port button.
+    3. Choose the Allow a program through Windows Firewall
+       option and click the Add port button.
 
-    4. Enter MySQL into the Name text box and 3306 (or the port of
-       your choice) into the Port number text box.
+    4. Enter MySQL into the Name text box and 3306 (or the port
+       of your choice) into the Port number text box.
 
-    5. Also ensure that the TCP protocol radio button is selected.
+    5. Also ensure that the TCP protocol radio button is
+       selected.
 
-    6. If you wish, you can also limit access to the MySQL server by
-       choosing the Change scope button.
+    6. If you wish, you can also limit access to the MySQL
+       server by choosing the Change scope button.
 
     7. Confirm your choices by clicking the OK button.
 
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
    Note
 
-   When using Windows Vista or newer, you may want to disable User
-   Account Control (UAC) before performing the installation. If you
-   do not do so, then MySQL may be identified as a security risk,
-   which will mean that you need to enable MySQL. You can disable the
-   security checking by following these instructions:
+   When using Windows Vista or newer, you may want to disable
+   User Account Control (UAC) before performing the
+   installation. If you do not do so, then MySQL may be
+   identified as a security risk, which will mean that you need
+   to enable MySQL. You can disable the security checking by
+   following these instructions:
 
     1. Open Control Panel.
 
@@ -1260,199 +1688,213 @@
     3. Click the Got to the main User Accounts page link.
 
     4. Click on Turn User Account Control on or off. You may be
-       prompted to provide permission to change this setting. Click
-       Continue.
+       prompted to provide permission to change this setting.
+       Click Continue.
 
-    5. Deselect or uncheck the check box next to Use User Account
-       Control (UAC) to help protect your computer. Click OK to save
-       the setting.
-
-   You will need to restart to complete the process. Click Restart
-   Now to reboot the machine and apply the changes. You can then
-   follow the instructions below for installing Windows.
-
-2.3.5.1. Using the MySQL Installation Wizard
-
-   MySQL Installation Wizard is an installer for the MySQL server
-   that uses the latest installer technologies for Microsoft Windows.
-   The MySQL Installation Wizard, in combination with the MySQL
-   Configuration Wizard, enables a user to install and configure a
-   MySQL server that is ready for use immediately after installation.
-
-   The MySQL Installation Wizard is the standard installer for all
-   MySQL server distributions, version 4.1.5 and higher. Users of
-   previous versions of MySQL need to shut down and remove their
-   existing MySQL installations manually before installing MySQL with
-   the MySQL Installation Wizard. See Section 2.3.5.1.6, "Upgrading
-   MySQL with the Installation Wizard," for more information on
-   upgrading from a previous version.
+    5. Deselect or uncheck the check box next to Use User
+       Account Control (UAC) to help protect your computer.
+       Click OK to save the setting.
+
+   You will need to restart to complete the process. Click
+   Restart Now to reboot the machine and apply the changes. You
+   can then follow the instructions below for installing
+   Windows.
+
+2.3.5.1 Using the MySQL Installation Wizard
+
+   MySQL Installation Wizard is an installer for the MySQL
+   server that uses the latest installer technologies for
+   Microsoft Windows. The MySQL Installation Wizard, in
+   combination with the MySQL Configuration Wizard, enables a
+   user to install and configure a MySQL server that is ready
+   for use immediately after installation.
+
+   The MySQL Installation Wizard is the standard installer for
+   all MySQL server distributions, version 4.1.5 and higher.
+   Users of previous versions of MySQL need to shut down and
+   remove their existing MySQL installations manually before
+   installing MySQL with the MySQL Installation Wizard. See
+   Section 2.3.5.1.6, "Upgrading MySQL with the Installation
+   Wizard," for more information on upgrading from a previous
+   version.
 
    Microsoft has included an improved version of their Microsoft
-   Windows Installer (MSI) in the recent versions of Windows. MSI has
-   become the de-facto standard for application installations on
-   Windows 2000, Windows XP, and Windows Server 2003. The MySQL
-   Installation Wizard makes use of this technology to provide a
-   smoother and more flexible installation process.
+   Windows Installer (MSI) in the recent versions of Windows.
+   MSI has become the de-facto standard for application
+   installations on Windows 2000, Windows XP, and Windows Server
+   2003. The MySQL Installation Wizard makes use of this
+   technology to provide a smoother and more flexible
+   installation process.
 
    The Microsoft Windows Installer Engine was updated with the
-   release of Windows XP; those using a previous version of Windows
-   can reference this Microsoft Knowledge Base article
-   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;292539)
-   for information on upgrading to the latest version of the Windows
-   Installer Engine.
-
-   In addition, Microsoft has introduced the WiX (Windows Installer
-   XML) toolkit recently. This is the first highly acknowledged Open
-   Source project from Microsoft. We have switched to WiX because it
-   is an Open Source project and it enables us to handle the complete
-   Windows installation process in a flexible manner using scripts.
-
-   Improving the MySQL Installation Wizard depends on the support and
-   feedback of users like you. If you find that the MySQL
-   Installation Wizard is lacking some feature important to you, or
-   if you discover a bug, please report it in our bugs database using
-   the instructions given in Section 1.7, "How to Report Bugs or
-   Problems."
+   release of Windows XP; those using a previous version of
+   Windows can reference this Microsoft Knowledge Base article
+   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;2925
+   39) for information on upgrading to the latest version of the
+   Windows Installer Engine.
+
+   In addition, Microsoft has introduced the WiX (Windows
+   Installer XML) toolkit recently. This is the first highly
+   acknowledged Open Source project from Microsoft. We have
+   switched to WiX because it is an Open Source project and it
+   enables us to handle the complete Windows installation
+   process in a flexible manner using scripts.
+
+   Improving the MySQL Installation Wizard depends on the
+   support and feedback of users like you. If you find that the
+   MySQL Installation Wizard is lacking some feature important
+   to you, or if you discover a bug, please report it in our
+   bugs database using the instructions given in Section 1.7,
+   "How to Report Bugs or Problems."
 
-2.3.5.1.1. Downloading and Starting the MySQL Installation Wizard
+2.3.5.1.1 Downloading and Starting the MySQL Installation Wizard
 
    The MySQL installation packages can be downloaded from
-   http://dev.mysql.com/downloads/. If the package you download is
-   contained within a Zip archive, you need to extract the archive
-   first.
-   Note
-
-   If you are installing on Windows Vista or newer, it is best to
-   open a network port before beginning the installation. To do this,
-   first ensure that you are logged in as an Administrator, go to the
-   Control Panel, and double-click the Windows Firewall icon. Choose
-   the Allow a program through Windows Firewall option and click the
-   Add port button. Enter MySQL into the Name text box and 3306 (or
-   the port of your choice) into the Port number text box. Also
-   ensure that the TCP protocol radio button is selected. If you
-   wish, you can also limit access to the MySQL server by choosing
-   the Change scope button. Confirm your choices by clicking the OK
-   button. If you do not open a port prior to installation, you
-   cannot configure the MySQL server immediately after installation.
+   http://dev.mysql.com/downloads/. If the package you download
+   is contained within a Zip archive, you need to extract the
+   archive first.
+   Note
+
+   If you are installing on Windows Vista or newer, it is best
+   to open a network port before beginning the installation. To
+   do this, first ensure that you are logged in as an
+   Administrator, go to the Control Panel, and double-click the
+   Windows Firewall icon. Choose the Allow a program through
+   Windows Firewall option and click the Add port button. Enter
+   MySQL into the Name text box and 3306 (or the port of your
+   choice) into the Port number text box. Also ensure that the
+   TCP protocol radio button is selected. If you wish, you can
+   also limit access to the MySQL server by choosing the Change
+   scope button. Confirm your choices by clicking the OK button.
+   If you do not open a port prior to installation, you cannot
+   configure the MySQL server immediately after installation.
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
-
-   The process for starting the wizard depends on the contents of the
-   installation package you download. If there is a setup.exe file
-   present, double-click it to start the installation process. If
-   there is an .msi file present, double-click it to start the
-   installation process.
-
-2.3.5.1.2. Choosing an Install Type
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
 
-   There are three installation types available: Typical, Complete,
-   and Custom.
+   The process for starting the wizard depends on the contents
+   of the installation package you download. If there is a
+   setup.exe file present, double-click it to start the
+   installation process. If there is an .msi file present,
+   double-click it to start the installation process.
+
+2.3.5.1.2 Choosing an Install Type
+
+   There are three installation types available: Typical,
+   Complete, and Custom.
+
+   The Typical installation type installs the MySQL server, the
+   mysql command-line client, and the command-line utilities.
+   The command-line clients and utilities include mysqldump,
+   myisamchk, and several other tools to help you manage the
+   MySQL server.
 
-   The Typical installation type installs the MySQL server, the mysql
-   command-line client, and the command-line utilities. The
-   command-line clients and utilities include mysqldump, myisamchk,
-   and several other tools to help you manage the MySQL server.
-
-   The Complete installation type installs all components included in
-   the installation package. The full installation package includes
-   components such as the embedded server library, the benchmark
-   suite, support scripts, and documentation.
-
-   The Custom installation type gives you complete control over which
-   packages you wish to install and the installation path that is
-   used. See Section 2.3.5.1.3, "The Custom Install Dialog," for more
-   information on performing a custom install.
-
-   If you choose the Typical or Complete installation types and click
-   the Next button, you advance to the confirmation screen to verify
-   your choices and begin the installation. If you choose the Custom
-   installation type and click the Next button, you advance to the
-   custom installation dialog, described in Section 2.3.5.1.3, "The
-   Custom Install Dialog."
+   The Complete installation type installs all components
+   included in the installation package. The full installation
+   package includes components such as the embedded server
+   library, the benchmark suite, support scripts, and
+   documentation.
+
+   The Custom installation type gives you complete control over
+   which packages you wish to install and the installation path
+   that is used. See Section 2.3.5.1.3, "The Custom Install
+   Dialog," for more information on performing a custom install.
+
+   If you choose the Typical or Complete installation types and
+   click the Next button, you advance to the confirmation screen
+   to verify your choices and begin the installation. If you
+   choose the Custom installation type and click the Next
+   button, you advance to the custom installation dialog,
+   described in Section 2.3.5.1.3, "The Custom Install Dialog."
 
-2.3.5.1.3. The Custom Install Dialog
+2.3.5.1.3 The Custom Install Dialog
 
    If you wish to change the installation path or the specific
-   components that are installed by the MySQL Installation Wizard,
-   choose the Custom installation type.
+   components that are installed by the MySQL Installation
+   Wizard, choose the Custom installation type.
 
-   A tree view on the left side of the custom install dialog lists
-   all available components. Components that are not installed have a
-   red X icon; components that are installed have a gray icon. To
-   change whether a component is installed, click that component's
-   icon and choose a new option from the drop-down list that appears.
+   A tree view on the left side of the custom install dialog
+   lists all available components. Components that are not
+   installed have a red X icon; components that are installed
+   have a gray icon. To change whether a component is installed,
+   click that component's icon and choose a new option from the
+   drop-down list that appears.
 
    You can change the default installation path by clicking the
-   Change... button to the right of the displayed installation path.
+   Change... button to the right of the displayed installation
+   path.
 
-   After choosing your installation components and installation path,
-   click the Next button to advance to the confirmation dialog.
-
-2.3.5.1.4. The Confirmation Dialog
-
-   Once you choose an installation type and optionally choose your
-   installation components, you advance to the confirmation dialog.
-   Your installation type and installation path are displayed for you
-   to review.
-
-   To install MySQL if you are satisfied with your settings, click
-   the Install button. To change your settings, click the Back
-   button. To exit the MySQL Installation Wizard without installing
-   MySQL, click the Cancel button.
+   After choosing your installation components and installation
+   path, click the Next button to advance to the confirmation
+   dialog.
+
+2.3.5.1.4 The Confirmation Dialog
+
+   Once you choose an installation type and optionally choose
+   your installation components, you advance to the confirmation
+   dialog. Your installation type and installation path are
+   displayed for you to review.
+
+   To install MySQL if you are satisfied with your settings,
+   click the Install button. To change your settings, click the
+   Back button. To exit the MySQL Installation Wizard without
+   installing MySQL, click the Cancel button.
 
    The final screen of the installer provides a summary of the
    installation and gives you the option to launch the MySQL
-   Configuration Wizard, which you can use to create a configuration
-   file, install the MySQL service, and configure security settings.
-
-2.3.5.1.5. Changes Made by MySQL Installation Wizard
-
-   Once you click the Install button, the MySQL Installation Wizard
-   begins the installation process and makes certain changes to your
-   system which are described in the sections that follow.
+   Configuration Wizard, which you can use to create a
+   configuration file, install the MySQL service, and configure
+   security settings.
+
+2.3.5.1.5 Changes Made by MySQL Installation Wizard
+
+   Once you click the Install button, the MySQL Installation
+   Wizard begins the installation process and makes certain
+   changes to your system which are described in the sections
+   that follow.
 
    Changes to the Registry
 
-   The MySQL Installation Wizard creates one Windows registry key in
-   a typical install situation, located in
+   The MySQL Installation Wizard creates one Windows registry
+   key in a typical install situation, located in
    HKEY_LOCAL_MACHINE\SOFTWARE\MySQL AB.
 
-   The MySQL Installation Wizard creates a key named after the major
-   version of the server that is being installed, such as MySQL
-   Server 5.5. It contains two string values, Location and Version.
-   The Location string contains the path to the installation
-   directory. In a default installation it contains C:\Program
-   Files\MySQL\MySQL Server 5.5\. The Version string contains the
-   release number. For example, for an installation of MySQL Server
-   5.5.36, the key contains a value of 5.5.36.
-
-   These registry keys are used to help external tools identify the
-   installed location of the MySQL server, preventing a complete scan
-   of the hard-disk to determine the installation path of the MySQL
-   server. The registry keys are not required to run the server, and
-   if you install MySQL using the noinstall Zip archive, the registry
-   keys are not created.
+   The MySQL Installation Wizard creates a key named after the
+   major version of the server that is being installed, such as
+   MySQL Server 5.5. It contains two string values, Location and
+   Version. The Location string contains the path to the
+   installation directory. In a default installation it contains
+   C:\Program Files\MySQL\MySQL Server 5.5\. The Version string
+   contains the release number. For example, for an installation
+   of MySQL Server 5.5.44, the key contains a value of 5.5.44.
+
+   These registry keys are used to help external tools identify
+   the installed location of the MySQL server, preventing a
+   complete scan of the hard-disk to determine the installation
+   path of the MySQL server. The registry keys are not required
+   to run the server, and if you install MySQL using the
+   noinstall Zip archive, the registry keys are not created.
 
    Changes to the Start Menu
 
-   The MySQL Installation Wizard creates a new entry in the Windows
-   Start menu under a common MySQL menu heading named after the major
-   version of MySQL that you have installed. For example, if you
-   install MySQL 5.5, the MySQL Installation Wizard creates a MySQL
-   Server 5.5 section in the Start menu.
+   The MySQL Installation Wizard creates a new entry in the
+   Windows Start menu under a common MySQL menu heading named
+   after the major version of MySQL that you have installed. For
+   example, if you install MySQL 5.5, the MySQL Installation
+   Wizard creates a MySQL Server 5.5 section in the Start menu.
 
    The following entries are created within the new Start menu
    section:
 
-     * MySQL Command-Line Client: This is a shortcut to the mysql
-       command-line client and is configured to connect as the root
-       user. The shortcut prompts for a root user password when you
-       connect.
-
-     * MySQL Server Instance Config Wizard: This is a shortcut to the
-       MySQL Configuration Wizard. Use this shortcut to configure a
-       newly installed server, or to reconfigure an existing server.
+     * MySQL Command-Line Client: This is a shortcut to the
+       mysql command-line client and is configured to connect as
+       the root user. The shortcut prompts for a root user
+       password when you connect.
+
+     * MySQL Server Instance Config Wizard: This is a shortcut
+       to the MySQL Configuration Wizard. Use this shortcut to
+       configure a newly installed server, or to reconfigure an
+       existing server.
 
      * MySQL Documentation: This is a link to the MySQL server
        documentation that is stored locally in the MySQL server
@@ -1460,118 +1902,122 @@
 
    Changes to the File System
 
-   The MySQL Installation Wizard by default installs the MySQL 5.5
-   server to C:\Program Files\MySQL\MySQL Server 5.5, where Program
-   Files is the default location for applications in your system, and
-   5.5 is the major version of your MySQL server. This is the
-   recommended location for the MySQL server, replacing the former
-   default location C:\mysql.
+   The MySQL Installation Wizard by default installs the MySQL
+   5.5 server to C:\Program Files\MySQL\MySQL Server 5.5, where
+   Program Files is the default location for applications in
+   your system, and 5.5 is the major version of your MySQL
+   server. This is the recommended location for the MySQL
+   server, replacing the former default location C:\mysql.
 
    By default, all MySQL applications are stored in a common
-   directory at C:\Program Files\MySQL, where Program Files is the
-   default location for applications in your Windows installation. A
-   typical MySQL installation on a developer machine might look like
-   this:
+   directory at C:\Program Files\MySQL, where Program Files is
+   the default location for applications in your Windows
+   installation. A typical MySQL installation on a developer
+   machine might look like this:
 C:\Program Files\MySQL\MySQL Server 5.5
 C:\Program Files\MySQL\MySQL Workbench 5.1 OSS
 
-   This approach makes it easier to manage and maintain all MySQL
-   applications installed on a particular system.
+   This approach makes it easier to manage and maintain all
+   MySQL applications installed on a particular system.
 
    The default location of the data directory is the AppData
    directory configured for the user that installed the MySQL
    application.
 
-2.3.5.1.6. Upgrading MySQL with the Installation Wizard
+2.3.5.1.6 Upgrading MySQL with the Installation Wizard
 
    The MySQL Installation Wizard can perform server upgrades
-   automatically using the upgrade capabilities of MSI. That means
-   you do not need to remove a previous installation manually before
-   installing a new release. The installer automatically shuts down
-   and removes the previous MySQL service before installing the new
-   version.
+   automatically using the upgrade capabilities of MSI. That
+   means you do not need to remove a previous installation
+   manually before installing a new release. The installer
+   automatically shuts down and removes the previous MySQL
+   service before installing the new version.
 
    Automatic upgrades are available only when upgrading between
-   installations that have the same major and minor version numbers.
-   For example, you can upgrade automatically from MySQL 5.5.5 to
-   MySQL 5.5.6, but not from MySQL 5.1 to MySQL 5.5.
+   installations that have the same major and minor version
+   numbers. For example, you can upgrade automatically from
+   MySQL 5.5.5 to MySQL 5.5.6, but not from MySQL 5.1 to MySQL
+   5.5.
 
    See Section 2.3.9, "Upgrading MySQL on Windows."
 
-2.3.5.2. Automating MySQL Installation on Microsoft Windows Using the
-MSI Package
+2.3.5.2 Automating MySQL Installation on Microsoft Windows Using
+the MSI Package
 
    The Microsoft Installer (MSI) supports a both a quiet and a
    passive mode that can be used to install MySQL automatically
-   without requiring intervention. You can use this either in scripts
-   to automatically install MySQL or through a terminal connection
-   such as Telnet where you do not have access to the standard
-   Windows user interface. The MSI packages can also be used in
-   combination with Microsoft's Group Policy system (part of Windows
-   Server 2003 and Windows Server 2008) to install MySQL across
-   multiple machines.
-
-   To install MySQL from one of the MSI packages automatically from
-   the command line (or within a script), you need to use the
-   msiexec.exe tool. For example, to perform a quiet installation
-   (which shows no dialog boxes or progress):
-shell> msiexec /i mysql-5.5.36.msi /quiet
-
-   The /i indicates that you want to perform an installation. The
-   /quiet option indicates that you want no interactive elements.
-
-   To provide a dialog box showing the progress during installation,
-   and the dialog boxes providing information on the installation and
-   registration of MySQL, use /passive mode instead of /quiet:
-shell> msiexec /i mysql-5.5.36.msi /passive
-
-   Regardless of the mode of the installation, installing the package
-   in this manner performs a 'Typical' installation, and installs the
-   default components into the standard location.
+   without requiring intervention. You can use this either in
+   scripts to automatically install MySQL or through a terminal
+   connection such as Telnet where you do not have access to the
+   standard Windows user interface. The MSI packages can also be
+   used in combination with Microsoft's Group Policy system
+   (part of Windows Server 2003 and Windows Server 2008) to
+   install MySQL across multiple machines.
+
+   To install MySQL from one of the MSI packages automatically
+   from the command line (or within a script), you need to use
+   the msiexec.exe tool. For example, to perform a quiet
+   installation (which shows no dialog boxes or progress):
+shell> msiexec /i mysql-5.5.44.msi /quiet
+
+   The /i indicates that you want to perform an installation.
+   The /quiet option indicates that you want no interactive
+   elements.
+
+   To provide a dialog box showing the progress during
+   installation, and the dialog boxes providing information on
+   the installation and registration of MySQL, use /passive mode
+   instead of /quiet:
+shell> msiexec /i mysql-5.5.44.msi /passive
+
+   Regardless of the mode of the installation, installing the
+   package in this manner performs a 'Typical' installation, and
+   installs the default components into the standard location.
 
    You can also use this method to uninstall MySQL by using the
    /uninstall or /x options:
-shell> msiexec /x mysql-5.5.36.msi /uninstall
+shell> msiexec /x mysql-5.5.44.msi /uninstall
 
-   To install MySQL and configure a MySQL instance from the command
-   line, see Section 2.3.6.13, "MySQL Server Instance Config Wizard:
-   Creating an Instance from the Command Line."
+   To install MySQL and configure a MySQL instance from the
+   command line, see Section 2.3.6.13, "MySQL Server Instance
+   Config Wizard: Creating an Instance from the Command Line."
 
    For information on using MSI packages to install software
-   automatically using Group Policy, see How to use Group Policy to
-   remotely install software in Windows Server 2003
+   automatically using Group Policy, see How to use Group Policy
+   to remotely install software in Windows Server 2003
    (http://support.microsoft.com/kb/816102).
 
-2.3.5.3. Removing MySQL When Installed from the MSI Package
+2.3.5.3 Removing MySQL When Installed from the MSI Package
 
-   To uninstall a MySQL where you have used the MSI packages, you
-   must use the Add/Remove Programs tool within Control Panel. To do
-   this:
+   To uninstall a MySQL where you have used the MSI packages,
+   you must use the Add/Remove Programs tool within Control
+   Panel. To do this:
 
     1. Right-click the start menu and choose Control Panel.
 
-    2. If the Control Panel is set to category mode (you will see
-       Pick a category at the top of the Control Panel window),
-       double-click Add or Remove Programs. If the Control is set to
-       classic mode, double-click the Add or Remove Programs icon.
-
-    3. Find MySQL in the list of installed software. MySQL Server is
-       installed against major version numbers (MySQL 5.1, MySQL 5.5,
-       etc.). Select the version that you want to remove and click
-       Remove.
+    2. If the Control Panel is set to category mode (you will
+       see Pick a category at the top of the Control Panel
+       window), double-click Add or Remove Programs. If the
+       Control is set to classic mode, double-click the Add or
+       Remove Programs icon.
+
+    3. Find MySQL in the list of installed software. MySQL
+       Server is installed against major version numbers (MySQL
+       5.1, MySQL 5.5, etc.). Select the version that you want
+       to remove and click Remove.
 
     4. You will be prompted to confirm the removal. Click Yes to
        remove MySQL.
 
    When MySQL is removed using this method, only the installed
-   components are removed. Any database information (including the
-   tables and data), import or export files, log files, and binary
-   logs produced during execution are kept in their configured
-   location.
-
-   If you try to install MySQL again the information will be retained
-   and you will be prompted to enter the password configured with the
-   original installation.
+   components are removed. Any database information (including
+   the tables and data), import or export files, log files, and
+   binary logs produced during execution are kept in their
+   configured location.
+
+   If you try to install MySQL again the information will be
+   retained and you will be prompted to enter the password
+   configured with the original installation.
 
    If you want to delete MySQL completely:
 
@@ -1583,86 +2029,92 @@
      * On Windows 7 and Windows Server 2008, the default data
        directory location is C:\ProgramData\Mysql.
        Note
-       The C:\ProgramData directory is hidden by default. You must
-       change your folder options to view the hidden file. Choose
-       Organize, Folder and search options, Show hidden folders.
-
-2.3.6. MySQL Server Instance Configuration Wizard
-
-   The MySQL Server Instance Configuration Wizard helps automate the
-   process of configuring your server. It creates a custom MySQL
-   configuration file (my.ini or my.cnf) by asking you a series of
-   questions and then applying your responses to a template to
-   generate the configuration file that is tuned to your
-   installation.
-
-   The MySQL Server Instance Configuration Wizard is included with
-   the MySQL 5.5 server. The MySQL Server Instance Configuration
-   Wizard is only available for Windows.
-
-2.3.6.1. Starting the MySQL Server Instance Configuration Wizard
-
-   The MySQL Server Instance Configuration Wizard is normally started
-   as part of the installation process. You should only need to run
-   the MySQL Server Instance Configuration Wizard again when you need
-   to change the configuration parameters of your server.
+       The C:\ProgramData directory is hidden by default. You
+       must change your folder options to view the hidden file.
+       Choose Organize, Folder and search options, Show hidden
+       folders.
+
+2.3.6 MySQL Server Instance Configuration Wizard
+
+   The MySQL Server Instance Configuration Wizard helps automate
+   the process of configuring your server. It creates a custom
+   MySQL configuration file (my.ini or my.cnf) by asking you a
+   series of questions and then applying your responses to a
+   template to generate the configuration file that is tuned to
+   your installation.
+
+   The MySQL Server Instance Configuration Wizard is included
+   with the MySQL 5.5 server. The MySQL Server Instance
+   Configuration Wizard is only available for Windows.
+
+2.3.6.1 Starting the MySQL Server Instance Configuration Wizard
+
+   The MySQL Server Instance Configuration Wizard is normally
+   started as part of the installation process. You should only
+   need to run the MySQL Server Instance Configuration Wizard
+   again when you need to change the configuration parameters of
+   your server.
 
    If you chose not to open a port prior to installing MySQL on
-   Windows Vista or newer, you can choose to use the MySQL Server
-   Configuration Wizard after installation. However, you must open a
-   port in the Windows Firewall. To do this see the instructions
-   given in Section 2.3.5.1.1, "Downloading and Starting the MySQL
-   Installation Wizard." Rather than opening a port, you also have
-   the option of adding MySQL as a program that bypasses the Windows
-   Firewall. One or the other option is sufficient---you need not do
-   both. Additionally, when running the MySQL Server Configuration
-   Wizard on Windows Vista or newer, ensure that you are logged in as
-   a user with administrative rights.
+   Windows Vista or newer, you can choose to use the MySQL
+   Server Configuration Wizard after installation. However, you
+   must open a port in the Windows Firewall. To do this see the
+   instructions given in Section 2.3.5.1.1, "Downloading and
+   Starting the MySQL Installation Wizard." Rather than opening
+   a port, you also have the option of adding MySQL as a program
+   that bypasses the Windows Firewall. One or the other option
+   is sufficient---you need not do both. Additionally, when
+   running the MySQL Server Configuration Wizard on Windows
+   Vista or newer, ensure that you are logged in as a user with
+   administrative rights.
    MySQL Server Instance Configuration Wizard
 
    You can launch the MySQL Configuration Wizard by clicking the
-   MySQL Server Instance Config Wizard entry in the MySQL section of
-   the Windows Start menu.
-
-   Alternatively, you can navigate to the bin directory of your MySQL
-   installation and launch the MySQLInstanceConfig.exe file directly.
-
-   The MySQL Server Instance Configuration Wizard places the my.ini
-   file in the installation directory for the MySQL server. This
-   helps associate configuration files with particular server
-   instances.
+   MySQL Server Instance Config Wizard entry in the MySQL
+   section of the Windows Start menu.
 
-   To ensure that the MySQL server knows where to look for the my.ini
-   file, an argument similar to this is passed to the MySQL server as
-   part of the service installation:
+   Alternatively, you can navigate to the bin directory of your
+   MySQL installation and launch the MySQLInstanceConfig.exe
+   file directly.
+
+   The MySQL Server Instance Configuration Wizard places the
+   my.ini file in the installation directory for the MySQL
+   server. This helps associate configuration files with
+   particular server instances.
+
+   To ensure that the MySQL server knows where to look for the
+   my.ini file, an argument similar to this is passed to the
+   MySQL server as part of the service installation:
 --defaults-file="C:\Program Files\MySQL\MySQL Server 5.5\my.ini"
 
-   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced with the
-   installation path to the MySQL Server. The --defaults-file option
-   instructs the MySQL server to read the specified file for
-   configuration options when it starts.
-
-   Apart from making changes to the my.ini file by running the MySQL
-   Server Instance Configuration Wizard again, you can modify it by
-   opening it with a text editor and making any necessary changes.
-   You can also modify the server configuration with the
-   http://www.mysql.com/products/administrator/ utility. For more
-   information about server configuration, see Section 5.1.3, "Server
-   Command Options."
+   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced
+   with the installation path to the MySQL Server. The
+   --defaults-file option instructs the MySQL server to read the
+   specified file for configuration options when it starts.
+
+   Apart from making changes to the my.ini file by running the
+   MySQL Server Instance Configuration Wizard again, you can
+   modify it by opening it with a text editor and making any
+   necessary changes. You can also modify the server
+   configuration with the
+   http://www.mysql.com/products/administrator/ utility. For
+   more information about server configuration, see Section
+   5.1.3, "Server Command Options."
 
    MySQL clients and utilities such as the mysql and mysqldump
    command-line clients are not able to locate the my.ini file
-   located in the server installation directory. To configure the
-   client and utility applications, create a new my.ini file in the
-   Windows installation directory (for example, C:\WINDOWS).
-
-   Under Windows Server 2003, Windows Server 2000, Windows XP, and
-   Windows Vista, MySQL Server Instance Configuration Wizard will
-   configure MySQL to work as a Windows service. To start and stop
-   MySQL you use the Services application that is supplied as part of
-   the Windows Administrator Tools.
+   located in the server installation directory. To configure
+   the client and utility applications, create a new my.ini file
+   in the Windows installation directory (for example,
+   C:\WINDOWS).
+
+   Under Windows Server 2003, Windows Server 2000, Windows XP,
+   and Windows Vista, MySQL Server Instance Configuration Wizard
+   will configure MySQL to work as a Windows service. To start
+   and stop MySQL you use the Services application that is
+   supplied as part of the Windows Administrator Tools.
 
-2.3.6.2. Choosing a Maintenance Option
+2.3.6.2 Choosing a Maintenance Option
 
    If the MySQL Server Instance Configuration Wizard detects an
    existing configuration file, you have the option of either
@@ -1672,118 +2124,119 @@
 
    To reconfigure an existing server, choose the Re-configure
    Instance option and click the Next button. Any existing
-   configuration file is not overwritten, but renamed (within the
-   same directory) using a timestamp (Windows) or sequential number
-   (Linux). To remove the existing server instance, choose the Remove
-   Instance option and click the Next button.
+   configuration file is not overwritten, but renamed (within
+   the same directory) using a timestamp (Windows) or sequential
+   number (Linux). To remove the existing server instance,
+   choose the Remove Instance option and click the Next button.
 
    If you choose the Remove Instance option, you advance to a
-   confirmation window. Click the Execute button. The MySQL Server
-   Configuration Wizard stops and removes the MySQL service, and then
-   deletes the configuration file. The server installation and its
-   data folder are not removed.
-
-   If you choose the Re-configure Instance option, you advance to the
-   Configuration Type dialog where you can choose the type of
-   installation that you wish to configure.
-
-2.3.6.3. Choosing a Configuration Type
-
-   When you start the MySQL Server Instance Configuration Wizard for
-   a new MySQL installation, or choose the Re-configure Instance
-   option for an existing installation, you advance to the
-   Configuration Type dialog.
-   MySQL Server Instance Configuration Wizard: Configuration Type
+   confirmation window. Click the Execute button. The MySQL
+   Server Configuration Wizard stops and removes the MySQL
+   service, and then deletes the configuration file. The server
+   installation and its data folder are not removed.
+
+   If you choose the Re-configure Instance option, you advance
+   to the Configuration Type dialog where you can choose the
+   type of installation that you wish to configure.
+
+2.3.6.3 Choosing a Configuration Type
+
+   When you start the MySQL Server Instance Configuration Wizard
+   for a new MySQL installation, or choose the Re-configure
+   Instance option for an existing installation, you advance to
+   the Configuration Type dialog.
+   MySQL Server Instance Configuration Wizard: Configuration
+   Type
 
    There are two configuration types available: Detailed
    Configuration and Standard Configuration. The Standard
-   Configuration option is intended for new users who want to get
-   started with MySQL quickly without having to make many decisions
-   about server configuration. The Detailed Configuration option is
-   intended for advanced users who want more fine-grained control
-   over server configuration.
+   Configuration option is intended for new users who want to
+   get started with MySQL quickly without having to make many
+   decisions about server configuration. The Detailed
+   Configuration option is intended for advanced users who want
+   more fine-grained control over server configuration.
 
    If you are new to MySQL and need a server configured as a
-   single-user developer machine, the Standard Configuration should
-   suit your needs. Choosing the Standard Configuration option causes
-   the MySQL Configuration Wizard to set all configuration options
-   automatically with the exception of Service Options and Security
-   Options.
-
-   The Standard Configuration sets options that may be incompatible
-   with systems where there are existing MySQL installations. If you
-   have an existing MySQL installation on your system in addition to
-   the installation you wish to configure, the Detailed Configuration
-   option is recommended.
+   single-user developer machine, the Standard Configuration
+   should suit your needs. Choosing the Standard Configuration
+   option causes the MySQL Configuration Wizard to set all
+   configuration options automatically with the exception of
+   Service Options and Security Options.
+
+   The Standard Configuration sets options that may be
+   incompatible with systems where there are existing MySQL
+   installations. If you have an existing MySQL installation on
+   your system in addition to the installation you wish to
+   configure, the Detailed Configuration option is recommended.
 
    To complete the Standard Configuration, please refer to the
    sections on Service Options and Security Options in Section
-   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11, "The
-   Security Options Dialog," respectively.
+   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11,
+   "The Security Options Dialog," respectively.
 
-2.3.6.4. The Server Type Dialog
+2.3.6.4 The Server Type Dialog
 
-   There are three different server types available to choose from.
-   The server type that you choose affects the decisions that the
-   MySQL Server Instance Configuration Wizard makes with regard to
-   memory, disk, and processor usage.
+   There are three different server types available to choose
+   from. The server type that you choose affects the decisions
+   that the MySQL Server Instance Configuration Wizard makes
+   with regard to memory, disk, and processor usage.
    MySQL Server Instance Configuration Wizard: Server Type
 
-     * Developer Machine: Choose this option for a typical desktop
-       workstation where MySQL is intended only for personal use. It
-       is assumed that many other desktop applications are running.
-       The MySQL server is configured to use minimal system
-       resources.
-
-     * Server Machine: Choose this option for a server machine where
-       the MySQL server is running alongside other server
-       applications such as FTP, email, and Web servers. The MySQL
-       server is configured to use a moderate portion of the system
-       resources.
+     * Developer Machine: Choose this option for a typical
+       desktop workstation where MySQL is intended only for
+       personal use. It is assumed that many other desktop
+       applications are running. The MySQL server is configured
+       to use minimal system resources.
+
+     * Server Machine: Choose this option for a server machine
+       where the MySQL server is running alongside other server
+       applications such as FTP, email, and Web servers. The
+       MySQL server is configured to use a moderate portion of
+       the system resources.
 
      * Dedicated MySQL Server Machine: Choose this option for a
-       server machine that is intended to run only the MySQL server.
-       It is assumed that no other applications are running. The
-       MySQL server is configured to use all available system
-       resources.
+       server machine that is intended to run only the MySQL
+       server. It is assumed that no other applications are
+       running. The MySQL server is configured to use all
+       available system resources.
 
    Note
 
-   By selecting one of the preconfigured configurations, the values
-   and settings of various options in your my.cnf or my.ini will be
-   altered accordingly. The default values and options as described
-   in the reference manual may therefore be different to the options
-   and values that were created during the execution of the
-   configuration wizard.
+   By selecting one of the preconfigured configurations, the
+   values and settings of various options in your my.cnf or
+   my.ini will be altered accordingly. The default values and
+   options as described in the reference manual may therefore be
+   different to the options and values that were created during
+   the execution of the configuration wizard.
 
-2.3.6.5. The Database Usage Dialog
+2.3.6.5 The Database Usage Dialog
 
    The Database Usage dialog enables you to indicate the storage
-   engines that you expect to use when creating MySQL tables. The
-   option you choose determines whether the InnoDB storage engine is
-   available and what percentage of the server resources are
-   available to InnoDB.
+   engines that you expect to use when creating MySQL tables.
+   The option you choose determines whether the InnoDB storage
+   engine is available and what percentage of the server
+   resources are available to InnoDB.
    MySQL Server Instance Configuration Wizard: Usage Dialog
 
-     * Multifunctional Database: This option enables both the InnoDB
-       and MyISAM storage engines and divides resources evenly
-       between the two. This option is recommended for users who use
-       both storage engines on a regular basis.
+     * Multifunctional Database: This option enables both the
+       InnoDB and MyISAM storage engines and divides resources
+       evenly between the two. This option is recommended for
+       users who use both storage engines on a regular basis.
 
      * Transactional Database Only: This option enables both the
-       InnoDB and MyISAM storage engines, but dedicates most server
-       resources to the InnoDB storage engine. This option is
-       recommended for users who use InnoDB almost exclusively and
-       make only minimal use of MyISAM.
+       InnoDB and MyISAM storage engines, but dedicates most
+       server resources to the InnoDB storage engine. This
+       option is recommended for users who use InnoDB almost
+       exclusively and make only minimal use of MyISAM.
 
      * Non-Transactional Database Only: This option disables the
        InnoDB storage engine completely and dedicates all server
        resources to the MyISAM storage engine. This option is
        recommended for users who do not use InnoDB.
 
-   The Configuration Wizard uses a template to generate the server
-   configuration file. The Database Usage dialog sets one of the
-   following option strings:
+   The Configuration Wizard uses a template to generate the
+   server configuration file. The Database Usage dialog sets one
+   of the following option strings:
 Multifunctional Database:        MIXED
 Transactional Database Only:     INNODB
 Non-Transactional Database Only: MYISAM
@@ -1807,213 +2260,229 @@
    resources dedicated to MyISAM. The remaining resources are
    allocated to InnoDB.
 
-2.3.6.6. The InnoDB Tablespace Dialog
+2.3.6.6 The InnoDB Tablespace Dialog
 
-   Some users may want to locate the InnoDB tablespace files in a
-   different location than the MySQL server data directory. Placing
-   the tablespace files in a separate location can be desirable if
-   your system has a higher capacity or higher performance storage
-   device available, such as a RAID storage system.
-   MySQL Server Instance Configuration Wizard: InnoDB Data Tablespace
-
-   To change the default location for the InnoDB tablespace files,
-   choose a new drive from the drop-down list of drive letters and
-   choose a new path from the drop-down list of paths. To create a
-   custom path, click the ... button.
-
-   If you are modifying the configuration of an existing server, you
-   must click the Modify button before you change the path. In this
-   situation you must move the existing tablespace files to the new
-   location manually before starting the server.
+   Some users may want to locate the InnoDB tablespace files in
+   a different location than the MySQL server data directory.
+   Placing the tablespace files in a separate location can be
+   desirable if your system has a higher capacity or higher
+   performance storage device available, such as a RAID storage
+   system.
+   MySQL Server Instance Configuration Wizard: InnoDB Data
+   Tablespace
+
+   To change the default location for the InnoDB tablespace
+   files, choose a new drive from the drop-down list of drive
+   letters and choose a new path from the drop-down list of
+   paths. To create a custom path, click the ... button.
+
+   If you are modifying the configuration of an existing server,
+   you must click the Modify button before you change the path.
+   In this situation you must move the existing tablespace files
+   to the new location manually before starting the server.
 
-2.3.6.7. The Concurrent Connections Dialog
+2.3.6.7 The Concurrent Connections Dialog
 
    To prevent the server from running out of resources, it is
-   important to limit the number of concurrent connections to the
-   MySQL server that can be established. The Concurrent Connections
-   dialog enables you to choose the expected usage of your server,
-   and sets the limit for concurrent connections accordingly. It is
-   also possible to set the concurrent connection limit manually.
+   important to limit the number of concurrent connections to
+   the MySQL server that can be established. The Concurrent
+   Connections dialog enables you to choose the expected usage
+   of your server, and sets the limit for concurrent connections
+   accordingly. It is also possible to set the concurrent
+   connection limit manually.
    MySQL Server Instance Configuration Wizard: Connections
 
-     * Decision Support (DSS)/OLAP: Choose this option if your server
-       does not require a large number of concurrent connections. The
-       maximum number of connections is set at 100, with an average
-       of 20 concurrent connections assumed.
-
-     * Online Transaction Processing (OLTP): Choose this option if
-       your server requires a large number of concurrent connections.
-       The maximum number of connections is set at 500.
-
-     * Manual Setting: Choose this option to set the maximum number
-       of concurrent connections to the server manually. Choose the
-       number of concurrent connections from the drop-down box
-       provided, or enter the maximum number of connections into the
-       drop-down box if the number you desire is not listed.
+     * Decision Support (DSS)/OLAP: Choose this option if your
+       server does not require a large number of concurrent
+       connections. The maximum number of connections is set at
+       100, with an average of 20 concurrent connections
+       assumed.
+
+     * Online Transaction Processing (OLTP): Choose this option
+       if your server requires a large number of concurrent
+       connections. The maximum number of connections is set at
+       500.
+
+     * Manual Setting: Choose this option to set the maximum
+       number of concurrent connections to the server manually.
+       Choose the number of concurrent connections from the
+       drop-down box provided, or enter the maximum number of
+       connections into the drop-down box if the number you
+       desire is not listed.
 
-2.3.6.8. The Networking and Strict Mode Options Dialog
+2.3.6.8 The Networking and Strict Mode Options Dialog
 
    Use the Networking Options dialog to enable or disable TCP/IP
    networking and to configure the port number that is used to
    connect to the MySQL server.
-   MySQL Server Instance Configuration Wizard: Network Configuration
+   MySQL Server Instance Configuration Wizard: Network
+   Configuration
 
    TCP/IP networking is enabled by default. To disable TCP/IP
-   networking, uncheck the box next to the Enable TCP/IP Networking
-   option.
+   networking, uncheck the box next to the Enable TCP/IP
+   Networking option.
 
-   Port 3306 is used by default. To change the port used to access
-   MySQL, choose a new port number from the drop-down box or type a
-   new port number directly into the drop-down box. If the port
-   number you choose is in use, you are prompted to confirm your
-   choice of port number.
-
-   Set the Server SQL Mode to either enable or disable strict mode.
-   Enabling strict mode (default) makes MySQL behave more like other
-   database management systems. If you run applications that rely on
-   MySQL's old "forgiving" behavior, make sure to either adapt those
-   applications or to disable strict mode. For more information about
-   strict mode, see Section 5.1.7, "Server SQL Modes."
+   Port 3306 is used by default. To change the port used to
+   access MySQL, choose a new port number from the drop-down box
+   or type a new port number directly into the drop-down box. If
+   the port number you choose is in use, you are prompted to
+   confirm your choice of port number.
+
+   Set the Server SQL Mode to either enable or disable strict
+   mode. Enabling strict mode (default) makes MySQL behave more
+   like other database management systems. If you run
+   applications that rely on MySQL's old "forgiving" behavior,
+   make sure to either adapt those applications or to disable
+   strict mode. For more information about strict mode, see
+   Section 5.1.7, "Server SQL Modes."
 
-2.3.6.9. The Character Set Dialog
+2.3.6.9 The Character Set Dialog
 
    The MySQL server supports multiple character sets and it is
-   possible to set a default server character set that is applied to
-   all tables, columns, and databases unless overridden. Use the
-   Character Set dialog to change the default character set of the
-   MySQL server.
+   possible to set a default server character set that is
+   applied to all tables, columns, and databases unless
+   overridden. Use the Character Set dialog to change the
+   default character set of the MySQL server.
    MySQL Server Instance Configuration Wizard: Character Set
 
-     * Standard Character Set: Choose this option if you want to use
-       latin1 as the default server character set. latin1 is used for
-       English and many Western European languages.
-
-     * Best Support For Multilingualism: Choose this option if you
-       want to use utf8 as the default server character set. This is
-       a Unicode character set that can store characters from many
-       different languages.
-
-     * Manual Selected Default Character Set / Collation: Choose this
-       option if you want to pick the server's default character set
-       manually. Choose the desired character set from the provided
-       drop-down list.
+     * Standard Character Set: Choose this option if you want to
+       use latin1 as the default server character set. latin1 is
+       used for English and many Western European languages.
+
+     * Best Support For Multilingualism: Choose this option if
+       you want to use utf8 as the default server character set.
+       This is a Unicode character set that can store characters
+       from many different languages.
+
+     * Manual Selected Default Character Set / Collation: Choose
+       this option if you want to pick the server's default
+       character set manually. Choose the desired character set
+       from the provided drop-down list.
 
-2.3.6.10. The Service Options Dialog
+2.3.6.10 The Service Options Dialog
 
    On Windows platforms, the MySQL server can be installed as a
-   Windows service. When installed this way, the MySQL server can be
-   started automatically during system startup, and even restarted
-   automatically by Windows in the event of a service failure.
-
-   The MySQL Server Instance Configuration Wizard installs the MySQL
-   server as a service by default, using the service name MySQL. If
-   you do not wish to install the service, uncheck the box next to
-   the Install As Windows Service option. You can change the service
-   name by picking a new service name from the drop-down box provided
-   or by entering a new service name into the drop-down box.
-   Note
-
-   Service names can include any legal character except forward (/)
-   or backward (\) slashes, and must be less than 256 characters
-   long.
+   Windows service. When installed this way, the MySQL server
+   can be started automatically during system startup, and even
+   restarted automatically by Windows in the event of a service
+   failure.
+
+   The MySQL Server Instance Configuration Wizard installs the
+   MySQL server as a service by default, using the service name
+   MySQL. If you do not wish to install the service, uncheck the
+   box next to the Install As Windows Service option. You can
+   change the service name by picking a new service name from
+   the drop-down box provided or by entering a new service name
+   into the drop-down box.
+   Note
+
+   Service names can include any legal character except forward
+   (/) or backward (\) slashes, and must be less than 256
+   characters long.
    Warning
 
-   If you are installing multiple versions of MySQL onto the same
-   machine, you must choose a different service name for each version
-   that you install. If you do not choose a different service for
-   each installed version then the service manager information will
-   be inconsistent and this will cause problems when you try to
-   uninstall a previous version.
-
-   If you have already installed multiple versions using the same
-   service name, you must manually edit the contents of the
-   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services parameters
-   within the Windows registry to update the association of the
-   service name with the correct server version.
-
-   Typically, when installing multiple versions you create a service
-   name based on the version information. For example, you might
-   install MySQL 5.x as mysql5, or specific versions such as MySQL
-   5.5.0 as mysql50500.
-
-   To install the MySQL server as a service but not have it started
-   automatically at startup, uncheck the box next to the Launch the
-   MySQL Server Automatically option.
-
-2.3.6.11. The Security Options Dialog
-
-   The content of the security options portion of the MySQL Server
-   Instance Configuration Wizard will depend on whether this is a new
-   installation, or modifying an existing installation.
+   If you are installing multiple versions of MySQL onto the
+   same machine, you must choose a different service name for
+   each version that you install. If you do not choose a
+   different service for each installed version then the service
+   manager information will be inconsistent and this will cause
+   problems when you try to uninstall a previous version.
+
+   If you have already installed multiple versions using the
+   same service name, you must manually edit the contents of the
+   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services
+   parameters within the Windows registry to update the
+   association of the service name with the correct server
+   version.
+
+   Typically, when installing multiple versions you create a
+   service name based on the version information. For example,
+   you might install MySQL 5.x as mysql5, or specific versions
+   such as MySQL 5.5.0 as mysql50500.
+
+   To install the MySQL server as a service but not have it
+   started automatically at startup, uncheck the box next to the
+   Launch the MySQL Server Automatically option.
+
+2.3.6.11 The Security Options Dialog
+
+   The content of the security options portion of the MySQL
+   Server Instance Configuration Wizard will depend on whether
+   this is a new installation, or modifying an existing
+   installation.
 
      * Setting the root password for a new installation
-       It is strongly recommended that you set a root password for
-       your MySQL server, and the MySQL Server Instance Config Wizard
-       requires by default that you do so. If you do not wish to set
-       a root password, uncheck the box next to the Modify Security
-       Settings option.
+       It is strongly recommended that you set a root password
+       for your MySQL server, and the MySQL Server Instance
+       Config Wizard requires by default that you do so. If you
+       do not wish to set a root password, uncheck the box next
+       to the Modify Security Settings option.
        MySQL Server Instance Config Wizard: Security
 
-     * To set the root password, enter the desired password into both
-       the New root password and Confirm boxes.
+     * To set the root password, enter the desired password into
+       both the New root password and Confirm boxes.
        Setting the root password for an existing installation
        If you are modifying the configuration of an existing
-       configuration, or you are installing an upgrade and the MySQL
-       Server Instance Configuration Wizard has detected an existing
-       MySQL system, then you must enter the existing password for
-       root before changing the configuration information.
+       configuration, or you are installing an upgrade and the
+       MySQL Server Instance Configuration Wizard has detected
+       an existing MySQL system, then you must enter the
+       existing password for root before changing the
+       configuration information.
        MySQL Server Instance Config Wizard: Security (Existing
        Installation)
-       If you want to change the current root password, enter the
-       desired new password into both the New root password and
-       Confirm boxes.
-
-   To permit root logins from across the network, check the box next
-   to the Enable root access from remote machines option. This
-   decreases the security of your root account.
-
-   To create an anonymous user account, check the box next to the
-   Create An Anonymous Account option. Creating an anonymous account
-   can decrease server security and cause login and permission
-   difficulties. For this reason, it is not recommended.
-
-2.3.6.12. The Confirmation Dialog
-
-   The final dialog in the MySQL Server Instance Configuration Wizard
-   is the Confirmation Dialog. To start the configuration process,
-   click the Execute button. To return to a previous dialog, click
-   the Back button. To exit the MySQL Server Instance Configuration
-   Wizard without configuring the server, click the Cancel button.
+       If you want to change the current root password, enter
+       the desired new password into both the New root password
+       and Confirm boxes.
+
+   To permit root logins from across the network, check the box
+   next to the Enable root access from remote machines option.
+   This decreases the security of your root account.
+
+   To create an anonymous user account, check the box next to
+   the Create An Anonymous Account option. Creating an anonymous
+   account can decrease server security and cause login and
+   permission difficulties. For this reason, it is not
+   recommended.
+
+2.3.6.12 The Confirmation Dialog
+
+   The final dialog in the MySQL Server Instance Configuration
+   Wizard is the Confirmation Dialog. To start the configuration
+   process, click the Execute button. To return to a previous
+   dialog, click the Back button. To exit the MySQL Server
+   Instance Configuration Wizard without configuring the server,
+   click the Cancel button.
    MySQL Server Instance Configuration Wizard: Confirmation
 
    After you click the Execute button, the MySQL Server Instance
-   Configuration Wizard performs a series of tasks and displays the
-   progress onscreen as the tasks are performed.
+   Configuration Wizard performs a series of tasks and displays
+   the progress onscreen as the tasks are performed.
 
-   The MySQL Server Instance Configuration Wizard first determines
-   configuration file options based on your choices using a template
-   prepared by MySQL developers and engineers. This template is named
-   my-template.ini and is located in your server installation
-   directory.
-
-   The MySQL Configuration Wizard then writes these options to the
-   corresponding configuration file.
-
-   If you chose to create a service for the MySQL server, the MySQL
-   Server Instance Configuration Wizard creates and starts the
-   service. If you are reconfiguring an existing service, the MySQL
-   Server Instance Configuration Wizard restarts the service to apply
-   your configuration changes.
+   The MySQL Server Instance Configuration Wizard first
+   determines configuration file options based on your choices
+   using a template prepared by MySQL developers and engineers.
+   This template is named my-template.ini and is located in your
+   server installation directory.
+
+   The MySQL Configuration Wizard then writes these options to
+   the corresponding configuration file.
+
+   If you chose to create a service for the MySQL server, the
+   MySQL Server Instance Configuration Wizard creates and starts
+   the service. If you are reconfiguring an existing service,
+   the MySQL Server Instance Configuration Wizard restarts the
+   service to apply your configuration changes.
 
    If you chose to set a root password, the MySQL Configuration
-   Wizard connects to the server, sets your new root password, and
-   applies any other security settings you may have selected.
-
-   After the MySQL Server Instance Configuration Wizard has completed
-   its tasks, it displays a summary. Click the Finish button to exit
-   the MySQL Server Configuration Wizard.
+   Wizard connects to the server, sets your new root password,
+   and applies any other security settings you may have
+   selected.
+
+   After the MySQL Server Instance Configuration Wizard has
+   completed its tasks, it displays a summary. Click the Finish
+   button to exit the MySQL Server Configuration Wizard.
 
-2.3.6.13. MySQL Server Instance Config Wizard: Creating an Instance
+2.3.6.13 MySQL Server Instance Config Wizard: Creating an Instance
 from the Command Line
 
    In addition to using the GUI interface to the MySQL Server
@@ -2021,25 +2490,27 @@
    automatically from the command line.
 
    To use the MySQL Server Instance Config Wizard on the command
-   line, you need to use the MySQLInstanceConfig.exe command that is
-   installed with MySQL in the bin directory within the installation
-   directory. MySQLInstanceConfig.exe takes a number of command-line
-   arguments the set the properties that would normally be selected
-   through the GUI interface, and then creates a new configuration
-   file (my.ini) by combining these selections with a template
-   configuration file to produce the working configuration file.
+   line, you need to use the MySQLInstanceConfig.exe command
+   that is installed with MySQL in the bin directory within the
+   installation directory. MySQLInstanceConfig.exe takes a
+   number of command-line arguments the set the properties that
+   would normally be selected through the GUI interface, and
+   then creates a new configuration file (my.ini) by combining
+   these selections with a template configuration file to
+   produce the working configuration file.
+
+   The main command line options are provided in the table
+   below. Some of the options are required, while some options
+   are optional.
 
-   The main command line options are provided in the table below.
-   Some of the options are required, while some options are optional.
-
-   Table 2.5. MySQL Server Instance Config Wizard Command Line
+   Table 2.5 MySQL Server Instance Config Wizard Command Line
    Options
    Option Description
    Required Parameters
    -nPRODUCTNAME The name of the instance when installed
    -pPATH Path of the base directory for installation. This is
-   equivalent to the directory when using the basedir configuration
-   parameter
+   equivalent to the directory when using the basedir
+   configuration parameter
    -vVERSION The version tag to use for this installation
    Action to Perform
    -i Install an instance
@@ -2048,95 +2519,97 @@
    -q Perform the operation quietly
    -lFILENAME Sae the installation progress in a logfile
    Config File to Use
-   -tFILENAME Path to the template config file that will be used to
-   generate the installed configuration file
+   -tFILENAME Path to the template config file that will be used
+   to generate the installed configuration file
    -cFILENAME Path to a config file to be generated
 
    The -t and -c options work together to set the configuration
    parameters for a new instance. The -t option specifies the
-   template configuration file to use as the basic configuration,
-   which are then merged with the configuration parameters generated
-   by the MySQL Server Instance Config Wizard into the configuration
-   file specified by the -c option.
+   template configuration file to use as the basic
+   configuration, which are then merged with the configuration
+   parameters generated by the MySQL Server Instance Config
+   Wizard into the configuration file specified by the -c
+   option.
 
    A sample template file, my-template.ini is provided in the
-   toplevel MySQL installation directory. The file contains elements
-   are replaced automatically by the MySQL Server Instance Config
-   Wizard during configuration.
+   toplevel MySQL installation directory. The file contains
+   elements are replaced automatically by the MySQL Server
+   Instance Config Wizard during configuration.
 
    If you specify a configuration file that already exists, the
-   existing configuration file will be saved in the file with the
-   original, with the date and time added. For example, the mysql.ini
-   will be copied to mysql 2009-10-27 1646.ini.bak.
+   existing configuration file will be saved in the file with
+   the original, with the date and time added. For example, the
+   mysql.ini will be copied to mysql 2009-10-27 1646.ini.bak.
 
-   The parameters that you can specify on the command line are listed
-   in the table below.
+   The parameters that you can specify on the command line are
+   listed in the table below.
 
-   Table 2.6. MySQL Server Instance Config Wizard Parameters
+   Table 2.6 MySQL Server Instance Config Wizard Parameters
    Parameter Description
    ServiceName=$ Specify the name of the service to be created
    AddBinToPath={yes | no} Specifies whether to add the binary
    directory of MySQL to the standard PATH environment variable
-   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the server
-   type. For more information, see Section 2.3.6.4, "The Server Type
-   Dialog"
+   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the
+   server type. For more information, see Section 2.3.6.4, "The
+   Server Type Dialog"
    DatabaseType={MIXED | INNODB | MYISAM} Specify the default
-   database type. For more information, see Section 2.3.6.5, "The
-   Database Usage Dialog"
+   database type. For more information, see Section 2.3.6.5,
+   "The Database Usage Dialog"
    ConnectionUsage={DSS | OLTP} Specify the type of connection
-   support, this automates the setting for the number of concurrent
-   connections (see the ConnectionCount parameter). For more
-   information, see Section 2.3.6.7, "The Concurrent Connections
-   Dialog"
-   ConnectionCount=# Specify the number of concurrent connections to
-   support. For more information, see Section 2.3.6.4, "The Server
-   Type Dialog"
-   SkipNetworking={yes | no} Specify whether network support should
-   be supported. Specifying yes disables network access altogether
+   support, this automates the setting for the number of
+   concurrent connections (see the ConnectionCount parameter).
+   For more information, see Section 2.3.6.7, "The Concurrent
+   Connections Dialog"
+   ConnectionCount=# Specify the number of concurrent
+   connections to support. For more information, see Section
+   2.3.6.4, "The Server Type Dialog"
+   SkipNetworking={yes | no} Specify whether network support
+   should be supported. Specifying yes disables network access
+   altogether
    Port=# Specify the network port number to use for network
    connections. For more information, see Section 2.3.6.8, "The
    Networking and Strict Mode Options Dialog"
-   StrictMode={yes | no} Specify whether to use the strict SQL mode.
-   For more information, see Section 2.3.6.8, "The Networking and
-   Strict Mode Options Dialog"
-   Charset=$ Specify the default character set. For more information,
-   see Section 2.3.6.9, "The Character Set Dialog"
+   StrictMode={yes | no} Specify whether to use the strict SQL
+   mode. For more information, see Section 2.3.6.8, "The
+   Networking and Strict Mode Options Dialog"
+   Charset=$ Specify the default character set. For more
+   information, see Section 2.3.6.9, "The Character Set Dialog"
    RootPassword=$ Specify the root password
    RootCurrentPassword=$ Specify the current root password then
    stopping or reconfiguring an existing service
    Note
 
-   When specifying options on the command line, you can enclose the
-   entire command-line option and the value you are specifying using
-   double quotation marks. This enables you to use spaces in the
-   options. For example, "-cC:\mysql.ini".
-
-   The following command installs a MySQL Server 5.5 instance from
-   the directory C:\Program Files\MySQL\MySQL Server 5.5 using the
-   service name MySQL55 and setting the root password to 1234.
+   When specifying options on the command line, you can enclose
+   the entire command-line option and the value you are
+   specifying using double quotation marks. This enables you to
+   use spaces in the options. For example, "-cC:\mysql.ini".
+
+   The following command installs a MySQL Server 5.5 instance
+   from the directory C:\Program Files\MySQL\MySQL Server 5.5
+   using the service name MySQL55 and setting the root password
+   to 1234.
 shell> MySQLInstanceConfig.exe -i -q "-lC:\mysql_install_log.txt" »
-   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -
-v5.5.36 »
-   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Datab
-aseType=MIXED »
-   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=123
-4
+   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -v
+5.5.44 »
+   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Databa
+seType=MIXED »
+   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=1234
 
    In the above example, a log file will be generated in
    mysql_install_log.txt containing the information about the
-   instance creation process. The log file generated by the above
-   example is shown below:
+   instance creation process. The log file generated by the
+   above example is shown below:
 Welcome to the MySQL Server Instance Configuration Wizard 1.0.16.0
 Date: 2009-10-27 17:07:21
 
 Installing service ...
 
 Product Name:         MySQL Server 5.5
-Version:              5.5.36
+Version:              5.5.44
 Installation Path:    C:\Program Files\MySQL\MySQL Server 5.5\
 
-Creating configuration file C:\mytest.ini using template my-template.
-ini.
+Creating configuration file C:\mytest.ini using template my-template.i
+ni.
 Options:
 DEVELOPMENT
 MIXED
@@ -2152,14 +2625,16 @@
 
 Creating Windows service entry.
 Service name: "MySQL55"
-Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --
-defaults-file="C:\mytest.ini" MySQL55.
+Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --d
+efaults-file="C:\mytest.ini" MySQL55.
 Windows service MySQL55 installed.
 
-   When using the command line, the return values in the following
-   table indicate an error performing the specified option.
+   When using the command line, the return values in the
+   following table indicate an error performing the specified
+   option.
 
-   Table 2.7. Return Value from MySQL Server Instance Config Wizard
+   Table 2.7 Return Value from MySQL Server Instance Config
+   Wizard
    Value                   Description
    2     Configuration template file cannot be found
    3     The Windows service entry cannot be created
@@ -2170,17 +2645,18 @@
    8     The configuration file cannot be written
    9     The Windows service entry cannot be removed
 
-   You can perform an installation of MySQL automatically using the
-   MSI package. For more information, see Section 2.3.5.2,
-   "Automating MySQL Installation on Microsoft Windows Using the MSI
-   Package."
+   You can perform an installation of MySQL automatically using
+   the MSI package. For more information, see Section 2.3.5.2,
+   "Automating MySQL Installation on Microsoft Windows Using the
+   MSI Package."
 
-2.3.7. Installing MySQL on Microsoft Windows Using a noinstall Zip
+2.3.7 Installing MySQL on Microsoft Windows Using a noinstall Zip
 Archive
 
-   Users who are installing from the noinstall package can use the
-   instructions in this section to manually install MySQL. The
-   process for installing MySQL from a Zip archive is as follows:
+   Users who are installing from the noinstall package can use
+   the instructions in this section to manually install MySQL.
+   The process for installing MySQL from a Zip archive is as
+   follows:
 
     1. Extract the archive to the desired install directory
 
@@ -2194,195 +2670,208 @@
 
    This process is described in the sections that follow.
 
-2.3.7.1. Extracting the Install Archive
+2.3.7.1 Extracting the Install Archive
 
    To install MySQL manually, do the following:
 
-    1. If you are upgrading from a previous version please refer to
-       Section 2.3.9, "Upgrading MySQL on Windows," before beginning
-       the upgrade process.
+    1. If you are upgrading from a previous version please refer
+       to Section 2.3.9, "Upgrading MySQL on Windows," before
+       beginning the upgrade process.
 
-    2. Make sure that you are logged in as a user with administrator
-       privileges.
+    2. Make sure that you are logged in as a user with
+       administrator privileges.
 
     3. Choose an installation location. Traditionally, the MySQL
-       server is installed in C:\mysql. The MySQL Installation Wizard
-       installs MySQL under C:\Program Files\MySQL. If you do not
-       install MySQL at C:\mysql, you must specify the path to the
-       install directory during startup or in an option file. See
-       Section 2.3.7.2, "Creating an Option File."
+       server is installed in C:\mysql. The MySQL Installation
+       Wizard installs MySQL under C:\Program Files\MySQL. If
+       you do not install MySQL at C:\mysql, you must specify
+       the path to the install directory during startup or in an
+       option file. See Section 2.3.7.2, "Creating an Option
+       File."
+       Note
+       The MySQL Installer installs MySQL under C:\Program
+       Files\MySQL.
 
     4. Extract the install archive to the chosen installation
-       location using your preferred Zip archive tool. Some tools may
-       extract the archive to a folder within your chosen
-       installation location. If this occurs, you can move the
-       contents of the subfolder into the chosen installation
-       location.
-
-2.3.7.2. Creating an Option File
-
-   If you need to specify startup options when you run the server,
-   you can indicate them on the command line or place them in an
-   option file. For options that are used every time the server
-   starts, you may find it most convenient to use an option file to
-   specify your MySQL configuration. This is particularly true under
-   the following circumstances:
-
-     * The installation or data directory locations are different
-       from the default locations (C:\Program Files\MySQL\MySQL
-       Server 5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data).
-
-     * You need to tune the server settings, such as memory, cache,
-       or InnoDB configuration information.
-
-   When the MySQL server starts on Windows, it looks for option files
-   in several locations, such as the Windows directory, C:\, and the
-   MySQL installation directory (for the full list of locations, see
-   Section 4.2.3.3, "Using Option Files"). The Windows directory
-   typically is named something like C:\WINDOWS. You can determine
-   its exact location from the value of the WINDIR environment
-   variable using the following command:
+       location using your preferred Zip archive tool. Some
+       tools may extract the archive to a folder within your
+       chosen installation location. If this occurs, you can
+       move the contents of the subfolder into the chosen
+       installation location.
+
+2.3.7.2 Creating an Option File
+
+   If you need to specify startup options when you run the
+   server, you can indicate them on the command line or place
+   them in an option file. For options that are used every time
+   the server starts, you may find it most convenient to use an
+   option file to specify your MySQL configuration. This is
+   particularly true under the following circumstances:
+
+     * The installation or data directory locations are
+       different from the default locations (C:\Program
+       Files\MySQL\MySQL Server 5.5 and C:\Program
+       Files\MySQL\MySQL Server 5.5\data).
+
+     * You need to tune the server settings, such as memory,
+       cache, or InnoDB configuration information.
+
+   When the MySQL server starts on Windows, it looks for option
+   files in several locations, such as the Windows directory,
+   C:\, and the MySQL installation directory (for the full list
+   of locations, see Section 4.2.6, "Using Option Files"). The
+   Windows directory typically is named something like
+   C:\WINDOWS. You can determine its exact location from the
+   value of the WINDIR environment variable using the following
+   command:
 C:\> echo %WINDIR%
 
-   MySQL looks for options in each location first in the my.ini file,
-   and then in the my.cnf file. However, to avoid confusion, it is
-   best if you use only one file. If your PC uses a boot loader where
-   C: is not the boot drive, your only option is to use the my.ini
-   file. Whichever option file you use, it must be a plain text file.
-   Note
-
-   When using the MySQL Installer to install MySQL Server, it will
-   create the my.ini at the default location. And as of MySQL Server
-   5.5.27, the user running MySQL Installer is granted full
-   permissions to this new my.ini.
-
-   In other words, be sure that the MySQL Server user has permission
-   to read the my.ini file.
-
-   You can also make use of the example option files included with
-   your MySQL distribution; see Section 5.1.2, "Server Configuration
-   Defaults."
-
-   An option file can be created and modified with any text editor,
-   such as Notepad. For example, if MySQL is installed in E:\mysql
-   and the data directory is in E:\mydata\data, you can create an
-   option file containing a [mysqld] section to specify values for
-   the basedir and datadir options:
+   MySQL looks for options in each location first in the my.ini
+   file, and then in the my.cnf file. However, to avoid
+   confusion, it is best if you use only one file. If your PC
+   uses a boot loader where C: is not the boot drive, your only
+   option is to use the my.ini file. Whichever option file you
+   use, it must be a plain text file.
+   Note
+
+   When using the MySQL Installer to install MySQL Server, it
+   will create the my.ini at the default location. And as of
+   MySQL Server 5.5.27, the user running MySQL Installer is
+   granted full permissions to this new my.ini.
+
+   In other words, be sure that the MySQL Server user has
+   permission to read the my.ini file.
+
+   You can also make use of the example option files included
+   with your MySQL distribution; see Section 5.1.2, "Server
+   Configuration Defaults."
+
+   An option file can be created and modified with any text
+   editor, such as Notepad. For example, if MySQL is installed
+   in E:\mysql and the data directory is in E:\mydata\data, you
+   can create an option file containing a [mysqld] section to
+   specify values for the basedir and datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=E:/mydata/data
 
-   Note that Windows path names are specified in option files using
-   (forward) slashes rather than backslashes. If you do use
-   backslashes, double them:
+   Microsoft Windows path names are specified in option files
+   using (forward) slashes rather than backslashes. If you do
+   use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=E:\\mysql
 # set datadir to the location of your data directory
 datadir=E:\\mydata\\data
 
-   The rules for use of backslash in option file values are given in
-   Section 4.2.3.3, "Using Option Files."
+   The rules for use of backslash in option file values are
+   given in Section 4.2.6, "Using Option Files."
 
-   The data directory is located within the AppData directory for the
-   user running MySQL.
+   The data directory is located within the AppData directory
+   for the user running MySQL.
 
-   If you would like to use a data directory in a different location,
-   you should copy the entire contents of the data directory to the
-   new location. For example, if you want to use E:\mydata as the
-   data directory instead, you must do two things:
-
-    1. Move the entire data directory and all of its contents from
-       the default location (for example C:\Program Files\MySQL\MySQL
-       Server 5.5\data) to E:\mydata.
+   If you would like to use a data directory in a different
+   location, you should copy the entire contents of the data
+   directory to the new location. For example, if you want to
+   use E:\mydata as the data directory instead, you must do two
+   things:
+
+    1. Move the entire data directory and all of its contents
+       from the default location (for example C:\Program
+       Files\MySQL\MySQL Server 5.5\data) to E:\mydata.
 
     2. Use a --datadir option to specify the new data directory
        location each time you start the server.
 
-2.3.7.3. Selecting a MySQL Server Type
+2.3.7.3 Selecting a MySQL Server Type
 
-   The following table shows the available servers for Windows in
-   MySQL 5.5.
+   The following table shows the available servers for Windows
+   in MySQL 5.5.
    Binary Description
    mysqld Optimized binary with named-pipe support
-   mysqld-debug Like mysqld, but compiled with full debugging and
-   automatic memory allocation checking
+   mysqld-debug Like mysqld, but compiled with full debugging
+   and automatic memory allocation checking
 
    All of the preceding binaries are optimized for modern Intel
    processors, but should work on any Intel i386-class or higher
    processor.
 
    Each of the servers in a distribution support the same set of
-   storage engines. The SHOW ENGINES statement displays which engines
-   a given server supports.
+   storage engines. The SHOW ENGINES statement displays which
+   engines a given server supports.
 
-   All Windows MySQL 5.5 servers have support for symbolic linking of
-   database directories.
+   All Windows MySQL 5.5 servers have support for symbolic
+   linking of database directories.
 
-   MySQL supports TCP/IP on all Windows platforms. MySQL servers on
-   Windows support named pipes as indicated in the following list.
-   However, the default is to use TCP/IP regardless of platform.
-   (Named pipes are slower than TCP/IP in many Windows
-   configurations.)
-
-   Named pipes are enabled only if you start the server with the
-   --enable-named-pipe option. It is necessary to use this option
-   explicitly because some users have experienced problems with
-   shutting down the MySQL server when named pipes were used.
+   MySQL supports TCP/IP on all Windows platforms. MySQL servers
+   on Windows also support named pipes, if you start the server
+   with the --enable-named-pipe option. It is necessary to use
+   this option explicitly because some users have experienced
+   problems with shutting down the MySQL server when named pipes
+   were used. The default is to use TCP/IP regardless of
+   platform because named pipes are slower than TCP/IP in many
+   Windows configurations.
 
-2.3.7.4. Starting the Server for the First Time
+2.3.7.4 Starting the Server for the First Time
 
    This section gives a general overview of starting the MySQL
-   server. The following sections provide more specific information
-   for starting the MySQL server from the command line or as a
-   Windows service.
+   server. The following sections provide more specific
+   information for starting the MySQL server from the command
+   line or as a Windows service.
 
    The information here applies primarily if you installed MySQL
-   using the Noinstall version, or if you wish to configure and test
-   MySQL manually rather than with the GUI tools.
+   using the Noinstall version, or if you wish to configure and
+   test MySQL manually rather than with the GUI tools.
+   Note
+
+   The MySQL server will automatically start after using the
+   MySQL Installer, and the MySQL Notifier GUI can be used to
+   start/stop/restart at any time.
 
    The examples in these sections assume that MySQL is installed
-   under the default location of C:\Program Files\MySQL\MySQL Server
-   5.5. Adjust the path names shown in the examples if you have MySQL
-   installed in a different location.
-
-   Clients have two options. They can use TCP/IP, or they can use a
-   named pipe if the server supports named-pipe connections.
-
-   MySQL for Windows also supports shared-memory connections if the
-   server is started with the --shared-memory option. Clients can
-   connect through shared memory by using the --protocol=MEMORY
-   option.
+   under the default location of C:\Program Files\MySQL\MySQL
+   Server 5.5. Adjust the path names shown in the examples if
+   you have MySQL installed in a different location.
+
+   Clients have two options. They can use TCP/IP, or they can
+   use a named pipe if the server supports named-pipe
+   connections.
+
+   MySQL for Windows also supports shared-memory connections if
+   the server is started with the --shared-memory option.
+   Clients can connect through shared memory by using the
+   --protocol=MEMORY option.
 
    For information about which server binary to run, see Section
    2.3.7.3, "Selecting a MySQL Server Type."
 
-   Testing is best done from a command prompt in a console window (or
-   "DOS window"). In this way you can have the server display status
-   messages in the window where they are easy to see. If something is
-   wrong with your configuration, these messages make it easier for
-   you to identify and fix any problems.
+   Testing is best done from a command prompt in a console
+   window (or "DOS window"). In this way you can have the server
+   display status messages in the window where they are easy to
+   see. If something is wrong with your configuration, these
+   messages make it easier for you to identify and fix any
+   problems.
 
    To start the server, enter this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --console
 
    For a server that includes InnoDB support, you should see the
-   messages similar to those following as it starts (the path names
-   and sizes may differ):
+   messages similar to those following as it starts (the path
+   names and sizes may differ):
 InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
 InnoDB: a new database to be created!
 InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
 InnoDB: Database physically writes the file full: wait...
-InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile0 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile1 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile2 size to 31457280
 InnoDB: Doublewrite buffer not found: creating new
 InnoDB: Doublewrite buffer created
@@ -2391,151 +2880,170 @@
 011024 10:58:25  InnoDB: Started
 
    When the server finishes its startup sequence, you should see
-   something like this, which indicates that the server is ready to
-   service client connections:
+   something like this, which indicates that the server is ready
+   to service client connections:
 mysqld: ready for connections
-Version: '5.5.36'  socket: ''  port: 3306
+Version: '5.5.44'  socket: ''  port: 3306
 
    The server continues to write to the console any further
-   diagnostic output it produces. You can open a new console window
-   in which to run client programs.
+   diagnostic output it produces. You can open a new console
+   window in which to run client programs.
 
-   If you omit the --console option, the server writes diagnostic
-   output to the error log in the data directory (C:\Program
-   Files\MySQL\MySQL Server 5.5\data by default). The error log is
-   the file with the .err extension, or may be specified by passing
-   in the --log-error option.
+   If you omit the --console option, the server writes
+   diagnostic output to the error log in the data directory
+   (C:\Program Files\MySQL\MySQL Server 5.5\data by default).
+   The error log is the file with the .err extension, and may be
+   set using the --log-error option.
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11.2,
-   "Securing the Initial MySQL Accounts."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
 
-2.3.7.5. Starting MySQL from the Windows Command Line
+2.3.7.5 Starting MySQL from the Windows Command Line
 
-   The MySQL server can be started manually from the command line.
-   This can be done on any version of Windows.
+   The MySQL server can be started manually from the command
+   line. This can be done on any version of Windows.
+   Note
+
+   The MySQL Notifier GUI can also be used to start/stop/restart
+   the MySQL server.
 
-   To start the mysqld server from the command line, you should start
-   a console window (or "DOS window") and enter this command:
+   To start the mysqld server from the command line, you should
+   start a console window (or "DOS window") and enter this
+   command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
 
-   The path to mysqld may vary depending on the install location of
-   MySQL on your system.
+   The path to mysqld may vary depending on the install location
+   of MySQL on your system.
 
    You can stop the MySQL server by executing this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" -u root
- shutdown
+shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
-
-   If mysqld doesn't start, check the error log to see whether the
-   server wrote any messages there to indicate the cause of the
-   problem. By default, the error log is located in the C:\Program
-   Files\MySQL\MySQL Server 5.5\data directory. It is the file with a
-   suffix of .err, or may be specified by passing in the --log-error
-   option. Alternatively, you can try to start the server as mysqld
-   --console; in this case, you may get some useful information on
-   the screen that may help solve the problem.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
+
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
+
+   Users in the MySQL grant system are wholly independent from
+   any login users under Microsoft Windows.
+
+   If mysqld doesn't start, check the error log to see whether
+   the server wrote any messages there to indicate the cause of
+   the problem. By default, the error log is located in the
+   C:\Program Files\MySQL\MySQL Server 5.5\data directory. It is
+   the file with a suffix of .err, or may be specified by
+   passing in the --log-error option. Alternatively, you can try
+   to start the server with the --console option; in this case,
+   the server may display some useful information on the screen
+   that will help solve the problem.
 
    The last option is to start mysqld with the --standalone and
    --debug options. In this case, mysqld writes a log file
-   C:\mysqld.trace that should contain the reason why mysqld doesn't
-   start. See Section 23.4.3, "The DBUG Package."
+   C:\mysqld.trace that should contain the reason why mysqld
+   doesn't start. See Section 24.4.3, "The DBUG Package."
 
-   Use mysqld --verbose --help to display all the options that mysqld
-   supports.
+   Use mysqld --verbose --help to display all the options that
+   mysqld supports.
 
-2.3.7.6. Customizing the PATH for MySQL Tools
+2.3.7.6 Customizing the PATH for MySQL Tools
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
 
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
 
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
 
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin)
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin)
        Note
-       There must be a semicolon separating this path from any values
-       present in this field.
-       Dismiss this dialogue, and each dialogue in turn, by clicking
-       OK until all of the dialogues that were opened have been
-       dismissed. You should now be able to invoke any MySQL
-       executable program by typing its name at the DOS prompt from
-       any directory on the system, without having to supply the
-       path. This includes the servers, the mysql client, and all
-       MySQL command-line utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       There must be a semicolon separating this path from any
+       values present in this field.
+       Dismiss this dialogue, and each dialogue in turn, by
+       clicking OK until all of the dialogues that were opened
+       have been dismissed. You should now be able to invoke any
+       MySQL executable program by typing its name at the DOS
+       prompt from any directory on the system, without having
+       to supply the path. This includes the servers, the mysql
+       client, and all MySQL command-line utilities such as
+       mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
-
-2.3.7.7. Starting MySQL as a Windows Service
-
-   On Windows, the recommended way to run MySQL is to install it as a
-   Windows service, so that MySQL starts and stops automatically when
-   Windows starts and stops. A MySQL server installed as a service
-   can also be controlled from the command line using NET commands,
-   or with the graphical Services utility. Generally, to install
-   MySQL as a Windows service you should be logged in using an
-   account that has administrator rights.
-
-   The Services utility (the Windows Service Control Manager) can be
-   found in the Windows Control Panel (under Administrative Tools on
-   Windows 2000, XP, Vista, and Server 2003). To avoid conflicts, it
-   is advisable to close the Services utility while performing server
-   installation or removal operations from the command line.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
+
+2.3.7.7 Starting MySQL as a Windows Service
+
+   On Windows, the recommended way to run MySQL is to install it
+   as a Windows service, so that MySQL starts and stops
+   automatically when Windows starts and stops. A MySQL server
+   installed as a service can also be controlled from the
+   command line using NET commands, or with the graphical
+   Services utility. Generally, to install MySQL as a Windows
+   service you should be logged in using an account that has
+   administrator rights.
+   Note
+
+   The MySQL Notifier GUI can also be used to monitor the status
+   of the MySQL service.
+
+   The Services utility (the Windows Service Control Manager)
+   can be found in the Windows Control Panel (under
+   Administrative Tools on Windows 2000, XP, Vista, and Server
+   2003). To avoid conflicts, it is advisable to close the
+   Services utility while performing server installation or
+   removal operations from the command line.
 
 Installing the service
 
-   Before installing MySQL as a Windows service, you should first
-   stop the current server if it is running by using the following
-   command:
+   Before installing MySQL as a Windows service, you should
+   first stop the current server if it is running by using the
+   following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin"
           -u root shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
+
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
+
+   Users in the MySQL grant system are wholly independent from
+   any login users under Windows.
 
    Install the server as a service using this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install
@@ -2543,381 +3051,451 @@
    The service-installation command does not start the server.
    Instructions for that are given later in this section.
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
-
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
-
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
-
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
+
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
+
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
+
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin), Note that there should be a semicolon separating
-       this path from any values present in this field. Dismiss this
-       dialogue, and each dialogue in turn, by clicking OK until all
-       of the dialogues that were opened have been dismissed. You
-       should now be able to invoke any MySQL executable program by
-       typing its name at the DOS prompt from any directory on the
-       system, without having to supply the path. This includes the
-       servers, the mysql client, and all MySQL command-line
-       utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin), and there should be a
+       semicolon separating this path from any values present in
+       this field. Dismiss this dialogue, and each dialogue in
+       turn, by clicking OK until all of the dialogues that were
+       opened have been dismissed. You should now be able to
+       invoke any MySQL executable program by typing its name at
+       the DOS prompt from any directory on the system, without
+       having to supply the path. This includes the servers, the
+       mysql client, and all MySQL command-line utilities such
+       as mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
 
-   The following additional arguments can be used when installing the
-   service:
+   The following additional arguments can be used when
+   installing the service:
 
      * You can specify a service name immediately following the
        --install option. The default service name is MySQL.
 
-     * If a service name is given, it can be followed by a single
-       option. By convention, this should be
-       --defaults-file=file_name to specify the name of an option
-       file from which the server should read options when it starts.
+     * If a service name is given, it can be followed by a
+       single option. By convention, this should be
+       --defaults-file=file_name to specify the name of an
+       option file from which the server should read options
+       when it starts.
        The use of a single option other than --defaults-file is
-       possible but discouraged. --defaults-file is more flexible
-       because it enables you to specify multiple startup options for
-       the server by placing them in the named option file.
+       possible but discouraged. --defaults-file is more
+       flexible because it enables you to specify multiple
+       startup options for the server by placing them in the
+       named option file.
 
-     * You can also specify a --local-service option following the
-       service name. This causes the server to run using the
+     * You can also specify a --local-service option following
+       the service name. This causes the server to run using the
        LocalService Windows account that has limited system
-       privileges. This account is available only for Windows XP or
-       newer. If both --defaults-file and --local-service are given
-       following the service name, they can be in any order.
-
-   For a MySQL server that is installed as a Windows service, the
-   following rules determine the service name and option files that
-   the server uses:
-
-     * If the service-installation command specifies no service name
-       or the default service name (MySQL) following the --install
-       option, the server uses the a service name of MySQL and reads
-       options from the [mysqld] group in the standard option files.
-
-     * If the service-installation command specifies a service name
-       other than MySQL following the --install option, the server
-       uses that service name. It reads options from the [mysqld]
-       group and the group that has the same name as the service in
-       the standard option files. This enables you to use the
-       [mysqld] group for options that should be used by all MySQL
-       services, and an option group with the service name for use by
-       the server installed with that service name.
+       privileges. This account is available only for Windows XP
+       or newer. If both --defaults-file and --local-service are
+       given following the service name, they can be in any
+       order.
+
+   For a MySQL server that is installed as a Windows service,
+   the following rules determine the service name and option
+   files that the server uses:
+
+     * If the service-installation command specifies no service
+       name or the default service name (MySQL) following the
+       --install option, the server uses the a service name of
+       MySQL and reads options from the [mysqld] group in the
+       standard option files.
+
+     * If the service-installation command specifies a service
+       name other than MySQL following the --install option, the
+       server uses that service name. It reads options from the
+       [mysqld] group and the group that has the same name as
+       the service in the standard option files. This enables
+       you to use the [mysqld] group for options that should be
+       used by all MySQL services, and an option group with the
+       service name for use by the server installed with that
+       service name.
 
      * If the service-installation command specifies a
        --defaults-file option after the service name, the server
-       reads options the same way as described in the previous item,
-       except that it reads options only from the the named file and
-       ignores the standard option files.
+       reads options the same way as described in the previous
+       item, except that it reads options only from the named
+       file and ignores the standard option files.
 
    As a more complex example, consider the following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
           --install MySQL --defaults-file=C:\my-opts.cnf
 
    Here, the default service name (MySQL) is given after the
-   --install option. If no --defaults-file option had been given,
-   this command would have the effect of causing the server to read
-   the [mysqld] group from the standard option files. However,
-   because the --defaults-file option is present, the server reads
-   options from the [mysqld] option group, and only from the named
-   file.
+   --install option. If no --defaults-file option had been
+   given, this command would have the effect of causing the
+   server to read the [mysqld] group from the standard option
+   files. However, because the --defaults-file option is
+   present, the server reads options from the [mysqld] option
+   group, and only from the named file.
    Note
 
-   On Windows, if the server is started with the --defaults-file and
-   --install options, --install must be first. Otherwise, mysqld.exe
-   will attempt to start the MySQL server.
+   On Windows, if the server is started with the --defaults-file
+   and --install options, --install must be first. Otherwise,
+   mysqld.exe will attempt to start the MySQL server.
 
-   You can also specify options as Start parameters in the Windows
-   Services utility before you start the MySQL service.
+   You can also specify options as Start parameters in the
+   Windows Services utility before you start the MySQL service.
 
 Starting the service
 
    Once a MySQL server has been installed as a service, Windows
    starts the service automatically whenever Windows starts. The
-   service also can be started immediately from the Services utility,
-   or by using a NET START MySQL command. The NET command is not case
-   sensitive.
-
-   When run as a service, mysqld has no access to a console window,
-   so no messages can be seen there. If mysqld does not start, check
-   the error log to see whether the server wrote any messages there
-   to indicate the cause of the problem. The error log is located in
-   the MySQL data directory (for example, C:\Program
-   Files\MySQL\MySQL Server 5.5\data). It is the file with a suffix
-   of .err.
+   service also can be started immediately from the Services
+   utility, or by using a NET START MySQL command. The NET
+   command is not case sensitive.
+
+   When run as a service, mysqld has no access to a console
+   window, so no messages can be seen there. If mysqld does not
+   start, check the error log to see whether the server wrote
+   any messages there to indicate the cause of the problem. The
+   error log is located in the MySQL data directory (for
+   example, C:\Program Files\MySQL\MySQL Server 5.5\data). It is
+   the file with a suffix of .err.
 
    When a MySQL server has been installed as a service, and the
-   service is running, Windows stops the service automatically when
-   Windows shuts down. The server also can be stopped manually by
-   using the Services utility, the NET STOP MySQL command, or the
-   mysqladmin shutdown command.
+   service is running, Windows stops the service automatically
+   when Windows shuts down. The server also can be stopped
+   manually by using the Services utility, the NET STOP MySQL
+   command, or the mysqladmin shutdown command.
 
    You also have the choice of installing the server as a manual
    service if you do not wish for the service to be started
    automatically during the boot process. To do this, use the
    --install-manual option rather than the --install option:
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-m
-anual
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-ma
+nual
 
 Removing the service
 
-   To remove a server that is installed as a service, first stop it
-   if it is running by executing NET STOP MySQL. Then use the
+   To remove a server that is installed as a service, first stop
+   it if it is running by executing NET STOP MySQL. Then use the
    --remove option to remove it:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --remove
 
-   If mysqld is not running as a service, you can start it from the
-   command line. For instructions, see Section 2.3.7.5, "Starting
-   MySQL from the Windows Command Line."
+   If mysqld is not running as a service, you can start it from
+   the command line. For instructions, see Section 2.3.7.5,
+   "Starting MySQL from the Windows Command Line."
+
+   If you encounter difficulties during installation. see
+   Section 2.3.8, "Troubleshooting a Microsoft Windows MySQL
+   Server Installation."
 
-   Please see Section 2.3.8, "Troubleshooting a Microsoft Windows
-   MySQL Server Installation," if you encounter difficulties during
-   installation.
-
-2.3.7.8. Testing The MySQL Installation
+2.3.7.8 Testing The MySQL Installation
 
-   You can test whether the MySQL server is working by executing any
-   of the following commands:
+   You can test whether the MySQL server is working by executing
+   any of the following commands:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow"
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root
-mysql
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root m
+ysql
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" version
- status proc
+status proc
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysql" test
 
-   If mysqld is slow to respond to TCP/IP connections from client
-   programs, there is probably a problem with your DNS. In this case,
-   start mysqld with the --skip-name-resolve option and use only
-   localhost and IP addresses in the Host column of the MySQL grant
-   tables.
-
-   You can force a MySQL client to use a named-pipe connection rather
-   than TCP/IP by specifying the --pipe or --protocol=PIPE option, or
-   by specifying . (period) as the host name. Use the --socket option
-   to specify the name of the pipe if you do not want to use the
-   default pipe name.
-
-   Note that if you have set a password for the root account, deleted
-   the anonymous account, or created a new user account, then you
-   must use the appropriate -u and -p options with the commands shown
-   above to connect with the MySQL Server. See Section 4.2.2,
-   "Connecting to the MySQL Server."
+   If mysqld is slow to respond to TCP/IP connections from
+   client programs, there is probably a problem with your DNS.
+   In this case, start mysqld with the --skip-name-resolve
+   option and use only localhost and IP addresses in the Host
+   column of the MySQL grant tables.
+
+   You can force a MySQL client to use a named-pipe connection
+   rather than TCP/IP by specifying the --pipe or
+   --protocol=PIPE option, or by specifying . (period) as the
+   host name. Use the --socket option to specify the name of the
+   pipe if you do not want to use the default pipe name.
+
+   If you have set a password for the root account, deleted the
+   anonymous account, or created a new user account, then to
+   connect to the MySQL server you must use the appropriate -u
+   and -p options with the commands shown previously. See
+   Section 4.2.2, "Connecting to the MySQL Server."
 
    For more information about mysqlshow, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information."
+   "mysqlshow --- Display Database, Table, and Column
+   Information."
 
-2.3.8. Troubleshooting a Microsoft Windows MySQL Server Installation
+2.3.8 Troubleshooting a Microsoft Windows MySQL Server Installation
 
    When installing and running MySQL for the first time, you may
    encounter certain errors that prevent the MySQL server from
-   starting. The purpose of this section is to help you diagnose and
-   correct some of these errors.
+   starting. This section helps you diagnose and correct some of
+   these errors.
 
    Your first resource when troubleshooting server issues is the
    error log. The MySQL server uses the error log to record
-   information relevant to the error that prevents the server from
-   starting. The error log is located in the data directory specified
-   in your my.ini file. The default data directory location is
-   C:\Program Files\MySQL\MySQL Server 5.5\data, or
-   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008. The
-   C:\ProgramData directory is hidden by default. You need to change
-   your folder options to see the directory and contents. For more
-   information on the error log and understanding the content, see
-   Section 5.2.2, "The Error Log."
-
-   Another source of information regarding possible errors is the
-   console messages displayed when the MySQL service is starting. Use
-   the NET START MySQL command from the command line after installing
-   mysqld as a service to see any error messages regarding the
-   starting of the MySQL server as a service. See Section 2.3.7.7,
-   "Starting MySQL as a Windows Service."
-
-   The following examples show other common error messages you may
-   encounter when installing MySQL and starting the server for the
-   first time:
+   information relevant to the error that prevents the server
+   from starting. The error log is located in the data directory
+   specified in your my.ini file. The default data directory
+   location is C:\Program Files\MySQL\MySQL Server 5.5\data, or
+   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008.
+   The C:\ProgramData directory is hidden by default. You need
+   to change your folder options to see the directory and
+   contents. For more information on the error log and
+   understanding the content, see Section 5.2.2, "The Error
+   Log."
+
+   For information regarding possible errors, also consult the
+   console messages displayed when the MySQL service is
+   starting. Use the NET START MySQL command from the command
+   line after installing mysqld as a service to see any error
+   messages regarding the starting of the MySQL server as a
+   service. See Section 2.3.7.7, "Starting MySQL as a Windows
+   Service."
 
-     * If the MySQL server cannot find the mysql privileges database
-       or other critical files, you may see these messages:
+   The following examples show other common error messages you
+   might encounter when installing MySQL and starting the server
+   for the first time:
+
+     * If the MySQL server cannot find the mysql privileges
+       database or other critical files, it displays these
+       messages:
 System error 1067 has occurred.
-Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
-exist
+Fatal error: Can't open and lock privilege tables:
+Table 'mysql.user' doesn't exist
+
        These messages often occur when the MySQL base or data
        directories are installed in different locations than the
-       default locations (C:\Program Files\MySQL\MySQL Server 5.5 and
-       C:\Program Files\MySQL\MySQL Server 5.5\data, respectively).
-       This situation may occur when MySQL is upgraded and installed
-       to a new location, but the configuration file is not updated
-       to reflect the new location. In addition, there may be old and
-       new configuration files that conflict. Be sure to delete or
-       rename any old configuration files when upgrading MySQL.
+       default locations (C:\Program Files\MySQL\MySQL Server
+       5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data,
+       respectively).
+       This situation can occur when MySQL is upgraded and
+       installed to a new location, but the configuration file
+       is not updated to reflect the new location. In addition,
+       old and new configuration files might conflict. Be sure
+       to delete or rename any old configuration files when
+       upgrading MySQL.
        If you have installed MySQL to a directory other than
-       C:\Program Files\MySQL\MySQL Server 5.5, you need to ensure
-       that the MySQL server is aware of this through the use of a
-       configuration (my.ini) file. The my.ini file needs to be
-       located in your Windows directory, typically C:\WINDOWS. You
-       can determine its exact location from the value of the WINDIR
-       environment variable by issuing the following command from the
-       command prompt:
+       C:\Program Files\MySQL\MySQL Server 5.5, ensure that the
+       MySQL server is aware of this through the use of a
+       configuration (my.ini) file. Put the my.ini file in your
+       Windows directory, typically C:\WINDOWS. To determine its
+       exact location from the value of the WINDIR environment
+       variable, issue the following command from the command
+       prompt:
 C:\> echo %WINDIR%
-       An option file can be created and modified with any text
-       editor, such as Notepad. For example, if MySQL is installed in
-       E:\mysql and the data directory is D:\MySQLdata, you can
-       create the option file and set up a [mysqld] section to
-       specify values for the basedir and datadir options:
+
+       You can create or modify an option file with any text
+       editor, such as Notepad. For example, if MySQL is
+       installed in E:\mysql and the data directory is
+       D:\MySQLdata, you can create the option file and set up a
+       [mysqld] section to specify values for the basedir and
+       datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=D:/MySQLdata
-       Note that Windows path names are specified in option files
-       using (forward) slashes rather than backslashes. If you do use
-       backslashes, double them:
+
+       Microsoft Windows path names are specified in option
+       files using (forward) slashes rather than backslashes. If
+       you do use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=C:\\Program Files\\MySQL\\MySQL Server 5.5
 # set datadir to the location of your data directory
 datadir=D:\\MySQLdata
-       The rules for use of backslash in option file values are given
-       in Section 4.2.3.3, "Using Option Files."
-       If you change the datadir value in your MySQL configuration
-       file, you must move the contents of the existing MySQL data
-       directory before restarting the MySQL server.
+
+       The rules for use of backslash in option file values are
+       given in Section 4.2.6, "Using Option Files."
+       If you change the datadir value in your MySQL
+       configuration file, you must move the contents of the
+       existing MySQL data directory before restarting the MySQL
+       server.
        See Section 2.3.7.2, "Creating an Option File."
 
-     * If you reinstall or upgrade MySQL without first stopping and
-       removing the existing MySQL service and install MySQL using
-       the MySQL Configuration Wizard, you may see this error:
+     * If you reinstall or upgrade MySQL without first stopping
+       and removing the existing MySQL service and install MySQL
+       using the MySQL Installer, you might see this error:
 Error: Cannot create Windows service for MySql. Error: 0
-       This occurs when the Configuration Wizard tries to install the
-       service and finds an existing service with the same name.
-       One solution to this problem is to choose a service name other
-       than mysql when using the configuration wizard. This enables
-       the new service to be installed correctly, but leaves the
-       outdated service in place. Although this is harmless, it is
-       best to remove old services that are no longer in use.
+
+       This occurs when the Configuration Wizard tries to
+       install the service and finds an existing service with
+       the same name.
+       One solution to this problem is to choose a service name
+       other than mysql when using the configuration wizard.
+       This enables the new service to be installed correctly,
+       but leaves the outdated service in place. Although this
+       is harmless, it is best to remove old services that are
+       no longer in use.
        To permanently remove the old mysql service, execute the
-       following command as a user with administrative privileges, on
-       the command-line:
+       following command as a user with administrative
+       privileges, on the command line:
 C:\> sc delete mysql
 [SC] DeleteService SUCCESS
+
        If the sc utility is not available for your version of
        Windows, download the delsrv utility from
-       http://www.microsoft.com/windows2000/techinfo/reskit/tools/exi
-       sting/delsrv-o.asp and use the delsrv mysql syntax.
+       http://www.microsoft.com/windows2000/techinfo/reskit/tool
+       s/existing/delsrv-o.asp and use the delsrv mysql syntax.
 
-2.3.9. Upgrading MySQL on Windows
+2.3.9 Upgrading MySQL on Windows
 
-   This section lists some of the steps you should take when
-   upgrading MySQL on Windows.
+   To upgrade MySQL on Windows, follow these steps:
 
-    1. Review Section 2.12.1, "Upgrading MySQL," for additional
+    1. Review Section 2.11.1, "Upgrading MySQL," for additional
        information on upgrading MySQL that is not specific to
        Windows.
 
-    2. You should always back up your current MySQL installation
-       before performing an upgrade. See Section 7.2, "Database
-       Backup Methods."
+    2. Always back up your current MySQL installation before
+       performing an upgrade. See Section 7.2, "Database Backup
+       Methods."
 
     3. Download the latest Windows distribution of MySQL from
        http://dev.mysql.com/downloads/.
 
-    4. Before upgrading MySQL, you must stop the server. If the
-       server is installed as a service, stop the service with the
+    4. Before upgrading MySQL, stop the server. If the server is
+       installed as a service, stop the service with the
        following command from the command prompt:
 C:\> NET STOP MySQL
+
        If you are not running the MySQL server as a service, use
        mysqladmin to stop it. For example, before upgrading from
-       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as follows:
+       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as
+       follows:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.1\bin\mysqladmin" -u root
- shutdown
+shutdown
+
        Note
-       If the MySQL root user account has a password, you need to
-       invoke mysqladmin with the -p option and supply the password
-       when prompted.
-
-    5. Before upgrading a MySQL service from MySQL 5.1 to 5.5, you
-       should stop the 5.1 server and remove the instance. Run the
-       MySQL Instance Configuration Wizard, choose the Remove
-       Instance option and in the next screen, confirm removal. After
-       that it is safe to uninstall MySQL Server 5.1.
-
-    6. Before upgrading to MySQL 5.5 from a version previous to
-       4.1.5, or from a version of MySQL installed from a Zip archive
-       to a version of MySQL installed with the MySQL Installation
-       Wizard, you must first manually remove the previous
-       installation and MySQL service (if the server is installed as
-       a service).
+       If the MySQL root user account has a password, invoke
+       mysqladmin with the -p option and enter the password when
+       prompted.
+
+    5. Before upgrading to MySQL 5.5 from a version previous to
+       4.1.5, or from a version of MySQL installed from a Zip
+       archive to a version of MySQL installed with the MySQL
+       Installation Wizard, you must first manually remove the
+       previous installation and MySQL service (if the server is
+       installed as a service).
        To remove the MySQL service, use the following command:
 C:\> C:\mysql\bin\mysqld --remove
+
        If you do not remove the existing service, the MySQL
-       Installation Wizard may fail to properly install the new MySQL
-       service.
+       Installation Wizard may fail to properly install the new
+       MySQL service.
 
-    7. If you are using the MySQL Installation Wizard, start the
+    6. If you are using the MySQL Installer, start it as
+       described in Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+       If you are using the MySQL Installation Wizard, start the
        wizard as described in Section 2.3.5.1, "Using the MySQL
        Installation Wizard."
 
-    8. If you are installing MySQL from a Zip archive, extract the
-       archive. You may either overwrite your existing MySQL
-       installation (usually located at C:\mysql), or install it into
-       a different directory, such as C:\mysql5. Overwriting the
-       existing installation is recommended.
-
-    9. If you were running MySQL as a Windows service and you had to
-       remove the service earlier in this procedure, reinstall the
-       service. (See Section 2.3.7.7, "Starting MySQL as a Windows
-       Service.")
-   10. Restart the server. For example, use NET START MySQL if you
-       run MySQL as a service, or invoke mysqld directly otherwise.
-   11. As Administrator, run mysql_upgrade to check your tables,
-       attempt to repair them if necessary, and update your grant
-       tables if they have changed so that you can take advantage of
-       any new capabilities. See Section 4.4.7, "mysql_upgrade ---
-       Check and Upgrade MySQL Tables."
-   12. If you encounter errors, see Section 2.3.8, "Troubleshooting a
-       Microsoft Windows MySQL Server Installation."
-
-2.3.10. Windows Postinstallation Procedures
-
-   On Windows, you need not create the data directory and the grant
-   tables. MySQL Windows distributions include the grant tables with
-   a set of preinitialized accounts in the mysql database under the
-   data directory. Regarding passwords, if you installed MySQL using
-   the Windows Installation Wizard, you may have already assigned
-   passwords to the accounts. (See Section 2.3.5.1, "Using the MySQL
-   Installation Wizard.") Otherwise, use the password-assignment
-   procedure given in Section 2.11.2, "Securing the Initial MySQL
+    7. If you are upgrading MySQL from a Zip archive, extract
+       the archive. You may either overwrite your existing MySQL
+       installation (usually located at C:\mysql), or install it
+       into a different directory, such as C:\mysql5.
+       Overwriting the existing installation is recommended.
+       However, for upgrades (as opposed to installing for the
+       first time), you must remove the data directory from your
+       existing MySQL installation to avoid replacing your
+       current data files. To do so, follow these steps:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Rezip the Zip archive
+         d. Unzip the modified Zip archive on top of your
+            existing installation
+       Alternatively:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Move the data directory from the current MySQL
+            installation to the location of the just-removed
+            data directory
+         d. Remove the current MySQL installation
+         e. Move the unzipped installation to the location of
+            the just-removed installation
+
+    8. If you were running MySQL as a Windows service and you
+       had to remove the service earlier in this procedure,
+       reinstall the service. (See Section 2.3.7.7, "Starting
+       MySQL as a Windows Service.")
+
+    9. Restart the server. For example, use NET START MySQL if
+       you run MySQL as a service, or invoke mysqld directly
+       otherwise.
+   10. As Administrator, run mysql_upgrade to check your tables,
+       attempt to repair them if necessary, and update your
+       grant tables if they have changed so that you can take
+       advantage of any new capabilities. See Section 4.4.7,
+       "mysql_upgrade --- Check and Upgrade MySQL Tables."
+   11. If you encounter errors, see Section 2.3.8,
+       "Troubleshooting a Microsoft Windows MySQL Server
+       Installation."
+
+2.3.10 Windows Postinstallation Procedures
+
+   GUI tools exist that perform most of the tasks described
+   below, including:
+
+     * MySQL Installer: Used to install and upgrade MySQL
+       products.
+
+     * MySQL Workbench: Manages the MySQL server and edits SQL
+       statements.
+
+     * MySQL Notifier: Starts, stops, or restarts the MySQL
+       server, and monitors its status.
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html):
+       Edits MySQL data with Microsoft Excel.
+
+   On Windows, you need not create the data directory and the
+   grant tables. MySQL Windows distributions include the grant
+   tables with a set of preinitialized accounts in the mysql
+   database under the data directory. Regarding passwords, if
+   you installed MySQL using the MySQL Installer, you may have
+   already assigned passwords to the accounts. (See Section
+   2.3.3, "Installing MySQL on Microsoft Windows Using MySQL
+   Installer.") Otherwise, use the password-assignment procedure
+   given in Section 2.10.2, "Securing the Initial MySQL
    Accounts."
 
-   Before setting up passwords, you might want to try running some
-   client programs to make sure that you can connect to the server
-   and that it is operating properly. Make sure that the server is
-   running (see Section 2.3.7.4, "Starting the Server for the First
-   Time"), and then issue the following commands to verify that you
-   can retrieve information from the server. You may need to specify
-   directory different from C:\mysql\bin on the command line. If you
-   used the Windows Installation Wizard, the default directory is
-   C:\Program Files\MySQL\MySQL Server 5.5, and the mysql and
-   mysqlshow client programs are in C:\Program Files\MySQL\MySQL
-   Server 5.5\bin. See Section 2.3.5.1, "Using the MySQL Installation
-   Wizard," for more information.
+   Before setting up passwords, you might want to try running
+   some client programs to make sure that you can connect to the
+   server and that it is operating properly. Make sure that the
+   server is running (see Section 2.3.7.4, "Starting the Server
+   for the First Time"). If you are running a version of Windows
+   that supports services, you can set up the MySQL server to
+   run automatically when Windows starts (see Section 2.3.7.7,
+   "Starting MySQL as a Windows Service").
+
+   With the server running, issue the following commands to
+   verify that you can retrieve information from the server. You
+   may need to specify a directory different from C:\mysql\bin
+   on the command line. If you installed MySQL using MySQL
+   Installer, the default directory is C:\Program
+   Files\MySQL\MySQL Server 5.5, and the mysql and mysqlshow
+   client programs are in C:\Program Files\MySQL\MySQL Server
+   5.5\bin. See Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer," for more information.
 
    Use mysqlshow to see what databases exist:
 C:\> C:\mysql\bin\mysqlshow
@@ -2929,20 +3507,21 @@
 | test               |
 +--------------------+
 
-   The list of installed databases may vary, but will always include
-   the minimum of mysql and information_schema. In most cases, the
-   test database will also be installed automatically.
-
-   The preceding command (and commands for other MySQL programs such
-   as mysql) may not work if the correct MySQL account does not
-   exist. For example, the program may fail with an error, or you may
-   not be able to view all databases. If you installed using the MSI
-   packages and used the MySQL Server Instance Config Wizard, then
-   the root user will have been created automatically with the
-   password you supplied. In this case, you should use the -u root
-   and -p options. (You will also need to use the -u root and -p
-   options if you have already secured the initial MySQL accounts.)
-   With -p, you will be prompted for the root password. For example:
+   The list of installed databases may vary, but will always
+   include the minimum of mysql and information_schema. In most
+   cases, the test database will also be installed
+   automatically.
+
+   The preceding command (and commands for other MySQL programs
+   such as mysql) may not work if the correct MySQL account does
+   not exist. For example, the program may fail with an error,
+   or you may not be able to view all databases. If you
+   installed MySQL using MySQL Installer, the root user will
+   have been created automatically with the password you
+   supplied. In this case, you should use the -u root and -p
+   options. (You must use those options if you have already
+   secured the initial MySQL accounts.) With -p, the client
+   program prompts for the root password. For example:
 C:\> C:\mysql\bin\mysqlshow -u root -p
 Enter password: (enter root password here)
 +--------------------+
@@ -2953,8 +3532,8 @@
 | test               |
 +--------------------+
 
-   If you specify a database name, mysqlshow displays a list of the
-   tables within the database:
+   If you specify a database name, mysqlshow displays a list of
+   the tables within the database:
 C:\> C:\mysql\bin\mysqlshow mysql
 Database: mysql
 +---------------------------+
@@ -2982,8 +3561,8 @@
 | user                      |
 +---------------------------+
 
-   Use the mysql program to select information from a table in the
-   mysql database:
+   Use the mysql program to select information from a table in
+   the mysql database:
 C:\> C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM mysql.db"
 +------+--------+------+
 | host | db     | user |
@@ -2992,14 +3571,7 @@
 | %    | test_% |      |
 +------+--------+------+
 
-   For more information about mysqlshow and mysql, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information,"
-   and Section 4.5.1, "mysql --- The MySQL Command-Line Tool."
-
-   If you are running a version of Windows that supports services,
-   you can set up the MySQL server to run automatically when Windows
-   starts. See Section 2.3.7.7, "Starting MySQL as a Windows
-   Service."
-
-   Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights
-   reserved. Legal Notices
+   For more information about mysqlshow and mysql, see Section
+   4.5.6, "mysqlshow --- Display Database, Table, and Column
+   Information," and Section 4.5.1, "mysql --- The MySQL
+   Command-Line Tool."
diff -Nru mysql-5.5-5.5.35+dfsg/extra/replace.c mysql-5.5-5.5.43/extra/replace.c
--- mysql-5.5-5.5.35+dfsg/extra/replace.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/replace.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1020,7 +1020,7 @@
   updated=retain=0;
   reset_buffer();
 
-  while ((error=fill_buffer_retaining(fileno(in),retain)) > 0)
+  while ((error=fill_buffer_retaining(my_fileno(in),retain)) > 0)
   {
     end_of_line=buffer ;
     buffer[bufbytes]=0;			/* Sentinel  */
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/ca-cert.pem mysql-5.5-5.5.43/extra/yassl/certs/ca-cert.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/ca-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/ca-cert.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,56 +1,87 @@
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIJAJpBR82hFGKMMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
+A1UECgwIU2F3dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3
+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
+Fw0xNDA3MTEwMzIwMDhaFw0xNzA0MDYwMzIwMDhaMIGUMQswCQYDVQQGEwJVUzEQ
+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8GA1UECgwIU2F3
+dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL8Myi0Ush6EQlvNOB9K8k11EPG2NZ/fyn0D
+mNOs3gNm7irx2LB9bgdUCxCYIU2AyxIg58xP3kV9yXJ3MurKkLtpUhADL6jzlcXx
+i2JWG+9nb6QQQZWtCpvjpcCw0nB2UDBbqOgILHztp6J6jTgpHKzH7fJ8lbCVgn1J
+XDjNdyXvvYB1U5Q8PcpjW58VtdMdEy8Z0TzbdjrMuH3J5cLX2kBv2CHccxtCLVOc
+/hr8fat6Nj+Y3oR8BWfOahQ4h6nxjLVoy2h/cSAr9aBj9VYvoybSt2+xWhfXOJkI
+/pNYb/7DE0kIFgunTWcAUjFnI06Y7VFFHbkE2Qvs2CizS73tNnkCAwEAAaOB/DCB
++TAdBgNVHQ4EFgQUJ45nEXTDJh0/7TNjs6TYHTDl6NUwgckGA1UdIwSBwTCBvoAU
+J45nEXTDJh0/7TNjs6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
+aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAeXgMbXmIkfw6FZz5J2IW8CEf
++n0/oqgyHvfyEal0FnRe3BjK8AAq1QMGJjDxR4P9Mm787apPfQxjYDEvfAy/mWaH
+7ScIhi3EM+iYIxz+o9uaSU78WkLvccM/rdxKqNKjHQmsMwR7hvNtAFmjyNvRPHP2
+DpDWXkngvzZjCHulsI81O1aMETVJBBzQ57pWxQ0KkY3Wt2IZNBJSTNJtfMU9DxiB
+VMv2POWE0tZxFewaNAvwoCF0Q8ijsN/ZZ9rirZNI+KCHvXkU4GIK3/cxLjF70TIq
+Cv5dFO/ZZFDkg5G8cA3XiI3ZvIQOxRqzv2QCTlGRpKKFFYOv8FubKElfsrMD2A==
+-----END CERTIFICATE-----
 Certificate:
     Data:
         Version: 3 (0x2)
         Serial Number:
-            8a:37:22:65:73:f5:aa:e8
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
+            9a:41:47:cd:a1:14:62:8c
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Jun 30 18:47:10 2010 GMT
-            Not After : Mar 26 18:47:10 2013 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 03:20:08 2014 GMT
+            Not After : Apr  6 03:20:08 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:97:30:b9:1a:92:ef:25:4f:ca:4c:11:31:95:1a:
-                    e1:c0:10:19:0a:20:b9:37:80:1a:57:38:02:4e:1b:
-                    c5:0f:28:4f:da:e3:c9:16:aa:50:bd:4a:fb:b7:71:
-                    c7:35:cc:63:81:c1:dd:9d:33:f9:38:16:88:32:a0:
-                    aa:56:23:03:a3
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
+                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
+                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
+                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
+                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
+                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
+                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
+                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
+                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
+                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
+                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
+                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
+                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
+                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
+                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
+                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
+                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
+                    36:79
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
+                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
             X509v3 Authority Key Identifier: 
-                keyid:3B:66:FD:A0:40:C6:F4:E2:70:CF:21:1A:0C:4F:67:FE:B7:4B:42:09
-                DirName:/C=US/ST=Montana/L=Bozeman/O=sawtooth/OU=consulting/CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
-                serial:8A:37:22:65:73:F5:AA:E8
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:9A:41:47:CD:A1:14:62:8C
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        32:65:a2:b1:dc:6d:e0:8d:8b:c8:58:29:8e:b8:18:4b:62:88:
-        13:67:f8:6c:75:46:75:8f:8a:19:a6:a3:d5:3c:fc:57:4e:7a:
-        68:a9:fc:93:dc:ae:29:7d:bb:4e:ec:ea:55:fa:a4:e3:00:61:
-        f4:b0:34:6d:d1:d5:a4:64:24:f8
------BEGIN CERTIFICATE-----
-MIIDQDCCAuqgAwIBAgIJAIo3ImVz9aroMA0GCSqGSIb3DQEBBAUAMIGeMQswCQYD
-VQQGEwJVUzEQMA4GA1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjERMA8G
-A1UEChMIc2F3dG9vdGgxEzARBgNVBAsTCmNvbnN1bHRpbmcxJDAiBgNVBAMTG3d3
-dy5zYXd0b290aC1jb25zdWx0aW5nLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5
-YXNzbC5jb20wHhcNMTAwNjMwMTg0NzEwWhcNMTMwMzI2MTg0NzEwWjCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
-eWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBAJcwuRqS7yVPykwRMZUa
-4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaqUL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYj
-A6MCAwEAAaOCAQcwggEDMB0GA1UdDgQWBBQ7Zv2gQMb04nDPIRoMT2f+t0tCCTCB
-0wYDVR0jBIHLMIHIgBQ7Zv2gQMb04nDPIRoMT2f+t0tCCaGBpKSBoTCBnjELMAkG
-A1UEBhMCVVMxEDAOBgNVBAgTB01vbnRhbmExEDAOBgNVBAcTB0JvemVtYW4xETAP
-BgNVBAoTCHNhd3Rvb3RoMRMwEQYDVQQLEwpjb25zdWx0aW5nMSQwIgYDVQQDExt3
-d3cuc2F3dG9vdGgtY29uc3VsdGluZy5jb20xHTAbBgkqhkiG9w0BCQEWDmluZm9A
-eWFzc2wuY29tggkAijciZXP1qugwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQQF
-AANBADJlorHcbeCNi8hYKY64GEtiiBNn+Gx1RnWPihmmo9U8/FdOemip/JPcril9
-u07s6lX6pOMAYfSwNG3R1aRkJPg=
------END CERTIFICATE-----
+    Signature Algorithm: sha1WithRSAEncryption
+         79:78:0c:6d:79:88:91:fc:3a:15:9c:f9:27:62:16:f0:21:1f:
+         fa:7d:3f:a2:a8:32:1e:f7:f2:11:a9:74:16:74:5e:dc:18:ca:
+         f0:00:2a:d5:03:06:26:30:f1:47:83:fd:32:6e:fc:ed:aa:4f:
+         7d:0c:63:60:31:2f:7c:0c:bf:99:66:87:ed:27:08:86:2d:c4:
+         33:e8:98:23:1c:fe:a3:db:9a:49:4e:fc:5a:42:ef:71:c3:3f:
+         ad:dc:4a:a8:d2:a3:1d:09:ac:33:04:7b:86:f3:6d:00:59:a3:
+         c8:db:d1:3c:73:f6:0e:90:d6:5e:49:e0:bf:36:63:08:7b:a5:
+         b0:8f:35:3b:56:8c:11:35:49:04:1c:d0:e7:ba:56:c5:0d:0a:
+         91:8d:d6:b7:62:19:34:12:52:4c:d2:6d:7c:c5:3d:0f:18:81:
+         54:cb:f6:3c:e5:84:d2:d6:71:15:ec:1a:34:0b:f0:a0:21:74:
+         43:c8:a3:b0:df:d9:67:da:e2:ad:93:48:f8:a0:87:bd:79:14:
+         e0:62:0a:df:f7:31:2e:31:7b:d1:32:2a:0a:fe:5d:14:ef:d9:
+         64:50:e4:83:91:bc:70:0d:d7:88:8d:d9:bc:84:0e:c5:1a:b3:
+         bf:64:02:4e:51:91:a4:a2:85:15:83:af:f0:5b:9b:28:49:5f:
+         b2:b3:03:d8
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/ca-key.pem mysql-5.5-5.5.43/extra/yassl/certs/ca-key.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/ca-key.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/ca-key.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOQIBAAJBAJcwuRqS7yVPykwRMZUa4cAQGQoguTeAGlc4Ak4bxQ8oT9rjyRaq
-UL1K+7dxxzXMY4HB3Z0z+TgWiDKgqlYjA6MCAwEAAQJAEQ9TY7c+uuQU/J5YDO4a
-mRR37tegbq3Kyxqrz+p8QuhqLDtVh13GaF7rVU70vyNHm+cgihUyzho/PViAkPBo
-qQIhAMU8/RDhDLgL5BxID4sxKIVBtg+imFSbyKVyg7oQLUcXAiEAxDu94O45Cf4a
-np9R0thumY/QqWpCkycWAB7fFEuaf1UCIEH+bg4/vqm2ENUFp23DPPOZUPlaRe3J
-UhFJh5mx3/RxAiBq++8vfHFYg1Lb/BxOCXVy/zdRxf753ytdcXdJx1Y56QIgVgpN
-FNfYJofQfWaP96sjlc0usrT28uceHx0QmHqolVc=
+MIIEpAIBAAKCAQEAvwzKLRSyHoRCW804H0ryTXUQ8bY1n9/KfQOY06zeA2buKvHY
+sH1uB1QLEJghTYDLEiDnzE/eRX3Jcncy6sqQu2lSEAMvqPOVxfGLYlYb72dvpBBB
+la0Km+OlwLDScHZQMFuo6AgsfO2nonqNOCkcrMft8nyVsJWCfUlcOM13Je+9gHVT
+lDw9ymNbnxW10x0TLxnRPNt2Osy4fcnlwtfaQG/YIdxzG0ItU5z+Gvx9q3o2P5je
+hHwFZ85qFDiHqfGMtWjLaH9xICv1oGP1Vi+jJtK3b7FaF9c4mQj+k1hv/sMTSQgW
+C6dNZwBSMWcjTpjtUUUduQTZC+zYKLNLve02eQIDAQABAoIBAD1uTmAahH+dhXzh
+Swd84NaZKt6d+TY0DncOPgjqT+UGJtT2OPffDQ8cLgai9CponGNy4zXmBJGRtcGx
+pFSs18b7QaDWdW+9C06/sVLoX0kmmFZHx97p6jxgAb8o3DG/SV+TSYd6gVuWS03K
+XDhPt+Gy08ch2jwShwfkG9xD7OjsVGHn9u2mCy7134J/xh9hGZykgznfIYWJb3ev
+hhUyCKJaCyZh+3AMypw4fbwi7uujqBYA+YqAHgCEqEpB+IQDZy8jWy+baybDBzSU
+owM7ctWfcuCtzDSrvcfV9SYwhQ8wIzlS/zzLmSFNiKWr7mK5x+C7R4fBac9z8zC+
+zjkEnOUCgYEA4XZFgFm200nfCu8S1g/wt8sqN7+n+LVN9TE1reSjlKHb8ZattQVk
+hYP8G1spqr74Jj92fq0c8MvXJrQbBY5Whn4IYiHBhtZHeT63XaTGOtexdCD2UJdB
+BFPtPybWb5H6aCbsKtya8efc+3PweUMbIaNZBGNSB8nX5tEbXV6W+lMCgYEA2O1O
+ZGFrkQxhAbUPu0RnUx7cB8Qkfp5shCORDOQSBBZNeJjMlj0gTg9Fmrb4s5MNsqIb
+KfImecjF0nh+XnPy13Bhu0DOYQX+aR6CKeYUuKHnltAjPwWTAPLhTX7tt5Zs9/Dk
+0c8BmE/cdFSqbV5aQTH+/5q2oAXdqRBU+GvQqoMCgYAh0wSKROtQt3xmv4cr5ihO
+6oPi6TXh8hFH/6H1/J8t5TqB/AEDb1OtVCe2Uu7lVtETq+GzD3WQCoS0ocCMDNae
+RrorPrUx7WO7pNUNj3LN0R4mNeu+G3L9mzm0h7cT9eqDRZOYuo/kSsy0TKh/CLpB
+SahJKD1ePcHONwDL+SzdUQKBgQChV58+udavg22DP4/70NyozgMJI7GhG2PKxElW
+NSvRLmVglQVVmRE1/dXfRMeliHJfsoJRqHFFkzbPXB9hUQwFgOivxXu6XiLjPHXD
+hAVVbdY6LYSJkzPLONqqMQXNzmwt3VXTVwvwpTVqsK4xukOWygDHS+MZEkPTQvpv
+6oDA0QKBgQC524kgNCdwYjTqXyViEvOdgb9I7poOwY0Q/2WanS0aipRayMClpYRh
+ntQkue+pncl3C8dwZj26yFTf0jPh9X/5J2G+V0Xdt0UXJPUj5DgOkSfu4yDYFMiU
+R3dAd0UYng3OeT9XMVYJSWe+lFhP9sSr4onj44rABVUsJMBKlwQnmg==
 -----END RSA PRIVATE KEY-----
Binary files /tmp/MslfMd0v5_/mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-cert.der and /tmp/NaaegeSpl1/mysql-5.5-5.5.43/extra/yassl/certs/client-cert.der differ
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-cert.pem mysql-5.5-5.5.43/extra/yassl/certs/client-cert.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/client-cert.pem	2015-02-27 08:30:34.000000000 +0000
@@ -2,54 +2,86 @@
     Data:
         Version: 3 (0x2)
         Serial Number:
-            c5:d7:6c:11:36:f0:35:e1
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=info@yassl.com
+            b6:63:af:8f:5d:62:57:a0
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Jun 30 18:39:39 2010 GMT
-            Not After : Mar 26 18:39:40 2013 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=programming, CN=www.yassl.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 17:39:44 2014 GMT
+            Not After : Apr  6 17:39:44 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Programming, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:bd:51:4a:14:fd:6a:19:84:0c:33:38:fc:27:32:
-                    9c:97:0b:fc:a4:18:60:69:4e:d9:d8:78:50:0b:e9:
-                    20:5d:d6:1d:70:1c:0c:24:9f:23:82:cc:3a:01:d5:
-                    97:17:b2:73:6c:86:cf:b5:f1:e5:ce:68:0c:d9:a2:
-                    12:39:7c:f2:53
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:c3:03:d1:2b:fe:39:a4:32:45:3b:53:c8:84:2b:
+                    2a:7c:74:9a:bd:aa:2a:52:07:47:d6:a6:36:b2:07:
+                    32:8e:d0:ba:69:7b:c6:c3:44:9e:d4:81:48:fd:2d:
+                    68:a2:8b:67:bb:a1:75:c8:36:2c:4a:d2:1b:f7:8b:
+                    ba:cf:0d:f9:ef:ec:f1:81:1e:7b:9b:03:47:9a:bf:
+                    65:cc:7f:65:24:69:a6:e8:14:89:5b:e4:34:f7:c5:
+                    b0:14:93:f5:67:7b:3a:7a:78:e1:01:56:56:91:a6:
+                    13:42:8d:d2:3c:40:9c:4c:ef:d1:86:df:37:51:1b:
+                    0c:a1:3b:f5:f1:a3:4a:35:e4:e1:ce:96:df:1b:7e:
+                    bf:4e:97:d0:10:e8:a8:08:30:81:af:20:0b:43:14:
+                    c5:74:67:b4:32:82:6f:8d:86:c2:88:40:99:36:83:
+                    ba:1e:40:72:22:17:d7:52:65:24:73:b0:ce:ef:19:
+                    cd:ae:ff:78:6c:7b:c0:12:03:d4:4e:72:0d:50:6d:
+                    3b:a3:3b:a3:99:5e:9d:c8:d9:0c:85:b3:d9:8a:d9:
+                    54:26:db:6d:fa:ac:bb:ff:25:4c:c4:d1:79:f4:71:
+                    d3:86:40:18:13:b0:63:b5:72:4e:30:c4:97:84:86:
+                    2d:56:2f:d7:15:f7:7f:c0:ae:f5:fc:5b:e5:fb:a1:
+                    ba:d3
                 Exponent: 65537 (0x10001)
         X509v3 extensions:
             X509v3 Subject Key Identifier: 
-                5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
+                33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
             X509v3 Authority Key Identifier: 
-                keyid:5C:F7:29:21:69:7A:09:78:9E:7B:CD:53:42:02:EC:CE:29:0D:11:DF
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=programming/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:C5:D7:6C:11:36:F0:35:E1
+                keyid:33:D8:45:66:D7:68:87:18:7E:54:0D:70:27:91:C7:26:D7:85:65:C0
+                DirName:/C=US/ST=Montana/L=Bozeman/O=wolfSSL/OU=Programming/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:B6:63:AF:8F:5D:62:57:A0
 
             X509v3 Basic Constraints: 
                 CA:TRUE
-    Signature Algorithm: md5WithRSAEncryption
-        b4:a5:f1:71:26:4d:b9:ff:54:f3:09:1f:ac:e1:19:59:e5:ec:
-        57:e3:f1:0b:b2:8f:f3:29:eb:6b:c6:fa:27:33:3e:91:d0:77:
-        43:c9:ce:1e:0f:71:07:a9:f7:26:e0:7e:ff:30:7d:52:0a:e1:
-        80:48:46:bb:99:e9:d9:77:ce:75
+    Signature Algorithm: sha1WithRSAEncryption
+         85:10:90:c5:5d:de:25:8c:f2:57:7b:2d:14:1c:05:f9:71:63:
+         40:b0:e3:c1:c1:2e:13:2a:7a:b7:d6:24:58:87:eb:03:fb:0d:
+         af:e0:f4:d0:c8:bc:51:36:10:4f:79:cc:4f:66:7d:af:99:cb:
+         7b:ce:68:94:c6:36:aa:42:6e:8c:78:5b:b2:85:ca:d1:e1:a8:
+         31:d1:81:d9:f9:c1:a3:9e:34:43:ef:0a:79:7d:3e:83:61:fc:
+         14:5c:d1:dd:bc:0e:d7:51:b7:71:6e:41:7e:8b:2c:5a:9a:cb:
+         77:4b:6a:f5:06:ff:02:af:1e:e6:63:4f:bc:44:d9:3f:56:9e:
+         09:9c:43:f9:55:21:32:46:82:09:86:a9:7b:74:1c:9e:5a:2a:
+         bf:03:79:91:cb:f2:29:7f:c9:15:82:89:b9:53:cd:7e:07:90:
+         a9:5d:76:e1:19:5e:0d:58:b8:59:d5:0d:df:23:ab:6b:63:76:
+         19:9e:9c:df:b0:57:49:6c:d0:86:97:c3:6c:3c:fa:e0:56:c2:
+         1b:e3:a1:42:1a:58:62:85:9d:74:19:83:08:af:59:90:f8:99:
+         bd:67:d3:4a:ea:0e:c9:ca:61:8a:0d:8a:42:cc:90:e9:2e:c2:
+         54:73:7f:5e:af:8d:e2:32:cb:45:20:d6:19:4d:5b:77:31:cc:
+         0f:2d:c0:7e
 -----BEGIN CERTIFICATE-----
-MIIDDjCCArigAwIBAgIJAMXXbBE28DXhMA0GCSqGSIb3DQEBBAUAMIGOMQswCQYD
-VQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwG
-A1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cu
-eWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0xMDA2
-MzAxODM5MzlaFw0xMzAzMjYxODM5NDBaMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UE
-CBMGT3JlZ29uMREwDwYDVQQHEwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDAS
-BgNVBAsTC3Byb2dyYW1taW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJ
-KoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTBcMA0GCSqGSIb3DQEBAQUAA0sAMEgC
-QQC9UUoU/WoZhAwzOPwnMpyXC/ykGGBpTtnYeFAL6SBd1h1wHAwknyOCzDoB1ZcX
-snNshs+18eXOaAzZohI5fPJTAgMBAAGjgfYwgfMwHQYDVR0OBBYEFFz3KSFpegl4
-nnvNU0IC7M4pDRHfMIHDBgNVHSMEgbswgbiAFFz3KSFpegl4nnvNU0IC7M4pDRHf
-oYGUpIGRMIGOMQswCQYDVQQGEwJVUzEPMA0GA1UECBMGT3JlZ29uMREwDwYDVQQH
-EwhQb3J0bGFuZDEOMAwGA1UEChMFeWFTU0wxFDASBgNVBAsTC3Byb2dyYW1taW5n
-MRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlh
-c3NsLmNvbYIJAMXXbBE28DXhMAwGA1UdEwQFMAMBAf8wDQYJKoZIhvcNAQEEBQAD
-QQC0pfFxJk25/1TzCR+s4RlZ5exX4/ELso/zKetrxvonMz6R0HdDyc4eD3EHqfcm
-4H7/MH1SCuGASEa7menZd851
+MIIEqjCCA5KgAwIBAgIJALZjr49dYlegMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4G
+A1UECgwHd29sZlNTTDEUMBIGA1UECwwLUHJvZ3JhbW1pbmcxGDAWBgNVBAMMD3d3
+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
+Fw0xNDA3MTExNzM5NDRaFw0xNzA0MDYxNzM5NDRaMIGUMQswCQYDVQQGEwJVUzEQ
+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjEQMA4GA1UECgwHd29s
+ZlNTTDEUMBIGA1UECwwLUHJvZ3JhbW1pbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMMD0Sv+OaQyRTtTyIQrKnx0mr2qKlIHR9am
+NrIHMo7Quml7xsNEntSBSP0taKKLZ7uhdcg2LErSG/eLus8N+e/s8YEee5sDR5q/
+Zcx/ZSRppugUiVvkNPfFsBST9Wd7Onp44QFWVpGmE0KN0jxAnEzv0YbfN1EbDKE7
+9fGjSjXk4c6W3xt+v06X0BDoqAgwga8gC0MUxXRntDKCb42GwohAmTaDuh5AciIX
+11JlJHOwzu8Zza7/eGx7wBID1E5yDVBtO6M7o5lencjZDIWz2YrZVCbbbfqsu/8l
+TMTRefRx04ZAGBOwY7VyTjDEl4SGLVYv1xX3f8Cu9fxb5fuhutMCAwEAAaOB/DCB
++TAdBgNVHQ4EFgQUM9hFZtdohxh+VA1wJ5HHJteFZcAwgckGA1UdIwSBwTCBvoAU
+M9hFZtdohxh+VA1wJ5HHJteFZcChgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMRAwDgYDVQQKDAd3b2xmU1NM
+MRQwEgYDVQQLDAtQcm9ncmFtbWluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAtmOvj11iV6AwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAhRCQxV3eJYzyV3stFBwF+XFj
+QLDjwcEuEyp6t9YkWIfrA/sNr+D00Mi8UTYQT3nMT2Z9r5nLe85olMY2qkJujHhb
+soXK0eGoMdGB2fnBo540Q+8KeX0+g2H8FFzR3bwO11G3cW5BfossWprLd0tq9Qb/
+Aq8e5mNPvETZP1aeCZxD+VUhMkaCCYape3QcnloqvwN5kcvyKX/JFYKJuVPNfgeQ
+qV124RleDVi4WdUN3yOra2N2GZ6c37BXSWzQhpfDbDz64FbCG+OhQhpYYoWddBmD
+CK9ZkPiZvWfTSuoOycphig2KQsyQ6S7CVHN/Xq+N4jLLRSDWGU1bdzHMDy3Afg==
 -----END CERTIFICATE-----
Binary files /tmp/MslfMd0v5_/mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-key.der and /tmp/NaaegeSpl1/mysql-5.5-5.5.43/extra/yassl/certs/client-key.der differ
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-keyEnc.pem mysql-5.5-5.5.43/extra/yassl/certs/client-keyEnc.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-keyEnc.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/client-keyEnc.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,12 +1,12 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,B9D8FB94E38635AB
+DEK-Info: DES-EDE3-CBC,BDE979D13CCC0ABD
 
-e7bVyzL1RF6p7hl8GDaOrRTcgB4ip+pWWUcnNf6y2tsuAQx/c/Bd5c9ZDc3L5AXC
-oOAzWYB+ay1vWkmAQB4ivFS5QzGDf8870d4FbOejwmgPhiHdZNw5xNwscAN6ps0v
-dFaUrR9nzWmbycsQCjXZGIZtGFCtXkA8Gdl5OMO4o+rzM0muNPS5fb++x7oNl1YG
-gjReu2sQ85dPfMlnoHhr8Pz9LBcxVyOmcqtmT0SOSuPcoj6aDtcZ+EY9MQf6SR9E
-ysmrJKMtp+ABgXglAj5hbT0dMpoJ2KpJYk62JAh/A6DDyv5YYUI0W57xY5+QzaV+
-YXnIvqwLjJ3cXEV4YH7ozLHAESgnAAUoQsin42rrRKt7GxjSdBoFhWjH69V2nl65
-LYRNjE1O5BBEX+rz0S+fe2ZZgT17kUr7eLZCq15J+L5xWQ7R4ERc0w==
+N7yz2JV13EmQ7MZPL5wamid5+G1V1gp8FKqMemAC5JDxonS/W9oViMLUcxbfPTDx
+FznKdYSVTIQ7vv3ofmDG4MEyV/2C568N2kdtAw+jTfrZFN+IU9CI+W+In/nacirF
+02sAcvDMofustnooKNOO7/iyb5+3vRvEt5vSSRQn5WuSQ9sUKjuzoLs/lbf7fyAt
+4NeqfI3rYBZXxiUOLITOGXzGNRuFoY+o2uDCfelLAJ8uhiVG6ME3LeJEo1dT5lZ8
+CSJOLPasKg0iG4V7olM4j9FvAfZr48RRsSfUen756Jo2HpI4bad8LKhFYIdNs2Au
+WwKLmjpo6QB9hBmRshR04rEXPdrgTqLBExCE08PyaGYnWU8ggWritCeBzDQFj/n4
+sI+NO0Mymuvg98e5RpO52lg3Xnqv9RIK3guLFOmI6aEHC0PS4WwOEQ==
 -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-key.pem mysql-5.5-5.5.43/extra/yassl/certs/client-key.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/client-key.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/client-key.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBPAIBAAJBAL1RShT9ahmEDDM4/CcynJcL/KQYYGlO2dh4UAvpIF3WHXAcDCSf
-I4LMOgHVlxeyc2yGz7Xx5c5oDNmiEjl88lMCAwEAAQJAVGHWLlLhpqvXsEEXCvWh
-HCYono+K8YVGzhiaPSTU212fCoQryIxsXQKGBjhFdZm96DZWp+Vd/t/u+B4ZeaqY
-+QIhAOBEfbFtdZqk5OmbbRsRVPI7+YYmubgY1TVIPqmxHQ4NAiEA2BrTQkjOb3ul
-A/SZO04fJUZsm7Ng92FWHDJsRancSd8CIQCmGbQqZBK1TamJZ6dAY+7RViAx/p6Q
-vjuzMeXPUrFdRQIhAMkfBhg9bCqjFyt8PBPOm/vz8+ZgZlE0/JAXeV7IPCVfAiEA
-gZwCFm1ghGxmaoB424YC4DHeDeN/g9xwJHT7EuM9Mvc=
+MIIEpAIBAAKCAQEAwwPRK/45pDJFO1PIhCsqfHSavaoqUgdH1qY2sgcyjtC6aXvG
+w0Se1IFI/S1oootnu6F1yDYsStIb94u6zw357+zxgR57mwNHmr9lzH9lJGmm6BSJ
+W+Q098WwFJP1Z3s6enjhAVZWkaYTQo3SPECcTO/Rht83URsMoTv18aNKNeThzpbf
+G36/TpfQEOioCDCBryALQxTFdGe0MoJvjYbCiECZNoO6HkByIhfXUmUkc7DO7xnN
+rv94bHvAEgPUTnINUG07ozujmV6dyNkMhbPZitlUJttt+qy7/yVMxNF59HHThkAY
+E7BjtXJOMMSXhIYtVi/XFfd/wK71/Fvl+6G60wIDAQABAoIBAQCi5thfEHFkCJ4u
+bdFtHoXSCrGMR84sUWqgEp5T3pFMHW3qWXvyd6rZxtmKq9jhFuRjJv+1bBNZuOOl
+yHIXLgyfb+VZP3ZvSbERwlouFikN3reO3EDVou7gHqH0vpfbhmOWFM2YCWAtMHac
+PM3miO5HknkLWgDiXl8RfH35CLcgBokqXf0AqyLh8LO8JKleJg4fAC3+IZpTW23T
+K6uUgmhDNtj2L8Yi/LVBXQ0zYOqkfX7oS1WRVtNcV48flBcvqt7pnqj0z4pMjqDk
+VnOyz0+GxWk88yQgi1yWDPprEjuaZ8HfxpaypdWSDZsJQmgkEEXUUOQXOUjQNYuU
+bRHej8pZAoGBAOokp/lpM+lx3FJ9iCEoL0neunIW6cxHeogNlFeEWBY6gbA/os+m
+bB6wBikAj+d3dqzbysfZXps/JpBSrvw4kAAUu7QPWJTnL2p+HE9BIdQxWR9OihqN
+p1dsItjl9H4yphDLZKVVA4emJwWMw9e2J7JNujDaR49U0z2LhI2UmFilAoGBANU4
+G8OPxZMMRwtvNZLFsI1GyJIYj/WACvfvof6AubUqusoYsF2lB9CTjdicBBzUYo6m
+JoEB/86KKmM0NUCqbYDeiSNqV02ebq2TTlaQC22dc4sMric93k7wqsVseGdslFKc
+N2dsLe+7r9+mkDzER8+Nlp6YqbSfxaZQ3LPw+3QXAoGAXoMJYr26fKK/QnT1fBzS
+ackEDYV+Pj0kEsMYe/Mp818OdmxZdeRBhGmdMvPNIquwNbpKsjzl2Vi2Yk9d3uWe
+CspTsiz3nrNrClt5ZexukU6SIPb8/Bbt03YM4ux/smkTa3gOWkZktF63JaBadTpL
+78c8Pvf9JrggxJkKmnO+wxkCgYEAukSTFKw0GTtfkWCs97TWgQU2UVM96GXcry7c
+YT7Jfbh/h/A7mwOCKTfOck4R1bHBDAegmZFKjX/sec/xObXphexi99p9vGRNIjwO
+8tZR9YfYmcARIF0PKf1b4q7ZHNkhVm38hNBf7RAVHBgh58Q9S9fQnmqVzyLJA3ue
+42AB/C8CgYAR0EvPG2e5nxB1R4ZlrjHCxjCsWQZQ2Q+1cAb38NPIYnyo2m72IT/T
+f1/qiqs/2Spe81HSwjA34y2jdQ0eTSE01VdwXIm/cuxKbmjVzRh0M06MOkWP5pZA
+62P5GYY6Ud2JS7Dz+Z9dKJU4vjWrylznk1M0oUVdEzllQkahn831vw==
 -----END RSA PRIVATE KEY-----
Binary files /tmp/MslfMd0v5_/mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa1024.der and /tmp/NaaegeSpl1/mysql-5.5-5.5.43/extra/yassl/certs/dsa1024.der differ
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa1024.pem mysql-5.5-5.5.43/extra/yassl/certs/dsa1024.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa1024.pem	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/dsa1024.pem	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,12 @@
+-----BEGIN DSA PRIVATE KEY-----
+MIIBvAIBAAKBgQC9Ue5KMuCKx+rG4epwxFFDzyoH4ccSwlglXsRdvqswDRK/oQvT
+NNNoWiVxTn3kvQ8qDlhWy9KjGTrqr/ttgmh56FFpe6tz4yTgCNyR9D+eGclD7lNf
+dPUc4E3SA6efopG6+ymI55bS+9xUFTG402UCrYSKT59zI2HBfuI6dltsxQIVAJHJ
+7WDQ+jBn/nmMyCQzdi+0qJx1AoGBAJJacRK36s5yGY1b6qhxWqvpoAC+SfEKylZn
+YWGYf2PM+Iwo6AgPKEw6BSsX+7Nmc4Gjyr4JWhComKi6onPamO/A2CbMM0DCxb47
+BeLBWfqWAgXVj0CODT4MQos5yugnviR/YpEgbzLxvrXr469lKWsAyB19/gFmGmQW
+cCgAwGm6AoGBAJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caa
+DDa0XJ7ak6A7TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WX
+S0kk3m/DHaC03ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVAhQ01VXa
+Rr8IPem35lKghVKnq/kGQw==
+-----END DSA PRIVATE KEY-----
Binary files /tmp/MslfMd0v5_/mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa512.der and /tmp/NaaegeSpl1/mysql-5.5-5.5.43/extra/yassl/certs/dsa512.der differ
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa512.pem mysql-5.5-5.5.43/extra/yassl/certs/dsa512.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa512.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/dsa512.pem	1970-01-01 00:00:00.000000000 +0000
@@ -1,8 +0,0 @@
------BEGIN DSA PRIVATE KEY-----
-MIH3AgEAAkEAmSlpgMk8mGhFqYL+Z+uViMW0DNYmRZUZLKAgW37faencww/zYQol
-m/IhAWrNqow358pm21b0D3160Ri5Qv0bEQIVAK0lKasKnwkcwa0DIHZ/prfdTQMJ
-AkASiJna59ALk5vm7jwhf5yztI2ljOI3gD8X0YFPvfBxtjIIVN2/AeKzdwZkdYoE
-1nk5sQIDA8YGdOWQBQoQRhkxAkAEhKAmMXIM6E9dUxdisYDKwBZfwx7qxdmYOPm+
-VlNHaM4IIlccuw13kc9bNu3zJIKQis2QfNt3+Rctc3Pvu7mCAhQjg+e+aqykxwwc
-E2V27tjDFY02uA==
------END DSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa-cert.pem mysql-5.5-5.5.43/extra/yassl/certs/dsa-cert.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/dsa-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/dsa-cert.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,70 +1,22 @@
-Certificate:
-    Data:
-        Version: 3 (0x2)
-        Serial Number:
-            ce:df:23:31:64:b4:13:da
-        Signature Algorithm: dsaWithSHA1
-        Issuer: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=info@yassl.com
-        Validity
-            Not Before: Jun 30 18:56:38 2010 GMT
-            Not After : Mar 26 18:56:39 2013 GMT
-        Subject: C=US, ST=Oregon, L=Portland, O=yaSSL, OU=testing, CN=www.yassl.com/emailAddress=info@yassl.com
-        Subject Public Key Info:
-            Public Key Algorithm: dsaEncryption
-            DSA Public Key:
-                pub: 
-                    04:84:a0:26:31:72:0c:e8:4f:5d:53:17:62:b1:80:
-                    ca:c0:16:5f:c3:1e:ea:c5:d9:98:38:f9:be:56:53:
-                    47:68:ce:08:22:57:1c:bb:0d:77:91:cf:5b:36:ed:
-                    f3:24:82:90:8a:cd:90:7c:db:77:f9:17:2d:73:73:
-                    ef:bb:b9:82
-                P:   
-                    00:99:29:69:80:c9:3c:98:68:45:a9:82:fe:67:eb:
-                    95:88:c5:b4:0c:d6:26:45:95:19:2c:a0:20:5b:7e:
-                    df:69:e9:dc:c3:0f:f3:61:0a:25:9b:f2:21:01:6a:
-                    cd:aa:8c:37:e7:ca:66:db:56:f4:0f:7d:7a:d1:18:
-                    b9:42:fd:1b:11
-                Q:   
-                    00:ad:25:29:ab:0a:9f:09:1c:c1:ad:03:20:76:7f:
-                    a6:b7:dd:4d:03:09
-                G:   
-                    12:88:99:da:e7:d0:0b:93:9b:e6:ee:3c:21:7f:9c:
-                    b3:b4:8d:a5:8c:e2:37:80:3f:17:d1:81:4f:bd:f0:
-                    71:b6:32:08:54:dd:bf:01:e2:b3:77:06:64:75:8a:
-                    04:d6:79:39:b1:02:03:03:c6:06:74:e5:90:05:0a:
-                    10:46:19:31
-        X509v3 extensions:
-            X509v3 Subject Key Identifier: 
-                BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
-            X509v3 Authority Key Identifier: 
-                keyid:BE:F9:8C:5D:D6:1C:B4:EE:81:DD:36:56:0A:21:E4:61:44:73:E9:E2
-                DirName:/C=US/ST=Oregon/L=Portland/O=yaSSL/OU=testing/CN=www.yassl.com/emailAddress=info@yassl.com
-                serial:CE:DF:23:31:64:B4:13:DA
-
-            X509v3 Basic Constraints: 
-                CA:TRUE
-    Signature Algorithm: dsaWithSHA1
-        30:2d:02:14:00:a3:21:20:34:6a:2c:f9:fb:76:d7:20:c9:c0:
-        35:1b:64:9a:c2:83:02:15:00:a4:59:ac:6d:da:85:48:ff:f5:
-        0d:49:72:c8:cd:91:fc:ec:2f:5c:63
 -----BEGIN CERTIFICATE-----
-MIIDfjCCAz2gAwIBAgIJAM7fIzFktBPaMAkGByqGSM44BAMwgYoxCzAJBgNVBAYT
-AlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRsYW5kMQ4wDAYDVQQK
-EwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMNd3d3Lnlhc3NsLmNv
-bTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb20wHhcNMTAwNjMwMTg1NjM4
-WhcNMTMwMzI2MTg1NjM5WjCBijELMAkGA1UEBhMCVVMxDzANBgNVBAgTBk9yZWdv
-bjERMA8GA1UEBxMIUG9ydGxhbmQxDjAMBgNVBAoTBXlhU1NMMRAwDgYDVQQLEwd0
-ZXN0aW5nMRYwFAYDVQQDEw13d3cueWFzc2wuY29tMR0wGwYJKoZIhvcNAQkBFg5p
-bmZvQHlhc3NsLmNvbTCB8DCBqAYHKoZIzjgEATCBnAJBAJkpaYDJPJhoRamC/mfr
-lYjFtAzWJkWVGSygIFt+32np3MMP82EKJZvyIQFqzaqMN+fKZttW9A99etEYuUL9
-GxECFQCtJSmrCp8JHMGtAyB2f6a33U0DCQJAEoiZ2ufQC5Ob5u48IX+cs7SNpYzi
-N4A/F9GBT73wcbYyCFTdvwHis3cGZHWKBNZ5ObECAwPGBnTlkAUKEEYZMQNDAAJA
-BISgJjFyDOhPXVMXYrGAysAWX8Me6sXZmDj5vlZTR2jOCCJXHLsNd5HPWzbt8ySC
-kIrNkHzbd/kXLXNz77u5gqOB8jCB7zAdBgNVHQ4EFgQUvvmMXdYctO6B3TZWCiHk
-YURz6eIwgb8GA1UdIwSBtzCBtIAUvvmMXdYctO6B3TZWCiHkYURz6eKhgZCkgY0w
-gYoxCzAJBgNVBAYTAlVTMQ8wDQYDVQQIEwZPcmVnb24xETAPBgNVBAcTCFBvcnRs
-YW5kMQ4wDAYDVQQKEwV5YVNTTDEQMA4GA1UECxMHdGVzdGluZzEWMBQGA1UEAxMN
-d3d3Lnlhc3NsLmNvbTEdMBsGCSqGSIb3DQEJARYOaW5mb0B5YXNzbC5jb22CCQDO
-3yMxZLQT2jAMBgNVHRMEBTADAQH/MAkGByqGSM44BAMDMAAwLQIUAKMhIDRqLPn7
-dtcgycA1G2SawoMCFQCkWaxt2oVI//UNSXLIzZH87C9cYw==
+MIIDqzCCA2ugAwIBAgIJAMGqrgDU6DyhMAkGByqGSM44BAMwgY4xCzAJBgNVBAYT
+AlVTMQ8wDQYDVQQIDAZPcmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQK
+DAd3b2xmU1NMMRAwDgYDVQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wu
+Y29tMR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tMB4XDTEzMDQyMjIw
+MDk0NFoXDTE2MDExNzIwMDk0NFowgY4xCzAJBgNVBAYTAlVTMQ8wDQYDVQQIDAZP
+cmVnb24xETAPBgNVBAcMCFBvcnRsYW5kMRAwDgYDVQQKDAd3b2xmU1NMMRAwDgYD
+VQQLDAd0ZXN0aW5nMRYwFAYDVQQDDA13d3cueWFzc2wuY29tMR8wHQYJKoZIhvcN
+AQkBFhBpbmZvQHdvbGZzc2wuY29tMIIBuDCCASwGByqGSM44BAEwggEfAoGBAL1R
+7koy4IrH6sbh6nDEUUPPKgfhxxLCWCVexF2+qzANEr+hC9M002haJXFOfeS9DyoO
+WFbL0qMZOuqv+22CaHnoUWl7q3PjJOAI3JH0P54ZyUPuU1909RzgTdIDp5+ikbr7
+KYjnltL73FQVMbjTZQKthIpPn3MjYcF+4jp2W2zFAhUAkcntYND6MGf+eYzIJDN2
+L7SonHUCgYEAklpxErfqznIZjVvqqHFaq+mgAL5J8QrKVmdhYZh/Y8z4jCjoCA8o
+TDoFKxf7s2ZzgaPKvglaEKiYqLqic9qY78DYJswzQMLFvjsF4sFZ+pYCBdWPQI4N
+PgxCiznK6Ce+JH9ikSBvMvG+tevjr2UpawDIHX3+AWYaZBZwKADAaboDgYUAAoGB
+AJ3LY89yHyvQ/TsQ6zlYbovjbk/ogndsMqPdNUvL4RuPTgJP/caaDDa0XJ7ak6A7
+TJ+QheLNwOXoZPYJC4EGFSDAXpYniGhbWIrVTCGe6lmZDfnx40WXS0kk3m/DHaC0
+3ElLAiybxVGxyqoUfbT3Zv1JwftWMuiqHH5uADhdXuXVo1AwTjAdBgNVHQ4EFgQU
+IJjk416o4v8qpH9LBtXlR9v8gccwHwYDVR0jBBgwFoAUIJjk416o4v8qpH9LBtXl
+R9v8gccwDAYDVR0TBAUwAwEB/zAJBgcqhkjOOAQDAy8AMCwCFCjGKIdOSV12LcTu
+k08owGM6YkO1AhQe+K173VuaO/OsDNsxZlKpyH8+1g==
 -----END CERTIFICATE-----
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/server-cert.pem mysql-5.5-5.5.43/extra/yassl/certs/server-cert.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/server-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/server-cert.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,39 +1,173 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
+        Version: 3 (0x2)
         Serial Number: 1 (0x1)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=US, ST=Montana, L=Bozeman, O=sawtooth, OU=consulting, CN=www.sawtooth-consulting.com/emailAddress=info@yassl.com
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Validity
-            Not Before: Jun 30 18:52:17 2010 GMT
-            Not After : Mar 26 18:52:17 2013 GMT
-        Subject: C=US, ST=Montana, L=Bozeman, O=yaSSL, OU=support, CN=www.yassl.com/emailAddress=info@yassl.com
+            Not Before: Jul 11 17:20:14 2014 GMT
+            Not After : Apr  6 17:20:14 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=wolfSSL, OU=Support, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-            RSA Public Key: (512 bit)
-                Modulus (512 bit):
-                    00:c6:7b:c0:68:81:2f:de:82:3f:f9:ac:c3:86:4a:
-                    66:b7:ec:d4:f1:f6:64:21:ff:f5:a2:34:42:d0:38:
-                    9f:c6:dd:3b:6e:26:65:6a:54:96:dd:d2:7b:eb:36:
-                    a2:ae:7e:2a:9e:7e:56:a5:b6:87:9f:15:c7:18:66:
-                    7e:16:77:e2:a7
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:c0:95:08:e1:57:41:f2:71:6d:b7:d2:45:41:27:
+                    01:65:c6:45:ae:f2:bc:24:30:b8:95:ce:2f:4e:d6:
+                    f6:1c:88:bc:7c:9f:fb:a8:67:7f:fe:5c:9c:51:75:
+                    f7:8a:ca:07:e7:35:2f:8f:e1:bd:7b:c0:2f:7c:ab:
+                    64:a8:17:fc:ca:5d:7b:ba:e0:21:e5:72:2e:6f:2e:
+                    86:d8:95:73:da:ac:1b:53:b9:5f:3f:d7:19:0d:25:
+                    4f:e1:63:63:51:8b:0b:64:3f:ad:43:b8:a5:1c:5c:
+                    34:b3:ae:00:a0:63:c5:f6:7f:0b:59:68:78:73:a6:
+                    8c:18:a9:02:6d:af:c3:19:01:2e:b8:10:e3:c6:cc:
+                    40:b4:69:a3:46:33:69:87:6e:c4:bb:17:a6:f3:e8:
+                    dd:ad:73:bc:7b:2f:21:b5:fd:66:51:0c:bd:54:b3:
+                    e1:6d:5f:1c:bc:23:73:d1:09:03:89:14:d2:10:b9:
+                    64:c3:2a:d0:a1:96:4a:bc:e1:d4:1a:5b:c7:a0:c0:
+                    c1:63:78:0f:44:37:30:32:96:80:32:23:95:a1:77:
+                    ba:13:d2:97:73:e2:5d:25:c9:6a:0d:c3:39:60:a4:
+                    b4:b0:69:42:42:09:e9:d8:08:bc:33:20:b3:58:22:
+                    a7:aa:eb:c4:e1:e6:61:83:c5:d2:96:df:d9:d0:4f:
+                    ad:d7
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        58:a9:98:e7:16:52:4c:40:e7:e1:47:92:19:1b:3a:8f:97:6c:
-        7b:b7:b0:cb:20:6d:ad:b5:d3:47:58:d8:e4:f2:3e:32:e9:ef:
-        87:77:e5:54:36:f4:8d:50:8d:07:b4:77:45:ea:9d:a4:33:36:
-        9b:0b:e0:74:58:11:c5:01:7b:4d
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                B3:11:32:C9:92:98:84:E2:C9:F8:D0:3B:6E:03:42:CA:1F:0E:8E:3C
+            X509v3 Authority Key Identifier: 
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:9A:41:47:CD:A1:14:62:8C
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         3d:8c:70:05:5b:62:4b:bf:6c:b6:48:61:01:10:1d:5e:05:ba:
+         55:94:2c:ae:59:6f:97:80:5d:6c:86:ec:9a:eb:15:45:44:e4:
+         56:f8:75:ca:8a:45:32:f4:c7:e1:fa:f2:98:1c:91:d3:3f:e8:
+         0e:c9:1b:fa:e1:79:99:67:0e:0d:6b:8a:ec:1a:2c:59:c4:34:
+         04:8d:39:77:cd:b5:e9:60:5b:82:bf:34:ce:ed:c6:4f:3f:b4:
+         5c:4d:8a:b4:f4:0a:04:12:a0:56:c1:e1:33:37:a1:54:87:48:
+         e9:81:c2:0f:8f:6f:d3:52:4c:4c:32:4c:6b:9f:3a:04:8f:77:
+         5d:ad:dc:3d:2b:f2:c9:df:3c:60:5d:d8:fc:86:72:7c:3d:d0:
+         84:4b:8c:df:26:43:fe:c0:cc:5b:e1:36:b3:3d:32:28:a3:ef:
+         0c:20:d6:b1:50:39:d6:67:a9:8b:84:bc:92:34:eb:19:23:e8:
+         10:8f:ea:bd:18:8c:93:27:3c:74:75:8e:58:04:fa:2a:74:44:
+         7d:fc:4d:39:df:54:17:ba:78:e1:5d:6a:70:d3:7c:a2:80:81:
+         e6:19:51:91:c3:44:51:ec:bb:88:a9:53:e1:d7:a9:8c:28:f4:
+         21:1c:42:51:09:b4:12:6d:a0:d6:25:09:85:c6:2a:0c:af:a7:
+         58:e6:52:8b
 -----BEGIN CERTIFICATE-----
-MIICFDCCAb4CAQEwDQYJKoZIhvcNAQEEBQAwgZ4xCzAJBgNVBAYTAlVTMRAwDgYD
-VQQIEwdNb250YW5hMRAwDgYDVQQHEwdCb3plbWFuMREwDwYDVQQKEwhzYXd0b290
-aDETMBEGA1UECxMKY29uc3VsdGluZzEkMCIGA1UEAxMbd3d3LnNhd3Rvb3RoLWNv
-bnN1bHRpbmcuY29tMR0wGwYJKoZIhvcNAQkBFg5pbmZvQHlhc3NsLmNvbTAeFw0x
-MDA2MzAxODUyMTdaFw0xMzAzMjYxODUyMTdaMIGKMQswCQYDVQQGEwJVUzEQMA4G
-A1UECBMHTW9udGFuYTEQMA4GA1UEBxMHQm96ZW1hbjEOMAwGA1UEChMFeWFTU0wx
-EDAOBgNVBAsTB3N1cHBvcnQxFjAUBgNVBAMTDXd3dy55YXNzbC5jb20xHTAbBgkq
-hkiG9w0BCQEWDmluZm9AeWFzc2wuY29tMFwwDQYJKoZIhvcNAQEBBQADSwAwSAJB
-AMZ7wGiBL96CP/msw4ZKZrfs1PH2ZCH/9aI0QtA4n8bdO24mZWpUlt3Se+s2oq5+
-Kp5+VqW2h58VxxhmfhZ34qcCAwEAATANBgkqhkiG9w0BAQQFAANBAFipmOcWUkxA
-5+FHkhkbOo+XbHu3sMsgba2100dY2OTyPjLp74d35VQ29I1QjQe0d0XqnaQzNpsL
-4HRYEcUBe00=
+MIIEnjCCA4agAwIBAgIBATANBgkqhkiG9w0BAQUFADCBlDELMAkGA1UEBhMCVVMx
+EDAOBgNVBAgMB01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xETAPBgNVBAoMCFNh
+d3Rvb3RoMRMwEQYDVQQLDApDb25zdWx0aW5nMRgwFgYDVQQDDA93d3cud29sZnNz
+bC5jb20xHzAdBgkqhkiG9w0BCQEWEGluZm9Ad29sZnNzbC5jb20wHhcNMTQwNzEx
+MTcyMDE0WhcNMTcwNDA2MTcyMDE0WjCBkDELMAkGA1UEBhMCVVMxEDAOBgNVBAgM
+B01vbnRhbmExEDAOBgNVBAcMB0JvemVtYW4xEDAOBgNVBAoMB3dvbGZTU0wxEDAO
+BgNVBAsMB1N1cHBvcnQxGDAWBgNVBAMMD3d3dy53b2xmc3NsLmNvbTEfMB0GCSqG
+SIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZIhvcNAQEBBQADggEP
+ADCCAQoCggEBAMCVCOFXQfJxbbfSRUEnAWXGRa7yvCQwuJXOL07W9hyIvHyf+6hn
+f/5cnFF194rKB+c1L4/hvXvAL3yrZKgX/Mpde7rgIeVyLm8uhtiVc9qsG1O5Xz/X
+GQ0lT+FjY1GLC2Q/rUO4pRxcNLOuAKBjxfZ/C1loeHOmjBipAm2vwxkBLrgQ48bM
+QLRpo0YzaYduxLsXpvPo3a1zvHsvIbX9ZlEMvVSz4W1fHLwjc9EJA4kU0hC5ZMMq
+0KGWSrzh1Bpbx6DAwWN4D0Q3MDKWgDIjlaF3uhPSl3PiXSXJag3DOWCktLBpQkIJ
+6dgIvDMgs1gip6rrxOHmYYPF0pbf2dBPrdcCAwEAAaOB/DCB+TAdBgNVHQ4EFgQU
+sxEyyZKYhOLJ+NA7bgNCyh8OjjwwgckGA1UdIwSBwTCBvoAUJ45nEXTDJh0/7TNj
+s6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYDVQQIDAdNb250YW5h
+MRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290aDETMBEGA1UECwwK
+Q29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29tMR8wHQYJKoZIhvcN
+AQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYDVR0TBAUwAwEB/zAN
+BgkqhkiG9w0BAQUFAAOCAQEAPYxwBVtiS79stkhhARAdXgW6VZQsrllvl4BdbIbs
+musVRUTkVvh1yopFMvTH4frymByR0z/oDskb+uF5mWcODWuK7BosWcQ0BI05d821
+6WBbgr80zu3GTz+0XE2KtPQKBBKgVsHhMzehVIdI6YHCD49v01JMTDJMa586BI93
+Xa3cPSvyyd88YF3Y/IZyfD3QhEuM3yZD/sDMW+E2sz0yKKPvDCDWsVA51mepi4S8
+kjTrGSPoEI/qvRiMkyc8dHWOWAT6KnREffxNOd9UF7p44V1qcNN8ooCB5hlRkcNE
+Uey7iKlT4depjCj0IRxCUQm0Em2g1iUJhcYqDK+nWOZSiw==
+-----END CERTIFICATE-----
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number:
+            9a:41:47:cd:a1:14:62:8c
+    Signature Algorithm: sha1WithRSAEncryption
+        Issuer: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+        Validity
+            Not Before: Jul 11 03:20:08 2014 GMT
+            Not After : Apr  6 03:20:08 2017 GMT
+        Subject: C=US, ST=Montana, L=Bozeman, O=Sawtooth, OU=Consulting, CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:bf:0c:ca:2d:14:b2:1e:84:42:5b:cd:38:1f:4a:
+                    f2:4d:75:10:f1:b6:35:9f:df:ca:7d:03:98:d3:ac:
+                    de:03:66:ee:2a:f1:d8:b0:7d:6e:07:54:0b:10:98:
+                    21:4d:80:cb:12:20:e7:cc:4f:de:45:7d:c9:72:77:
+                    32:ea:ca:90:bb:69:52:10:03:2f:a8:f3:95:c5:f1:
+                    8b:62:56:1b:ef:67:6f:a4:10:41:95:ad:0a:9b:e3:
+                    a5:c0:b0:d2:70:76:50:30:5b:a8:e8:08:2c:7c:ed:
+                    a7:a2:7a:8d:38:29:1c:ac:c7:ed:f2:7c:95:b0:95:
+                    82:7d:49:5c:38:cd:77:25:ef:bd:80:75:53:94:3c:
+                    3d:ca:63:5b:9f:15:b5:d3:1d:13:2f:19:d1:3c:db:
+                    76:3a:cc:b8:7d:c9:e5:c2:d7:da:40:6f:d8:21:dc:
+                    73:1b:42:2d:53:9c:fe:1a:fc:7d:ab:7a:36:3f:98:
+                    de:84:7c:05:67:ce:6a:14:38:87:a9:f1:8c:b5:68:
+                    cb:68:7f:71:20:2b:f5:a0:63:f5:56:2f:a3:26:d2:
+                    b7:6f:b1:5a:17:d7:38:99:08:fe:93:58:6f:fe:c3:
+                    13:49:08:16:0b:a7:4d:67:00:52:31:67:23:4e:98:
+                    ed:51:45:1d:b9:04:d9:0b:ec:d8:28:b3:4b:bd:ed:
+                    36:79
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+            X509v3 Authority Key Identifier: 
+                keyid:27:8E:67:11:74:C3:26:1D:3F:ED:33:63:B3:A4:D8:1D:30:E5:E8:D5
+                DirName:/C=US/ST=Montana/L=Bozeman/O=Sawtooth/OU=Consulting/CN=www.wolfssl.com/emailAddress=info@wolfssl.com
+                serial:9A:41:47:CD:A1:14:62:8C
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha1WithRSAEncryption
+         79:78:0c:6d:79:88:91:fc:3a:15:9c:f9:27:62:16:f0:21:1f:
+         fa:7d:3f:a2:a8:32:1e:f7:f2:11:a9:74:16:74:5e:dc:18:ca:
+         f0:00:2a:d5:03:06:26:30:f1:47:83:fd:32:6e:fc:ed:aa:4f:
+         7d:0c:63:60:31:2f:7c:0c:bf:99:66:87:ed:27:08:86:2d:c4:
+         33:e8:98:23:1c:fe:a3:db:9a:49:4e:fc:5a:42:ef:71:c3:3f:
+         ad:dc:4a:a8:d2:a3:1d:09:ac:33:04:7b:86:f3:6d:00:59:a3:
+         c8:db:d1:3c:73:f6:0e:90:d6:5e:49:e0:bf:36:63:08:7b:a5:
+         b0:8f:35:3b:56:8c:11:35:49:04:1c:d0:e7:ba:56:c5:0d:0a:
+         91:8d:d6:b7:62:19:34:12:52:4c:d2:6d:7c:c5:3d:0f:18:81:
+         54:cb:f6:3c:e5:84:d2:d6:71:15:ec:1a:34:0b:f0:a0:21:74:
+         43:c8:a3:b0:df:d9:67:da:e2:ad:93:48:f8:a0:87:bd:79:14:
+         e0:62:0a:df:f7:31:2e:31:7b:d1:32:2a:0a:fe:5d:14:ef:d9:
+         64:50:e4:83:91:bc:70:0d:d7:88:8d:d9:bc:84:0e:c5:1a:b3:
+         bf:64:02:4e:51:91:a4:a2:85:15:83:af:f0:5b:9b:28:49:5f:
+         b2:b3:03:d8
+-----BEGIN CERTIFICATE-----
+MIIEqjCCA5KgAwIBAgIJAJpBR82hFGKMMA0GCSqGSIb3DQEBBQUAMIGUMQswCQYD
+VQQGEwJVUzEQMA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8G
+A1UECgwIU2F3dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3
+dy53b2xmc3NsLmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTAe
+Fw0xNDA3MTEwMzIwMDhaFw0xNzA0MDYwMzIwMDhaMIGUMQswCQYDVQQGEwJVUzEQ
+MA4GA1UECAwHTW9udGFuYTEQMA4GA1UEBwwHQm96ZW1hbjERMA8GA1UECgwIU2F3
+dG9vdGgxEzARBgNVBAsMCkNvbnN1bHRpbmcxGDAWBgNVBAMMD3d3dy53b2xmc3Ns
+LmNvbTEfMB0GCSqGSIb3DQEJARYQaW5mb0B3b2xmc3NsLmNvbTCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL8Myi0Ush6EQlvNOB9K8k11EPG2NZ/fyn0D
+mNOs3gNm7irx2LB9bgdUCxCYIU2AyxIg58xP3kV9yXJ3MurKkLtpUhADL6jzlcXx
+i2JWG+9nb6QQQZWtCpvjpcCw0nB2UDBbqOgILHztp6J6jTgpHKzH7fJ8lbCVgn1J
+XDjNdyXvvYB1U5Q8PcpjW58VtdMdEy8Z0TzbdjrMuH3J5cLX2kBv2CHccxtCLVOc
+/hr8fat6Nj+Y3oR8BWfOahQ4h6nxjLVoy2h/cSAr9aBj9VYvoybSt2+xWhfXOJkI
+/pNYb/7DE0kIFgunTWcAUjFnI06Y7VFFHbkE2Qvs2CizS73tNnkCAwEAAaOB/DCB
++TAdBgNVHQ4EFgQUJ45nEXTDJh0/7TNjs6TYHTDl6NUwgckGA1UdIwSBwTCBvoAU
+J45nEXTDJh0/7TNjs6TYHTDl6NWhgZqkgZcwgZQxCzAJBgNVBAYTAlVTMRAwDgYD
+VQQIDAdNb250YW5hMRAwDgYDVQQHDAdCb3plbWFuMREwDwYDVQQKDAhTYXd0b290
+aDETMBEGA1UECwwKQ29uc3VsdGluZzEYMBYGA1UEAwwPd3d3LndvbGZzc2wuY29t
+MR8wHQYJKoZIhvcNAQkBFhBpbmZvQHdvbGZzc2wuY29tggkAmkFHzaEUYowwDAYD
+VR0TBAUwAwEB/zANBgkqhkiG9w0BAQUFAAOCAQEAeXgMbXmIkfw6FZz5J2IW8CEf
++n0/oqgyHvfyEal0FnRe3BjK8AAq1QMGJjDxR4P9Mm787apPfQxjYDEvfAy/mWaH
+7ScIhi3EM+iYIxz+o9uaSU78WkLvccM/rdxKqNKjHQmsMwR7hvNtAFmjyNvRPHP2
+DpDWXkngvzZjCHulsI81O1aMETVJBBzQ57pWxQ0KkY3Wt2IZNBJSTNJtfMU9DxiB
+VMv2POWE0tZxFewaNAvwoCF0Q8ijsN/ZZ9rirZNI+KCHvXkU4GIK3/cxLjF70TIq
+Cv5dFO/ZZFDkg5G8cA3XiI3ZvIQOxRqzv2QCTlGRpKKFFYOv8FubKElfsrMD2A==
 -----END CERTIFICATE-----
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/server-keyEnc.pem mysql-5.5-5.5.43/extra/yassl/certs/server-keyEnc.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/server-keyEnc.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/server-keyEnc.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,12 +1,30 @@
 -----BEGIN RSA PRIVATE KEY-----
 Proc-Type: 4,ENCRYPTED
-DEK-Info: DES-CBC,08132C1FFF5BC8CC
+DEK-Info: DES-CBC,136C7D8A69656668
 
-gsvuAsGmB8AkR23M25w4E6wuywfBey1Jqh3g71gJcnsUYwynex9dvfAU0lTowOXh
-sb7ld1KNjEMzrht9AC1IC0iE1rLqvRQZOdJ7h3n7aHZQ4a/HjcwAhqJq0ZW45m6Q
-mpoO5fRISjx2VbKFRUz6Xj2x0/do3IjQhpuUDVrTFFe1sEySM6APZ6CVpcnTOyPR
-ADyLDKzOi2E+sj1UXs58pct56FaqTIZPUEflICU3k6q9FPU6gsYANRLfzegclkv4
-JAx6mKVSJuYnjCCppx8WBwGJa1J1GcYRJ3qFfdbUzL4bcXTvoFkJEnDkHsXgDUS6
-xmT0XGT3IMaW8cwQ8KD8m5YYI/L26Mas/w3eA2ekyMR8pYICjXp/YZtcKxxkQSVE
-Uv/+D+20KbNAHIW5Mrxf61cX/CggGEbVP8ZhDY1flh8=
+jvNTyPaztxPIoAzbdmZnD0Zw2+60tMxNc0GMHNmeOyG25aHP/dT+TWiKFpFVkkkY
+uoCIhYUyw7gmpw+CnRJwWd+ans4nrvAjwy5oWJvarvsyUpjqvnPoIlAqd+d4TDKN
+eESzcI76+gHdisAtCrQD+fGqgTZhli5TgDbnpasL/QnY2qDlutvakkVw7gPXe156
+2Phy8WN+efr65J6wt3K/dj7Datl9u4JeHQK81gYyWBVX+EagEjPGDzkFQCj9Z0q7
+8K3iB5GW1JAqJS0IfZPB40AnSTF/n1TL1SN3qfU3l7hTGNrx9o7580bgDEoAR7pI
+F8eZlS15KHtZmh11AnU1KTKZ6kmgnNqeMTGMN6N0ct2wMKW1dV87eTDlF0oiR2ol
+XwtFgKmrIjfpmzkdWjbJmWnGMjD56KdiFZga/ZyKMsPrVoYLgfJEpn36iQspfygx
+HCGNTf0PjIsjEWU0WyQiF86t+c45W3wNFsv/AxVyfMl+su02yrd6u2ecuQDir3Cs
+b2k8IKtQgVe/NIpEWLKuiHG5oedIPPQyDYK5uq+gHxCGeOoKnWlsWFEHZRiza4X5
+tbgTrJB8Sw0ENWrvVGGmQZN4pSImlsMwzQ2qik5CQ00N1b3+56/obn0z75I3bUSb
+tC5g8DRjl6oclAenNgh/MYMT287y5W2dD4npxHcekX4O3J2CDXNfg4vV2j5GRxtg
+LVJdYE2p7bpYePCDHrYng8b9ubBprx0CrEnkIvvtUjzNPf6VDL0+MBKl+XgR2/nz
+iRqTuZnlGGOyM+KYDwXpgwfs/HfvFGksxTAlO/40GkGh+WGPaIoNyCK0SgQKhyb4
+JIkR0vd2/yLg3lWMJrGwh7A0Gm07Z/781oURP3uWd+PaCOgGcd5ipcAjcEyuxNly
+AthipWqmQWUcbf6Z2N9j3OA22Hv2Uzk8HSfi9VOZtL9svdEEZ0NnOekJgnc6stQp
+bXiknlK/T5WdrWxSyCfgUq68Vf6DFfIRAVuFdJ3WHT2wVXHrDfft6D+Ne/XCxPoE
+8zGmkyusaph33UHQ1oNyUbLbwcDCDSmOo8gYoedD3IwxtMA3wJRugomqosItwV8X
+vkgmcy8eSE/+gZUxJEN2gnLcfKFhCkC80J6oFhmoDD6vuUnPHcFdKZgVPw2rzPk5
+Vb1kX+gpORplYmKpq1vz/ujscL4T0TmYLz02hkIS4edpW55ncTTv7JWefpRiTB1J
+RB3td3me4htqR+YIDWJ+emrOmqsCG2WvpAS+MTw2mj1jYk9LL/ZYobTjSCEWmuwT
+yVK6m303irR7HQDauxhslRFgoK21w63viOyj5NKIU1gQtaAANGDxcgORC1XLjjgt
+oNutSQA+7P42vfHSHK4cnTBXl6V32H/GyVpdHQOZqSrqIjgLmUZodSmRPROxosZF
+a46B1O7m/rJFxkiKW4vod+/WqjoE0Hhfrb8rRrkRjzGeCqqSSnQ3vrunVkvF8hlA
+b6FOv4ZBJL4piC1GKH+rscqke9NEiDqXN8C3iYz86jbck/Ha21yUS8T3X7N52sg+
+B3AmOGnLK6BebYeto9vZxQjacChJZSixSxLV+l9/nVQ0+mW42azHdzk0ru59TGAj
 -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/certs/server-key.pem mysql-5.5-5.5.43/extra/yassl/certs/server-key.pem
--- mysql-5.5-5.5.35+dfsg/extra/yassl/certs/server-key.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/certs/server-key.pem	2015-02-27 08:30:34.000000000 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAMZ7wGiBL96CP/msw4ZKZrfs1PH2ZCH/9aI0QtA4n8bdO24mZWpU
-lt3Se+s2oq5+Kp5+VqW2h58VxxhmfhZ34qcCAwEAAQJBAJSbGxgjgV+rTZL2Ev58
-viN/IoB25cm/Bn4Heu7DNn2A2kpdGX2cCaf7rEQoIKCiHxvopvxOcd/7nLS/gNli
-dCECIQD/cX/9fvB1Uajw0fmvwNON9+3P9uJSqpig90zL32pwjQIhAMbqee9TBMN4
-TxXbgWqA92PrCXe8WDZ3PwoJqdR6MRUDAiEAny+TDF1z6hiWiGTCDgXDkKBlwgjf
-p5aKgR077XzwLu0CICVpWEGg1ZaF/CnaPP7w/pZ2UDOK4vRrfRnAM4bY7H5NAiBS
-1eXJ/MCZ2uPfpl7XK2BU9P69KdKUk5WHxdRchVvcDg==
+MIIEpQIBAAKCAQEAwJUI4VdB8nFtt9JFQScBZcZFrvK8JDC4lc4vTtb2HIi8fJ/7
+qGd//lycUXX3isoH5zUvj+G9e8AvfKtkqBf8yl17uuAh5XIuby6G2JVz2qwbU7lf
+P9cZDSVP4WNjUYsLZD+tQ7ilHFw0s64AoGPF9n8LWWh4c6aMGKkCba/DGQEuuBDj
+xsxAtGmjRjNph27Euxem8+jdrXO8ey8htf1mUQy9VLPhbV8cvCNz0QkDiRTSELlk
+wyrQoZZKvOHUGlvHoMDBY3gPRDcwMpaAMiOVoXe6E9KXc+JdJclqDcM5YKS0sGlC
+Qgnp2Ai8MyCzWCKnquvE4eZhg8XSlt/Z0E+t1wIDAQABAoIBAQCa0DQPUmIFUAHv
+n+1kbsLE2hryhNeSEEiSxOlq64t1bMZ5OPLJckqGZFSVd8vDmp231B2kAMieTuTd
+x7pnFsF0vKnWlI8rMBr77d8hBSPZSjm9mGtlmrjcxH3upkMVLj2+HSJgKnMw1T7Y
+oqyGQy7E9WReP4l1DxHYUSVOn9iqo85gs+KK2X4b8GTKmlsFC1uqy+XjP24yIgXz
+0PrvdFKB4l90073/MYNFdfpjepcu1rYZxpIm5CgGUFAOeC6peA0Ul7QS2DFAq6EB
+QcIw+AdfFuRhd9Jg8p+N6PS662PeKpeB70xs5lU0USsoNPRTHMRYCj+7r7X3SoVD
+LTzxWFiBAoGBAPIsVHY5I2PJEDK3k62vvhl1loFk5rW4iUJB0W3QHBv4G6xpyzY8
+ZH3c9Bm4w2CxV0hfUk9ZOlV/MsAZQ1A/rs5vF/MOn0DKTq0VO8l56cBZOHNwnAp8
+yTpIMqfYSXUKhcLC/RVz2pkJKmmanwpxv7AEpox6Wm9IWlQ7xrFTF9/nAoGBAMuT
+3ncVXbdcXHzYkKmYLdZpDmOzo9ymzItqpKISjI57SCyySzfcBhh96v52odSh6T8N
+zRtfr1+elltbD6F8r7ObkNtXczrtsCNErkFPHwdCEyNMy/r0FKTV9542fFufqDzB
+hV900jkt/9CE3/uzIHoumxeu5roLrl9TpFLtG8SRAoGBAOyY2rvV/vlSSn0CVUlv
+VW5SL4SjK7OGYrNU0mNS2uOIdqDvixWl0xgUcndex6MEH54ZYrUbG57D8rUy+UzB
+qusMJn3UX0pRXKRFBnBEp1bA1CIUdp7YY1CJkNPiv4GVkjFBhzkaQwsYpVMfORpf
+H0O8h2rfbtMiAP4imHBOGhkpAoGBAIpBVihRnl/Ungs7mKNU8mxW1KrpaTOFJAza
+1AwtxL9PAmk4fNTm3Ezt1xYRwz4A58MmwFEC3rt1nG9WnHrzju/PisUr0toGakTJ
+c/5umYf4W77xfOZltU9s8MnF/xbKixsX4lg9ojerAby/QM5TjI7t7+5ZneBj5nxe
+9Y5L8TvBAoGATUX5QIzFW/QqGoq08hysa+kMVja3TnKW1eWK0uL/8fEYEz2GCbjY
+dqfJHHFSlDBD4PF4dP1hG0wJzOZoKnGtHN9DvFbbpaS+NXCkXs9P/ABVmTo9I89n
+WvUi+LUp0EQR6zUuRr79jhiyX6i/GTKh9dwD5nyaHwx8qbAOITc78bA=
 -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/CMakeLists.txt mysql-5.5-5.5.43/extra/yassl/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/extra/yassl/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -37,7 +37,6 @@
 ADD_CONVENIENCE_LIBRARY(yassl ${YASSL_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(yassl)
 
-INSTALL_DEBUG_SYMBOLS(yassl)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(yassl DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/examples/client/client.cpp mysql-5.5-5.5.43/extra/yassl/examples/client/client.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/examples/client/client.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/examples/client/client.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -18,6 +18,10 @@
 
 /* client.cpp  */
 
+// takes an optional command line argument of cipher list to make scripting
+// easier
+
+
 #include "../../testsuite/test.hpp"
 
 //#define TEST_RESUME
@@ -73,11 +77,16 @@
 #ifdef NON_BLOCKING
     tcp_set_nonblocking(sockfd);
 #endif
-
     SSL_METHOD* method = TLSv1_client_method();
     SSL_CTX*    ctx = SSL_CTX_new(method);
 
     set_certs(ctx);
+    if (argc >= 2) {
+        printf("setting cipher list to %s\n", argv[1]);
+        if (SSL_CTX_set_cipher_list(ctx, argv[1]) != SSL_SUCCESS) {
+            ClientError(ctx, NULL, sockfd, "set_cipher_list error\n");
+        }
+    }
     SSL* ssl = SSL_new(ctx);
 
     SSL_set_fd(ssl, sockfd);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/examples/server/server.cpp mysql-5.5-5.5.43/extra/yassl/examples/server/server.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/examples/server/server.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/examples/server/server.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -18,6 +18,9 @@
 
 /* server.cpp */
 
+// takes 2 optional command line argument to make scripting
+// if the first  command line argument is 'n' client auth is disabled
+// if the second command line argument is 'd' DSA certs are used instead of RSA
 
 #include "../../testsuite/test.hpp"
 
@@ -69,6 +72,9 @@
     char**   argv     = 0;
 
     set_args(argc, argv, *static_cast<func_args*>(args));
+#ifdef SERVER_READY_FILE
+    set_file_ready("server_ready", *static_cast<func_args*>(args));
+#endif
     tcp_accept(sockfd, clientfd, *static_cast<func_args*>(args));
 
     tcp_close(sockfd);
@@ -77,8 +83,21 @@
     SSL_CTX*    ctx = SSL_CTX_new(method);
 
     //SSL_CTX_set_cipher_list(ctx, "RC4-SHA:RC4-MD5");
-    SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
-    set_serverCerts(ctx);
+    
+    // should we disable client auth
+    if (argc >= 2 && argv[1][0] == 'n')
+        printf("disabling client auth\n");
+    else
+        SSL_CTX_set_verify(ctx, SSL_VERIFY_PEER, 0);
+
+    // are we using DSA certs
+    if (argc >= 3 && argv[2][0] == 'd') {
+        printf("using DSA certs\n");
+        set_dsaServerCerts(ctx);
+    }
+    else {
+        set_serverCerts(ctx);
+    }
     DH* dh = set_tmpDH(ctx);
 
     SSL* ssl = SSL_new(ctx);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/buffer.hpp mysql-5.5-5.5.43/extra/yassl/include/buffer.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/buffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/buffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -48,7 +48,11 @@
 
 
 struct NoCheck {
-    void check(uint, uint);
+    int check(uint, uint);
+};
+
+struct Check {
+    int check(uint, uint);
 };
 
 /* input_buffer operates like a smart c style array with a checking option, 
@@ -60,11 +64,13 @@
  * write to the buffer bulk wise and have the correct size
  */
 
-class input_buffer : public NoCheck {
+class input_buffer : public Check {
     uint   size_;                // number of elements in buffer
     uint   current_;             // current offset position in buffer
     byte*  buffer_;              // storage for buffer
     byte*  end_;                 // end of storage marker
+    int    error_;               // error number
+    byte   zero_;                // for returning const reference to zero byte
 public:
     input_buffer();
 
@@ -93,6 +99,10 @@
 
     uint get_remaining() const;
 
+    int  get_error()     const;
+
+    void set_error();
+
     void set_current(uint i);
 
     // read only access through [], advance current
@@ -103,7 +113,7 @@
     bool eof();
 
     // peek ahead
-    byte peek() const;
+    byte peek();
 
     // write function, should use at/near construction
     void assign(const byte* t, uint s);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/cert_wrapper.hpp mysql-5.5-5.5.43/extra/yassl/include/cert_wrapper.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/cert_wrapper.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/cert_wrapper.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -88,6 +88,7 @@
     bool verifyNone_;                   // no error if verify fails
     bool failNoCert_;
     bool sendVerify_;
+    bool sendBlankCert_;
     VerifyCallback verifyCallback_;     // user verify callback
 public:
     CertManager();
@@ -114,16 +115,18 @@
     bool verifyNone() const;
     bool failNoCert() const;
     bool sendVerify() const;
+    bool sendBlankCert() const;
 
     void setVerifyPeer();
     void setVerifyNone();
     void setFailNoCert();
     void setSendVerify();
+    void setSendBlankCert();
     void setPeerX509(X509*);
     void setVerifyCallback(VerifyCallback);
 private:
     CertManager(const CertManager&);            // hide copy
-    CertManager& operator=(const CertManager&); // and assign
+    CertManager& operator=(const CertManager&); // and assigin
 };
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/crypto_wrapper.hpp mysql-5.5-5.5.43/extra/yassl/include/crypto_wrapper.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/crypto_wrapper.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/crypto_wrapper.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/factory.hpp mysql-5.5-5.5.43/extra/yassl/include/factory.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/factory.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/factory.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/handshake.hpp mysql-5.5-5.5.43/extra/yassl/include/handshake.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/handshake.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/handshake.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/log.hpp mysql-5.5-5.5.43/extra/yassl/include/log.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/log.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/log.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/crypto.h mysql-5.5-5.5.43/extra/yassl/include/openssl/crypto.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/crypto.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/crypto.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/des.h mysql-5.5-5.5.43/extra/yassl/include/openssl/des.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/des.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/des.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/des_old.h mysql-5.5-5.5.43/extra/yassl/include/openssl/des_old.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/des_old.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/des_old.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/engine.h mysql-5.5-5.5.43/extra/yassl/include/openssl/engine.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/engine.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/engine.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/err.h mysql-5.5-5.5.43/extra/yassl/include/openssl/err.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/err.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/err.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/evp.h mysql-5.5-5.5.43/extra/yassl/include/openssl/evp.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/evp.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/evp.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/generate_prefix_files.pl mysql-5.5-5.5.43/extra/yassl/include/openssl/generate_prefix_files.pl
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/generate_prefix_files.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/generate_prefix_files.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/hmac.h mysql-5.5-5.5.43/extra/yassl/include/openssl/hmac.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/hmac.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/hmac.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/lhash.h mysql-5.5-5.5.43/extra/yassl/include/openssl/lhash.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/lhash.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/lhash.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/md4.h mysql-5.5-5.5.43/extra/yassl/include/openssl/md4.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/md4.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/md4.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/md5.h mysql-5.5-5.5.43/extra/yassl/include/openssl/md5.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/md5.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/md5.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/objects.h mysql-5.5-5.5.43/extra/yassl/include/openssl/objects.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/objects.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/objects.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/opensslv.h mysql-5.5-5.5.43/extra/yassl/include/openssl/opensslv.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/opensslv.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/opensslv.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/pem.h mysql-5.5-5.5.43/extra/yassl/include/openssl/pem.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/pem.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/pem.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/pkcs12.h mysql-5.5-5.5.43/extra/yassl/include/openssl/pkcs12.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/pkcs12.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/pkcs12.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/prefix_crypto.h mysql-5.5-5.5.43/extra/yassl/include/openssl/prefix_crypto.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/prefix_crypto.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/prefix_crypto.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/rand.h mysql-5.5-5.5.43/extra/yassl/include/openssl/rand.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/rand.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/rand.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/rsa.h mysql-5.5-5.5.43/extra/yassl/include/openssl/rsa.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/rsa.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/rsa.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/sha.h mysql-5.5-5.5.43/extra/yassl/include/openssl/sha.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/sha.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/sha.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/ssl.h mysql-5.5-5.5.43/extra/yassl/include/openssl/ssl.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/ssl.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/ssl.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
    Use is subject to license terms.
 
    This program is free software; you can redistribute it and/or modify
@@ -35,7 +35,7 @@
 #include "rsa.h"
 
 
-#define YASSL_VERSION "2.2.2"
+#define YASSL_VERSION "2.3.7"
 
 
 #if defined(__cplusplus)
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/x509.h mysql-5.5-5.5.43/extra/yassl/include/openssl/x509.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/x509.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/x509.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/x509v3.h mysql-5.5-5.5.43/extra/yassl/include/openssl/x509v3.h
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/openssl/x509v3.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/openssl/x509v3.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/timer.hpp mysql-5.5-5.5.43/extra/yassl/include/timer.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/timer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/timer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl_error.hpp mysql-5.5-5.5.43/extra/yassl/include/yassl_error.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl_error.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/yassl_error.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl.hpp mysql-5.5-5.5.43/extra/yassl/include/yassl.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/yassl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl_int.hpp mysql-5.5-5.5.43/extra/yassl/include/yassl_int.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl_int.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/yassl_int.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -107,6 +107,25 @@
 };
 
 
+// track received messages to explicitly disallow duplicate messages
+struct RecvdMessages {
+    uint8 gotClientHello_;
+    uint8 gotServerHello_;
+    uint8 gotCert_;
+    uint8 gotServerKeyExchange_;
+    uint8 gotCertRequest_;
+    uint8 gotServerHelloDone_;
+    uint8 gotCertVerify_;
+    uint8 gotClientKeyExchange_;
+    uint8 gotFinished_;
+    RecvdMessages() : gotClientHello_(0), gotServerHello_(0), gotCert_(0),
+                      gotServerKeyExchange_(0), gotCertRequest_(0),
+                      gotServerHelloDone_(0), gotCertVerify_(0),
+                      gotClientKeyExchange_(0), gotFinished_(0)
+                    {} 
+};
+
+
 // combines all states
 class States {
     RecordLayerState recordLayer_;
@@ -115,6 +134,7 @@
     ServerState      serverState_;
     ConnectState     connectState_;
     AcceptState      acceptState_;
+    RecvdMessages    recvdMessages_;
     char             errorString_[MAX_ERROR_SZ];
     YasslError       what_;
 public:
@@ -137,6 +157,7 @@
     AcceptState&      UseAccept();
     char*             useString();
     void              SetError(YasslError);
+    int               SetMessageRecvd(HandShakeType);
 private:
     States(const States&);              // hide copy
     States& operator=(const States&);   // and assign
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl_types.hpp mysql-5.5-5.5.43/extra/yassl/include/yassl_types.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/include/yassl_types.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/include/yassl_types.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/README mysql-5.5-5.5.43/extra/yassl/README
--- mysql-5.5-5.5.35+dfsg/extra/yassl/README	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/README	2015-02-27 08:30:34.000000000 +0000
@@ -12,7 +12,71 @@
 
 *** end Note ***
 
-yaSSL Release notes, version 2.2.2 (7/5/2012)
+yaSSL Release notes, version 2.3.7 (12/10/2014)
+    This release of yaSSL fixes the potential to process duplicate handshake
+    messages by explicitly marking/checking received handshake messages.
+
+yaSSL Release notes, version 2.3.6 (11/25/2014)
+
+    This release of yaSSL fixes some valgrind warnings/errors including
+    uninitialized reads and off by one index errors induced from fuzzing
+    the handshake.  These were reported by Oracle. 
+
+yaSSL Release notes, version 2.3.5 (9/29/2014)
+
+    This release of yaSSL fixes an RSA Padding check vulnerability reported by
+    Intel Security Advanced Threat Research team
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+yaSSL Release notes, version 2.3.4 (8/15/2014)
+
+    This release of yaSSL adds checking to the input_buffer class itself.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+yaSSL Release notes, version 2.3.2 (7/25/2014)
+
+    This release of yaSSL updates test certs.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.3.0 (12/5/2013)
+
+    This release of yaSSL updates asm for newer GCC versions.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.3 (4/23/2013)
+
+    This release of yaSSL updates the test certificates as they were expired
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.2d (2/5/2013)
+
+    This release of yaSSL contains countermeasuers for the Lucky 13 TLS 1.1
+    CBC timing padding attack identified by Nadhem AlFardan and Kenneth Paterson
+    see: http://www.isg.rhul.ac.uk/tls/
+
+    It also adds SHA2 certificate verification and better checks for malicious
+    input.
+
+See normal  build instructions below under 1.0.6.
+See libcurl build instructions below under 1.3.0 and note in 1.5.8.
+
+
+*****************yaSSL Release notes, version 2.2.2 (7/5/2012)
 
     This release of yaSSL contains bug fixes and more security checks around
     malicious certificates.
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/buffer.cpp mysql-5.5-5.5.43/extra/yassl/src/buffer.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/buffer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/buffer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -32,8 +32,19 @@
 
 
 
-void NoCheck::check(uint, uint) 
+/* return 0 on check success, always true for NoCheck policy */
+int NoCheck::check(uint, uint) 
 {
+    return 0;
+}
+
+/* return 0 on check success */
+int Check::check(uint i, uint max) 
+{
+    if (i < max)
+        return 0;
+
+    return -1;
 }
 
 
@@ -48,18 +59,20 @@
 
 
 input_buffer::input_buffer() 
-    : size_(0), current_(0), buffer_(0), end_(0) 
+    : size_(0), current_(0), buffer_(0), end_(0), error_(0), zero_(0)
 {}
 
 
 input_buffer::input_buffer(uint s) 
-    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s)
+    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
+      error_(0), zero_(0)
 {}
 
 
 // with assign
 input_buffer::input_buffer(uint s, const byte* t, uint len) 
-    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s) 
+    : size_(0), current_(0), buffer_(NEW_YS byte[s]), end_(buffer_ + s),
+      error_(0), zero_(0)
 { 
     assign(t, len); 
 }
@@ -74,8 +87,10 @@
 // users can pass defualt zero length buffer and then allocate
 void input_buffer::allocate(uint s) 
 { 
-    buffer_ = NEW_YS byte[s];
-    end_ = buffer_ + s; 
+    if (error_ == 0) {
+        buffer_ = NEW_YS byte[s];
+        end_ = buffer_ + s;
+    }
 }
 
 
@@ -90,40 +105,67 @@
 // if you know the size before the write use assign()
 void input_buffer::add_size(uint i) 
 { 
-    check(size_ + i-1, get_capacity()); 
-    size_ += i; 
+    if (error_ == 0 && check(size_ + i-1, get_capacity()) == 0)
+        size_ += i;
+    else
+        error_ = -1;
 }
 
 
 uint input_buffer::get_capacity()  const 
 { 
-    return (uint) (end_ - buffer_); 
+    if (error_ == 0)
+        return end_ - buffer_;
+
+    return 0;
 }
 
 
 uint input_buffer::get_current()   const 
 { 
-    return current_; 
+    if (error_ == 0)
+        return current_;
+
+    return 0;
 }
 
 
 uint input_buffer::get_size()      const 
 { 
-    return size_; 
+    if (error_ == 0)
+        return size_;
+
+    return 0;
 }
 
 
 uint input_buffer::get_remaining() const 
 { 
-    return size_ - current_; 
+    if (error_ == 0)
+        return size_ - current_;
+
+    return 0;
+}
+
+
+int input_buffer::get_error() const 
+{ 
+    return error_;
+}
+
+
+void input_buffer::set_error()
+{ 
+    error_ = -1;
 }
 
 
 void input_buffer::set_current(uint i) 
 {
-    if (i)
-        check(i - 1, size_); 
-    current_ = i; 
+    if (error_ == 0 && i && check(i - 1, size_) == 0)
+        current_ = i;
+    else
+        error_ = -1;
 }
 
 
@@ -131,40 +173,59 @@
 // user passes in AUTO index for ease of use
 const byte& input_buffer::operator[](uint i) 
 {
-    check(current_, size_);
-    return buffer_[current_++];
+    if (error_ == 0 && check(current_, size_) == 0)
+        return buffer_[current_++];
+
+    error_ = -1;
+    return zero_;
 }
 
 
 // end of input test
 bool input_buffer::eof() 
 { 
+    if (error_ != 0)
+        return true;
+
     return current_ >= size_; 
 }
 
 
 // peek ahead
-byte input_buffer::peek() const
+byte input_buffer::peek()
 {
-    return buffer_[current_];
+    if (error_ == 0 && check(current_, size_) == 0)
+        return buffer_[current_];
+
+    error_ = -1;
+    return 0;
 }
 
 
 // write function, should use at/near construction
 void input_buffer::assign(const byte* t, uint s)
 {
-    check(current_, get_capacity());
-    add_size(s);
-    memcpy(&buffer_[current_], t, s);
+    if (t && error_ == 0 && check(current_, get_capacity()) == 0) {
+        add_size(s);
+        if (error_ == 0) {
+            memcpy(&buffer_[current_], t, s);
+            return;  // success
+        }
+    }
+
+    error_ = -1;
 }
 
 
 // use read to query input, adjusts current
 void input_buffer::read(byte* dst, uint length)
 {
-    check(current_ + length - 1, size_);
-    memcpy(dst, &buffer_[current_], length);
-    current_ += length;
+    if (dst && error_ == 0 && check(current_ + length - 1, size_) == 0) {
+        memcpy(dst, &buffer_[current_], length);
+        current_ += length;
+    } else {
+        error_ = -1;
+    }
 }
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/cert_wrapper.cpp mysql-5.5-5.5.43/extra/yassl/src/cert_wrapper.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/cert_wrapper.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/cert_wrapper.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -91,7 +91,7 @@
 //CertManager
 CertManager::CertManager()
     : peerX509_(0), verifyPeer_(false), verifyNone_(false), failNoCert_(false),
-      sendVerify_(false), verifyCallback_(0)
+      sendVerify_(false), sendBlankCert_(false), verifyCallback_(0)
 {}
 
 
@@ -142,6 +142,11 @@
     verifyNone_ = true;
 }
 
+bool CertManager::sendBlankCert() const
+{
+  return sendBlankCert_;
+}
+
 
 void CertManager::setFailNoCert()
 {
@@ -154,6 +159,11 @@
     sendVerify_ = true;
 }
 
+void CertManager::setSendBlankCert()
+{
+  sendBlankCert_ = true;
+}
+
 
 void CertManager::setVerifyCallback(VerifyCallback vc)
 {
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/crypto_wrapper.cpp mysql-5.5-5.5.43/extra/yassl/src/crypto_wrapper.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/crypto_wrapper.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/crypto_wrapper.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -953,9 +953,9 @@
                     info->set = true;
                 }
             }
-            // get blank line
-            if (fgets(line, sizeof(line), file))
             begin = ftell(file);
+            if (fgets(line,sizeof(line), file)) // get blank line
+              begin = ftell(file);
         }
           
     }
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/handshake.cpp mysql-5.5-5.5.43/extra/yassl/src/handshake.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/handshake.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/handshake.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -522,7 +522,7 @@
 // some clients still send sslv2 client hello
 void ProcessOldClientHello(input_buffer& input, SSL& ssl)
 {
-    if (input.get_remaining() < 2) {
+    if (input.get_error() || input.get_remaining() < 2) {
         ssl.SetError(bad_input);
         return;
     }
@@ -549,20 +549,24 @@
 
     byte len[2];
 
-    input.read(len, sizeof(len));
+    len[0] = input[AUTO];
+    len[1] = input[AUTO];
     ato16(len, ch.suite_len_);
 
-    input.read(len, sizeof(len));
+    len[0] = input[AUTO];
+    len[1] = input[AUTO];
     uint16 sessionLen;
     ato16(len, sessionLen);
     ch.id_len_ = sessionLen;
 
-    input.read(len, sizeof(len));
+    len[0] = input[AUTO];
+    len[1] = input[AUTO];
     uint16 randomLen;
     ato16(len, randomLen);
 
-    if (ch.suite_len_ > MAX_SUITE_SZ || sessionLen > ID_LEN ||
-                                        randomLen > RAN_LEN) {
+    if (input.get_error() || ch.suite_len_ > MAX_SUITE_SZ ||
+                             ch.suite_len_ > input.get_remaining() ||
+                             sessionLen > ID_LEN || randomLen > RAN_LEN) {
         ssl.SetError(bad_input);
         return;
     }
@@ -580,13 +584,12 @@
     ch.suite_len_ = j;
 
     if (ch.id_len_)
-        input.read(ch.session_id_, ch.id_len_);
+        input.read(ch.session_id_, ch.id_len_);   // id_len_ from sessionLen
 
     if (randomLen < RAN_LEN)
         memset(ch.random_, 0, RAN_LEN - randomLen);
     input.read(&ch.random_[RAN_LEN - randomLen], randomLen);
  
-
     ch.Process(input, ssl);
 }
 
@@ -787,6 +790,9 @@
             ssl.verifyState(hdr);
         }
 
+        if (ssl.GetError())
+            return 0;
+
         // make sure we have enough input in buffer to process this record
         if (needHdr || hdr.length_ > buffer.get_remaining()) {
             // put header in front for next time processing
@@ -799,6 +805,9 @@
 
         while (buffer.get_current() < hdr.length_ + RECORD_HEADER + offset) {
             // each message in record, can be more than 1 if not encrypted
+            if (ssl.GetError())
+                return 0;
+
             if (ssl.getSecurity().get_parms().pending_ == false) { // cipher on
                 // sanity check for malicious/corrupted/illegal input
                 if (buffer.get_remaining() < hdr.length_) {
@@ -1159,6 +1168,8 @@
 {
     if (ssl.GetError()) return;
 
+    if(ssl.getCrypto().get_certManager().sendBlankCert()) return;
+
     CertificateVerify  verify;
     verify.Build(ssl);
     RecordLayerHeader  rlHeader;
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/log.cpp mysql-5.5-5.5.43/extra/yassl/src/log.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/log.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/log.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/ssl.cpp mysql-5.5-5.5.43/extra/yassl/src/ssl.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/ssl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/ssl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -790,7 +790,10 @@
             strncpy(name, path, MAX_PATH - 1 - HALF_PATH);
             strncat(name, "/", 1);
             strncat(name, entry->d_name, HALF_PATH);
-            if (stat(name, &buf) < 0) return SSL_BAD_STAT;
+            if (stat(name, &buf) < 0) {
+                closedir(dir);
+                return SSL_BAD_STAT;
+            }
      
             if (S_ISREG(buf.st_mode))
                 ret = read_file(ctx, name, SSL_FILETYPE_PEM, CA);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/timer.cpp mysql-5.5-5.5.43/extra/yassl/src/timer.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/timer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/timer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/yassl_error.cpp mysql-5.5-5.5.43/extra/yassl/src/yassl_error.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/yassl_error.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/yassl_error.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/yassl_imp.cpp mysql-5.5-5.5.43/extra/yassl/src/yassl_imp.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/yassl_imp.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/yassl_imp.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -220,18 +220,29 @@
 // read PreMaster secret and decrypt, server side
 void EncryptedPreMasterSecret::read(SSL& ssl, input_buffer& input)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     const CertManager& cert = ssl.getCrypto().get_certManager();
     RSA rsa(cert.get_privateKey(), cert.get_privateKeyLength(), false);
     uint16 cipherLen = rsa.get_cipherLength();
     if (ssl.isTLS()) {
         byte len[2];
-        input.read(len, sizeof(len));
+        len[0] = input[AUTO];
+        len[1] = input[AUTO];
         ato16(len, cipherLen);
     }
     alloc(cipherLen);
     input.read(secret_, length_);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     opaque preMasterSecret[SECRET_LEN];
+    memset(preMasterSecret, 0, sizeof(preMasterSecret));
     rsa.decrypt(preMasterSecret, secret_, length_, 
                 ssl.getCrypto().get_random());
 
@@ -277,6 +288,11 @@
 // read client's public key, server side
 void ClientDiffieHellmanPublic::read(SSL& ssl, input_buffer& input)
 {
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     DiffieHellman& dh = ssl.useCrypto().use_dh();
 
     uint16 keyLength;
@@ -285,8 +301,17 @@
     tmp[1] = input[AUTO];
     ato16(tmp, keyLength);
 
+    if (keyLength < dh.get_agreedKeyLength()/2) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     alloc(keyLength);
     input.read(Yc_, keyLength);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     dh.makeAgreement(Yc_, keyLength); 
 
     // because of encoding, first byte might be 0, don't use for preMaster 
@@ -331,6 +356,10 @@
 // read server's p, g, public key and sig, client side
 void DH_Server::read(SSL& ssl, input_buffer& input)
 {
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
     uint16 length, messageTotal = 6; // pSz + gSz + pubSz
     byte tmp[2];
 
@@ -341,6 +370,10 @@
     messageTotal += length;
 
     input.read(parms_.alloc_p(length), length);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // g
     tmp[0] = input[AUTO];
@@ -349,6 +382,10 @@
     messageTotal += length;
 
     input.read(parms_.alloc_g(length), length);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // pub
     tmp[0] = input[AUTO];
@@ -357,20 +394,36 @@
     messageTotal += length;
 
     input.read(parms_.alloc_pub(length), length);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // save message for hash verify
     input_buffer message(messageTotal);
     input.set_current(input.get_current() - messageTotal);
     input.read(message.get_buffer(), messageTotal);
     message.add_size(messageTotal);
+    if (input.get_error() || input.get_remaining() < (uint)LENGTH_SZ) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // signature
     tmp[0] = input[AUTO];
     tmp[1] = input[AUTO];
     ato16(tmp, length);
 
+    if (length == 0) {
+        ssl.SetError(bad_input);
+        return;
+    }
     signature_ = NEW_YS byte[length];
     input.read(signature_, length);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     // verify signature
     byte hash[FINISHED_SZ];
@@ -645,6 +698,10 @@
 {
     ssl.verifyState(*this);
     if (ssl.GetError()) return;
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     const HandShakeFactory& hsf = ssl.getFactory().getHandShake();
     mySTL::auto_ptr<HandShakeBase> hs(hsf.CreateObject(type_));
     if (!hs.get()) {
@@ -810,8 +867,19 @@
 
 
 // CipherSpec processing handler
-void ChangeCipherSpec::Process(input_buffer&, SSL& ssl)
+void ChangeCipherSpec::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
+    // detect duplicate change_cipher
+    if (ssl.getSecurity().get_parms().pending_ == false) {
+        ssl.order_error();
+        return;
+    }
+
     ssl.useSecurity().use_parms().pending_ = false;
     if (ssl.getSecurity().get_resuming()) {
         if (ssl.getSecurity().get_parms().entity_ == client_end)
@@ -873,6 +941,11 @@
 // Alert processing handler
 void Alert::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     if (ssl.getSecurity().get_parms().pending_ == false)  { // encrypted alert
         int            aSz = get_length();  // alert size already read on input
         opaque         verify[SHA_LEN];
@@ -890,12 +963,19 @@
 
         if (ssl.getSecurity().get_parms().cipher_type_ == block) {
             int    ivExtra = 0;
+            opaque fill;
 
             if (ssl.isTLSv1_1())
                 ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
             int padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
                         aSz - digestSz;
-            input.set_current(input.get_current() + padSz);
+            for (int i = 0; i < padSz; i++) 
+                fill = input[AUTO];
+        }
+
+        if (input.get_error()) {
+            ssl.SetError(bad_input);
+            return;
         }
 
         // verify
@@ -1112,6 +1192,11 @@
 // Process handler for Data
 void Data::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     int msgSz = ssl.getSecurity().get_parms().encrypt_size_;
     int pad   = 0, padSz = 0;
     int ivExtra = 0;
@@ -1154,7 +1239,7 @@
 
     int dataSz = msgSz - ivExtra - digestSz - pad - padSz;
 
-    if (dataSz < 0) {
+    if (dataSz < 0 || dataSz > (MAX_RECORD_SIZE + COMPRESS_EXTRA)) {
         ssl.SetError(bad_input);
         return;
     }
@@ -1180,6 +1265,10 @@
 
     // advance past mac and fill
     input.set_current(input.get_current() + digestSz + pad + padSz);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 }
 
 
@@ -1199,22 +1288,38 @@
 
 Certificate::Certificate(const x509* cert) : cert_(cert) 
 {
-    set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
+    if (cert)
+      set_length(cert_->get_length() + 2 * CERT_HEADER); // list and cert size
+    else
+      set_length(CERT_HEADER); // total blank cert size, just list header
 }
 
 
 const opaque* Certificate::get_buffer() const
 {
-    return cert_->get_buffer(); 
+    if (cert_)
+      return cert_->get_buffer();
+
+    return NULL;
 }
 
 
 // output operator for Certificate
 output_buffer& operator<<(output_buffer& output, const Certificate& cert)
 {
-    uint sz = cert.get_length() - 2 * CERT_HEADER;
+    uint sz = cert.get_length();
     opaque tmp[CERT_HEADER];
 
+    if ((int)sz > CERT_HEADER)
+      sz -= 2 * CERT_HEADER;  // actual cert, not including headers
+    else {
+      sz = 0;                 // blank cert case
+      c32to24(sz, tmp);
+      output.write(tmp, CERT_HEADER);
+
+      return output;
+    }
+
     c32to24(sz + CERT_HEADER, tmp);
     output.write(tmp, CERT_HEADER);
     c32to24(sz, tmp);
@@ -1228,6 +1333,11 @@
 // certificate processing handler
 void Certificate::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     CertManager& cm = ssl.useCrypto().use_certManager();
   
     uint32 list_sz;
@@ -1264,9 +1374,11 @@
             ssl.SetError(YasslError(bad_input));
             return;
         }
-        x509* myCert;
-        cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
-        input.read(myCert->use_buffer(), myCert->get_length());
+        if (cert_sz) {
+          x509* myCert;
+          cm.AddPeerCert(myCert = NEW_YS x509(cert_sz));
+          input.read(myCert->use_buffer(), myCert->get_length());
+        }
 
         list_sz -= cert_sz + CERT_HEADER;
     }
@@ -1394,6 +1506,10 @@
     
     // Session
     hello.id_len_ = input[AUTO];
+    if (hello.id_len_ > ID_LEN) {
+        input.set_error(); 
+        return input;
+    }
     if (hello.id_len_)
         input.read(hello.session_id_, hello.id_len_);
  
@@ -1434,8 +1550,13 @@
 
 
 // Server Hello processing handler
-void ServerHello::Process(input_buffer&, SSL& ssl)
+void ServerHello::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     if (ssl.GetMultiProtocol()) {   // SSLv23 support
         if (ssl.isTLS() && server_version_.minor_ < 1)
             // downgrade to SSLv3
@@ -1529,8 +1650,12 @@
 
 
 // Server Hello Done processing handler
-void ServerHelloDone::Process(input_buffer&, SSL& ssl)
+void ServerHelloDone::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     ssl.useStates().useClient() = serverHelloDoneComplete;
 }
 
@@ -1649,8 +1774,13 @@
 
 
 // Client Hello processing handler
-void ClientHello::Process(input_buffer&, SSL& ssl)
+void ClientHello::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     // store version for pre master secret
     ssl.useSecurity().use_connection().chVersion_ = client_version_;
 
@@ -1782,9 +1912,17 @@
 // Server Key Exchange processing handler
 void ServerKeyExchange::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     createKey(ssl);
     if (ssl.GetError()) return;
     server_key_->read(ssl, input);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     ssl.useStates().useClient() = serverKeyExchangeComplete;
 }
@@ -1906,27 +2044,32 @@
 {
     // types
     request.typeTotal_ = input[AUTO];
+    if (request.typeTotal_ > CERT_TYPES) {
+        input.set_error();
+        return input;
+    }
     for (int i = 0; i < request.typeTotal_; i++)
         request.certificate_types_[i] = ClientCertificateType(input[AUTO]);
 
-    byte tmp[REQUEST_HEADER];
-    input.read(tmp, sizeof(tmp));
+    byte tmp[2];
+    tmp[0] = input[AUTO];
+    tmp[1] = input[AUTO];
     uint16 sz;
     ato16(tmp, sz);
 
     // authorities
     while (sz) {
         uint16 dnSz;
-        input.read(tmp, sizeof(tmp));
+        tmp[0] = input[AUTO];
+        tmp[1] = input[AUTO];
         ato16(tmp, dnSz);
-        
-        DistinguishedName dn;
-        request.certificate_authorities_.push_back(dn = NEW_YS 
-                                                  byte[REQUEST_HEADER + dnSz]);
-        memcpy(dn, tmp, REQUEST_HEADER);
-        input.read(&dn[REQUEST_HEADER], dnSz);
+       
+        input.set_current(input.get_current() + dnSz);
 
         sz -= dnSz + REQUEST_HEADER;
+
+        if (input.get_error())
+            break;
     }
 
     return input;
@@ -1965,13 +2108,17 @@
 
 
 // CertificateRequest processing handler
-void CertificateRequest::Process(input_buffer&, SSL& ssl)
+void CertificateRequest::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     CertManager& cm = ssl.useCrypto().use_certManager();
 
-    // make sure user provided cert and key before sending and using
-    if (cm.get_cert() && cm.get_privateKey())
-        cm.setSendVerify();
+    cm.setSendVerify();
+    if (cm.get_cert() == NULL || cm.get_privateKey() == NULL)
+      cm.setSendBlankCert();  // send blank cert, OpenSSL requires now
 }
 
 
@@ -2049,12 +2196,18 @@
 input_buffer& operator>>(input_buffer& input, CertificateVerify& request)
 {
     byte tmp[VERIFY_HEADER];
-    input.read(tmp, sizeof(tmp));
+    tmp[0] = input[AUTO];
+    tmp[1] = input[AUTO];
 
     uint16 sz = 0;
     ato16(tmp, sz);
     request.set_length(sz);
 
+    if (sz == 0) {
+        input.set_error();
+        return input;
+    }
+
     request.signature_ = NEW_YS byte[sz];
     input.read(request.signature_, sz);
 
@@ -2073,8 +2226,13 @@
 
 
 // CertificateVerify processing handler
-void CertificateVerify::Process(input_buffer&, SSL& ssl)
+void CertificateVerify::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
+
     const Hashes&      hashVerify = ssl.getHashes().get_certVerify();
     const CertManager& cert       = ssl.getCrypto().get_certManager();
 
@@ -2113,9 +2271,17 @@
 // Client Key Exchange processing handler
 void ClientKeyExchange::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     createKey(ssl);
     if (ssl.GetError()) return;
     client_key_->read(ssl, input);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     if (ssl.getCrypto().get_certManager().verifyPeer())
         build_certHashes(ssl, ssl.useHashes().use_certVerify());
@@ -2202,11 +2368,19 @@
 // Finished processing handler
 void Finished::Process(input_buffer& input, SSL& ssl)
 {
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
     // verify hashes
     const  Finished& verify = ssl.getHashes().get_verify();
     uint finishedSz = ssl.isTLS() ? TLS_FINISHED_SZ : FINISHED_SZ;
     
     input.read(hashes_.md5_, finishedSz);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     if (memcmp(&hashes_, &verify.hashes_, finishedSz)) {
         ssl.SetError(verify_error);
@@ -2228,19 +2402,23 @@
     opaque mac[SHA_LEN];   // max size
     int    digestSz = ssl.getCrypto().get_digest().get_digestSize();
     input.read(mac, digestSz);
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
+        return;
+    }
 
     uint ivExtra = 0;
     if (ssl.getSecurity().get_parms().cipher_type_ == block)
         if (ssl.isTLSv1_1())
             ivExtra = ssl.getCrypto().get_cipher().get_blockSize();
 
+    opaque fill;
     int    padSz = ssl.getSecurity().get_parms().encrypt_size_ - ivExtra -
                      HANDSHAKE_HEADER - finishedSz - digestSz;
-    input.set_current(input.get_current() + padSz);
-
-    // verify mac
-    if (memcmp(mac, verifyMAC, digestSz)) {
-        ssl.SetError(verify_error);
+    for (int i = 0; i < padSz; i++) 
+        fill = input[AUTO];
+    if (input.get_error()) {
+        ssl.SetError(bad_input);
         return;
     }
 
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/src/yassl_int.cpp mysql-5.5-5.5.43/extra/yassl/src/yassl_int.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/src/yassl_int.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/src/yassl_int.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 2014, 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
@@ -255,6 +255,77 @@
 }
 
 
+// mark message recvd, check for duplicates, return 0 on success
+int States::SetMessageRecvd(HandShakeType hst)
+{
+    switch (hst) {
+        case hello_request:
+            break;  // could send more than one
+
+        case client_hello:
+            if (recvdMessages_.gotClientHello_)
+                return -1;
+            recvdMessages_.gotClientHello_ = 1;
+            break;
+
+        case server_hello:
+            if (recvdMessages_.gotServerHello_)
+                return -1;
+            recvdMessages_.gotServerHello_ = 1;
+            break;
+
+        case certificate:
+            if (recvdMessages_.gotCert_)
+                return -1;
+            recvdMessages_.gotCert_ = 1;
+            break;
+
+        case server_key_exchange:
+            if (recvdMessages_.gotServerKeyExchange_)
+                return -1;
+            recvdMessages_.gotServerKeyExchange_ = 1;
+            break;
+
+        case certificate_request:
+            if (recvdMessages_.gotCertRequest_)
+                return -1;
+            recvdMessages_.gotCertRequest_ = 1;
+            break;
+
+        case server_hello_done:
+            if (recvdMessages_.gotServerHelloDone_)
+                return -1;
+            recvdMessages_.gotServerHelloDone_ = 1;
+            break;
+
+        case certificate_verify:
+            if (recvdMessages_.gotCertVerify_)
+                return -1;
+            recvdMessages_.gotCertVerify_ = 1;
+            break;
+
+        case client_key_exchange:
+            if (recvdMessages_.gotClientKeyExchange_)
+                return -1;
+            recvdMessages_.gotClientKeyExchange_ = 1;
+            break;
+
+        case finished:
+            if (recvdMessages_.gotFinished_)
+                return -1;
+            recvdMessages_.gotFinished_ = 1;
+            break;
+
+
+        default:
+            return -1;
+
+    }
+
+    return 0;
+}
+
+
 sslFactory::sslFactory() :           
         messageFactory_(InitMessageFactory),
         handShakeFactory_(InitHandShakeFactory),
@@ -1199,6 +1270,11 @@
         return;
     }
 
+    if (states_.SetMessageRecvd(hsHeader.get_handshakeType()) != 0) {
+        order_error();
+        return;
+    }
+
     if (secure_.get_parms().entity_ == client_end)
         verifyClientState(hsHeader.get_handshakeType());
     else
@@ -2534,8 +2610,9 @@
     int DeCompress(input_buffer& in, int sz, input_buffer& out)
     {
         byte tmp[LENGTH_SZ];
-    
-        in.read(tmp, sizeof(tmp));
+   
+        tmp[0] = in[AUTO]; 
+        tmp[1] = in[AUTO]; 
 
         uint16 len;
         ato16(tmp, len);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/CMakeLists.txt mysql-5.5-5.5.43/extra/yassl/taocrypt/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -36,7 +36,6 @@
 ADD_CONVENIENCE_LIBRARY(taocrypt ${TAOCRYPT_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(taocrypt)
 
-INSTALL_DEBUG_SYMBOLS(taocrypt)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(taocrypt DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/algebra.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/algebra.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/algebra.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/algebra.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/arc4.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/arc4.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/arc4.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/arc4.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/asn.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/asn.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/asn.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/asn.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -111,7 +111,7 @@
     MAX_LENGTH_SZ =  5,    
     MAX_SEQ_SZ    =  5,    // enum(seq|con) + length(4)
     MAX_ALGO_SIZE =  9,
-    MAX_DIGEST_SZ = 25,    // SHA + enum(Bit or Octet) + length(4)
+    MAX_DIGEST_SZ = 69,    // SHA512 + enum(Bit or Octet) + length(4)
     DSA_SIG_SZ    = 40,
     ASN_NAME_MAX  = 512    // max total of all included names
 };
@@ -257,8 +257,11 @@
 
 
 enum ContentType { HUH = 651 };
-enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA =649};
-enum HashType { MD2h = 646, MD5h = 649, SHAh = 88 };
+enum SigType  { SHAwDSA = 517, MD2wRSA = 646, MD5wRSA = 648, SHAwRSA = 649,
+                SHA256wRSA = 655, SHA384wRSA = 656, SHA512wRSA = 657,
+                SHA256wDSA = 416 };
+enum HashType { MD2h = 646, MD5h = 649, SHAh = 88, SHA256h = 414, SHA384h = 415,
+                SHA512h = 416 };
 enum KeyType  { DSAk = 515, RSAk = 645 };     // sums of algo OID
 
 
@@ -294,9 +297,9 @@
     byte*     signature_;
     char      issuer_[ASN_NAME_MAX];    // Names
     char      subject_[ASN_NAME_MAX];   // Names
-    char      beforeDate_[MAX_DATE_SZ]; // valid before date
-    char      afterDate_[MAX_DATE_SZ];  // valid after date
-    bool      verify_;                  // Default to yes, but could be off
+    char      beforeDate_[MAX_DATE_SZ+1]; // valid before date, +null term
+    char      afterDate_[MAX_DATE_SZ+1];  // valid after date, +null term
+    bool      verify_;                    // Default to yes, but could be off
 
     void   ReadHeader();
     void   Decode(SignerList*, CertType);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/block.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/block.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/block.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/block.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -74,7 +74,7 @@
     if (preserve) {
         A b = A();
         typename A::pointer newPointer = b.allocate(newSize, 0);
-        memcpy(newPointer, p, sizeof(T) * min((word32) oldSize, (word32) newSize));
+        memcpy(newPointer, p, sizeof(T) * min(oldSize, newSize));
         a.deallocate(p, oldSize);
         STL::swap(a, b);
         return newPointer;
@@ -186,9 +186,9 @@
 
     ~Block() { allocator_.deallocate(buffer_, sz_); }
 private:
+    A      allocator_;
     word32 sz_;     // size in Ts
     T*     buffer_;
-    A      allocator_;
 };
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/coding.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/coding.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/coding.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/coding.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/dh.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/dh.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/dh.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/dh.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/dsa.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/dsa.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/dsa.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/dsa.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/error.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/error.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/error.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/error.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/hmac.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/hmac.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/hmac.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/hmac.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/integer.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/integer.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/integer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/integer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -46,6 +46,14 @@
 
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
+    #if defined(__GNUC__) && (__GNUC__ >= 4)
+        // GCC 4 or greater optimizes too much inline on recursive for bigint, 
+        // -O3 just as fast without asm here anyway
+        #undef TAOCRYPT_X86ASM_AVAILABLE
+    #endif
+#endif
+
+#ifdef TAOCRYPT_X86ASM_AVAILABLE
 
 #ifdef _M_IX86
     #if (defined(__INTEL_COMPILER) && (__INTEL_COMPILER >= 500)) || \
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/md2.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/md2.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/md2.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/md2.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/md4.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/md4.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/md4.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/md4.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/md5.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/md5.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/md5.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/md5.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/misc.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/misc.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/misc.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/misc.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -124,15 +124,22 @@
 
 
 // no gas on these systems ?, disable for now
-#if defined(__sun__) || defined (__APPLE__)
+#if defined(__sun__)
+    #undef  TAOCRYPT_DISABLE_X86ASM
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 
 // icc problem with -03 and integer, disable for now
 #if defined(__INTEL_COMPILER)
+    #undef  TAOCRYPT_DISABLE_X86ASM
     #define TAOCRYPT_DISABLE_X86ASM
 #endif
 
+// indpedent of build system, unless ia32 asm is enabled disable it
+#if !defined(TAOCRYPT_ENABLE_X86ASM)
+    #undef  TAOCRYPT_DISABLE_X86ASM
+    #define TAOCRYPT_DISABLE_X86ASM
+#endif
 
 // Turn on ia32 ASM for Big Integer
 // CodeWarrior defines _MSC_VER
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/modarith.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/modarith.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/modarith.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/modarith.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/pwdbased.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/pwdbased.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/pwdbased.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/pwdbased.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -16,6 +16,7 @@
    MA  02110-1301  USA.
 */
 
+
 /* pwdbased.hpp defines PBKDF2 from PKCS #5
 */
 
@@ -48,10 +49,7 @@
                                  word32 pLen, const byte* salt, word32 sLen,
                                  word32 iterations) const
 {
-    if (dLen > MaxDerivedKeyLength())
-        return 0;
-
-    if (iterations < 0)
+	if (dLen > MaxDerivedKeyLength())
         return 0;
 
     ByteBlock buffer(T::DIGEST_SIZE);
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/random.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/random.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/random.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/random.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/ripemd.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/ripemd.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/ripemd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/ripemd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/runtime.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/runtime.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/runtime.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/runtime.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -34,7 +34,10 @@
 
 // Handler for pure virtual functions
 namespace __Crun {
-    void pure_error(void);
+    static void pure_error(void)
+    {
+       // "Pure virtual method called, Aborted", GCC 4.2 str cmp fix
+    }
 } // namespace __Crun
 
 #endif // __sun
@@ -48,7 +51,15 @@
 #if defined(DO_TAOCRYPT_KERNEL_MODE)
     #include "kernelc.hpp"
 #endif
-    int __cxa_pure_virtual () __attribute__ ((weak));
+
+/* Disallow inline __cxa_pure_virtual() */
+static int __cxa_pure_virtual() __attribute__((noinline, used));
+static int __cxa_pure_virtual()
+{
+    // oops, pure virtual called!
+    return 0;
+}
+
 } // extern "C"
 
 #endif // __GNUC__ > 2
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/sha.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/sha.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/sha.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/sha.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2014, 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
@@ -158,6 +158,12 @@
     void Transform();
 };
 
+enum { MAX_SHA2_DIGEST_SIZE = 64 };   // SHA512
+
+#else
+
+enum { MAX_SHA2_DIGEST_SIZE = 32 };   // SHA256
+
 #endif // WORD64_AVAILABLE
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/twofish.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/twofish.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/twofish.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/twofish.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/type_traits.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/include/type_traits.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/include/type_traits.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/include/type_traits.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/algorithm.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/algorithm.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/algorithm.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/algorithm.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/helpers.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/helpers.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/helpers.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/helpers.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/list.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/list.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/list.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/list.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/memory_array.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/memory_array.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/memory_array.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/memory_array.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/memory.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/memory.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/memory.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/memory.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/pair.hpp mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/pair.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/mySTL/pair.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/mySTL/pair.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/aes.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/aes.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/aes.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/aes.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -52,7 +52,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in +  4);
@@ -65,7 +65,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmDecrypt(in, out, (void*)Td0);
                 
@@ -78,7 +79,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-   }
+        }
+    }
 }
 
 #endif // DO_AES_ASM
@@ -452,27 +454,30 @@
 
 #if defined(DO_AES_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    sub   esp, 4                        )   \
-            AS2(    movd  mm7, ebp                      )   \
-            AS2(    mov   [ebp - 4], esi                )   \
-            AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )   \
-            AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
-
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm7, ebp;" \
+            "movd mm4, eax;" \
+            "mov  ebp, edx;"  \
+            "sub  esp, 4;" 
         #define EPILOG()  \
-            AS2(    mov  esi, [ebp - 4]             )   \
-            AS2(    mov  esp, ebp                   )   \
-            AS2(    movd ebx, mm4                   )   \
-            AS2(    movd edi, mm3                   )   \
-            AS1(    emms                            )   \
-            asm(".att_syntax");
+            "add esp, 4;" \
+            "pop ebp;" \
+            "pop ebx;" \
+       	    "emms;" \
+       	    ".att_syntax;" \
+                : \
+                : "c" (this), "S" (inBlock), "d" (boxes), "a" (outBlock) \
+                : "%edi", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -504,6 +509,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void AES::AsmEncrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
@@ -537,7 +544,11 @@
     AS2(    xor   ecx, DWORD PTR [edi +  8]          )   // s2
     AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
 
-    AS1(loop1:                                                          )
+#ifdef _MSC_VER
+    AS1( loop1: )  // loop1
+#else
+    AS1(1:  )      // loop1
+#endif
             /* Put0 (mm0) =  
                 Te0[get0,rs 24] ^
                 Te1[get1,rs 16] ^
@@ -652,7 +663,11 @@
     AS1(    dec   edi                                                   )
     AS2(    movd  mm5, edi                                              )
 
-    AS1(    jnz   loop1                                                 )
+#ifdef _MSC_VER
+    AS1(    jnz   loop1)  // loop1
+#else
+    AS1(    jnz   1b )    // loop1
+#endif
 
             // last round
             /*
@@ -799,9 +814,9 @@
 
             // store
     #ifdef __GNUC__
-        AS2(    mov esi, DWORD PTR [ebp + 16]       )   //  outBlock
+        AS2(    movd esi, mm4                       )   //  outBlock
     #else
-        AS2(    mov esi, DWORD PTR [ebp + 12]       )   //  outBlock
+        AS2(    mov  esi, DWORD PTR [ebp + 12]      )   //  outBlock
     #endif
 
     AS1(    bswap ecx                                                   )
@@ -819,6 +834,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void AES::AsmDecrypt(const byte* inBlock, byte* outBlock, void* boxes) const
 {
@@ -853,7 +870,11 @@
     AS2(    xor   edx, DWORD PTR [edi + 12]          )   // s3
 
 
-    AS1(loop2:                                                          )
+#ifdef _MSC_VER
+    AS1( loop2: )  // loop2
+#else
+    AS1(2:  )      // loop2
+#endif
        /*   Put0 (mm0) =
             Td0[GETBYTE(get0, rs24)] ^
             Td1[GETBYTE(get3, rs16)] ^
@@ -964,7 +985,11 @@
     AS1(    dec   edi                                                   )
     AS2(    movd  mm5, edi                                              )
 
-    AS1(    jnz   loop2                                                 )
+#ifdef _MSC_VER
+    AS1(    jnz   loop2)  // loop2
+#else
+    AS1(    jnz   2b )    // loop2
+#endif
 
             // last round
             /*
@@ -1114,9 +1139,9 @@
 
             // store
     #ifdef __GNUC__
-        AS2(    mov esi, DWORD PTR [ebp + 16]       )   //  outBlock
+        AS2(    movd esi, mm4                        )   //  outBlock
     #else
-        AS2(    mov esi, DWORD PTR [ebp + 12]       )   //  outBlock
+        AS2(    mov esi,  DWORD PTR [ebp + 12]       )   //  outBlock
     #endif
     AS2(    mov DWORD PTR [esi],      eax                               )
     AS2(    mov DWORD PTR [esi +  4], ebx                               )
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/algebra.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/algebra.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/algebra.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/algebra.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -186,10 +186,10 @@
 
 struct WindowSlider
 {
-    WindowSlider(const Integer &expIn, bool fastNegateIn,
+    WindowSlider(const Integer &exp, bool fastNegate,
                  unsigned int windowSizeIn=0)
-        : exp(expIn), windowModulus(Integer::One()), windowSize(windowSizeIn),
-          windowBegin(0), fastNegate(fastNegateIn), firstTime(true),
+        : exp(exp), windowModulus(Integer::One()), windowSize(windowSizeIn),
+          windowBegin(0), fastNegate(fastNegate), firstTime(true),
           finished(false)
     {
         if (windowSize == 0)
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/arc4.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/arc4.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/arc4.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/arc4.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -111,28 +111,26 @@
 void ARC4::AsmProcess(byte* out, const byte* in, word32 length)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 16]     )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
-
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;" \
+        "mov ebp, eax;"
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+       	"emms;" \
+       	".att_syntax;" \
+            : \
+            : "c" (this), "D" (out), "S" (in), "a" (length) \
+            : "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -178,7 +176,11 @@
     AS2(    movzx  eax, BYTE PTR [ebp + ecx]    )
 
 
-AS1( begin:                             )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
+#endif
 
     // y = (y+a) & 0xff;
     AS2(    add    edx, eax                     )
@@ -215,7 +217,11 @@
     AS1(    inc    edi                          )
 
     AS1(    dec    DWORD PTR [esp]              )
-    AS1(    jnz    begin                        )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
 
     // write back to x_ and y_
@@ -225,6 +231,8 @@
 
 AS1( nothing:                           )
 
+    // inline adjust 
+    AS2(    add   esp, 4               )   // fix room on stack
 
     EPILOG()
 }
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/asn.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/asn.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/asn.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/asn.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
-   Use is subject to license terms.
+   Copyright (c) 2000, 2014, 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
@@ -673,7 +672,7 @@
     }
 
     sigLength_ = GetLength(source_);
-    if (sigLength_ == 0 || source_.IsLeft(sigLength_) == false) {
+    if (sigLength_ <= 1 || source_.IsLeft(sigLength_) == false) {
         source_.SetError(CONTENT_E);
         return 0;
     }
@@ -761,7 +760,7 @@
     while (source_.get_index() < length) {
         GetSet();
         if (source_.GetError().What() == SET_E) {
-            source_.SetError(NO_ERROR_E);  // extensions may only have sequence
+            source_.SetError(NO_ERROR_E);  // extensions may only have sequence 
             source_.prev();
         }
         GetSequence();
@@ -832,10 +831,8 @@
             if (source_.IsLeft(length) == false) return;
 
             if (email) {
-                if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length))) {
-                    source_.SetError(CONTENT_E);
-                    return;
-                }
+                if (!(ptr = AddTag(ptr, buf_end, "/emailAddress=", 14, length)))
+                    return; 
             }
 
             source_.advance(length);
@@ -972,12 +969,26 @@
         hasher.reset(NEW_TC SHA);
         ht = SHAh;
     }
+    else if (signatureOID_ == SHA256wRSA || signatureOID_ == SHA256wDSA) {
+        hasher.reset(NEW_TC SHA256);
+        ht = SHA256h;
+    }
+#ifdef WORD64_AVAILABLE
+    else if (signatureOID_ == SHA384wRSA) {
+        hasher.reset(NEW_TC SHA384);
+        ht = SHA384h;
+    }
+    else if (signatureOID_ == SHA512wRSA) {
+        hasher.reset(NEW_TC SHA512);
+        ht = SHA512h;
+    }
+#endif
     else {
         source_.SetError(UNKOWN_SIG_E);
         return false;
     }
 
-    byte digest[SHA::DIGEST_SIZE];      // largest size
+    byte digest[MAX_SHA2_DIGEST_SIZE];      // largest size
 
     hasher->Update(source_.get_buffer() + certBegin_, sigIndex_ - certBegin_);
     hasher->Final(digest);
@@ -990,11 +1001,17 @@
         RSA_PublicKey pubKey(pub);
         RSAES_Encryptor enc(pubKey);
 
+        if (pubKey.FixedCiphertextLength() != sigLength_) {
+            source_.SetError(SIG_LEN_E);
+            return false;
+        }
+
         return enc.SSL_Verify(build.get_buffer(), build.size(), signature_);
     }
     else  { // DSA
         // extract r and s from sequence
         byte seqDecoded[DSA_SIG_SZ];
+        memset(seqDecoded, 0, sizeof(seqDecoded));
         DecodeDSA_Signature(seqDecoded, signature_, sigLength_);
 
         DSA_PublicKey pubKey(pub);
@@ -1050,6 +1067,12 @@
                                       0x02, 0x05, 0x05, 0x00  };
     static const byte md2AlgoID[] = { 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d,
                                       0x02, 0x02, 0x05, 0x00};
+    static const byte sha256AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
+                                         0x04, 0x02, 0x01, 0x05, 0x00 };
+    static const byte sha384AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
+                                         0x04, 0x02, 0x02, 0x05, 0x00 };
+    static const byte sha512AlgoID[] = { 0x60, 0x86, 0x48, 0x01, 0x65, 0x03,
+                                         0x04, 0x02, 0x03, 0x05, 0x00 };
 
     int algoSz = 0;
     const byte* algoName = 0;
@@ -1060,6 +1083,21 @@
         algoName = shaAlgoID;
         break;
 
+    case SHA256h:
+        algoSz = sizeof(sha256AlgoID);
+        algoName = sha256AlgoID;
+        break;
+
+    case SHA384h:
+        algoSz = sizeof(sha384AlgoID);
+        algoName = sha384AlgoID;
+        break;
+
+    case SHA512h:
+        algoSz = sizeof(sha512AlgoID);
+        algoName = sha512AlgoID;
+        break;
+
     case MD2h:
         algoSz = sizeof(md2AlgoID);
         algoName = md2AlgoID;
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/bftables.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/bftables.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/bftables.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/bftables.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/blowfish.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/blowfish.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/blowfish.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/blowfish.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -54,7 +54,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in + 4);
@@ -66,7 +66,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmProcess(in, out);
                 
@@ -78,6 +79,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+        }
     }
 }
 
@@ -222,23 +224,26 @@
 
 #if defined(DO_BLOWFISH_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )
-
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm3, eax;"
         #define EPILOG()  \
-            AS2(    movd esi, mm5                  )   \
-            AS2(    movd ebx, mm4                  )   \
-            AS2(    movd edi, mm3                  )   \
-            AS1(    emms                           )   \
-            asm(".att_syntax");
+            "pop ebp;" \
+            "pop ebx;" \
+       	    "emms;" \
+       	    ".att_syntax;" \
+                : \
+                : "c" (this), "S" (inBlock), "a" (outBlock) \
+                : "%edi", "%edx", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -287,6 +292,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void Blowfish::AsmProcess(const byte* inBlock, byte* outBlock) const
 {
@@ -335,7 +342,7 @@
     #endif
 
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/des.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/des.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/des.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/des.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (C) 2000-2007 MySQL AB
+   Copyright (c) 2000, 2014, 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
@@ -473,7 +473,7 @@
 
    uses ecx
 */
-#define AsmIPERM() {\
+#define AsmIPERM() \
     AS2(    rol   ebx, 4                        )   \
     AS2(    mov   ecx, eax                      )   \
     AS2(    xor   ecx, ebx                      )   \
@@ -504,7 +504,7 @@
     AS2(    and   ecx, 0xaaaaaaaa               )   \
     AS2(    xor   eax, ecx                      )   \
     AS2(    rol   eax, 1                        )   \
-    AS2(    xor   ebx, ecx                      ) }
+    AS2(    xor   ebx, ecx                      )
 
 
 /* Uses FPERM algorithm from above
@@ -514,7 +514,7 @@
 
    uses ecx
 */
-#define AsmFPERM()    {\
+#define AsmFPERM()    \
     AS2(    ror  ebx, 1                     )    \
     AS2(    mov  ecx, eax                   )    \
     AS2(    xor  ecx, ebx                   )    \
@@ -545,7 +545,7 @@
     AS2(    and  ecx, 0xf0f0f0f0            )    \
     AS2(    xor  eax, ecx                   )    \
     AS2(    xor  ebx, ecx                   )    \
-    AS2(    ror  eax, 4                     ) }
+    AS2(    ror  eax, 4                     )
 
 
 
@@ -642,31 +642,33 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void DES_EDE3::AsmProcess(const byte* in, byte* out, void* box) const
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
-
-    asm(".intel_syntax noprefix");
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   edx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   esi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   ebp, DWORD PTR [ebp + 20]     )
-
-    // ebp restored at end
-    #define EPILOG()    \
-        AS2(    movd  edi, mm3                      )   \
-        AS2(    movd  ebx, mm4                      )   \
-        AS2(    movd  esi, mm5                      )   \
-        AS1(    emms                                )   \
-        asm(".att_syntax");
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;" \
+        "movd mm6, ebp;" \
+        "movd mm7, ecx;" \
+        "mov  ebp, eax;"
+    #define EPILOG()  \
+        "pop ebp;" \
+        "pop ebx;" \
+       	"emms;" \
+       	".att_syntax;" \
+            :  \
+            : "d" (this), "S" (in), "a" (box), "c" (out) \
+            : "%edi", "memory", "cc" \
+    );
 
 #else
     #define AS1(x)      __asm x
@@ -756,7 +758,7 @@
     AS1(    bswap eax                           )
 
 #ifdef __GNUC__
-    AS2(    mov   esi, DWORD PTR [ebp +  16]    )   // outBlock
+    AS2(    movd  esi, mm7   )   // outBlock
 #else
     AS2(    mov   esi, DWORD PTR [ebp +  12]    )   // outBlock
 #endif
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/dh.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/dh.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/dh.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/dh.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/file.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/file.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/file.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/file.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/integer.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/integer.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/integer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/integer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -55,8 +55,9 @@
         #include <emmintrin.h>
     #endif
 #elif defined(_MSC_VER) && defined(_M_IX86)
-    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
+/*    #pragma message("You do not seem to have the Visual C++ Processor Pack ")
     #pragma message("installed, so use of SSE2 intrinsics will be disabled.")
+*/
 #elif defined(__GNUC__) && defined(__i386__)
 /*   #warning You do not have GCC 3.3 or later, or did not specify the -msse2 \
              compiler option. Use of SSE2 intrinsics will be disabled.
@@ -73,7 +74,7 @@
 CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
                                            size_type n, const void *)
 {
-    if (n > max_size())
+    if (n > this->max_size())
         return 0;
     if (n == 0)
         return 0;
@@ -280,7 +281,12 @@
     word GetHighHalfAsBorrow() const {return 0-halfs_.high;}
 
 private:
-    struct dword_struct
+    union
+    {
+    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
+        dword whole_;
+    #endif
+        struct
         {
         #ifdef LITTLE_ENDIAN_ORDER
             word low;
@@ -289,14 +295,7 @@
             word high;
             word low;
         #endif
-    };
-
-    union
-    {
-    #ifdef TAOCRYPT_NATIVE_DWORD_AVAILABLE
-        dword whole_;
-    #endif
-        struct dword_struct halfs_;
+        } halfs_;
     };
 };
 
@@ -1199,24 +1198,20 @@
     #define AS1(x) #x ";"
     #define AS2(x, y) #x ", " #y ";"
     #define AddPrologue \
-        word res; \
         __asm__ __volatile__ \
         ( \
             "push %%ebx;"	/* save this manually, in case of -fPIC */ \
-            "mov %3, %%ebx;" \
+            "mov %2, %%ebx;" \
             ".intel_syntax noprefix;" \
             "push ebp;"
     #define AddEpilogue \
             "pop ebp;" \
             ".att_syntax prefix;" \
             "pop %%ebx;" \
-            "mov %%eax, %0;" \
-                    : "=g" (res) \
+                    : \
                     : "c" (C), "d" (A), "m" (B), "S" (N) \
                     : "%edi", "memory", "cc" \
-        ); \
-        return res;
-
+        );
     #define MulPrologue \
         __asm__ __volatile__ \
         ( \
@@ -2610,18 +2605,20 @@
 void Integer::Decode(const byte* input, unsigned int inputLen, Signedness s)
 {
     unsigned int idx(0);
-    byte b = input[idx++];
+    byte b = 0; 
+    if (inputLen>0)
+        b = input[idx];   // peek
     sign_  = ((s==SIGNED) && (b & 0x80)) ? NEGATIVE : POSITIVE;
 
     while (inputLen>0 && (sign_==POSITIVE ? b==0 : b==0xff))
     {
-        inputLen--;
-        b = input[idx++];
+        idx++;   // skip
+        if (--inputLen>0)
+            b = input[idx];  // peek
     }
 
     reg_.CleanNew(RoundupSize(BytesToWords(inputLen)));
 
-    --idx;
     for (unsigned int i=inputLen; i > 0; i--)
     {
         b = input[idx++];
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/md2.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/md2.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/md2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/md2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/md5.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/md5.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/md5.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/md5.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -224,31 +224,31 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void MD5::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 16]     )
-
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+       	"emms;" \
+       	".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "a" (times) \
+            : "%esi", "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -294,7 +294,11 @@
     AS2(    mov   ecx, [esi +  8]       )   // c
     AS2(    mov   edx, [esi + 12]       )   // d
   
-AS1(loopStart:)
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
+#endif
 
     // set up
     AS2(    mov   esi, ecx      )
@@ -389,7 +393,11 @@
     AS2(    movd  ebp, mm2              )   // times
     AS1(    dec   ebp                   )
     AS2(    movd  mm2, ebp              )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
 
     EPILOG()
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/misc.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/misc.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/misc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/misc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -84,17 +84,7 @@
 
     }
 
-#ifdef __sun
-
-// Handler for pure virtual functions
-namespace __Crun {
-    void pure_error() {
-    }
-}
-
-#endif
-
-#if defined(__ICC) || defined(__INTEL_COMPILER) || (__GNUC__ > 2)
+#if defined(__ICC) || defined(__INTEL_COMPILER)
 
 extern "C" {
 
@@ -175,6 +165,14 @@
 
 #ifdef TAOCRYPT_X86ASM_AVAILABLE
 
+#ifndef _MSC_VER
+    static jmp_buf s_env;
+    static void SigIllHandler(int)
+    {
+        longjmp(s_env, 1);
+    }
+#endif
+
 
 bool HaveCpuId()
 {
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/rabbit.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/rabbit.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/rabbit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/rabbit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,15 +1,15 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
- 
+   Copyright (c) 2000, 2014, 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; see the file COPYING. If not, write to the
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
@@ -198,7 +198,6 @@
 {
     /* Temporary variables */
     word32 i;
-    byte buffer[16];
 
     /* Encrypt/decrypt all full blocks */
     while (msglen >= 16) {
@@ -227,17 +226,23 @@
 
     /* Encrypt/decrypt remaining data */
     if (msglen) {
+
+        word32 tmp[4];
+        byte*  buffer = (byte*)tmp;
+
+        memset(tmp, 0, sizeof(tmp));   /* help static analysis */
+
         /* Iterate the system */
         NextState(Work);
 
         /* Generate 16 bytes of pseudo-random data */
-        *(word32*)(buffer+ 0) = LITTLE32(workCtx_.x[0] ^
+        tmp[0] = LITTLE32(workCtx_.x[0] ^
                   (workCtx_.x[5]>>16) ^ U32V(workCtx_.x[3]<<16));
-        *(word32*)(buffer+ 4) = LITTLE32(workCtx_.x[2] ^ 
+        tmp[1] = LITTLE32(workCtx_.x[2] ^ 
                   (workCtx_.x[7]>>16) ^ U32V(workCtx_.x[5]<<16));
-        *(word32*)(buffer+ 8) = LITTLE32(workCtx_.x[4] ^ 
+        tmp[2] = LITTLE32(workCtx_.x[4] ^ 
                   (workCtx_.x[1]>>16) ^ U32V(workCtx_.x[7]<<16));
-        *(word32*)(buffer+12) = LITTLE32(workCtx_.x[6] ^ 
+        tmp[3] = LITTLE32(workCtx_.x[6] ^ 
                   (workCtx_.x[3]>>16) ^ U32V(workCtx_.x[1]<<16));
 
         /* Encrypt/decrypt the data */
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/random.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/random.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/random.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/random.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -27,6 +27,7 @@
 #include <time.h>
 
 #if defined(_WIN32)
+    #define _WIN32_WINNT 0x0400
     #include <windows.h>
     #include <wincrypt.h>
 #else
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/ripemd.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/ripemd.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/ripemd.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/ripemd.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -507,31 +507,31 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void RIPEMD160::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   edx, DWORD PTR [ebp + 16]     )
-
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+       	"emms;" \
+       	".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "d" (times) \
+            : "%esi", "%eax", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -569,7 +569,11 @@
     AS2(    sub   esp, 24               )   // make room for tmp a1 - e1
     AS2(    movd  mm1, esi              )   // store digest_
     
-AS1( loopStart: )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
+#endif
 
     AS2(    movd  mm2, edx              )   // store times_
 
@@ -821,8 +825,14 @@
     AS2(    movd  edx, mm2              )   // times
     AS2(    movd  edi, mm0              )   // data, already advanced
     AS1(    dec   edx                   )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
+    // inline adjust 
+    AS2(    add   esp, 24               )   // fix room on stack
 
     EPILOG()
 }
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/rsa.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/rsa.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/rsa.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/rsa.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -177,7 +177,7 @@
 
     // skip past the padding until we find the separator
     unsigned i=1;
-    while (i<pkcsBlockLen && pkcsBlock[i++]) { // null body
+    while (i<pkcsBlockLen && pkcsBlock[i++] == 0xFF) { // null body
         }
     if (!(i==pkcsBlockLen || pkcsBlock[i-1]==0))
         return 0;
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/sha.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/sha.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/sha.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/sha.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -760,32 +760,32 @@
 
 
 #ifdef _MSC_VER
-    __declspec(naked) 
+    __declspec(naked)
+#else
+    __attribute__ ((noinline))
 #endif
 void SHA::AsmTransform(const byte* data, word32 times)
 {
 #ifdef __GNUC__
-    #define AS1(x)    asm(#x);
-    #define AS2(x, y) asm(#x ", " #y);
+    #define AS1(x)    #x ";"
+    #define AS2(x, y) #x ", " #y ";"
 
     #define PROLOG()  \
-        asm(".intel_syntax noprefix"); \
-        AS2(    movd  mm3, edi                      )   \
-        AS2(    movd  mm4, ebx                      )   \
-        AS2(    movd  mm5, esi                      )   \
-        AS2(    movd  mm6, ebp                      )   \
-        AS2(    mov   ecx, DWORD PTR [ebp +  8]     )   \
-        AS2(    mov   edi, DWORD PTR [ebp + 12]     )   \
-        AS2(    mov   eax, DWORD PTR [ebp + 16]     )
-
+    __asm__ __volatile__ \
+    ( \
+        ".intel_syntax noprefix;" \
+        "push ebx;" \
+        "push ebp;"
     #define EPILOG()  \
-        AS2(    movd  ebp, mm6                  )   \
-        AS2(    movd  esi, mm5                  )   \
-        AS2(    movd  ebx, mm4                  )   \
-        AS2(    mov   esp, ebp                  )   \
-        AS2(    movd  edi, mm3                  )   \
-        AS1(    emms                            )   \
-        asm(".att_syntax");
+        "pop ebp;" \
+        "pop ebx;" \
+       	"emms;" \
+       	".att_syntax;" \
+            : \
+            : "c" (this), "D" (data), "a" (times) \
+            : "%esi", "%edx", "memory", "cc" \
+    );
+
 #else
     #define AS1(x)    __asm x
     #define AS2(x, y) __asm x, y
@@ -826,7 +826,11 @@
 
     AS2(    sub   esp, 68               )   // make room on stack
 
-AS1( loopStart: )
+#ifdef _MSC_VER
+    AS1( loopStart: )  // loopStart
+#else
+    AS1( 0: )          // loopStart for some gas (need numeric for jump back 
+#endif
 
     // byte reverse 16 words of input, 4 at a time, put on stack for W[]
 
@@ -1011,8 +1015,14 @@
     
     AS1(    dec   ebp                   )
     AS2(    movd  mm2, ebp              )
-    AS1(    jnz   loopStart             )
+#ifdef _MSC_VER
+    AS1(    jnz   loopStart )  // loopStart
+#else
+    AS1(    jnz   0b )         // loopStart
+#endif
 
+    // inline adjust 
+    AS2(    add   esp, 68               )   // fix room on stack
 
     EPILOG()
 }
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/tftables.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/tftables.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/tftables.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/tftables.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
    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
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/twofish.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/src/twofish.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/src/twofish.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/src/twofish.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -55,7 +55,7 @@
             in  += BLOCK_SIZE;
         }
     else if (mode_ == CBC) {
-        if (dir_ == ENCRYPTION)
+        if (dir_ == ENCRYPTION) {
             while (blocks--) {
                 r_[0] ^= *(word32*)in;
                 r_[1] ^= *(word32*)(in +  4);
@@ -68,7 +68,8 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
-        else
+        }
+        else {
             while (blocks--) {
                 AsmDecrypt(in, out);
                
@@ -82,6 +83,7 @@
                 out += BLOCK_SIZE;
                 in  += BLOCK_SIZE;
             }
+        }
     }
 }
 
@@ -272,25 +274,27 @@
 
 #if defined(DO_TWOFISH_ASM)
     #ifdef __GNUC__
-        #define AS1(x)    asm(#x);
-        #define AS2(x, y) asm(#x ", " #y);
+        #define AS1(x)    #x ";"
+        #define AS2(x, y) #x ", " #y ";"
 
         #define PROLOG()  \
-            asm(".intel_syntax noprefix"); \
-            AS2(    movd  mm3, edi                      )   \
-            AS2(    movd  mm4, ebx                      )   \
-            AS2(    movd  mm5, esi                      )   \
-            AS2(    movd  mm6, ebp                      )   \
-            AS2(    mov   edi, DWORD PTR [ebp +  8]     )   \
-            AS2(    mov   esi, DWORD PTR [ebp + 12]     )
-
+        __asm__ __volatile__ \
+        ( \
+            ".intel_syntax noprefix;" \
+            "push ebx;" \
+            "push ebp;" \
+            "movd mm3, eax;" \
+            "movd mm6, ebp;"
         #define EPILOG()  \
-            AS2(    movd esp, mm6                  )   \
-            AS2(    movd esi, mm5                  )   \
-            AS2(    movd ebx, mm4                  )   \
-            AS2(    movd edi, mm3                  )   \
-            AS1(    emms                           )   \
-            asm(".att_syntax");
+            "pop ebp;" \
+            "pop ebx;" \
+       	    "emms;" \
+       	    ".att_syntax;" \
+                : \
+                : "D" (this), "S" (inBlock), "a" (outBlock) \
+                : "%ecx", "%edx", "memory", "cc" \
+        );
+
     #else
         #define AS1(x)    __asm x
         #define AS2(x, y) __asm x, y
@@ -424,6 +428,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void Twofish::AsmEncrypt(const byte* inBlock, byte* outBlock) const
 {
@@ -472,7 +478,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
@@ -494,6 +500,8 @@
 
 #ifdef _MSC_VER
     __declspec(naked) 
+#else
+    __attribute__ ((noinline))
 #endif
 void Twofish::AsmDecrypt(const byte* inBlock, byte* outBlock) const
 {
@@ -542,7 +550,7 @@
     AS2(    movd  ebp, mm6                      )
     AS2(    movd  esi, mm0                      ) // k_
     #ifdef __GNUC__
-        AS2(    mov   edi, [ebp + 16]           ) // outBlock
+        AS2(    movd  edi, mm3                  ) // outBlock
     #else
         AS2(    mov   edi, [ebp + 12]           ) // outBlock
     #endif
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/test/test.cpp mysql-5.5-5.5.43/extra/yassl/taocrypt/test/test.cpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/taocrypt/test/test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/taocrypt/test/test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2006, 2014, 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
@@ -1165,12 +1165,12 @@
     RSAES_Encryptor enc(priv);
     byte message[] = "Everyone gets Friday off.";
     const word32 len = (word32)strlen((char*)message);
-    byte cipher[64];
+    byte cipher[512];
     enc.Encrypt(message, len, cipher, rng);
 
     RSAES_Decryptor dec(priv);
-    byte plain[64];
-    dec.Decrypt(cipher, sizeof(plain), plain, rng);
+    byte plain[512];
+    dec.Decrypt(cipher, priv.FixedCiphertextLength(), plain, rng);
 
     if (memcmp(plain, message, len))
         return -70;
@@ -1242,11 +1242,11 @@
 int dsa_test()
 {
     Source source;
-    FileSource("../certs/dsa512.der", source);
+    FileSource("../certs/dsa1024.der", source);
     if (source.size() == 0) {
-        FileSource("../../certs/dsa512.der", source);  // for testsuite
+        FileSource("../../certs/dsa1024.der", source);  // for testsuite
         if (source.size() == 0) {
-            FileSource("../../../certs/dsa512.der", source); // win32 Debug dir
+            FileSource("../../../certs/dsa1024.der", source); // win32 Debug dir
             if (source.size() == 0)
                 err_sys("where's your certs dir?", -89);
         }
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/testsuite/cipher-test.sh mysql-5.5-5.5.43/extra/yassl/testsuite/cipher-test.sh
--- mysql-5.5-5.5.35+dfsg/extra/yassl/testsuite/cipher-test.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/testsuite/cipher-test.sh	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,130 @@
+#!/bin/bash
+
+# test all yassl cipher suties 
+# 
+
+
+server_pid=$no_pid
+
+
+do_cleanup() {
+    echo "in cleanup"
+
+    if [[ $server_pid != $no_pid ]]
+    then
+        echo "killing server"
+        kill -9 $server_pid
+    fi
+}
+
+do_trap() {
+    echo "got trap"
+    do_cleanup
+    exit -1
+}
+
+trap do_trap INT TERM
+
+
+# make sure example server and client are built
+if test ! -s ../examples/server/server; then
+    echo "Please build yaSSL first, example server missing"
+    exit -1
+fi
+
+if test ! -s ../examples/client/client; then
+    echo "Please build yaSSL first, example client missing"
+    exit -1
+fi
+
+
+# non DSA suites
+for suite in {"DHE-RSA-AES256-SHA","AES256-SHA","DHE-RSA-AES128-SHA","AES128-SHA","AES256-RMD","AES128-RMD","DES-CBC3-RMD","DHE-RSA-AES256-RMD","DHE-RSA-AES128-RMD","DHE-RSA-DES-CBC3-RMD","RC4-SHA","RC4-MD5","DES-CBC3-SHA","DES-CBC-SHA","EDH-RSA-DES-CBC3-SHA","EDH-RSA-DES-CBC-SHA"}
+do
+  for client_auth in {y,n}
+  do
+    echo "Trying $suite client auth = $client_auth ..."
+
+    if test -e server_ready; then
+        echo -e "removing exisitng server_ready file"
+        rm server_ready
+    fi
+    ../examples/server/server $client_auth &
+    server_pid=$!
+
+    while [ ! -s server_ready ]; do
+        echo -e "waiting for server_ready file..."
+        sleep 0.1
+    done
+
+    ../examples/client/client $suite
+    client_result=$?
+
+    wait $server_pid
+    server_result=$?
+
+    server_pid=$no_pid
+
+    if [[ $client_result != 0 ]]
+    then
+        echo "Client Error"
+        exit $client_result
+    fi
+
+    if [[ $server_result != 0 ]]
+    then
+        echo "Server Error"
+        exit $server_result
+    fi
+
+  done   # end client auth loop
+done  # end non dsa suite list
+echo -e "Non DSA Loop SUCCESS"
+
+
+
+# DSA suites
+for suite in {"DHE-DSS-AES256-SHA","DHE-DSS-AES128-SHA","DHE-DSS-AES256-RMD","DHE-DSS-AES128-RMD","DHE-DSS-DES-CBC3-RMD","EDH-DSS-DES-CBC3-SHA","EDH-DSS-DES-CBC-SHA"}
+do
+  for client_auth in {y,n}
+  do
+    echo "Trying $suite client auth = $client_auth ..."
+
+    if test -e server_ready; then
+        echo -e "removing exisitng server_ready file"
+        rm server_ready
+    fi
+    # d signifies DSA
+    ../examples/server/server $client_auth d &
+    server_pid=$!
+
+    while [ ! -s server_ready ]; do
+        echo -e "waiting for server_ready file..."
+        sleep 0.1
+    done
+
+    ../examples/client/client $suite
+    client_result=$?
+
+    wait $server_pid
+    server_result=$?
+
+    server_pid=$no_pid
+
+    if [[ $client_result != 0 ]]
+    then
+        echo "Client Error"
+        exit $client_result
+    fi
+
+    if [[ $server_result != 0 ]]
+    then
+        echo "Server Error"
+        exit $server_result
+    fi
+
+  done   # end client auth loop
+done  # end dsa suite list
+echo -e "DSA Loop SUCCESS"
+
+exit 0
diff -Nru mysql-5.5-5.5.35+dfsg/extra/yassl/testsuite/test.hpp mysql-5.5-5.5.43/extra/yassl/testsuite/test.hpp
--- mysql-5.5-5.5.35+dfsg/extra/yassl/testsuite/test.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/extra/yassl/testsuite/test.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -131,9 +131,10 @@
     int    argc;
     char** argv;
     int    return_code;
+    const char* file_ready;
     tcp_ready* signal_;
 
-    func_args(int c = 0, char** v = 0) : argc(c), argv(v) {}
+    func_args(int c = 0, char** v = 0) : argc(c), argv(v), file_ready(0) {}
 
     void SetSignal(tcp_ready* p) { signal_ = p; }
 };
@@ -146,6 +147,7 @@
 // yaSSL
 const char* const    yasslIP      = "127.0.0.1";
 const unsigned short yasslPort    =  11111;
+const unsigned short proxyPort    =  12345;
 
 
 // client
@@ -172,13 +174,13 @@
 
 // server dsa
 const char* const dsaCert = "../certs/dsa-cert.pem";
-const char* const dsaKey  = "../certs/dsa512.der";
+const char* const dsaKey  = "../certs/dsa1024.der";
 
 const char* const dsaCert2 = "../../certs/dsa-cert.pem";
-const char* const dsaKey2  = "../../certs/dsa512.der";
+const char* const dsaKey2  = "../../certs/dsa1024.der";
 
 const char* const dsaCert3 = "../../../certs/dsa-cert.pem";
-const char* const dsaKey3  = "../../../certs/dsa512.der";
+const char* const dsaKey3  = "../../../certs/dsa1024.der";
 
 
 // CA 
@@ -222,6 +224,13 @@
         if (SSL_CTX_load_verify_locations(ctx, certSuite, 0) != SSL_SUCCESS)
             if (SSL_CTX_load_verify_locations(ctx, certDebug,0) != SSL_SUCCESS)
                 err_sys("failed to use certificate: certs/client-cert.pem");
+
+    // DSA cert 
+    if (SSL_CTX_load_verify_locations(ctx, dsaCert, 0) != SSL_SUCCESS)
+        if (SSL_CTX_load_verify_locations(ctx, dsaCert2, 0) != SSL_SUCCESS)
+            if (SSL_CTX_load_verify_locations(ctx, dsaCert3, 0) != SSL_SUCCESS)
+                err_sys("failed to use certificate: certs/dsa-cert.pem");
+
 }
 
 
@@ -298,7 +307,7 @@
             != SSL_SUCCESS) 
                 if (SSL_CTX_use_PrivateKey_file(ctx, dsaKey3,SSL_FILETYPE_ASN1)
                     != SSL_SUCCESS) 
-                    err_sys("failed to use key file: certs/dsa512.der");
+                    err_sys("failed to use key file: certs/dsa1024.der");
 }
 
 
@@ -310,6 +319,12 @@
 }
 
 
+inline void set_file_ready(const char* name, func_args& args)
+{
+    args.file_ready = name;
+}
+
+
 inline void tcp_set_nonblocking(SOCKET_T& sockfd)
 {
 #ifdef NON_BLOCKING
@@ -349,7 +364,11 @@
         */   // end external testing later
 #else
     addr.sin_family = AF_INET_V;
+#ifdef YASSL_PROXY_PORT
+    addr.sin_port = htons(proxyPort);
+#else
     addr.sin_port = htons(yasslPort);
+#endif
     addr.sin_addr.s_addr = inet_addr(yasslIP);
 #endif
 
@@ -401,6 +420,16 @@
 }
 
 
+inline void create_ready_file(func_args& args)
+{
+    FILE* f = fopen(args.file_ready, "w+");
+
+    if (f) {
+        fputs("ready", f);
+        fclose(f);
+    }
+}
+
 
 inline void tcp_accept(SOCKET_T& sockfd, SOCKET_T& clientfd, func_args& args)
 {
@@ -418,6 +447,9 @@
     pthread_mutex_unlock(&ready.mutex_);
 #endif
 
+    if (args.file_ready)
+        create_ready_file(args);
+
     clientfd = accept(sockfd, (sockaddr*)&client, (ACCEPT_THIRD_T)&client_len);
 
     if (clientfd == (SOCKET_T) -1) {
diff -Nru mysql-5.5-5.5.35+dfsg/.gitignore mysql-5.5-5.5.43/.gitignore
--- mysql-5.5-5.5.35+dfsg/.gitignore	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/.gitignore	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,3071 @@
+*-t
+*.Plo
+*.Po
+*.a
+*.bb
+*.bbg
+*.bin
+*.cdf
+*.core
+*.d
+*.da
+*.dir
+*.dll
+*.dylib
+*.exe
+*.exp
+*.gcda
+*.gcno
+*.gcov
+*.idb
+*.ilk
+*.la
+*.lai
+*.lib
+*.lo
+*.manifest
+*.map
+*.o
+*.obj
+*.old
+*.pch
+*.pdb
+*.reject
+*.res
+*.rule
+*.sbr
+*.so
+*.so.*
+*.spec
+*.user
+*.vcproj
+*.vcproj.cmake
+*.vcxproj
+*.vcxproj.filters
+*/*.dir/*
+Debug
+MySql.sdf
+Win32
+*/*_pure_*warnings
+*/.deps
+*/.libs/*
+*/.pure
+*/debug/*
+*/minsizerel/*
+*/release/*
+RelWithDebInfo
+*~
+.*.swp
+./CMakeCache.txt
+./MySql.ncb
+./MySql.sln
+./MySql.suo
+./README.build-files
+./cmakecache.txt
+./config.h
+./copy_mysql_files.bat
+./fix-project-files
+./mysql*.ds?
+./mysql.ncb
+./mysql.sln
+./mysql.suo
+./prepare
+.DS_Store
+.defs.mk
+.depend
+.depend.mk
+.deps
+.gdb_history
+.gdbinit
+.libs
+.o
+.out
+.snprj/*
+.vimrc
+50
+=6
+BUILD/compile-pentium-maintainer
+BitKeeper/etc/RESYNC_TREE
+BitKeeper/etc/config
+BitKeeper/etc/csets
+BitKeeper/etc/csets-in
+BitKeeper/etc/csets-out
+BitKeeper/etc/gone
+BitKeeper/etc/level
+BitKeeper/etc/pushed
+BitKeeper/post-commit
+BitKeeper/post-commit-manual
+BitKeeper/tmp/*
+BitKeeper/tmp/bkr3sAHD
+BitKeeper/tmp/gone
+CMakeFiles
+CMakeFiles/*
+CTestTestfile.cmake
+COPYING
+COPYING.LIB
+Docs/#manual.texi#
+Docs/INSTALL-BINARY
+Docs/Images/myaccess-odbc.txt
+Docs/Images/myaccess.txt
+Docs/Images/myarchitecture.txt
+Docs/Images/mydll-properties.txt
+Docs/Images/mydsn-example.txt
+Docs/Images/mydsn-icon.txt
+Docs/Images/mydsn-options.txt
+Docs/Images/mydsn-setup.txt
+Docs/Images/mydsn-test-fail.txt
+Docs/Images/mydsn-test-success.txt
+Docs/Images/mydsn-trace.txt
+Docs/Images/mydsn.txt
+Docs/Images/myflowchart.txt
+Docs/include.texi
+Docs/internals.html
+Docs/internals.info
+Docs/internals.pdf
+Docs/internals.txt
+Docs/internals_toc.html
+Docs/manual.aux
+Docs/manual.cp
+Docs/manual.cps
+Docs/manual.de.log
+Docs/manual.dvi
+Docs/manual.fn
+Docs/manual.fns
+Docs/manual.html
+Docs/manual.ky
+Docs/manual.log
+Docs/manual.pdf
+Docs/manual.pg
+Docs/manual.texi.orig
+Docs/manual.texi.rej
+Docs/manual.toc
+Docs/manual.tp
+Docs/manual.txt
+Docs/manual.vr
+Docs/manual_a4.ps
+Docs/manual_letter.ps
+Docs/manual_toc.html
+Docs/my_sys.doc
+Docs/mysql.info
+Docs/mysql.xml
+Docs/safe-mysql.xml
+Docs/tex.fmt
+Docs/texi2dvi.out
+EXCEPTIONS-CLIENT
+INSTALL-SOURCE
+INSTALL-WIN-SOURCE
+Logs/*
+MIRRORS
+Makefile
+Makefile.in
+Makefile.in'
+PENDING/*
+scripts/scripts
+TAGS
+VC++Files/client/mysql_amd64.dsp
+ac_available_languages_fragment
+acinclude.m4
+aclocal.m4
+analyse.test
+autom4te-2.53.cache/*
+autom4te-2.53.cache/output.0
+autom4te-2.53.cache/requests
+autom4te-2.53.cache/traces.0
+autom4te.cache/*
+autom4te.cache/output.0
+autom4te.cache/requests
+autom4te.cache/traces.0
+bdb/*.ds?
+bdb/*.vcproj
+bdb/README
+bdb/btree/btree_auto.c
+bdb/build_unix/*
+bdb/build_vxworks/db.h
+bdb/build_vxworks/db_int.h
+bdb/build_win32/db.h
+bdb/build_win32/db_archive.dsp
+bdb/build_win32/db_checkpoint.dsp
+bdb/build_win32/db_config.h
+bdb/build_win32/db_cxx.h
+bdb/build_win32/db_deadlock.dsp
+bdb/build_win32/db_dll.dsp
+bdb/build_win32/db_dump.dsp
+bdb/build_win32/db_int.h
+bdb/build_win32/db_java.dsp
+bdb/build_win32/db_load.dsp
+bdb/build_win32/db_perf.dsp
+bdb/build_win32/db_printlog.dsp
+bdb/build_win32/db_recover.dsp
+bdb/build_win32/db_stat.dsp
+bdb/build_win32/db_static.dsp
+bdb/build_win32/db_tcl.dsp
+bdb/build_win32/db_test.dsp
+bdb/build_win32/db_upgrade.dsp
+bdb/build_win32/db_verify.dsp
+bdb/build_win32/ex_access.dsp
+bdb/build_win32/ex_btrec.dsp
+bdb/build_win32/ex_env.dsp
+bdb/build_win32/ex_lock.dsp
+bdb/build_win32/ex_mpool.dsp
+bdb/build_win32/ex_tpcb.dsp
+bdb/build_win32/excxx_access.dsp
+bdb/build_win32/excxx_btrec.dsp
+bdb/build_win32/excxx_env.dsp
+bdb/build_win32/excxx_lock.dsp
+bdb/build_win32/excxx_mpool.dsp
+bdb/build_win32/excxx_tpcb.dsp
+bdb/build_win32/include.tcl
+bdb/build_win32/libdb.def
+bdb/build_win32/libdb.rc
+bdb/db/crdel_auto.c
+bdb/db/db_auto.c
+bdb/dbinc_auto/*.*
+bdb/dbreg/dbreg_auto.c
+bdb/dist/autom4te-2.53.cache/*
+bdb/dist/autom4te-2.53.cache/output.0
+bdb/dist/autom4te-2.53.cache/requests
+bdb/dist/autom4te-2.53.cache/traces.0
+bdb/dist/autom4te.cache/*
+bdb/dist/autom4te.cache/output.0
+bdb/dist/autom4te.cache/requests
+bdb/dist/autom4te.cache/traces.0
+bdb/dist/config.hin
+bdb/dist/configure
+bdb/dist/db.h
+bdb/dist/db_config.h
+bdb/dist/db_cxx.h
+bdb/dist/db_int.h
+bdb/dist/include.tcl
+bdb/dist/tags
+bdb/dist/template/db_server_proc
+bdb/dist/template/gen_client_ret
+bdb/dist/template/rec_btree
+bdb/dist/template/rec_crdel
+bdb/dist/template/rec_db
+bdb/dist/template/rec_dbreg
+bdb/dist/template/rec_fileops
+bdb/dist/template/rec_hash
+bdb/dist/template/rec_log
+bdb/dist/template/rec_qam
+bdb/dist/template/rec_txn
+bdb/examples_c/ex_apprec/ex_apprec_auto.c
+bdb/examples_c/ex_apprec/ex_apprec_auto.h
+bdb/examples_c/ex_apprec/ex_apprec_template
+bdb/examples_java
+bdb/fileops/fileops_auto.c
+bdb/hash/hash_auto.c
+bdb/include/btree_auto.h
+bdb/include/btree_ext.h
+bdb/include/clib_ext.h
+bdb/include/common_ext.h
+bdb/include/crdel_auto.h
+bdb/include/db_auto.h
+bdb/include/db_ext.h
+bdb/include/db_server.h
+bdb/include/env_ext.h
+bdb/include/gen_client_ext.h
+bdb/include/gen_server_ext.h
+bdb/include/hash_auto.h
+bdb/include/hash_ext.h
+bdb/include/lock_ext.h
+bdb/include/log_auto.h
+bdb/include/log_ext.h
+bdb/include/mp_ext.h
+bdb/include/mutex_ext.h
+bdb/include/os_ext.h
+bdb/include/qam_auto.h
+bdb/include/qam_ext.h
+bdb/include/rpc_client_ext.h
+bdb/include/rpc_server_ext.h
+bdb/include/tcl_ext.h
+bdb/include/txn_auto.h
+bdb/include/txn_ext.h
+bdb/include/xa_ext.h
+bdb/java/src/com/sleepycat/db/Db.java
+bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+bdb/java/src/com/sleepycat/db/DbConstants.java
+bdb/java/src/com/sleepycat/db/DbHashStat.java
+bdb/java/src/com/sleepycat/db/DbLockStat.java
+bdb/java/src/com/sleepycat/db/DbLogStat.java
+bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+bdb/java/src/com/sleepycat/db/DbQueueStat.java
+bdb/java/src/com/sleepycat/db/DbRepStat.java
+bdb/java/src/com/sleepycat/db/DbTxnStat.java
+bdb/libdb_java/java_stat_auto.c
+bdb/libdb_java/java_stat_auto.h
+bdb/log/log_auto.c
+bdb/qam/qam_auto.c
+bdb/rpc_client/db_server_clnt.c
+bdb/rpc_client/gen_client.c
+bdb/rpc_server/c/db_server_proc.c
+bdb/rpc_server/c/db_server_proc.sed
+bdb/rpc_server/c/db_server_svc.c
+bdb/rpc_server/c/db_server_xdr.c
+bdb/rpc_server/c/gen_db_server.c
+bdb/rpc_server/db_server.x
+bdb/rpc_server/db_server_proc.sed
+bdb/rpc_server/db_server_svc.c
+bdb/rpc_server/db_server_xdr.c
+bdb/rpc_server/gen_db_server.c
+bdb/test/TESTS
+bdb/test/include.tcl
+bdb/test/logtrack.list
+bdb/txn/txn_auto.c
+binary/*
+bkpull.log
+bkpull.log*
+bkpull.log.2
+bkpull.log.3
+bkpull.log.4
+bkpull.log.5
+bkpull.log.6
+bkpush.log
+bkpush.log*
+build.log
+build_tags.sh
+client/#mysql.cc#
+client/*.ds?
+client/*.vcproj
+client/.deps/base64.Po
+client/.deps/completion_hash.Po
+client/.deps/dummy.Po
+client/.deps/mf_tempdir.Po
+client/.deps/my_bit.Po
+client/.deps/my_bitmap.Po
+client/.deps/my_getsystime.Po
+client/.deps/my_new.Po
+client/.deps/my_user.Po
+client/.deps/my_vle.Po
+client/.deps/mysql.Po
+client/.deps/mysql_upgrade.Po
+client/.deps/mysqladmin.Po
+client/.deps/mysqlbinlog.Po
+client/.deps/mysqlcheck.Po
+client/.deps/mysqldump.Po
+client/.deps/mysqlimport.Po
+client/.deps/mysqlshow.Po
+client/.deps/mysqlslap.Po
+client/.deps/mysqltest.Po
+client/.deps/readline.Po
+client/.deps/sql_string.Po
+client/.libs -prune
+client/.libs/lt-mysql
+client/.libs/lt-mysqladmin
+client/.libs/lt-mysqlbinlog
+client/.libs/lt-mysqlcheck
+client/.libs/lt-mysqldump
+client/.libs/lt-mysqlimport
+client/.libs/lt-mysqlshow
+client/.libs/lt-mysqlslap
+client/.libs/lt-mysqltest
+client/.libs/mysql
+client/.libs/mysql_upgrade
+client/.libs/mysqladmin
+client/.libs/mysqlbinlog
+client/.libs/mysqlcheck
+client/.libs/mysqldump
+client/.libs/mysqlimport
+client/.libs/mysqlshow
+client/.libs/mysqlslap
+client/.libs/mysqltest
+client/completion_hash.cpp
+client/decimal.c
+client/insert_test
+client/link_sources
+client/log_event.cc
+client/log_event.h
+client/log_event_old.cc
+client/log_event_old.h
+client/mf_iocache.c
+client/mf_iocache.cc
+client/my_decimal.cc
+client/my_decimal.h
+client/my_user.c
+client/mysql
+client/mysql.cpp
+client/mysql_upgrade
+client/mysqladmin
+client/mysqladmin.c
+client/mysqladmin.cpp
+client/mysqlbinlog
+client/mysqlbinlog.cpp
+client/mysqlcheck
+client/mysqldump
+client/mysqlimport
+client/mysqlmanager-pwgen
+client/mysqlmanagerc
+client/mysqlshow
+client/mysqlslap
+client/mysqltest
+client/mysqltestmanager-pwgen
+client/mysqltestmanagerc
+client/mysys_priv.h
+client/readline.cpp
+client/rpl_constants.h
+client/rpl_record_old.cc
+client/rpl_record_old.h
+client/rpl_tblmap.h
+client/rpl_tblmap.cc
+client/rpl_utility.h
+client/rpl_utility.cc
+client/select_test
+client/sql_const.h
+client/sql_string.cpp
+client/ssl_test
+client/thimble
+client/thread_test
+client/tmp.diff
+client_debug/*
+client_release/*
+client_test
+cmake_install.cmake
+cmd-line-utils/libedit/.deps/chared.Po
+cmd-line-utils/libedit/.deps/common.Po
+cmd-line-utils/libedit/.deps/el.Po
+cmd-line-utils/libedit/.deps/emacs.Po
+cmd-line-utils/libedit/.deps/fcns.Po
+cmd-line-utils/libedit/.deps/fgetln.Po
+cmd-line-utils/libedit/.deps/help.Po
+cmd-line-utils/libedit/.deps/hist.Po
+cmd-line-utils/libedit/.deps/history.Po
+cmd-line-utils/libedit/.deps/key.Po
+cmd-line-utils/libedit/.deps/map.Po
+cmd-line-utils/libedit/.deps/parse.Po
+cmd-line-utils/libedit/.deps/prompt.Po
+cmd-line-utils/libedit/.deps/read.Po
+cmd-line-utils/libedit/.deps/readline.Po
+cmd-line-utils/libedit/.deps/refresh.Po
+cmd-line-utils/libedit/.deps/search.Po
+cmd-line-utils/libedit/.deps/sig.Po
+cmd-line-utils/libedit/.deps/strlcat.Po
+cmd-line-utils/libedit/.deps/strlcpy.Po
+cmd-line-utils/libedit/.deps/term.Po
+cmd-line-utils/libedit/.deps/tokenizer.Po
+cmd-line-utils/libedit/.deps/tty.Po
+cmd-line-utils/libedit/.deps/unvis.Po
+cmd-line-utils/libedit/.deps/vi.Po
+cmd-line-utils/libedit/.deps/vis.Po
+cmd-line-utils/libedit/common.h
+cmd-line-utils/libedit/makelist
+cmd-line-utils/readline/.deps/bind.Po
+cmd-line-utils/readline/.deps/callback.Po
+cmd-line-utils/readline/.deps/compat.Po
+cmd-line-utils/readline/.deps/complete.Po
+cmd-line-utils/readline/.deps/display.Po
+cmd-line-utils/readline/.deps/funmap.Po
+cmd-line-utils/readline/.deps/histexpand.Po
+cmd-line-utils/readline/.deps/histfile.Po
+cmd-line-utils/readline/.deps/history.Po
+cmd-line-utils/readline/.deps/histsearch.Po
+cmd-line-utils/readline/.deps/input.Po
+cmd-line-utils/readline/.deps/isearch.Po
+cmd-line-utils/readline/.deps/keymaps.Po
+cmd-line-utils/readline/.deps/kill.Po
+cmd-line-utils/readline/.deps/macro.Po
+cmd-line-utils/readline/.deps/mbutil.Po
+cmd-line-utils/readline/.deps/misc.Po
+cmd-line-utils/readline/.deps/nls.Po
+cmd-line-utils/readline/.deps/parens.Po
+cmd-line-utils/readline/.deps/readline.Po
+cmd-line-utils/readline/.deps/rltty.Po
+cmd-line-utils/readline/.deps/savestring.Po
+cmd-line-utils/readline/.deps/search.Po
+cmd-line-utils/readline/.deps/shell.Po
+cmd-line-utils/readline/.deps/signals.Po
+cmd-line-utils/readline/.deps/terminal.Po
+cmd-line-utils/readline/.deps/text.Po
+cmd-line-utils/readline/.deps/tilde.Po
+cmd-line-utils/readline/.deps/undo.Po
+cmd-line-utils/readline/.deps/util.Po
+cmd-line-utils/readline/.deps/vi_mode.Po
+cmd-line-utils/readline/.deps/xmalloc.Po
+comon.h
+comp_err/*.ds?
+comp_err/*.vcproj
+compile
+config.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+configure.lineno
+contrib/*.ds?
+contrib/*.vcproj
+core
+core.*
+cscope.in.out
+cscope.out
+cscope.po.out
+db-*.*.*
+dbug/*.ds?
+dbug/*.vcproj
+dbug/.deps/dbug.Po
+dbug/.deps/dbug_analyze.Po
+dbug/.deps/factorial.Po
+dbug/.deps/my_main.Po
+dbug/.deps/sanity.Po
+dbug/dbug_analyze
+dbug/example*.r
+dbug/factorial
+dbug/factorial.r
+dbug/main.r
+dbug/output*.r
+dbug/user.ps
+dbug/user.t
+debian/control
+debian/defs.mk
+depcomp
+emacs.h
+examples/*.ds?
+examples/*.vcproj
+examples/udf_example/udf_example.def
+extra/.deps/charset2html.Po
+extra/.deps/comp_err.Po
+extra/.deps/innochecksum.Po
+extra/.deps/my_print_defaults.Po
+extra/.deps/mysql_waitpid.Po
+extra/.deps/perror.Po
+extra/.deps/replace.Po
+extra/.deps/resolve_stack_dump.Po
+extra/.deps/resolveip.Po
+extra/charset2html
+extra/comp_err
+extra/created_include_files
+extra/innochecksum
+extra/my_print_defaults
+extra/mysql_install
+extra/mysql_tzinfo_to_sql
+extra/mysql_waitpid
+extra/mysqld_ername.h
+extra/mysqld_error.h
+extra/perror
+extra/replace
+extra/resolve_stack_dump
+extra/resolveip
+extra/sql_state.h
+extra/tztime.cc
+extra/yassl/src/.deps/buffer.Plo
+extra/yassl/src/.deps/cert_wrapper.Plo
+extra/yassl/src/.deps/crypto_wrapper.Plo
+extra/yassl/src/.deps/handshake.Plo
+extra/yassl/src/.deps/lock.Plo
+extra/yassl/src/.deps/log.Plo
+extra/yassl/src/.deps/socket_wrapper.Plo
+extra/yassl/src/.deps/ssl.Plo
+extra/yassl/src/.deps/template_instnt.Plo
+extra/yassl/src/.deps/timer.Plo
+extra/yassl/src/.deps/yassl_error.Plo
+extra/yassl/src/.deps/yassl_imp.Plo
+extra/yassl/src/.deps/yassl_int.Plo
+extra/yassl/taocrypt/benchmark/.deps/benchmark-benchmark.Po
+extra/yassl/taocrypt/benchmark/benchmark
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aes.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-aestables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-algebra.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-arc4.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-asn.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-bftables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-blowfish.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-coding.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-des.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dh.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-dsa.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-file.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-hash.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-integer.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md2.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md4.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-md5.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-misc.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-random.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-ripemd.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-rsa.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-sha.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-template_instnt.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-tftables.Plo
+extra/yassl/taocrypt/src/.deps/libtaocrypt_la-twofish.Plo
+extra/yassl/taocrypt/test/.deps/test-test.Po
+extra/yassl/taocrypt/test/test
+extra/yassl/testsuite/.deps/testsuite-client.Po
+extra/yassl/testsuite/.deps/testsuite-echoclient.Po
+extra/yassl/testsuite/.deps/testsuite-echoserver.Po
+extra/yassl/testsuite/.deps/testsuite-server.Po
+extra/yassl/testsuite/.deps/testsuite-test.Po
+extra/yassl/testsuite/.deps/testsuite-testsuite.Po
+extra/yassl/testsuite/testsuite
+fcns.c
+fcns.h
+gdbinit
+gmon.out
+hardcopy.0
+heap/*.ds?
+heap/*.vcproj
+heap/hp_test1
+heap/hp_test2
+help
+help.c
+help.h
+include/abi_check
+include/check_abi
+include/link_sources
+include/my_config.h
+include/my_global.h
+include/mysql_h.ic
+include/mysql_version.h
+include/mysqld_ername.h
+include/mysqld_error.h
+include/mysqld_error.h.rule
+include/openssl
+include/probes_mysql_dtrace.h
+include/readline
+include/readline/*.h
+include/readline/readline.h
+include/sql_state.h
+include/widec.h
+innobase/*.ds?
+innobase/*.vcproj
+innobase/autom4te-2.53.cache/*
+innobase/autom4te-2.53.cache/output.0
+innobase/autom4te-2.53.cache/requests
+innobase/autom4te-2.53.cache/traces.0
+innobase/autom4te.cache/*
+innobase/autom4te.cache/output.0
+innobase/autom4te.cache/requests
+innobase/autom4te.cache/traces.0
+innobase/configure.lineno
+innobase/conftest.s1
+innobase/conftest.subs
+innobase/ib_config.h
+innobase/ib_config.h.in
+innobase/mkinstalldirs
+innobase/stamp-h1
+insert_test
+install
+install-sh
+isam/*.ds?
+isam/*.vcproj
+isam/isamchk
+isam/isamlog
+isam/pack_isam
+isam/test1
+isam/test2
+isam/test3
+isamchk/*.ds?
+isamchk/*.vcproj
+item_xmlfunc.cc
+lib_debug/*
+lib_release/*
+libmysql/*.c
+libmysql/*.ds?
+libmysql/*.vcproj
+libmysql/.deps/array.Plo
+libmysql/.deps/bchange.Plo
+libmysql/.deps/bcmp.Plo
+libmysql/.deps/bmove.Plo
+libmysql/.deps/bmove_upp.Plo
+libmysql/.deps/charset-def.Plo
+libmysql/.deps/charset.Plo
+libmysql/.deps/client.Plo
+libmysql/.deps/conf_to_src.Po
+libmysql/.deps/ctype-big5.Plo
+libmysql/.deps/ctype-bin.Plo
+libmysql/.deps/ctype-cp932.Plo
+libmysql/.deps/ctype-czech.Plo
+libmysql/.deps/ctype-euc_kr.Plo
+libmysql/.deps/ctype-eucjpms.Plo
+libmysql/.deps/ctype-extra.Plo
+libmysql/.deps/ctype-gb2312.Plo
+libmysql/.deps/ctype-gbk.Plo
+libmysql/.deps/ctype-latin1.Plo
+libmysql/.deps/ctype-mb.Plo
+libmysql/.deps/ctype-simple.Plo
+libmysql/.deps/ctype-sjis.Plo
+libmysql/.deps/ctype-tis620.Plo
+libmysql/.deps/ctype-uca.Plo
+libmysql/.deps/ctype-ucs2.Plo
+libmysql/.deps/ctype-ujis.Plo
+libmysql/.deps/ctype-utf8.Plo
+libmysql/.deps/ctype-win1250ch.Plo
+libmysql/.deps/ctype.Plo
+libmysql/.deps/dbug.Plo
+libmysql/.deps/default.Plo
+libmysql/.deps/default_modify.Plo
+libmysql/.deps/errmsg.Plo
+libmysql/.deps/errors.Plo
+libmysql/.deps/get_password.Plo
+libmysql/.deps/hash.Plo
+libmysql/.deps/int2str.Plo
+libmysql/.deps/is_prefix.Plo
+libmysql/.deps/libmysql.Plo
+libmysql/.deps/list.Plo
+libmysql/.deps/llstr.Plo
+libmysql/.deps/longlong2str.Plo
+libmysql/.deps/manager.Plo
+libmysql/.deps/md5.Plo
+libmysql/.deps/mf_cache.Plo
+libmysql/.deps/mf_dirname.Plo
+libmysql/.deps/mf_fn_ext.Plo
+libmysql/.deps/mf_format.Plo
+libmysql/.deps/mf_iocache.Plo
+libmysql/.deps/mf_iocache2.Plo
+libmysql/.deps/mf_loadpath.Plo
+libmysql/.deps/mf_pack.Plo
+libmysql/.deps/mf_path.Plo
+libmysql/.deps/mf_tempfile.Plo
+libmysql/.deps/mf_unixpath.Plo
+libmysql/.deps/mf_wcomp.Plo
+libmysql/.deps/mulalloc.Plo
+libmysql/.deps/my_alloc.Plo
+libmysql/.deps/my_chsize.Plo
+libmysql/.deps/my_compress.Plo
+libmysql/.deps/my_create.Plo
+libmysql/.deps/my_delete.Plo
+libmysql/.deps/my_div.Plo
+libmysql/.deps/my_error.Plo
+libmysql/.deps/my_file.Plo
+libmysql/.deps/my_fopen.Plo
+libmysql/.deps/my_fstream.Plo
+libmysql/.deps/my_gethostbyname.Plo
+libmysql/.deps/my_getopt.Plo
+libmysql/.deps/my_getwd.Plo
+libmysql/.deps/my_init.Plo
+libmysql/.deps/my_lib.Plo
+libmysql/.deps/my_malloc.Plo
+libmysql/.deps/my_messnc.Plo
+libmysql/.deps/my_net.Plo
+libmysql/.deps/my_once.Plo
+libmysql/.deps/my_open.Plo
+libmysql/.deps/my_port.Plo
+libmysql/.deps/my_pread.Plo
+libmysql/.deps/my_pthread.Plo
+libmysql/.deps/my_read.Plo
+libmysql/.deps/my_realloc.Plo
+libmysql/.deps/my_rename.Plo
+libmysql/.deps/my_seek.Plo
+libmysql/.deps/my_sleep.Plo
+libmysql/.deps/my_static.Plo
+libmysql/.deps/my_strtoll10.Plo
+libmysql/.deps/my_symlink.Plo
+libmysql/.deps/my_thr_init.Plo
+libmysql/.deps/my_time.Plo
+libmysql/.deps/my_vsnprintf.Plo
+libmysql/.deps/my_write.Plo
+libmysql/.deps/net.Plo
+libmysql/.deps/pack.Plo
+libmysql/.deps/password.Plo
+libmysql/.deps/safemalloc.Plo
+libmysql/.deps/sha1.Plo
+libmysql/.deps/str2int.Plo
+libmysql/.deps/str_alloc.Plo
+libmysql/.deps/strcend.Plo
+libmysql/.deps/strcont.Plo
+libmysql/.deps/strend.Plo
+libmysql/.deps/strfill.Plo
+libmysql/.deps/string.Plo
+libmysql/.deps/strinstr.Plo
+libmysql/.deps/strmake.Plo
+libmysql/.deps/strmov.Plo
+libmysql/.deps/strnlen.Plo
+libmysql/.deps/strnmov.Plo
+libmysql/.deps/strtod.Plo
+libmysql/.deps/strtoll.Plo
+libmysql/.deps/strtoull.Plo
+libmysql/.deps/strxmov.Plo
+libmysql/.deps/strxnmov.Plo
+libmysql/.deps/thr_mutex.Plo
+libmysql/.deps/typelib.Plo
+libmysql/.deps/vio.Plo
+libmysql/.deps/viosocket.Plo
+libmysql/.deps/viossl.Plo
+libmysql/.deps/viosslfactories.Plo
+libmysql/.deps/xml.Plo
+libmysql/.libs/libmysqlclient.lai
+libmysql/.libs/libmysqlclient.so.15
+libmysql/.libs/libmysqlclient.so.15.0.0
+libmysql/conf_to_src
+libmysql/debug/libmysql.exp
+libmysql/libmysql.ver
+libmysql/link_sources
+libmysql/my_static.h
+libmysql/my_time.c
+libmysql/mysys_priv.h
+libmysql/net.c
+libmysql/release/libmysql.exp
+libmysql/vio_priv.h
+libmysql/viosocket.o.6WmSJk
+libmysql_r/*.c
+libmysql_r/.deps/array.Plo
+libmysql_r/.deps/bchange.Plo
+libmysql_r/.deps/bcmp.Plo
+libmysql_r/.deps/bmove.Plo
+libmysql_r/.deps/bmove_upp.Plo
+libmysql_r/.deps/charset-def.Plo
+libmysql_r/.deps/charset.Plo
+libmysql_r/.deps/client.Plo
+libmysql_r/.deps/conf_to_src.Po
+libmysql_r/.deps/ctype-big5.Plo
+libmysql_r/.deps/ctype-bin.Plo
+libmysql_r/.deps/ctype-cp932.Plo
+libmysql_r/.deps/ctype-czech.Plo
+libmysql_r/.deps/ctype-euc_kr.Plo
+libmysql_r/.deps/ctype-eucjpms.Plo
+libmysql_r/.deps/ctype-extra.Plo
+libmysql_r/.deps/ctype-gb2312.Plo
+libmysql_r/.deps/ctype-gbk.Plo
+libmysql_r/.deps/ctype-latin1.Plo
+libmysql_r/.deps/ctype-mb.Plo
+libmysql_r/.deps/ctype-simple.Plo
+libmysql_r/.deps/ctype-sjis.Plo
+libmysql_r/.deps/ctype-tis620.Plo
+libmysql_r/.deps/ctype-uca.Plo
+libmysql_r/.deps/ctype-ucs2.Plo
+libmysql_r/.deps/ctype-ujis.Plo
+libmysql_r/.deps/ctype-utf8.Plo
+libmysql_r/.deps/ctype-win1250ch.Plo
+libmysql_r/.deps/ctype.Plo
+libmysql_r/.deps/dbug.Plo
+libmysql_r/.deps/default.Plo
+libmysql_r/.deps/default_modify.Plo
+libmysql_r/.deps/errmsg.Plo
+libmysql_r/.deps/errors.Plo
+libmysql_r/.deps/get_password.Plo
+libmysql_r/.deps/hash.Plo
+libmysql_r/.deps/int2str.Plo
+libmysql_r/.deps/is_prefix.Plo
+libmysql_r/.deps/libmysql.Plo
+libmysql_r/.deps/list.Plo
+libmysql_r/.deps/llstr.Plo
+libmysql_r/.deps/longlong2str.Plo
+libmysql_r/.deps/manager.Plo
+libmysql_r/.deps/md5.Plo
+libmysql_r/.deps/mf_cache.Plo
+libmysql_r/.deps/mf_dirname.Plo
+libmysql_r/.deps/mf_fn_ext.Plo
+libmysql_r/.deps/mf_format.Plo
+libmysql_r/.deps/mf_iocache.Plo
+libmysql_r/.deps/mf_iocache2.Plo
+libmysql_r/.deps/mf_loadpath.Plo
+libmysql_r/.deps/mf_pack.Plo
+libmysql_r/.deps/mf_path.Plo
+libmysql_r/.deps/mf_tempfile.Plo
+libmysql_r/.deps/mf_unixpath.Plo
+libmysql_r/.deps/mf_wcomp.Plo
+libmysql_r/.deps/mulalloc.Plo
+libmysql_r/.deps/my_alloc.Plo
+libmysql_r/.deps/my_chsize.Plo
+libmysql_r/.deps/my_compress.Plo
+libmysql_r/.deps/my_create.Plo
+libmysql_r/.deps/my_delete.Plo
+libmysql_r/.deps/my_div.Plo
+libmysql_r/.deps/my_error.Plo
+libmysql_r/.deps/my_file.Plo
+libmysql_r/.deps/my_fopen.Plo
+libmysql_r/.deps/my_fstream.Plo
+libmysql_r/.deps/my_gethostbyname.Plo
+libmysql_r/.deps/my_getopt.Plo
+libmysql_r/.deps/my_getwd.Plo
+libmysql_r/.deps/my_init.Plo
+libmysql_r/.deps/my_lib.Plo
+libmysql_r/.deps/my_malloc.Plo
+libmysql_r/.deps/my_messnc.Plo
+libmysql_r/.deps/my_net.Plo
+libmysql_r/.deps/my_once.Plo
+libmysql_r/.deps/my_open.Plo
+libmysql_r/.deps/my_port.Plo
+libmysql_r/.deps/my_pread.Plo
+libmysql_r/.deps/my_pthread.Plo
+libmysql_r/.deps/my_read.Plo
+libmysql_r/.deps/my_realloc.Plo
+libmysql_r/.deps/my_rename.Plo
+libmysql_r/.deps/my_seek.Plo
+libmysql_r/.deps/my_sleep.Plo
+libmysql_r/.deps/my_static.Plo
+libmysql_r/.deps/my_strtoll10.Plo
+libmysql_r/.deps/my_symlink.Plo
+libmysql_r/.deps/my_thr_init.Plo
+libmysql_r/.deps/my_time.Plo
+libmysql_r/.deps/my_vsnprintf.Plo
+libmysql_r/.deps/my_write.Plo
+libmysql_r/.deps/net.Plo
+libmysql_r/.deps/pack.Plo
+libmysql_r/.deps/password.Plo
+libmysql_r/.deps/safemalloc.Plo
+libmysql_r/.deps/sha1.Plo
+libmysql_r/.deps/str2int.Plo
+libmysql_r/.deps/str_alloc.Plo
+libmysql_r/.deps/strcend.Plo
+libmysql_r/.deps/strcont.Plo
+libmysql_r/.deps/strend.Plo
+libmysql_r/.deps/strfill.Plo
+libmysql_r/.deps/string.Plo
+libmysql_r/.deps/strinstr.Plo
+libmysql_r/.deps/strmake.Plo
+libmysql_r/.deps/strmov.Plo
+libmysql_r/.deps/strnlen.Plo
+libmysql_r/.deps/strnmov.Plo
+libmysql_r/.deps/strtod.Plo
+libmysql_r/.deps/strtoll.Plo
+libmysql_r/.deps/strtoull.Plo
+libmysql_r/.deps/strxmov.Plo
+libmysql_r/.deps/strxnmov.Plo
+libmysql_r/.deps/thr_mutex.Plo
+libmysql_r/.deps/typelib.Plo
+libmysql_r/.deps/vio.Plo
+libmysql_r/.deps/viosocket.Plo
+libmysql_r/.deps/viossl.Plo
+libmysql_r/.deps/viosslfactories.Plo
+libmysql_r/.deps/xml.Plo
+libmysql_r/.libs/libmysqlclient_r.lai
+libmysql_r/.libs/libmysqlclient_r.so.15
+libmysql_r/.libs/libmysqlclient_r.so.15.0.0
+libmysql_r/acconfig.h
+libmysql_r/client_settings.h
+libmysql_r/conf_to_src
+libmysql_r/link_sources
+libmysql_r/my_static.h
+libmysql_r/mysys_priv.h
+libmysql_r/vio_priv.h
+libmysqld/*.ds?
+libmysqld/*.vcproj
+libmysqld/.deps/client.Po
+libmysqld/.deps/derror.Po
+libmysqld/.deps/discover.Po
+libmysqld/.deps/emb_qcache.Po
+libmysqld/.deps/errmsg.Po
+libmysqld/.deps/event_data_objects.Po
+libmysqld/.deps/event_db_repository.Po
+libmysqld/.deps/event_queue.Po
+libmysqld/.deps/event_scheduler.Po
+libmysqld/.deps/events.Po
+libmysqld/.deps/field.Po
+libmysqld/.deps/field_conv.Po
+libmysqld/.deps/filesort.Po
+libmysqld/.deps/get_password.Po
+libmysqld/.deps/gstream.Po
+libmysqld/.deps/ha_berkeley.Po
+libmysqld/.deps/ha_federated.Po
+libmysqld/.deps/ha_heap.Po
+libmysqld/.deps/ha_innodb.Po
+libmysqld/.deps/ha_myisam.Po
+libmysqld/.deps/ha_myisammrg.Po
+libmysqld/.deps/ha_ndbcluster.Po
+libmysqld/.deps/ha_ndbcluster_binlog.Po
+libmysqld/.deps/ha_partition.Po
+libmysqld/.deps/handler.Po
+libmysqld/.deps/hash_filo.Po
+libmysqld/.deps/hostname.Po
+libmysqld/.deps/init.Po
+libmysqld/.deps/item.Po
+libmysqld/.deps/item_buff.Po
+libmysqld/.deps/item_cmpfunc.Po
+libmysqld/.deps/item_create.Po
+libmysqld/.deps/item_func.Po
+libmysqld/.deps/item_geofunc.Po
+libmysqld/.deps/item_row.Po
+libmysqld/.deps/item_strfunc.Po
+libmysqld/.deps/item_subselect.Po
+libmysqld/.deps/item_sum.Po
+libmysqld/.deps/item_timefunc.Po
+libmysqld/.deps/item_uniq.Po
+libmysqld/.deps/item_xmlfunc.Po
+libmysqld/.deps/key.Po
+libmysqld/.deps/lib_sql.Po
+libmysqld/.deps/libmysql.Po
+libmysqld/.deps/libmysqld.Po
+libmysqld/.deps/lock.Po
+libmysqld/.deps/log.Po
+libmysqld/.deps/log_event.Po
+libmysqld/.deps/my_decimal.Po
+libmysqld/.deps/my_time.Po
+libmysqld/.deps/my_user.Po
+libmysqld/.deps/net_serv.Po
+libmysqld/.deps/opt_range.Po
+libmysqld/.deps/opt_sum.Po
+libmysqld/.deps/pack.Po
+libmysqld/.deps/parse_file.Po
+libmysqld/.deps/partition_info.Po
+libmysqld/.deps/password.Po
+libmysqld/.deps/procedure.Po
+libmysqld/.deps/protocol.Po
+libmysqld/.deps/records.Po
+libmysqld/.deps/rpl_filter.Po
+libmysqld/.deps/rpl_injector.Po
+libmysqld/.deps/set_var.Po
+libmysqld/.deps/sp.Po
+libmysqld/.deps/sp_cache.Po
+libmysqld/.deps/sp_head.Po
+libmysqld/.deps/sp_pcontext.Po
+libmysqld/.deps/sp_rcontext.Po
+libmysqld/.deps/spatial.Po
+libmysqld/.deps/sql_acl.Po
+libmysqld/.deps/sql_analyse.Po
+libmysqld/.deps/sql_base.Po
+libmysqld/.deps/sql_builtin.Po
+libmysqld/.deps/sql_cache.Po
+libmysqld/.deps/sql_class.Po
+libmysqld/.deps/sql_crypt.Po
+libmysqld/.deps/sql_cursor.Po
+libmysqld/.deps/sql_db.Po
+libmysqld/.deps/sql_delete.Po
+libmysqld/.deps/sql_truncate.Po
+libmysqld/.deps/sql_reload.Po
+libmysqld/.deps/datadict.Po
+libmysqld/.deps/sql_derived.Po
+libmysqld/.deps/sql_do.Po
+libmysqld/.deps/sql_error.Po
+libmysqld/.deps/sql_handler.Po
+libmysqld/.deps/sql_help.Po
+libmysqld/.deps/sql_insert.Po
+libmysqld/.deps/sql_lex.Po
+libmysqld/.deps/sql_list.Po
+libmysqld/.deps/sql_load.Po
+libmysqld/.deps/sql_manager.Po
+libmysqld/.deps/sql_map.Po
+libmysqld/.deps/sql_parse.Po
+libmysqld/.deps/sql_partition.Po
+libmysqld/.deps/sql_plugin.Po
+libmysqld/.deps/sql_prepare.Po
+libmysqld/.deps/sql_rename.Po
+libmysqld/.deps/sql_select.Po
+libmysqld/.deps/sql_show.Po
+libmysqld/.deps/sql_state.Po
+libmysqld/.deps/sql_string.Po
+libmysqld/.deps/sql_table.Po
+libmysqld/.deps/sql_tablespace.Po
+libmysqld/.deps/sql_test.Po
+libmysqld/.deps/sql_trigger.Po
+libmysqld/.deps/sql_udf.Po
+libmysqld/.deps/sql_union.Po
+libmysqld/.deps/sql_update.Po
+libmysqld/.deps/sql_view.Po
+libmysqld/.deps/sql_yacc.Po
+libmysqld/.deps/stacktrace.Po
+libmysqld/.deps/strfunc.Po
+libmysqld/.deps/table.Po
+libmysqld/.deps/thr_malloc.Po
+libmysqld/.deps/time.Po
+libmysqld/.deps/tztime.Po
+libmysqld/.deps/uniques.Po
+libmysqld/.deps/unireg.Po
+libmysqld/backup_dir
+libmysqld/client.c
+libmysqld/client_settings.h
+libmysqld/cmake_dummy.c
+libmysqld/convert.cc
+libmysqld/derror.cc
+libmysqld/discover.cc
+libmysqld/emb_qcache.cpp
+libmysqld/errmsg.c
+libmysqld/event.cc
+libmysqld/event_data_objects.cc
+libmysqld/event_db_repository.cc
+libmysqld/event_executor.cc
+libmysqld/event_queue.cc
+libmysqld/event_scheduler.cc
+libmysqld/event_timed.cc
+libmysqld/events.cc
+libmysqld/examples/.deps/completion_hash.Po
+libmysqld/examples/.deps/mysql.Po
+libmysqld/examples/.deps/mysql_client_test.Po
+libmysqld/examples/.deps/mysqltest.Po
+libmysqld/examples/.deps/readline.Po
+libmysqld/examples/client_test.c
+libmysqld/examples/client_test.cc
+libmysqld/examples/completion_hash.cc
+libmysqld/examples/completion_hash.h
+libmysqld/examples/link_sources
+libmysqld/examples/my_readline.h
+libmysqld/examples/mysql
+libmysqld/examples/mysql.cc
+libmysqld/examples/mysql_client_test.c
+libmysqld/examples/mysql_client_test_embedded
+libmysqld/examples/mysqltest
+libmysqld/examples/mysqltest.c
+libmysqld/examples/mysqltest_embedded
+libmysqld/examples/readline.cc
+libmysqld/examples/sql_string.cc
+libmysqld/examples/sql_string.h
+libmysqld/examples/test-gdbinit
+libmysqld/field.cc
+libmysqld/field_conv.cc
+libmysqld/filesort.cc
+libmysqld/get_password.c
+libmysqld/gstream.cc
+libmysqld/ha_archive.cc
+libmysqld/ha_berkeley.cc
+libmysqld/ha_blackhole.cc
+libmysqld/ha_example.cc
+libmysqld/ha_federated.cc
+libmysqld/ha_heap.cc
+libmysqld/ha_innobase.cc
+libmysqld/ha_innodb.cc
+libmysqld/ha_isam.cc
+libmysqld/ha_isammrg.cc
+libmysqld/ha_myisam.cc
+libmysqld/ha_myisammrg.cc
+libmysqld/ha_ndbcluster.cc
+libmysqld/ha_ndbcluster_binlog.cc
+libmysqld/ha_ndbcluster_cond.cc
+libmysqld/ha_partition.cc
+libmysqld/ha_tina.cc
+libmysqld/handler.cc
+libmysqld/handlerton.cc
+libmysqld/hash_filo.cc
+libmysqld/hostname.cc
+libmysqld/init.cc
+libmysqld/item.cc
+libmysqld/item_buff.cc
+libmysqld/item_cmpfunc.cc
+libmysqld/item_create.cc
+libmysqld/item_func.cc
+libmysqld/item_geofunc.cc
+libmysqld/item_row.cc
+libmysqld/item_strfunc.cc
+libmysqld/item_subselect.cc
+libmysqld/item_sum.cc
+libmysqld/item_timefunc.cc
+libmysqld/item_uniq.cc
+libmysqld/key.cc
+libmysqld/lex_hash.h
+libmysqld/lib_sql.cpp
+libmysqld/libmysql.c
+libmysqld/link_sources
+libmysqld/lock.cc
+libmysqld/log.cc
+libmysqld/log_event.cc
+libmysqld/log_event_old.cc
+libmysqld/md5.c
+libmysqld/message.h
+libmysqld/message.rc
+libmysqld/mf_iocache.cc
+libmysqld/mini_client.cc
+libmysqld/my_decimal.cc
+libmysqld/my_time.c
+libmysqld/my_user.c
+libmysqld/net_pkg.cc
+libmysqld/net_serv.cc
+libmysqld/opt_ft.cc
+libmysqld/opt_range.cc
+libmysqld/opt_sum.cc
+libmysqld/pack.c
+libmysqld/parse_file.cc
+libmysqld/partition_info.cc
+libmysqld/password.c
+libmysqld/procedure.cc
+libmysqld/protocol.cc
+libmysqld/protocol_cursor.cc
+libmysqld/records.cc
+libmysqld/repl_failsafe.cc
+libmysqld/rpl_filter.cc
+libmysqld/rpl_handler.cc
+libmysqld/rpl_injector.cc
+libmysqld/rpl_record.cc
+libmysqld/rpl_record_old.cc
+libmysqld/rpl_utility.cc
+libmysqld/scheduler.cc
+libmysqld/set_var.cc
+libmysqld/sha2.cc
+libmysqld/simple-test
+libmysqld/slave.cc
+libmysqld/sp.cc
+libmysqld/sp_cache.cc
+libmysqld/sp_head.cc
+libmysqld/sp_pcontext.cc
+libmysqld/sp_rcontext.cc
+libmysqld/spatial.cc
+libmysqld/sql_acl.cc
+libmysqld/sql_analyse.cc
+libmysqld/sql_base.cc
+libmysqld/sql_builtin.cc
+libmysqld/sql_cache.cc
+libmysqld/sql_class.cc
+libmysqld/sql_command
+libmysqld/sql_connect.cc
+libmysqld/sql_crypt.cc
+libmysqld/sql_cursor.cc
+libmysqld/sql_cursor.h
+libmysqld/sql_db.cc
+libmysqld/sql_delete.cc
+libmysqld/sql_truncate.cc
+libmysqld/sql_reload.cc
+libmysqld/datadict.cc
+libmysqld/sql_derived.cc
+libmysqld/sql_do.cc
+libmysqld/sql_error.cc
+libmysqld/sql_handler.cc
+libmysqld/sql_help.cc
+libmysqld/sql_insert.cc
+libmysqld/sql_lex.cc
+libmysqld/sql_list.cc
+libmysqld/sql_load.cc
+libmysqld/sql_locale.cc
+libmysqld/sql_manager.cc
+libmysqld/sql_map.cc
+libmysqld/sql_olap.cc
+libmysqld/sql_parse.cc
+libmysqld/sql_partition.cc
+libmysqld/sql_plugin.cc
+libmysqld/sql_prepare.cc
+libmysqld/sql_profile.cc
+libmysqld/sql_rename.cc
+libmysqld/sql_repl.cc
+libmysqld/sql_select.cc
+libmysqld/sql_servers.cc
+libmysqld/sql_show.cc
+libmysqld/sql_state.c
+libmysqld/sql_string.cc
+libmysqld/sql_table.cc
+libmysqld/sql_tablespace.cc
+libmysqld/sql_test.cc
+libmysqld/sql_trigger.cc
+libmysqld/sql_udf.cc
+libmysqld/sql_union.cc
+libmysqld/sql_unions.cc
+libmysqld/sql_update.cc
+libmysqld/sql_view.cc
+libmysqld/sql_yacc.cc
+libmysqld/sql_yacc.cpp
+libmysqld/sql_yacc.h
+libmysqld/stacktrace.c
+libmysqld/strfunc.cc
+libmysqld/table.cc
+libmysqld/thr_malloc.cc
+libmysqld/sql_time.cc
+libmysqld/tztime.cc
+libmysqld/uniques.cc
+libmysqld/unireg.cc
+libmysqltest/*.ds?
+libmysqltest/*.vcproj
+libmysqltest/mytest.c
+libtool
+linked_client_sources
+linked_include_sources
+linked_libmysql_r_sources
+linked_libmysql_sources
+linked_libmysqld_sources
+linked_libmysqldex_sources
+linked_server_sources
+linked_tools_sources
+locked
+ltmain.sh
+man/*.1
+merge/*.ds?
+merge/*.vcproj
+missing
+mit-pthreads/config.flags
+mit-pthreads/include/bits
+mit-pthreads/include/pthread/machdep.h
+mit-pthreads/include/pthread/posix.h
+mit-pthreads/include/sys
+mit-pthreads/machdep.c
+mit-pthreads/pg++
+mit-pthreads/pgcc
+mit-pthreads/syscall.S
+mkinstalldirs
+my_print_defaults/*.ds?
+my_print_defaults/*.vcproj
+myisam/*.ds?
+myisam/*.vcproj
+myisam/FT1.MYD
+myisam/FT1.MYI
+myisam/ft_dump
+myisam/ft_eval
+myisam/ft_test1
+myisam/ftbench/data
+myisam/ftbench/t
+myisam/ftbench/var/*
+myisam/mi_test1
+myisam/mi_test2
+myisam/mi_test3
+myisam/mi_test_all
+myisam/myisam.log
+myisam/myisam_ftdump
+myisam/myisamchk
+myisam/myisamlog
+myisam/myisampack
+myisam/rt_test
+myisam/rt_test.MYD
+myisam/rt_test.MYI
+myisam/sp_test
+myisam/test1.MYD
+myisam/test1.MYI
+myisam/test2.MYD
+myisam/test2.MYI
+myisam_ftdump/*.ds?
+myisam_ftdump/*.vcproj
+myisamchk/*.ds?
+myisamchk/*.vcproj
+myisamlog/*.ds?
+myisamlog/*.vcproj
+myisammrg/*.ds?
+myisammrg/*.vcproj
+myisampack/*.ds?
+myisampack/*.vcproj
+mysql-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-4.0.2-alpha.tar.gz
+mysql-4.1.8-win-src.zip
+mysql-5.0.2-alpha.tar.gz
+mysql-max-4.0.2-alpha-pc-linux-gnu-i686.tar.gz
+mysql-test/*.ds?
+mysql-test/*.vcproj
+mysql-test/.DS_Store
+mysql-test/collections/default.release
+mysql-test/collections/default.release.done
+mysql-test/funcs_1.log
+mysql-test/funcs_1.tar
+mysql-test/gmon.out
+mysql-test/install_test_db
+mysql-test/lib/My/SafeProcess/my_safe_process
+mysql-test/lib/init_db.sql
+mysql-test/linux_sys_vars.inc
+mysql-test/load_sysvars.inc
+mysql-test/mtr
+mysql-test/mysql-test-run
+mysql-test/mysql-test-gcov.err
+mysql-test/mysql-test-gcov.msg
+mysql-test/mysql-test-run-shell
+mysql-test/mysql-test-run.log
+mysql-test/mysql_test_run_new
+mysql-test/ndb/ndbcluster
+mysql-test/partitions.log
+mysql-test/r/*.err
+mysql-test/r/*.log
+mysql-test/r/*.out
+mysql-test/r/*.reject
+mysql-test/r/index_merge_load.result
+mysql-test/r/max_allowed_packet_func.result
+mysql-test/r/rpl000001.eval
+mysql-test/r/rpl000002.eval
+mysql-test/r/rpl000014.eval
+mysql-test/r/rpl000015.eval
+mysql-test/r/rpl000016.eval
+mysql-test/r/rpl_log.eval
+mysql-test/r/slave-running.eval
+mysql-test/r/slave-stopped.eval
+mysql-test/r/tmp.result
+mysql-test/reg.log
+mysql-test/rpl.log
+mysql-test/share/mysql
+mysql-test/std_data/*.pem
+mysql-test/suite/funcs_1.tar.gz
+mysql-test/suite/funcs_1.tar.zip
+mysql-test/suite/funcs_1/r/innodb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/innodb_views.warnings
+mysql-test/suite/funcs_1/r/memory_trig_03e.warnings
+mysql-test/suite/funcs_1/r/memory_views.warnings
+mysql-test/suite/funcs_1/r/myisam_trig_03e.warnings
+mysql-test/suite/funcs_1/r/myisam_views.warnings
+mysql-test/suite/funcs_1/r/ndb_trig_03e.warnings
+mysql-test/suite/funcs_1/r/ndb_views.warnings
+mysql-test/suite/partitions/r/dif
+mysql-test/suite/partitions/r/diff
+mysql-test/suite/partitions/r/partition.result
+mysql-test/suite/partitions/r/partition_bit_ndb.warnings
+mysql-test/suite/partitions/r/partition_special_innodb.warnings
+mysql-test/suite/partitions/r/partition_special_myisam.warnings
+mysql-test/suite/partitions/r/partition_t55.out
+mysql-test/suite/partitions/r/partition_t55.refout
+mysql-test/suite/partitions/t/partition.test
+mysql-test/t/index_merge.load
+mysql-test/t/tmp.test
+mysql-test/var
+mysql-test/var/*
+mysql-test/windows_sys_vars.inc
+mysql.kdevprj
+mysql.proj
+sql_priv.h
+mysqlbinlog/*.ds?
+mysqlbinlog/*.vcproj
+mysqlcheck/*.ds?
+mysqlcheck/*.vcproj
+mysqld.S
+mysqld.sym
+mysqldemb/*.ds?
+mysqldemb/*.vcproj
+mysqlserver/*.ds?
+mysqlserver/*.vcproj
+mysys/#mf_iocache.c#
+mysys/*.ds?
+mysys/*.vcproj
+mysys/.deps/array.Po
+mysys/.deps/base64.Po
+mysys/.deps/charset-def.Po
+mysys/.deps/charset.Po
+mysys/.deps/checksum.Po
+mysys/.deps/default.Po
+mysys/.deps/default_modify.Po
+mysys/.deps/errors.Po
+mysys/.deps/hash.Po
+mysys/.deps/list.Po
+mysys/.deps/md5.Po
+mysys/.deps/mf_brkhant.Po
+mysys/.deps/mf_cache.Po
+mysys/.deps/mf_dirname.Po
+mysys/.deps/mf_fn_ext.Po
+mysys/.deps/mf_format.Po
+mysys/.deps/mf_getdate.Po
+mysys/.deps/mf_iocache.Po
+mysys/.deps/mf_iocache2.Po
+mysys/.deps/mf_keycache.Po
+mysys/.deps/mf_keycaches.Po
+mysys/.deps/mf_loadpath.Po
+mysys/.deps/mf_pack.Po
+mysys/.deps/mf_path.Po
+mysys/.deps/mf_qsort.Po
+mysys/.deps/mf_qsort2.Po
+mysys/.deps/mf_radix.Po
+mysys/.deps/mf_same.Po
+mysys/.deps/mf_sort.Po
+mysys/.deps/mf_strip.Po
+mysys/.deps/mf_tempdir.Po
+mysys/.deps/mf_tempfile.Po
+mysys/.deps/mf_unixpath.Po
+mysys/.deps/mf_wcomp.Po
+mysys/.deps/mf_wfile.Po
+mysys/.deps/mulalloc.Po
+mysys/.deps/my_access.Po
+mysys/.deps/my_aes.Po
+mysys/.deps/my_alarm.Po
+mysys/.deps/my_alloc.Po
+mysys/.deps/my_append.Po
+mysys/.deps/my_atomic.Po
+mysys/.deps/my_bit.Po
+mysys/.deps/my_bitmap.Po
+mysys/.deps/my_chsize.Po
+mysys/.deps/my_clock.Po
+mysys/.deps/my_compress.Po
+mysys/.deps/my_copy.Po
+mysys/.deps/my_crc32.Po
+mysys/.deps/my_create.Po
+mysys/.deps/my_delete.Po
+mysys/.deps/my_div.Po
+mysys/.deps/my_dup.Po
+mysys/.deps/my_error.Po
+mysys/.deps/my_file.Po
+mysys/.deps/my_fopen.Po
+mysys/.deps/my_fstream.Po
+mysys/.deps/my_gethostbyname.Po
+mysys/.deps/my_gethwaddr.Po
+mysys/.deps/my_getncpus.Po
+mysys/.deps/my_getopt.Po
+mysys/.deps/my_getsystime.Po
+mysys/.deps/my_getwd.Po
+mysys/.deps/my_handler.Po
+mysys/.deps/my_init.Po
+mysys/.deps/my_largepage.Po
+mysys/.deps/my_lib.Po
+mysys/.deps/my_libwrap.Po
+mysys/.deps/my_lock.Po
+mysys/.deps/my_lockmem.Po
+mysys/.deps/my_lread.Po
+mysys/.deps/my_lwrite.Po
+mysys/.deps/my_malloc.Po
+mysys/.deps/my_memmem.Po
+mysys/.deps/my_messnc.Po
+mysys/.deps/my_mkdir.Po
+mysys/.deps/my_mmap.Po
+mysys/.deps/my_net.Po
+mysys/.deps/my_netware.Po
+mysys/.deps/my_new.Po
+mysys/.deps/my_once.Po
+mysys/.deps/my_open.Po
+mysys/.deps/my_port.Po
+mysys/.deps/my_pread.Po
+mysys/.deps/my_pthread.Po
+mysys/.deps/my_quick.Po
+mysys/.deps/my_read.Po
+mysys/.deps/my_realloc.Po
+mysys/.deps/my_redel.Po
+mysys/.deps/my_rename.Po
+mysys/.deps/my_seek.Po
+mysys/.deps/my_semaphore.Po
+mysys/.deps/my_sleep.Po
+mysys/.deps/my_static.Po
+mysys/.deps/my_symlink.Po
+mysys/.deps/my_symlink2.Po
+mysys/.deps/my_sync.Po
+mysys/.deps/my_thr_init.Po
+mysys/.deps/my_vle.Po
+mysys/.deps/my_windac.Po
+mysys/.deps/my_write.Po
+mysys/.deps/ptr_cmp.Po
+mysys/.deps/queues.Po
+mysys/.deps/rijndael.Po
+mysys/.deps/safemalloc.Po
+mysys/.deps/sha1.Po
+mysys/.deps/string.Po
+mysys/.deps/thr_alarm.Po
+mysys/.deps/thr_lock.Po
+mysys/.deps/thr_mutex.Po
+mysys/.deps/thr_rwlock.Po
+mysys/.deps/tree.Po
+mysys/.deps/trie.Po
+mysys/.deps/typelib.Po
+mysys/charset2html
+mysys/getopt.c
+mysys/getopt1.c
+mysys/main.cc
+mysys/my_new.cpp
+mysys/raid.cpp
+mysys/ste5KbMa
+mysys/test_atomic
+mysys/test_bitmap
+mysys/test_charset
+mysys/test_dir
+mysys/test_gethwaddr
+mysys/test_io_cache
+mysys/test_thr_alarm
+mysys/test_thr_lock
+mysys/test_vsnprintf
+mysys/testhash
+ndb/bin/DbAsyncGenerator
+ndb/bin/DbCreate
+ndb/bin/acid
+ndb/bin/async-lmc-bench-l-p10.sh
+ndb/bin/async-lmc-bench-l.sh
+ndb/bin/async-lmc-bench-p10.sh
+ndb/bin/async-lmc-bench.sh
+ndb/bin/atrt
+ndb/bin/atrt-analyze-result.sh
+ndb/bin/atrt-clear-result.sh
+ndb/bin/atrt-gather-result.sh
+ndb/bin/atrt-setup.sh
+ndb/bin/bankCreator
+ndb/bin/bankMakeGL
+ndb/bin/bankSumAccounts
+ndb/bin/bankTimer
+ndb/bin/bankTransactionMaker
+ndb/bin/bankValidateAllGLs
+ndb/bin/basicTransporterTest
+ndb/bin/benchronja
+ndb/bin/bulk_copy
+ndb/bin/copy_tab
+ndb/bin/create_all_tabs
+ndb/bin/create_index
+ndb/bin/create_tab
+ndb/bin/delete_all
+ndb/bin/desc
+ndb/bin/drop_all_tabs
+ndb/bin/drop_index
+ndb/bin/drop_tab
+ndb/bin/flexAsynch
+ndb/bin/flexBench
+ndb/bin/flexHammer
+ndb/bin/flexScan
+ndb/bin/flexTT
+ndb/bin/hugoCalculator
+ndb/bin/hugoFill
+ndb/bin/hugoLoad
+ndb/bin/hugoLockRecords
+ndb/bin/hugoPkDelete
+ndb/bin/hugoPkRead
+ndb/bin/hugoPkReadRecord
+ndb/bin/hugoPkUpdate
+ndb/bin/hugoScanRead
+ndb/bin/hugoScanUpdate
+ndb/bin/index
+ndb/bin/index2
+ndb/bin/initronja
+ndb/bin/interpreterInTup
+ndb/bin/list_tables
+ndb/bin/make-config.sh
+ndb/bin/mgmtclient
+ndb/bin/mgmtsrvr
+ndb/bin/mkconfig
+ndb/bin/ndb
+ndb/bin/ndb_cpcc
+ndb/bin/ndb_cpcd
+ndb/bin/ndb_rep
+ndb/bin/ndbsql
+ndb/bin/newton_basic
+ndb/bin/newton_br
+ndb/bin/newton_pb
+ndb/bin/newton_perf
+ndb/bin/perfTransporterTest
+ndb/bin/printConfig
+ndb/bin/printSchemafile
+ndb/bin/printSysfile
+ndb/bin/redoLogFileReader
+ndb/bin/restart
+ndb/bin/restarter
+ndb/bin/restarter2
+ndb/bin/restarts
+ndb/bin/restore
+ndb/bin/select_all
+ndb/bin/select_count
+ndb/bin/telco
+ndb/bin/testBackup
+ndb/bin/testBank
+ndb/bin/testBasic
+ndb/bin/testBasicAsynch
+ndb/bin/testCopy
+ndb/bin/testDataBuffers
+ndb/bin/testDict
+ndb/bin/testGrep
+ndb/bin/testGrepVerify
+ndb/bin/testIndex
+ndb/bin/testInterpreter
+ndb/bin/testKernelDataBuffer
+ndb/bin/testLongSig
+ndb/bin/testMgm
+ndb/bin/testMgmapi
+ndb/bin/testNdbApi
+ndb/bin/testNodeRestart
+ndb/bin/testOIBasic
+ndb/bin/testOdbcDriver
+ndb/bin/testOperations
+ndb/bin/testRestartGci
+ndb/bin/testScan
+ndb/bin/testScanInterpreter
+ndb/bin/testSimplePropertiesSection
+ndb/bin/testSystemRestart
+ndb/bin/testTimeout
+ndb/bin/testTransactions
+ndb/bin/test_cpcd
+ndb/bin/test_event
+ndb/bin/verify_index
+ndb/bin/waiter
+ndb/config/autom4te.cache/*
+ndb/config/config.mk
+ndb/examples/ndbapi_example1/ndbapi_example1
+ndb/examples/ndbapi_example2/ndbapi_example2
+ndb/examples/ndbapi_example3/ndbapi_example3
+ndb/examples/ndbapi_example5/ndbapi_example5
+ndb/examples/select_all/select_all
+ndb/include/ndb_global.h
+ndb/include/ndb_types.h
+ndb/include/ndb_version.h
+ndb/lib/libMGM_API.so
+ndb/lib/libNDB_API.so
+ndb/lib/libNDB_ODBC.so
+ndb/lib/libNEWTON_API.so
+ndb/lib/libNEWTON_BASICTEST_COMMON.so
+ndb/lib/libREP_API.so
+ndb/lib/libndbclient.so
+ndb/lib/libndbclient_extra.so
+ndb/src/common/debugger/libtrace.dsp
+ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+ndb/src/common/logger/liblogger.dsp
+ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
+ndb/src/common/mgmcommon/printConfig/*.d
+ndb/src/common/portlib/libportlib.dsp
+ndb/src/common/transporter/libtransporter.dsp
+ndb/src/common/util/libgeneral.dsp
+ndb/src/common/util/testBitmask.cpp
+ndb/src/cw/cpcd/ndb_cpcd
+ndb/src/dummy.cpp
+ndb/src/kernel/blocks/backup/libbackup.dsp
+ndb/src/kernel/blocks/backup/restore/ndb_restore
+ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+ndb/src/kernel/blocks/grep/libgrep.dsp
+ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+ndb/src/kernel/blocks/suma/libsuma.dsp
+ndb/src/kernel/blocks/trix/libtrix.dsp
+ndb/src/kernel/error/liberror.dsp
+ndb/src/kernel/ndbd
+ndb/src/kernel/ndbd.dsp
+ndb/src/kernel/vm/libkernel.dsp
+ndb/src/libndb.ver
+ndb/src/libndbclient.dsp
+ndb/src/mgmapi/libmgmapi.dsp
+ndb/src/mgmclient/libndbmgmclient.dsp
+ndb/src/mgmclient/ndb_mgm
+ndb/src/mgmclient/ndb_mgm.dsp
+ndb/src/mgmclient/test_cpcd/*.d
+ndb/src/mgmsrv/ndb_mgmd
+ndb/src/mgmsrv/ndb_mgmd.dsp
+ndb/src/ndbapi/libndbapi.dsp
+ndb/test/ndbapi/bank/bankCreator
+ndb/test/ndbapi/bank/bankMakeGL
+ndb/test/ndbapi/bank/bankSumAccounts
+ndb/test/ndbapi/bank/bankTimer
+ndb/test/ndbapi/bank/bankTransactionMaker
+ndb/test/ndbapi/bank/bankValidateAllGLs
+ndb/test/ndbapi/bank/testBank
+ndb/test/ndbapi/create_all_tabs
+ndb/test/ndbapi/create_tab
+ndb/test/ndbapi/drop_all_tabs
+ndb/test/ndbapi/flexAsynch
+ndb/test/ndbapi/flexBench
+ndb/test/ndbapi/flexBench.dsp
+ndb/test/ndbapi/flexHammer
+ndb/test/ndbapi/flexTT
+ndb/test/ndbapi/testBackup
+ndb/test/ndbapi/testBasic
+ndb/test/ndbapi/testBasic.dsp
+ndb/test/ndbapi/testBasicAsynch
+ndb/test/ndbapi/testBlobs
+ndb/test/ndbapi/testBlobs.dsp
+ndb/test/ndbapi/testDataBuffers
+ndb/test/ndbapi/testDeadlock
+ndb/test/ndbapi/testDict
+ndb/test/ndbapi/testIndex
+ndb/test/ndbapi/testMgm
+ndb/test/ndbapi/testNdbApi
+ndb/test/ndbapi/testNodeRestart
+ndb/test/ndbapi/testOIBasic
+ndb/test/ndbapi/testOperations
+ndb/test/ndbapi/testRestartGci
+ndb/test/ndbapi/testSRBank
+ndb/test/ndbapi/testScan
+ndb/test/ndbapi/testScan.dsp
+ndb/test/ndbapi/testScanInterpreter
+ndb/test/ndbapi/testScanPerf
+ndb/test/ndbapi/testSystemRestart
+ndb/test/ndbapi/testTimeout
+ndb/test/ndbapi/testTransactions
+ndb/test/ndbapi/test_event
+ndb/test/run-test/atrt
+ndb/test/src/libNDBT.dsp
+ndb/test/tools/copy_tab
+ndb/test/tools/create_index
+ndb/test/tools/hugoCalculator
+ndb/test/tools/hugoFill
+ndb/test/tools/hugoLoad
+ndb/test/tools/hugoLockRecords
+ndb/test/tools/hugoPkDelete
+ndb/test/tools/hugoPkRead
+ndb/test/tools/hugoPkReadRecord
+ndb/test/tools/hugoPkUpdate
+ndb/test/tools/hugoScanRead
+ndb/test/tools/hugoScanUpdate
+ndb/test/tools/ndb_cpcc
+ndb/test/tools/restart
+ndb/test/tools/verify_index
+ndb/tools/ndb_config
+ndb/tools/ndb_delete_all
+ndb/tools/ndb_delete_all.dsp
+ndb/tools/ndb_desc
+ndb/tools/ndb_desc.dsp
+ndb/tools/ndb_drop_index
+ndb/tools/ndb_drop_index.dsp
+ndb/tools/ndb_drop_table
+ndb/tools/ndb_drop_table.dsp
+ndb/tools/ndb_restore
+ndb/tools/ndb_select_all
+ndb/tools/ndb_select_all.dsp
+ndb/tools/ndb_select_count
+ndb/tools/ndb_select_count.dsp
+ndb/tools/ndb_show_tables
+ndb/tools/ndb_show_tables.dsp
+ndb/tools/ndb_test_platform
+ndb/tools/ndb_waiter
+ndb/tools/ndb_waiter.dsp
+ndbcluster-1186
+ndbcluster-1186/SCCS
+ndbcluster-1186/config.ini
+ndbcluster-1186/ndb_1.pid
+ndbcluster-1186/ndb_1_out.log
+ndbcluster-1186/ndb_1_signal.log
+ndbcluster-1186/ndb_2.pid
+ndbcluster-1186/ndb_2_out.log
+ndbcluster-1186/ndb_2_signal.log
+ndbcluster-1186/ndb_3.pid
+ndbcluster-1186/ndb_3_cluster.log
+ndbcluster-1186/ndb_3_out.log
+ndbcluster-1186/ndbcluster.pid
+netware/.deps/libmysqlmain.Po
+netware/.deps/my_manage.Po
+netware/.deps/mysql_install_db.Po
+netware/.deps/mysql_test_run.Po
+netware/.deps/mysqld_safe.Po
+netware/init_db.sql
+netware/libmysql.imp
+netware/test_db.sql
+pack_isam/*.ds?
+perror/*.ds?
+perror/*.vcproj
+plugin/fulltext/.deps/mypluglib_la-plugin_example.Plo
+plugin/fulltext/.libs/mypluglib.lai
+plugin/fulltext/.libs/mypluglib.so.0
+plugin/fulltext/.libs/mypluglib.so.0.0.0
+pstack/.deps/bucomm.Po
+pstack/.deps/debug.Po
+pstack/.deps/filemode.Po
+pstack/.deps/ieee.Po
+pstack/.deps/linuxthreads.Po
+pstack/.deps/pstack.Po
+pstack/.deps/rddbg.Po
+pstack/.deps/stabs.Po
+pull.log
+regex/*.ds?
+regex/*.vcproj
+regex/.deps/debug.Po
+regex/.deps/main.Po
+regex/.deps/regcomp.Po
+regex/.deps/regerror.Po
+regex/.deps/regexec.Po
+regex/.deps/regfree.Po
+regex/.deps/reginit.Po
+regex/.deps/split.Po
+regex/re
+repl-tests/test-repl-ts/repl-timestamp.master.reject
+repl-tests/test-repl/foo-dump-slave.master.
+repl-tests/test-repl/sum-wlen-slave.master.
+repl-tests/test-repl/sum-wlen-slave.master.re
+repl-tests/test-repl/sum-wlen-slave.master.reje
+replace/*.ds?
+replace/*.vcproj
+scripts/comp_sql
+scripts/fill_func_tables
+scripts/fill_func_tables.sql
+scripts/fill_help_tables
+scripts/fill_help_tables.sql
+scripts/make_binary_distribution
+scripts/make_sharedlib_distribution
+scripts/make_win_binary_distribution
+scripts/make_win_src_distribution
+scripts/make_win_src_distribution_old
+scripts/msql2mysql
+scripts/mysql_config
+scripts/mysql_convert_table_format
+scripts/mysql_create_system_tables
+scripts/mysql_explain_log
+scripts/mysql_find_rows
+scripts/mysql_fix_extensions
+scripts/mysql_fix_privilege_tables
+scripts/mysql_fix_privilege_tables.sql
+scripts/mysql_fix_privilege_tables.sql.rule
+scripts/mysql_fix_privilege_tables_sql.c
+scripts/mysql_fix_privilege_tables_sql.c.rule
+scripts/mysql_install_db
+scripts/mysql_secure_installation
+scripts/mysql_setpermission
+scripts/mysql_tableinfo
+scripts/mysql_upgrade
+scripts/mysql_upgrade_shell
+scripts/mysql_zap
+scripts/mysqlaccess
+scripts/mysqlbug
+scripts/mysqld_multi
+scripts/mysqld_safe
+scripts/mysqldumpslow
+scripts/mysqlhotcopy
+scripts/mysqlhotcopy.sh.rej
+scripts/safe_mysqld
+select_test
+server-tools/instance-manager/.deps/buffer.Po
+server-tools/instance-manager/.deps/command.Po
+server-tools/instance-manager/.deps/commands.Po
+server-tools/instance-manager/.deps/guardian.Po
+server-tools/instance-manager/.deps/instance.Po
+server-tools/instance-manager/.deps/instance_map.Po
+server-tools/instance-manager/.deps/instance_options.Po
+server-tools/instance-manager/.deps/liboptions_la-options.Plo
+server-tools/instance-manager/.deps/liboptions_la-priv.Plo
+server-tools/instance-manager/.deps/listener.Po
+server-tools/instance-manager/.deps/log.Po
+server-tools/instance-manager/.deps/manager.Po
+server-tools/instance-manager/.deps/messages.Po
+server-tools/instance-manager/.deps/mysql_connection.Po
+server-tools/instance-manager/.deps/mysqlmanager.Po
+server-tools/instance-manager/.deps/net_serv.Po
+server-tools/instance-manager/.deps/parse.Po
+server-tools/instance-manager/.deps/parse_output.Po
+server-tools/instance-manager/.deps/protocol.Po
+server-tools/instance-manager/.deps/thread_registry.Po
+server-tools/instance-manager/.deps/user_management_commands.Po
+server-tools/instance-manager/.deps/user_map.Po
+server-tools/instance-manager/buffer.cpp
+server-tools/instance-manager/client.c
+server-tools/instance-manager/client_settings.h
+server-tools/instance-manager/command.cpp
+server-tools/instance-manager/commands.cpp
+server-tools/instance-manager/errmsg.c
+server-tools/instance-manager/guardian.cpp
+server-tools/instance-manager/instance.cpp
+server-tools/instance-manager/instance_map.cpp
+server-tools/instance-manager/instance_options.cpp
+server-tools/instance-manager/listener.cpp
+server-tools/instance-manager/log.cpp
+server-tools/instance-manager/manager.cpp
+server-tools/instance-manager/messages.cpp
+server-tools/instance-manager/mysql_connection.cpp
+server-tools/instance-manager/mysqlmanager
+server-tools/instance-manager/mysqlmanager.cpp
+server-tools/instance-manager/net_serv.cc
+server-tools/instance-manager/options.cpp
+server-tools/instance-manager/parse.cpp
+server-tools/instance-manager/parse_output.cpp
+server-tools/instance-manager/priv.cpp
+server-tools/instance-manager/protocol.cpp
+server-tools/instance-manager/thr_alarm.c
+server-tools/instance-manager/thread_registry.cpp
+server-tools/instance-manager/user_map.cpp
+sql-bench/Results-linux/ATIS-mysql_bdb-Linux_2.2.14_my_SMP_i686
+sql-bench/bench-count-distinct
+sql-bench/bench-init.pl
+sql-bench/compare-results
+sql-bench/compare-results-all
+sql-bench/copy-db
+sql-bench/crash-me
+sql-bench/gif/*
+sql-bench/graph-compare-results
+sql-bench/innotest1
+sql-bench/innotest1a
+sql-bench/innotest1b
+sql-bench/innotest2
+sql-bench/innotest2a
+sql-bench/innotest2b
+sql-bench/output/*
+sql-bench/run-all-tests
+sql-bench/server-cfg
+sql-bench/template.html
+sql-bench/test-ATIS
+sql-bench/test-alter-table
+sql-bench/test-big-tables
+sql-bench/test-connect
+sql-bench/test-create
+sql-bench/test-insert
+sql-bench/test-select
+sql-bench/test-transactions
+sql-bench/test-wisconsin
+sql/*.cpp
+sql/*.ds?
+sql/*.def
+sql/*.vcproj
+sql/.deps/client.Po
+sql/.deps/derror.Po
+sql/.deps/des_key_file.Po
+sql/.deps/discover.Po
+sql/.deps/event_data_objects.Po
+sql/.deps/event_db_repository.Po
+sql/.deps/event_queue.Po
+sql/.deps/event_scheduler.Po
+sql/.deps/events.Po
+sql/.deps/field.Po
+sql/.deps/field_conv.Po
+sql/.deps/filesort.Po
+sql/.deps/gen_lex_hash.Po
+sql/.deps/gstream.Po
+sql/.deps/ha_berkeley.Po
+sql/.deps/ha_federated.Po
+sql/.deps/ha_heap.Po
+sql/.deps/ha_innodb.Po
+sql/.deps/ha_myisam.Po
+sql/.deps/ha_myisammrg.Po
+sql/.deps/ha_ndbcluster.Po
+sql/.deps/ha_ndbcluster_binlog.Po
+sql/.deps/ha_partition.Po
+sql/.deps/handler.Po
+sql/.deps/hash_filo.Po
+sql/.deps/hostname.Po
+sql/.deps/init.Po
+sql/.deps/item.Po
+sql/.deps/item_buff.Po
+sql/.deps/item_cmpfunc.Po
+sql/.deps/item_create.Po
+sql/.deps/item_func.Po
+sql/.deps/item_geofunc.Po
+sql/.deps/item_row.Po
+sql/.deps/item_strfunc.Po
+sql/.deps/item_subselect.Po
+sql/.deps/item_sum.Po
+sql/.deps/item_timefunc.Po
+sql/.deps/item_uniq.Po
+sql/.deps/item_xmlfunc.Po
+sql/.deps/key.Po
+sql/.deps/lock.Po
+sql/.deps/log.Po
+sql/.deps/log_event.Po
+sql/.deps/mf_iocache.Po
+sql/.deps/mini_client_errors.Po
+sql/.deps/my_decimal.Po
+sql/.deps/my_lock.Po
+sql/.deps/my_time.Po
+sql/.deps/my_user.Po
+sql/.deps/mysql_tzinfo_to_sql.Po
+sql/.deps/mysqld.Po
+sql/.deps/net_serv.Po
+sql/.deps/opt_range.Po
+sql/.deps/opt_sum.Po
+sql/.deps/pack.Po
+sql/.deps/parse_file.Po
+sql/.deps/partition_info.Po
+sql/.deps/password.Po
+sql/.deps/procedure.Po
+sql/.deps/protocol.Po
+sql/.deps/records.Po
+sql/.deps/repl_failsafe.Po
+sql/.deps/rpl_filter.Po
+sql/.deps/rpl_injector.Po
+sql/.deps/rpl_tblmap.Po
+sql/.deps/set_var.Po
+sql/.deps/slave.Po
+sql/.deps/sp.Po
+sql/.deps/sp_cache.Po
+sql/.deps/sp_head.Po
+sql/.deps/sp_pcontext.Po
+sql/.deps/sp_rcontext.Po
+sql/.deps/spatial.Po
+sql/.deps/sql_acl.Po
+sql/.deps/sql_analyse.Po
+sql/.deps/sql_base.Po
+sql/.deps/sql_binlog.Po
+sql/.deps/sql_builtin.Po
+sql/.deps/sql_cache.Po
+sql/.deps/sql_class.Po
+sql/.deps/sql_client.Po
+sql/.deps/sql_crypt.Po
+sql/.deps/sql_cursor.Po
+sql/.deps/sql_db.Po
+sql/.deps/sql_delete.Po
+sql/.deps/sql_truncate.Po
+sql/.deps/sql_reload.Po
+sql/.deps/datadict.Po
+sql/.deps/sql_derived.Po
+sql/.deps/sql_do.Po
+sql/.deps/sql_error.Po
+sql/.deps/sql_handler.Po
+sql/.deps/sql_help.Po
+sql/.deps/sql_insert.Po
+sql/.deps/sql_lex.Po
+sql/.deps/sql_list.Po
+sql/.deps/sql_load.Po
+sql/.deps/sql_manager.Po
+sql/.deps/sql_map.Po
+sql/.deps/sql_olap.Po
+sql/.deps/sql_parse.Po
+sql/.deps/sql_partition.Po
+sql/.deps/sql_plugin.Po
+sql/.deps/sql_prepare.Po
+sql/.deps/sql_rename.Po
+sql/.deps/sql_repl.Po
+sql/.deps/sql_select.Po
+sql/.deps/sql_show.Po
+sql/.deps/sql_state.Po
+sql/.deps/sql_string.Po
+sql/.deps/sql_table.Po
+sql/.deps/sql_tablespace.Po
+sql/.deps/sql_test.Po
+sql/.deps/sql_trigger.Po
+sql/.deps/sql_udf.Po
+sql/.deps/sql_union.Po
+sql/.deps/sql_update.Po
+sql/.deps/sql_view.Po
+sql/.deps/sql_yacc.Po
+sql/.deps/stacktrace.Po
+sql/.deps/strfunc.Po
+sql/.deps/table.Po
+sql/.deps/thr_malloc.Po
+sql/.deps/time.Po
+sql/.deps/tztime.Po
+sql/.deps/udf_example.Plo
+sql/.deps/uniques.Po
+sql/.deps/unireg.Po
+sql/.gdbinit
+sql/.libs/udf_example.lai
+sql/.libs/udf_example.so.0
+sql/.libs/udf_example.so.0.0.0
+sql/client.c
+sql/cmake_dummy.cc
+sql/Doxyfile
+sql/f.c
+sql/gen_lex_hash
+sql/gmon.out
+sql/handlerton.cc
+sql/html
+sql/latex
+sql/lex_hash.h
+sql/lex_hash.h.rule
+sql/link_sources
+sql/max/*
+sql/message.h
+sql/message.mc
+sql/message.rc
+sql/mini_client_errors.c
+sql/my_time.c
+sql/my_user.c
+sql/mysql_tzinfo_to_sql
+sql/mysql_tzinfo_to_sql.cc
+sql/mysql_tzinfo_to_sql_tztime.cc
+sql/mysqlbinlog
+sql/mysqld
+sql/mysqld-purecov
+sql/mysqld-purify
+sql/mysqld-quantify
+sql/new.cc
+sql/pack.c
+sql/safe_to_cache_query.txt
+sql/share/*.sys
+sql/share/charsets/gmon.out
+sql/share/fixerrmsg.pl
+sql/share/gmon.out
+sql/share/iso639-2.txt
+sql/share/mysql
+sql/share/norwegian-ny/errmsg.sys
+sql/share/norwegian/errmsg.sys
+sql/sql_builtin.cc
+sql/sql_select.cc.orig
+sql/sql_yacc.cc
+sql/sql_yacc.h
+sql/sql_yacc.h.rule
+sql/sql_yacc.output
+sql/sql_yacc.yy.orig
+sql/test_time
+sql/udf_example.so
+sql_error.cc
+sql_prepare.cc
+stamp-h
+stamp-h.in
+stamp-h1
+stamp-h1.in
+stamp-h2
+stamp-h2.in
+stamp-h3
+stamp-h4
+start_mysqld.sh
+storage/archive/.deps/archive_test-archive_test.Po
+storage/archive/.deps/archive_test-azio.Po
+storage/archive/.deps/ha_archive_la-azio.Plo
+storage/archive/.deps/ha_archive_la-ha_archive.Plo
+storage/archive/.deps/libarchive_a-azio.Po
+storage/archive/.deps/libarchive_a-ha_archive.Po
+storage/archive/archive_reader
+storage/archive/archive_test
+storage/bdb/*.ds?
+storage/bdb/*.vcproj
+storage/bdb/README
+storage/bdb/btree/btree_auto.c
+storage/bdb/btree/btree_autop.c
+storage/bdb/build_unix/*
+storage/bdb/build_vxworks/BerkeleyDB20.wpj
+storage/bdb/build_vxworks/BerkeleyDB20small.wpj
+storage/bdb/build_vxworks/BerkeleyDB22.wpj
+storage/bdb/build_vxworks/BerkeleyDB22small.wpj
+storage/bdb/build_vxworks/db.h
+storage/bdb/build_vxworks/db_config.h
+storage/bdb/build_vxworks/db_config_small.h
+storage/bdb/build_vxworks/db_deadlock/db_deadlock20.wpj
+storage/bdb/build_vxworks/db_deadlock/db_deadlock22.wpj
+storage/bdb/build_vxworks/db_int.h
+storage/bdb/build_vxworks/dbdemo/dbdemo.c
+storage/bdb/build_vxworks/dbdemo/dbdemo20.wpj
+storage/bdb/build_vxworks/dbdemo/dbdemo22.wpj
+storage/bdb/build_win32/*.dsp
+storage/bdb/build_win32/*.h
+storage/bdb/build_win32/db.h
+storage/bdb/build_win32/db_archive.dsp
+storage/bdb/build_win32/db_checkpoint.dsp
+storage/bdb/build_win32/db_config.h
+storage/bdb/build_win32/db_cxx.h
+storage/bdb/build_win32/db_deadlock.dsp
+storage/bdb/build_win32/db_dll.dsp
+storage/bdb/build_win32/db_dump.dsp
+storage/bdb/build_win32/db_int.h
+storage/bdb/build_win32/db_java.dsp
+storage/bdb/build_win32/db_load.dsp
+storage/bdb/build_win32/db_perf.dsp
+storage/bdb/build_win32/db_printlog.dsp
+storage/bdb/build_win32/db_recover.dsp
+storage/bdb/build_win32/db_stat.dsp
+storage/bdb/build_win32/db_static.dsp
+storage/bdb/build_win32/db_tcl.dsp
+storage/bdb/build_win32/db_test.dsp
+storage/bdb/build_win32/db_upgrade.dsp
+storage/bdb/build_win32/db_verify.dsp
+storage/bdb/build_win32/ex_access.dsp
+storage/bdb/build_win32/ex_btrec.dsp
+storage/bdb/build_win32/ex_env.dsp
+storage/bdb/build_win32/ex_lock.dsp
+storage/bdb/build_win32/ex_mpool.dsp
+storage/bdb/build_win32/ex_tpcb.dsp
+storage/bdb/build_win32/excxx_access.dsp
+storage/bdb/build_win32/excxx_btrec.dsp
+storage/bdb/build_win32/excxx_env.dsp
+storage/bdb/build_win32/excxx_lock.dsp
+storage/bdb/build_win32/excxx_mpool.dsp
+storage/bdb/build_win32/excxx_tpcb.dsp
+storage/bdb/build_win32/include.tcl
+storage/bdb/build_win32/libdb.def
+storage/bdb/build_win32/libdb.rc
+storage/bdb/build_win64/*.dsp
+storage/bdb/build_win64/*.dsw
+storage/bdb/build_win64/*.h
+storage/bdb/db/crdel_auto.c
+storage/bdb/db/crdel_autop.c
+storage/bdb/db/db_auto.c
+storage/bdb/db/db_autop.c
+storage/bdb/dbinc_auto/*.*
+storage/bdb/dbreg/dbreg_auto.c
+storage/bdb/dbreg/dbreg_autop.c
+storage/bdb/dist/autom4te-2.53.cache/*
+storage/bdb/dist/autom4te-2.53.cache/output.0
+storage/bdb/dist/autom4te-2.53.cache/requests
+storage/bdb/dist/autom4te-2.53.cache/traces.0
+storage/bdb/dist/autom4te.cache/*
+storage/bdb/dist/autom4te.cache/output.0
+storage/bdb/dist/autom4te.cache/requests
+storage/bdb/dist/autom4te.cache/traces.0
+storage/bdb/dist/config.hin
+storage/bdb/dist/configure
+storage/bdb/dist/tags
+storage/bdb/dist/template/db_server_proc
+storage/bdb/dist/template/gen_client_ret
+storage/bdb/dist/template/rec_btree
+storage/bdb/dist/template/rec_crdel
+storage/bdb/dist/template/rec_db
+storage/bdb/dist/template/rec_dbreg
+storage/bdb/dist/template/rec_fileops
+storage/bdb/dist/template/rec_hash
+storage/bdb/dist/template/rec_log
+storage/bdb/dist/template/rec_qam
+storage/bdb/dist/template/rec_txn
+storage/bdb/examples_c/ex_apprec/ex_apprec_auto.c
+storage/bdb/examples_c/ex_apprec/ex_apprec_auto.h
+storage/bdb/examples_c/ex_apprec/ex_apprec_template
+storage/bdb/examples_java
+storage/bdb/fileops/fileops_auto.c
+storage/bdb/fileops/fileops_autop.c
+storage/bdb/hash/hash_auto.c
+storage/bdb/hash/hash_autop.c
+storage/bdb/include/btree_auto.h
+storage/bdb/include/btree_ext.h
+storage/bdb/include/clib_ext.h
+storage/bdb/include/common_ext.h
+storage/bdb/include/crdel_auto.h
+storage/bdb/include/db_auto.h
+storage/bdb/include/db_ext.h
+storage/bdb/include/db_server.h
+storage/bdb/include/env_ext.h
+storage/bdb/include/gen_client_ext.h
+storage/bdb/include/gen_server_ext.h
+storage/bdb/include/hash_auto.h
+storage/bdb/include/hash_ext.h
+storage/bdb/include/lock_ext.h
+storage/bdb/include/log_auto.h
+storage/bdb/include/log_ext.h
+storage/bdb/include/mp_ext.h
+storage/bdb/include/mutex_ext.h
+storage/bdb/include/os_ext.h
+storage/bdb/include/qam_auto.h
+storage/bdb/include/qam_ext.h
+storage/bdb/include/rpc_client_ext.h
+storage/bdb/include/rpc_server_ext.h
+storage/bdb/include/tcl_ext.h
+storage/bdb/include/txn_auto.h
+storage/bdb/include/txn_ext.h
+storage/bdb/include/xa_ext.h
+storage/bdb/java/src/com/sleepycat/db/Db.java
+storage/bdb/java/src/com/sleepycat/db/DbBtreeStat.java
+storage/bdb/java/src/com/sleepycat/db/DbConstants.java
+storage/bdb/java/src/com/sleepycat/db/DbHashStat.java
+storage/bdb/java/src/com/sleepycat/db/DbLockStat.java
+storage/bdb/java/src/com/sleepycat/db/DbLogStat.java
+storage/bdb/java/src/com/sleepycat/db/DbMpoolFStat.java
+storage/bdb/java/src/com/sleepycat/db/DbQueueStat.java
+storage/bdb/java/src/com/sleepycat/db/DbRepStat.java
+storage/bdb/java/src/com/sleepycat/db/DbTxnStat.java
+storage/bdb/libdb_java/java_stat_auto.c
+storage/bdb/libdb_java/java_stat_auto.h
+storage/bdb/libdb_java/java_util.i
+storage/bdb/log/log_auto.c
+storage/bdb/qam/qam_auto.c
+storage/bdb/qam/qam_autop.c
+storage/bdb/rep/rep_auto.c
+storage/bdb/rep/rep_autop.c
+storage/bdb/rpc_client/db_server_clnt.c
+storage/bdb/rpc_client/gen_client.c
+storage/bdb/rpc_server/c/db_server_proc.c
+storage/bdb/rpc_server/c/db_server_proc.sed
+storage/bdb/rpc_server/c/db_server_svc.c
+storage/bdb/rpc_server/c/db_server_xdr.c
+storage/bdb/rpc_server/c/gen_db_server.c
+storage/bdb/rpc_server/db_server.x
+storage/bdb/rpc_server/db_server_proc.sed
+storage/bdb/rpc_server/db_server_svc.c
+storage/bdb/rpc_server/db_server_xdr.c
+storage/bdb/rpc_server/gen_db_server.c
+storage/bdb/test/TESTS
+storage/bdb/test/include.tcl
+storage/bdb/test/logtrack.list
+storage/bdb/txn/txn_auto.c
+storage/bdb/txn/txn_autop.c
+storage/blackhole/.deps/ha_blackhole_la-ha_blackhole.Plo
+storage/blackhole/.deps/libblackhole_a-ha_blackhole.Po
+storage/csv/.deps/ha_csv_la-ha_tina.Plo
+storage/csv/.deps/libcsv_a-ha_tina.Po
+storage/example/.deps/ha_example_la-ha_example.Plo
+storage/example/.deps/libexample_a-ha_example.Po
+storage/heap/.deps/_check.Po
+storage/heap/.deps/_rectest.Po
+storage/heap/.deps/hp_block.Po
+storage/heap/.deps/hp_clear.Po
+storage/heap/.deps/hp_close.Po
+storage/heap/.deps/hp_create.Po
+storage/heap/.deps/hp_delete.Po
+storage/heap/.deps/hp_extra.Po
+storage/heap/.deps/hp_hash.Po
+storage/heap/.deps/hp_info.Po
+storage/heap/.deps/hp_open.Po
+storage/heap/.deps/hp_panic.Po
+storage/heap/.deps/hp_rename.Po
+storage/heap/.deps/hp_rfirst.Po
+storage/heap/.deps/hp_rkey.Po
+storage/heap/.deps/hp_rlast.Po
+storage/heap/.deps/hp_rnext.Po
+storage/heap/.deps/hp_rprev.Po
+storage/heap/.deps/hp_rrnd.Po
+storage/heap/.deps/hp_rsame.Po
+storage/heap/.deps/hp_scan.Po
+storage/heap/.deps/hp_static.Po
+storage/heap/.deps/hp_test1.Po
+storage/heap/.deps/hp_test2.Po
+storage/heap/.deps/hp_update.Po
+storage/heap/.deps/hp_write.Po
+storage/heap/hp_test1
+storage/heap/hp_test2
+storage/innobase/autom4te-2.53.cache/*
+storage/innobase/autom4te-2.53.cache/output.0
+storage/innobase/autom4te-2.53.cache/requests
+storage/innobase/autom4te-2.53.cache/traces.0
+storage/innobase/autom4te.cache/*
+storage/innobase/autom4te.cache/output.0
+storage/innobase/autom4te.cache/requests
+storage/innobase/autom4te.cache/traces.0
+storage/innobase/btr/.deps/btr0btr.Po
+storage/innobase/btr/.deps/btr0cur.Po
+storage/innobase/btr/.deps/btr0pcur.Po
+storage/innobase/btr/.deps/btr0sea.Po
+storage/innobase/buf/.deps/buf0buf.Po
+storage/innobase/buf/.deps/buf0flu.Po
+storage/innobase/buf/.deps/buf0lru.Po
+storage/innobase/buf/.deps/buf0rea.Po
+storage/innobase/configure.lineno
+storage/innobase/conftest.s1
+storage/innobase/conftest.subs
+storage/innobase/data/.deps/data0data.Po
+storage/innobase/data/.deps/data0type.Po
+storage/innobase/dict/.deps/dict0boot.Po
+storage/innobase/dict/.deps/dict0crea.Po
+storage/innobase/dict/.deps/dict0dict.Po
+storage/innobase/dict/.deps/dict0load.Po
+storage/innobase/dict/.deps/dict0mem.Po
+storage/innobase/dyn/.deps/dyn0dyn.Po
+storage/innobase/eval/.deps/eval0eval.Po
+storage/innobase/eval/.deps/eval0proc.Po
+storage/innobase/fil/.deps/fil0fil.Po
+storage/innobase/fsp/.deps/fsp0fsp.Po
+storage/innobase/fut/.deps/fut0fut.Po
+storage/innobase/fut/.deps/fut0lst.Po
+storage/innobase/ha/.deps/ha0ha.Po
+storage/innobase/ha/.deps/hash0hash.Po
+storage/innobase/ib_config.h
+storage/innobase/ib_config.h.in
+storage/innobase/ibuf/.deps/ibuf0ibuf.Po
+storage/innobase/lock/.deps/lock0lock.Po
+storage/innobase/log/.deps/log0log.Po
+storage/innobase/log/.deps/log0recv.Po
+storage/innobase/mach/.deps/mach0data.Po
+storage/innobase/mem/.deps/mem0mem.Po
+storage/innobase/mem/.deps/mem0pool.Po
+storage/innobase/mkinstalldirs
+storage/innobase/mtr/.deps/mtr0log.Po
+storage/innobase/mtr/.deps/mtr0mtr.Po
+storage/innobase/os/.deps/os0file.Po
+storage/innobase/os/.deps/os0proc.Po
+storage/innobase/os/.deps/os0sync.Po
+storage/innobase/os/.deps/os0thread.Po
+storage/innobase/page/.deps/page0cur.Po
+storage/innobase/page/.deps/page0page.Po
+storage/innobase/pars/.deps/lexyy.Po
+storage/innobase/pars/.deps/pars0grm.Po
+storage/innobase/pars/.deps/pars0opt.Po
+storage/innobase/pars/.deps/pars0pars.Po
+storage/innobase/pars/.deps/pars0sym.Po
+storage/innobase/que/.deps/que0que.Po
+storage/innobase/read/.deps/read0read.Po
+storage/innobase/rem/.deps/rem0cmp.Po
+storage/innobase/rem/.deps/rem0rec.Po
+storage/innobase/row/.deps/row0ins.Po
+storage/innobase/row/.deps/row0mysql.Po
+storage/innobase/row/.deps/row0purge.Po
+storage/innobase/row/.deps/row0row.Po
+storage/innobase/row/.deps/row0sel.Po
+storage/innobase/row/.deps/row0uins.Po
+storage/innobase/row/.deps/row0umod.Po
+storage/innobase/row/.deps/row0undo.Po
+storage/innobase/row/.deps/row0upd.Po
+storage/innobase/row/.deps/row0vers.Po
+storage/innobase/srv/.deps/srv0que.Po
+storage/innobase/srv/.deps/srv0srv.Po
+storage/innobase/srv/.deps/srv0start.Po
+storage/innobase/stamp-h1
+storage/innobase/sync/.deps/sync0arr.Po
+storage/innobase/sync/.deps/sync0rw.Po
+storage/innobase/sync/.deps/sync0sync.Po
+storage/innobase/thr/.deps/thr0loc.Po
+storage/innobase/trx/.deps/trx0purge.Po
+storage/innobase/trx/.deps/trx0rec.Po
+storage/innobase/trx/.deps/trx0roll.Po
+storage/innobase/trx/.deps/trx0rseg.Po
+storage/innobase/trx/.deps/trx0sys.Po
+storage/innobase/trx/.deps/trx0trx.Po
+storage/innobase/trx/.deps/trx0undo.Po
+storage/innobase/usr/.deps/usr0sess.Po
+storage/innobase/ut/.deps/ut0byte.Po
+storage/innobase/ut/.deps/ut0dbg.Po
+storage/innobase/ut/.deps/ut0list.Po
+storage/innobase/ut/.deps/ut0mem.Po
+storage/innobase/ut/.deps/ut0rnd.Po
+storage/innobase/ut/.deps/ut0ut.Po
+storage/innobase/ut/.deps/ut0vec.Po
+storage/innobase/ut/.deps/ut0wqueue.Po
+storage/myisam/.deps/ft_boolean_search.Po
+storage/myisam/.deps/ft_nlq_search.Po
+storage/myisam/.deps/ft_parser.Po
+storage/myisam/.deps/ft_static.Po
+storage/myisam/.deps/ft_stopwords.Po
+storage/myisam/.deps/ft_update.Po
+storage/myisam/.deps/mi_cache.Po
+storage/myisam/.deps/mi_changed.Po
+storage/myisam/.deps/mi_check.Po
+storage/myisam/.deps/mi_checksum.Po
+storage/myisam/.deps/mi_close.Po
+storage/myisam/.deps/mi_create.Po
+storage/myisam/.deps/mi_dbug.Po
+storage/myisam/.deps/mi_delete.Po
+storage/myisam/.deps/mi_delete_all.Po
+storage/myisam/.deps/mi_delete_table.Po
+storage/myisam/.deps/mi_dynrec.Po
+storage/myisam/.deps/mi_extra.Po
+storage/myisam/.deps/mi_info.Po
+storage/myisam/.deps/mi_key.Po
+storage/myisam/.deps/mi_keycache.Po
+storage/myisam/.deps/mi_locking.Po
+storage/myisam/.deps/mi_log.Po
+storage/myisam/.deps/mi_open.Po
+storage/myisam/.deps/mi_packrec.Po
+storage/myisam/.deps/mi_page.Po
+storage/myisam/.deps/mi_panic.Po
+storage/myisam/.deps/mi_preload.Po
+storage/myisam/.deps/mi_range.Po
+storage/myisam/.deps/mi_rename.Po
+storage/myisam/.deps/mi_rfirst.Po
+storage/myisam/.deps/mi_rkey.Po
+storage/myisam/.deps/mi_rlast.Po
+storage/myisam/.deps/mi_rnext.Po
+storage/myisam/.deps/mi_rnext_same.Po
+storage/myisam/.deps/mi_rprev.Po
+storage/myisam/.deps/mi_rrnd.Po
+storage/myisam/.deps/mi_rsame.Po
+storage/myisam/.deps/mi_rsamepos.Po
+storage/myisam/.deps/mi_scan.Po
+storage/myisam/.deps/mi_search.Po
+storage/myisam/.deps/mi_static.Po
+storage/myisam/.deps/mi_statrec.Po
+storage/myisam/.deps/mi_test1.Po
+storage/myisam/.deps/mi_test2.Po
+storage/myisam/.deps/mi_test3.Po
+storage/myisam/.deps/mi_unique.Po
+storage/myisam/.deps/mi_update.Po
+storage/myisam/.deps/mi_write.Po
+storage/myisam/.deps/myisam_ftdump.Po
+storage/myisam/.deps/myisamchk.Po
+storage/myisam/.deps/myisamlog.Po
+storage/myisam/.deps/myisampack.Po
+storage/myisam/.deps/rt_index.Po
+storage/myisam/.deps/rt_key.Po
+storage/myisam/.deps/rt_mbr.Po
+storage/myisam/.deps/rt_split.Po
+storage/myisam/.deps/rt_test.Po
+storage/myisam/.deps/sort.Po
+storage/myisam/.deps/sp_key.Po
+storage/myisam/.deps/sp_test.Po
+storage/myisam/FT1.MYD
+storage/myisam/FT1.MYI
+storage/myisam/ft_dump
+storage/myisam/ft_eval
+storage/myisam/ft_test1
+storage/myisam/ftbench/data
+storage/myisam/ftbench/t
+storage/myisam/ftbench/var/*
+storage/myisam/mi_test1
+storage/myisam/mi_test2
+storage/myisam/mi_test3
+storage/myisam/mi_test_all
+storage/myisam/myisam.log
+storage/myisam/myisam_ftdump
+storage/myisam/myisamchk
+storage/myisam/myisamlog
+storage/myisam/myisampack
+storage/myisam/rt_test
+storage/myisam/rt_test.MYD
+storage/myisam/rt_test.MYI
+storage/myisam/sp_test
+storage/myisam/test1.MYD
+storage/myisam/test1.MYI
+storage/myisam/test2.MYD
+storage/myisam/test2.MYI
+storage/myisammrg/.deps/myrg_close.Po
+storage/myisammrg/.deps/myrg_create.Po
+storage/myisammrg/.deps/myrg_delete.Po
+storage/myisammrg/.deps/myrg_extra.Po
+storage/myisammrg/.deps/myrg_info.Po
+storage/myisammrg/.deps/myrg_locking.Po
+storage/myisammrg/.deps/myrg_open.Po
+storage/myisammrg/.deps/myrg_panic.Po
+storage/myisammrg/.deps/myrg_queue.Po
+storage/myisammrg/.deps/myrg_range.Po
+storage/myisammrg/.deps/myrg_rfirst.Po
+storage/myisammrg/.deps/myrg_rkey.Po
+storage/myisammrg/.deps/myrg_rlast.Po
+storage/myisammrg/.deps/myrg_rnext.Po
+storage/myisammrg/.deps/myrg_rnext_same.Po
+storage/myisammrg/.deps/myrg_rprev.Po
+storage/myisammrg/.deps/myrg_rrnd.Po
+storage/myisammrg/.deps/myrg_rsame.Po
+storage/myisammrg/.deps/myrg_static.Po
+storage/myisammrg/.deps/myrg_update.Po
+storage/myisammrg/.deps/myrg_write.Po
+storage/ndb/bin/DbAsyncGenerator
+storage/ndb/bin/DbCreate
+storage/ndb/bin/acid
+storage/ndb/bin/async-lmc-bench-l-p10.sh
+storage/ndb/bin/async-lmc-bench-l.sh
+storage/ndb/bin/async-lmc-bench-p10.sh
+storage/ndb/bin/async-lmc-bench.sh
+storage/ndb/bin/atrt
+storage/ndb/bin/atrt-analyze-result.sh
+storage/ndb/bin/atrt-clear-result.sh
+storage/ndb/bin/atrt-gather-result.sh
+storage/ndb/bin/atrt-setup.sh
+storage/ndb/bin/bankCreator
+storage/ndb/bin/bankMakeGL
+storage/ndb/bin/bankSumAccounts
+storage/ndb/bin/bankTimer
+storage/ndb/bin/bankTransactionMaker
+storage/ndb/bin/bankValidateAllGLs
+storage/ndb/bin/basicTransporterTest
+storage/ndb/bin/benchronja
+storage/ndb/bin/bulk_copy
+storage/ndb/bin/copy_tab
+storage/ndb/bin/create_all_tabs
+storage/ndb/bin/create_index
+storage/ndb/bin/create_tab
+storage/ndb/bin/delete_all
+storage/ndb/bin/desc
+storage/ndb/bin/drop_all_tabs
+storage/ndb/bin/drop_index
+storage/ndb/bin/drop_tab
+storage/ndb/bin/flexAsynch
+storage/ndb/bin/flexBench
+storage/ndb/bin/flexHammer
+storage/ndb/bin/flexScan
+storage/ndb/bin/flexTT
+storage/ndb/bin/hugoCalculator
+storage/ndb/bin/hugoFill
+storage/ndb/bin/hugoLoad
+storage/ndb/bin/hugoLockRecords
+storage/ndb/bin/hugoPkDelete
+storage/ndb/bin/hugoPkRead
+storage/ndb/bin/hugoPkReadRecord
+storage/ndb/bin/hugoPkUpdate
+storage/ndb/bin/hugoScanRead
+storage/ndb/bin/hugoScanUpdate
+storage/ndb/bin/index
+storage/ndb/bin/index2
+storage/ndb/bin/initronja
+storage/ndb/bin/interpreterInTup
+storage/ndb/bin/list_tables
+storage/ndb/bin/make-config.sh
+storage/ndb/bin/mgmtclient
+storage/ndb/bin/mgmtsrvr
+storage/ndb/bin/mkconfig
+storage/ndb/bin/ndb
+storage/ndb/bin/ndb_cpcc
+storage/ndb/bin/ndb_cpcd
+storage/ndb/bin/ndb_rep
+storage/ndb/bin/ndbsql
+storage/ndb/bin/newton_basic
+storage/ndb/bin/newton_br
+storage/ndb/bin/newton_pb
+storage/ndb/bin/newton_perf
+storage/ndb/bin/perfTransporterTest
+storage/ndb/bin/printConfig
+storage/ndb/bin/printSchemafile
+storage/ndb/bin/printSysfile
+storage/ndb/bin/redoLogFileReader
+storage/ndb/bin/restart
+storage/ndb/bin/restarter
+storage/ndb/bin/restarter2
+storage/ndb/bin/restarts
+storage/ndb/bin/restore
+storage/ndb/bin/select_all
+storage/ndb/bin/select_count
+storage/ndb/bin/telco
+storage/ndb/bin/testBackup
+storage/ndb/bin/testBank
+storage/ndb/bin/testBasic
+storage/ndb/bin/testBasicAsynch
+storage/ndb/bin/testCopy
+storage/ndb/bin/testDataBuffers
+storage/ndb/bin/testDict
+storage/ndb/bin/testGrep
+storage/ndb/bin/testGrepVerify
+storage/ndb/bin/testIndex
+storage/ndb/bin/testInterpreter
+storage/ndb/bin/testKernelDataBuffer
+storage/ndb/bin/testLongSig
+storage/ndb/bin/testMgm
+storage/ndb/bin/testMgmapi
+storage/ndb/bin/testNdbApi
+storage/ndb/bin/testNodeRestart
+storage/ndb/bin/testOIBasic
+storage/ndb/bin/testOdbcDriver
+storage/ndb/bin/testOperations
+storage/ndb/bin/testRestartGci
+storage/ndb/bin/testScan
+storage/ndb/bin/testScanInterpreter
+storage/ndb/bin/testSimplePropertiesSection
+storage/ndb/bin/testSystemRestart
+storage/ndb/bin/testTimeout
+storage/ndb/bin/testTransactions
+storage/ndb/bin/test_cpcd
+storage/ndb/bin/test_event
+storage/ndb/bin/verify_index
+storage/ndb/bin/waiter
+storage/ndb/config/autom4te.cache/*
+storage/ndb/config/config.mk
+storage/ndb/examples/ndbapi_example1/ndbapi_example1
+storage/ndb/examples/ndbapi_example2/ndbapi_example2
+storage/ndb/examples/ndbapi_example3/ndbapi_example3
+storage/ndb/examples/ndbapi_example5/ndbapi_example5
+storage/ndb/examples/select_all/select_all
+storage/ndb/include/ndb_global.h
+storage/ndb/include/ndb_types.h
+storage/ndb/include/ndb_version.h
+storage/ndb/lib/libMGM_API.so
+storage/ndb/lib/libNDB_API.so
+storage/ndb/lib/libNDB_ODBC.so
+storage/ndb/lib/libNEWTON_API.so
+storage/ndb/lib/libNEWTON_BASICTEST_COMMON.so
+storage/ndb/lib/libREP_API.so
+storage/ndb/lib/libndbclient.so
+storage/ndb/lib/libndbclient_extra.so
+storage/ndb/ndbapi-examples/mgmapi_logevent/mgmapi_logevent
+storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2
+storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async
+storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1
+storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event
+storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries
+storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan
+storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple
+storage/ndb/ndbapi-examples/ndbapi_simple_dual/ndbapi_simple_dual
+storage/ndb/ndbapi-examples/ndbapi_simple_index/ndbapi_simple_index
+storage/ndb/src/common/debugger/libtrace.dsp
+storage/ndb/src/common/debugger/signaldata/libsignaldataprint.dsp
+storage/ndb/src/common/logger/liblogger.dsp
+storage/ndb/src/common/mgmcommon/libmgmsrvcommon.dsp
+storage/ndb/src/common/mgmcommon/printConfig/*.d
+storage/ndb/src/common/portlib/libportlib.dsp
+storage/ndb/src/common/transporter/libtransporter.dsp
+storage/ndb/src/common/util/libgeneral.dsp
+storage/ndb/src/common/util/testBitmask.cpp
+storage/ndb/src/cw/cpcd/ndb_cpcd
+storage/ndb/src/dummy.cpp
+storage/ndb/src/kernel/blocks/backup/libbackup.dsp
+storage/ndb/src/kernel/blocks/backup/ndb_print_backup_file
+storage/ndb/src/kernel/blocks/backup/restore/ndb_restore
+storage/ndb/src/kernel/blocks/cmvmi/libcmvmi.dsp
+storage/ndb/src/kernel/blocks/dbacc/libdbacc.dsp
+storage/ndb/src/kernel/blocks/dbdict/libdbdict.dsp
+storage/ndb/src/kernel/blocks/dbdict/ndb_print_schema_file
+storage/ndb/src/kernel/blocks/dbdih/libdbdih.dsp
+storage/ndb/src/kernel/blocks/dbdih/ndb_print_sys_file
+storage/ndb/src/kernel/blocks/dblqh/libdblqh.dsp
+storage/ndb/src/kernel/blocks/dbtc/libdbtc.dsp
+storage/ndb/src/kernel/blocks/dbtup/libdbtup.dsp
+storage/ndb/src/kernel/blocks/dbtup/test_varpage
+storage/ndb/src/kernel/blocks/dbtux/libdbtux.dsp
+storage/ndb/src/kernel/blocks/dbutil/libdbutil.dsp
+storage/ndb/src/kernel/blocks/grep/libgrep.dsp
+storage/ndb/src/kernel/blocks/ndb_print_file
+storage/ndb/src/kernel/blocks/ndbcntr/libndbcntr.dsp
+storage/ndb/src/kernel/blocks/ndbfs/libndbfs.dsp
+storage/ndb/src/kernel/blocks/qmgr/libqmgr.dsp
+storage/ndb/src/kernel/blocks/suma/libsuma.dsp
+storage/ndb/src/kernel/blocks/trix/libtrix.dsp
+storage/ndb/src/kernel/error/liberror.dsp
+storage/ndb/src/kernel/ndbd
+storage/ndb/src/kernel/ndbd.dsp
+storage/ndb/src/kernel/vm/libkernel.dsp
+storage/ndb/src/libndb.ver
+storage/ndb/src/libndbclient.dsp
+storage/ndb/src/mgmapi/libmgmapi.dsp
+storage/ndb/src/mgmclient/libndbmgmclient.dsp
+storage/ndb/src/mgmclient/ndb_mgm
+storage/ndb/src/mgmclient/ndb_mgm.dsp
+storage/ndb/src/mgmclient/test_cpcd/*.d
+storage/ndb/src/mgmsrv/ndb_mgmd
+storage/ndb/src/mgmsrv/ndb_mgmd.dsp
+storage/ndb/src/ndbapi/libndbapi.dsp
+storage/ndb/src/ndbapi/ndberror_check
+storage/ndb/test/ndbapi/DbAsyncGenerator
+storage/ndb/test/ndbapi/DbCreate
+storage/ndb/test/ndbapi/bank/bankCreator
+storage/ndb/test/ndbapi/bank/bankMakeGL
+storage/ndb/test/ndbapi/bank/bankSumAccounts
+storage/ndb/test/ndbapi/bank/bankTimer
+storage/ndb/test/ndbapi/bank/bankTransactionMaker
+storage/ndb/test/ndbapi/bank/bankValidateAllGLs
+storage/ndb/test/ndbapi/bank/testBank
+storage/ndb/test/ndbapi/create_all_tabs
+storage/ndb/test/ndbapi/create_tab
+storage/ndb/test/ndbapi/drop_all_tabs
+storage/ndb/test/ndbapi/flexAsynch
+storage/ndb/test/ndbapi/flexBench
+storage/ndb/test/ndbapi/flexBench.dsp
+storage/ndb/test/ndbapi/flexHammer
+storage/ndb/test/ndbapi/flexTT
+storage/ndb/test/ndbapi/ndbapi_slow_select
+storage/ndb/test/ndbapi/testBackup
+storage/ndb/test/ndbapi/testBasic
+storage/ndb/test/ndbapi/testBasic.dsp
+storage/ndb/test/ndbapi/testBasicAsynch
+storage/ndb/test/ndbapi/testBitfield
+storage/ndb/test/ndbapi/testBlobs
+storage/ndb/test/ndbapi/testBlobs.dsp
+storage/ndb/test/ndbapi/testDataBuffers
+storage/ndb/test/ndbapi/testDeadlock
+storage/ndb/test/ndbapi/testDict
+storage/ndb/test/ndbapi/testIndex
+storage/ndb/test/ndbapi/testIndexStat
+storage/ndb/test/ndbapi/testInterpreter
+storage/ndb/test/ndbapi/testLcp
+storage/ndb/test/ndbapi/testMgm
+storage/ndb/test/ndbapi/testNdbApi
+storage/ndb/test/ndbapi/testNodeRestart
+storage/ndb/test/ndbapi/testOIBasic
+storage/ndb/test/ndbapi/testOperations
+storage/ndb/test/ndbapi/testPartitioning
+storage/ndb/test/ndbapi/testReadPerf
+storage/ndb/test/ndbapi/testRestartGci
+storage/ndb/test/ndbapi/testSRBank
+storage/ndb/test/ndbapi/testScan
+storage/ndb/test/ndbapi/testScan.dsp
+storage/ndb/test/ndbapi/testScanInterpreter
+storage/ndb/test/ndbapi/testScanPerf
+storage/ndb/test/ndbapi/testSystemRestart
+storage/ndb/test/ndbapi/testTimeout
+storage/ndb/test/ndbapi/testTransactions
+storage/ndb/test/ndbapi/test_event
+storage/ndb/test/ndbapi/test_event_merge
+storage/ndb/test/run-test/atrt
+storage/ndb/test/src/libNDBT.dsp
+storage/ndb/test/tools/copy_tab
+storage/ndb/test/tools/create_index
+storage/ndb/test/tools/hugoCalculator
+storage/ndb/test/tools/hugoFill
+storage/ndb/test/tools/hugoLoad
+storage/ndb/test/tools/hugoLockRecords
+storage/ndb/test/tools/hugoPkDelete
+storage/ndb/test/tools/hugoPkRead
+storage/ndb/test/tools/hugoPkReadRecord
+storage/ndb/test/tools/hugoPkUpdate
+storage/ndb/test/tools/hugoScanRead
+storage/ndb/test/tools/hugoScanUpdate
+storage/ndb/test/tools/listen_event
+storage/ndb/test/tools/ndb_cpcc
+storage/ndb/test/tools/rep_latency
+storage/ndb/test/tools/restart
+storage/ndb/test/tools/verify_index
+storage/ndb/tools/ndb_config
+storage/ndb/tools/ndb_delete_all
+storage/ndb/tools/ndb_delete_all.dsp
+storage/ndb/tools/ndb_desc
+storage/ndb/tools/ndb_desc.dsp
+storage/ndb/tools/ndb_drop_index
+storage/ndb/tools/ndb_drop_index.dsp
+storage/ndb/tools/ndb_drop_table
+storage/ndb/tools/ndb_drop_table.dsp
+storage/ndb/tools/ndb_restore
+storage/ndb/tools/ndb_select_all
+storage/ndb/tools/ndb_select_all.dsp
+storage/ndb/tools/ndb_select_count
+storage/ndb/tools/ndb_select_count.dsp
+storage/ndb/tools/ndb_show_tables
+storage/ndb/tools/ndb_show_tables.dsp
+storage/ndb/tools/ndb_test_platform
+storage/ndb/tools/ndb_waiter
+storage/ndb/tools/ndb_waiter.dsp
+strings/*.ds?
+strings/*.vcproj
+strings/.deps/bchange.Po
+strings/.deps/bcmp.Po
+strings/.deps/bfill.Po
+strings/.deps/bmove.Po
+strings/.deps/bmove512.Po
+strings/.deps/bmove_upp.Po
+strings/.deps/conf_to_src.Po
+strings/.deps/ctype-big5.Po
+strings/.deps/ctype-bin.Po
+strings/.deps/ctype-cp932.Po
+strings/.deps/ctype-czech.Po
+strings/.deps/ctype-euc_kr.Po
+strings/.deps/ctype-eucjpms.Po
+strings/.deps/ctype-extra.Po
+strings/.deps/ctype-gb2312.Po
+strings/.deps/ctype-gbk.Po
+strings/.deps/ctype-latin1.Po
+strings/.deps/ctype-mb.Po
+strings/.deps/ctype-simple.Po
+strings/.deps/ctype-sjis.Po
+strings/.deps/ctype-tis620.Po
+strings/.deps/ctype-uca.Po
+strings/.deps/ctype-ucs2.Po
+strings/.deps/ctype-ujis.Po
+strings/.deps/ctype-utf8.Po
+strings/.deps/ctype-win1250ch.Po
+strings/.deps/ctype.Po
+strings/.deps/decimal.Po
+strings/.deps/int2str.Po
+strings/.deps/is_prefix.Po
+strings/.deps/llstr.Po
+strings/.deps/longlong2str.Po
+strings/.deps/longlong2str_asm.Po
+strings/.deps/my_strchr.Po
+strings/.deps/my_strtoll10.Po
+strings/.deps/my_vsnprintf.Po
+strings/.deps/r_strinstr.Po
+strings/.deps/str2int.Po
+strings/.deps/str_alloc.Po
+strings/.deps/strappend.Po
+strings/.deps/strcend.Po
+strings/.deps/strcont.Po
+strings/.deps/strend.Po
+strings/.deps/strfill.Po
+strings/.deps/strinstr.Po
+strings/.deps/strmake.Po
+strings/.deps/strmov.Po
+strings/.deps/strnlen.Po
+strings/.deps/strnmov.Po
+strings/.deps/strstr.Po
+strings/.deps/strtod.Po
+strings/.deps/strtol.Po
+strings/.deps/strtoll.Po
+strings/.deps/strtoul.Po
+strings/.deps/strtoull.Po
+strings/.deps/strxmov.Po
+strings/.deps/strxnmov.Po
+strings/.deps/xml.Po
+strings/conf_to_src
+strings/ctype_autoconf.c
+strings/ctype_extra_sources.c
+strings/str_test
+strings/test_decimal
+support-files/*.ini
+support-files/MacOSX/Description.plist
+support-files/MacOSX/Info.plist
+support-files/MacOSX/ReadMe.txt
+support-files/MacOSX/StartupParameters.plist
+support-files/MacOSX/postflight
+support-files/MacOSX/postinstall
+support-files/MacOSX/preflight
+support-files/MacOSX/preinstall
+support-files/binary-configure
+support-files/my-huge.cnf
+support-files/my-innodb-heavy-4G.cnf
+support-files/my-large.cnf
+support-files/my-medium.cnf
+support-files/my-small.cnf
+support-files/mysql-3.23.25-beta.spec
+support-files/mysql-3.23.26-beta.spec
+support-files/mysql-3.23.27-beta.spec
+support-files/mysql-3.23.28-gamma.spec
+support-files/mysql-3.23.29-gamma.spec
+support-files/mysql-log-rotate
+support-files/mysql.server
+support-files/mysql.spec
+support-files/mysqld_multi.server
+support-files/ndb-config-2-node.ini
+tags
+test/ndbapi/bank/bankCreator
+test/ndbapi/bank/bankMakeGL
+test/ndbapi/bank/bankSumAccounts
+test/ndbapi/bank/bankTimer
+test/ndbapi/bank/bankTransactionMaker
+test/ndbapi/bank/bankValidateAllGLs
+test/ndbapi/bank/testBank
+test/ndbapi/create_all_tabs
+test/ndbapi/create_tab
+test/ndbapi/drop_all_tabs
+test/ndbapi/flexAsynch
+test/ndbapi/flexBench
+test/ndbapi/flexHammer
+test/ndbapi/flexTT
+test/ndbapi/testBackup
+test/ndbapi/testBasic
+test/ndbapi/testBasicAsynch
+test/ndbapi/testBlobs
+test/ndbapi/testDataBuffers
+test/ndbapi/testDeadlock
+test/ndbapi/testDict
+test/ndbapi/testIndex
+test/ndbapi/testMgm
+test/ndbapi/testNdbApi
+test/ndbapi/testNodeRestart
+test/ndbapi/testOIBasic
+test/ndbapi/testOperations
+test/ndbapi/testRestartGci
+test/ndbapi/testScan
+test/ndbapi/testScanInterpreter
+test/ndbapi/testScanPerf
+test/ndbapi/testSystemRestart
+test/ndbapi/testTimeout
+test/ndbapi/testTransactions
+test/ndbapi/test_event
+test/run-test/atrt
+test/tools/copy_tab
+test/tools/create_index
+test/tools/hugoCalculator
+test/tools/hugoFill
+test/tools/hugoLoad
+test/tools/hugoLockRecords
+test/tools/hugoPkDelete
+test/tools/hugoPkRead
+test/tools/hugoPkReadRecord
+test/tools/hugoPkUpdate
+test/tools/hugoScanRead
+test/tools/hugoScanUpdate
+test/tools/ndb_cpcc
+test/tools/restart
+test/tools/verify_index
+test1/*
+test_xml
+tests/*.ds?
+tests/*.vcproj
+tests/.deps/dummy.Po
+tests/.deps/insert_test.Po
+tests/.deps/mysql_client_test.Po
+tests/.deps/select_test.Po
+tests/.deps/thread_test.Po
+tests/.libs -prune
+tests/.libs/lt-mysql_client_test
+tests/.libs/mysql_client_test
+tests/bug25714
+tests/client_test
+tests/connect_test
+tests/mysql_client_test
+thr_insert_test/*
+thr_test/*
+thread_test
+tmp/*
+tools/.libs -prune
+tools/my_vsnprintf.c
+tools/mysqlmanager
+tools/mysqlmngd
+tools/mysqltestmanager
+tools/mysys_priv.h
+unittest/examples/*.t
+unittest/examples/.deps/no_plan-t.Po
+unittest/examples/.deps/simple-t.Po
+unittest/examples/.deps/skip-t.Po
+unittest/examples/.deps/skip_all-t.Po
+unittest/examples/.deps/todo-t.Po
+unittest/mysys/*.t
+unittest/mysys/.deps/base64-t.Po
+unittest/mysys/.deps/bitmap-t.Po
+unittest/mysys/.deps/my_atomic-t.Po
+unittest/mytap/.deps/tap.Po
+unittest/mytap/t/*.t
+unittest/mytap/t/.deps/basic-t.Po
+unittest/unit
+vi.h
+vio/*.ds?
+vio/*.vcproj
+vio/.deps/dummy.Po
+vio/.deps/test-ssl.Po
+vio/.deps/test-sslclient.Po
+vio/.deps/test-sslserver.Po
+vio/.deps/vio.Po
+vio/.deps/viosocket.Po
+vio/.deps/viossl.Po
+vio/.deps/viosslfactories.Po
+vio/test-ssl
+vio/test-sslclient
+vio/test-sslserver
+vio/viotest-ssl
+vio/viotest-sslconnect.cpp
+vio/viotest.cpp
+win/configure.data
+win/vs71cache.txt
+win/vs8cache.txt
+win/nmake_cache.txt
+ylwrap
+zlib/*.ds?
+zlib/*.vcproj
+mysql-test/bug36522-64.tar
+mysql-test/bug36522.tar
+mysql-test/t.log
+mysql-test/tps.log
+libmysqld/event_parse_data.cc
+autom4te.cache
+sql/share/czech
+sql/share/danish
+sql/share/dutch
+sql/share/english
+sql/share/estonian
+sql/share/french
+sql/share/german
+sql/share/greek
+sql/share/hungarian
+sql/share/italian
+sql/share/japanese
+sql/share/japanese-sjis
+sql/share/korean
+sql/share/norwegian
+sql/share/norwegian-ny
+sql/share/polish
+sql/share/portuguese
+sql/share/romanian
+sql/share/russian
+sql/share/serbian
+sql/share/slovak
+sql/share/spanish
+sql/share/swedish
+sql/share/ukrainian
+libmysqld/examples/mysqltest.cc
+libmysqld/sql_signal.cc
+libmysqld/debug_sync.cc
+dbug/tests
+libmysqld/mdl.cc
+client/transaction.h
+libmysqld/transaction.cc
+libmysqld/sys_vars.cc
+libmysqld/keycaches.cc
+client/dtoa.c
+libmysqld/sql_audit.cc
+configure.am
+libmysqld/des_key_file.cc
+CPackConfig.cmake
+CPackSourceConfig.cmake
+make_dist.cmake
+client/echo
+libmysql/libmysql_exports_file.cc
+libmysql/merge_archives_mysqlclient.cmake
+libmysqld/merge_archives_mysqlserver.cmake
+libmysqld/mysqlserver_depends.c
+libmysqld/examples/mysql_embedded
+sql/dummy.bak
+mysys/thr_lock
+VERSION.dep
+info_macros.cmake
+Docs/INFO_BIN
+Docs/INFO_SRC
+Testing
+FilesCopied
+source_downloads
diff -Nru mysql-5.5-5.5.35+dfsg/include/errmsg.h mysql-5.5-5.5.43/include/errmsg.h
--- mysql-5.5-5.5.35+dfsg/include/errmsg.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/errmsg.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ERRMSG_INCLUDED
 #define ERRMSG_INCLUDED
 
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -32,7 +32,9 @@
 #define CR_MIN_ERROR		2000	/* For easier client code */
 #define CR_MAX_ERROR		2999
 #if !defined(ER)
-#define ER(X) client_errors[(X)-CR_MIN_ERROR]
+#define ER(X) (((X) >= CR_ERROR_FIRST && (X) <= CR_ERROR_LAST)? \
+               client_errors[(X)-CR_ERROR_FIRST]: client_errors[CR_UNKNOWN_ERROR])
+
 #endif
 #define CLIENT_ERRMAP		2	/* Errormap used by my_error() */
 
diff -Nru mysql-5.5-5.5.35+dfsg/include/m_ctype.h mysql-5.5-5.5.43/include/m_ctype.h
--- mysql-5.5-5.5.35+dfsg/include/m_ctype.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/m_ctype.h	2015-02-27 08:30:34.000000000 +0000
@@ -372,13 +372,13 @@
 static inline my_bool
 my_cs_can_be_contraction_head(CHARSET_INFO *cs, my_wc_t wc)
 {
-  return ((const char *)cs->contractions)[0x40*0x40 + (wc & 0xFF)];
+  return ((const char *) cs->contractions)[0x40 * 0x40 * 2 + (wc & 0xFF)];
 }
 
 static inline my_bool
 my_cs_can_be_contraction_tail(CHARSET_INFO *cs, my_wc_t wc)
 {
-  return ((const char *)cs->contractions)[0x40*0x40 + (wc & 0xFF)];
+  return ((const char *) cs->contractions)[0x40 * 0x40 * 2 + (wc & 0xFF)];
 }
 
 static inline uint16*
diff -Nru mysql-5.5-5.5.35+dfsg/include/my_getopt.h mysql-5.5-5.5.43/include/my_getopt.h
--- mysql-5.5-5.5.35+dfsg/include/my_getopt.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/my_getopt.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 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 -Nru mysql-5.5-5.5.35+dfsg/include/myisam.h mysql-5.5-5.5.43/include/myisam.h
--- mysql-5.5-5.5.35+dfsg/include/myisam.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/myisam.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/include/my_net.h mysql-5.5-5.5.43/include/my_net.h
--- mysql-5.5-5.5.35+dfsg/include/my_net.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/my_net.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/include/my_pthread.h mysql-5.5-5.5.43/include/my_pthread.h
--- mysql-5.5-5.5.35+dfsg/include/my_pthread.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/my_pthread.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -134,7 +134,7 @@
 int pthread_cond_init(pthread_cond_t *cond, const pthread_condattr_t *attr);
 int pthread_cond_wait(pthread_cond_t *cond, pthread_mutex_t *mutex);
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-			   struct timespec *abstime);
+			   const struct timespec *abstime);
 int pthread_cond_signal(pthread_cond_t *cond);
 int pthread_cond_broadcast(pthread_cond_t *cond);
 int pthread_cond_destroy(pthread_cond_t *cond);
@@ -142,8 +142,18 @@
 int pthread_attr_setstacksize(pthread_attr_t *connect_att,DWORD stack);
 int pthread_attr_destroy(pthread_attr_t *connect_att);
 int my_pthread_once(my_pthread_once_t *once_control,void (*init_routine)(void));
-struct tm *localtime_r(const time_t *timep,struct tm *tmp);
-struct tm *gmtime_r(const time_t *timep,struct tm *tmp);
+
+static inline struct tm *localtime_r(const time_t *timep, struct tm *tmp)
+{
+  localtime_s(tmp, timep);
+  return tmp;
+}
+
+static inline struct tm *gmtime_r(const time_t *clock, struct tm *res)
+{
+  gmtime_s(res, clock);
+  return res;
+}
 
 void pthread_exit(void *a);
 int pthread_join(pthread_t thread, void **value_ptr);
diff -Nru mysql-5.5-5.5.35+dfsg/include/mysql/plugin_audit.h mysql-5.5-5.5.43/include/mysql/plugin_audit.h
--- mysql-5.5-5.5.35+dfsg/include/mysql/plugin_audit.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/mysql/plugin_audit.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 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
diff -Nru mysql-5.5-5.5.35+dfsg/include/mysql/plugin.h mysql-5.5-5.5.43/include/mysql/plugin.h
--- mysql-5.5-5.5.35+dfsg/include/mysql/plugin.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/mysql/plugin.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/include/mysql/psi/mysql_thread.h mysql-5.5-5.5.43/include/mysql/psi/mysql_thread.h
--- mysql-5.5-5.5.35+dfsg/include/mysql/psi/mysql_thread.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/mysql/psi/mysql_thread.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 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
@@ -988,7 +988,7 @@
 static inline int inline_mysql_cond_timedwait(
   mysql_cond_t *that,
   mysql_mutex_t *mutex,
-  struct timespec *abstime
+  const struct timespec *abstime
 #ifdef HAVE_PSI_INTERFACE
   , const char *src_file, uint src_line
 #endif
diff -Nru mysql-5.5-5.5.35+dfsg/include/mysql/thread_pool_priv.h mysql-5.5-5.5.43/include/mysql/thread_pool_priv.h
--- mysql-5.5-5.5.35+dfsg/include/mysql/thread_pool_priv.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/mysql/thread_pool_priv.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-  Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2010, 2014, 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
@@ -49,6 +49,8 @@
 void thd_set_thread_stack(THD *thd, char *stack_start);
 void thd_lock_thread_count(THD *thd);
 void thd_unlock_thread_count(THD *thd);
+void thd_lock_thread_remove(THD *thd);
+void thd_unlock_thread_remove(THD *thd);
 void thd_close_connection(THD *thd);
 THD *thd_get_current_thd();
 void thd_new_connection_setup(THD *thd, char *stack_start);
diff -Nru mysql-5.5-5.5.35+dfsg/include/mysql_version.h.in mysql-5.5-5.5.43/include/mysql_version.h.in
--- mysql-5.5-5.5.35+dfsg/include/mysql_version.h.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/mysql_version.h.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
-/* Copyright (c) 1996, 1999-2004, 2007 MySQL AB
-   Use is subject to license terms
-   This file is public domain and comes with NO WARRANTY of any kind */
+/* Copyright Abandoned 1996,1999 TCX DataKonsult AB & Monty Program KB
+   & Detron HB, 1996, 1999-2004, 2007 MySQL AB.
+   This file is public domain and comes with NO WARRANTY of any kind
+*/
 
 /* Version numbers for protocol & mysqld */
 
diff -Nru mysql-5.5-5.5.35+dfsg/include/t_ctype.h mysql-5.5-5.5.43/include/t_ctype.h
--- mysql-5.5-5.5.35+dfsg/include/t_ctype.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/t_ctype.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/include/welcome_copyright_notice.h mysql-5.5-5.5.43/include/welcome_copyright_notice.h
--- mysql-5.5-5.5.35+dfsg/include/welcome_copyright_notice.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/include/welcome_copyright_notice.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -16,7 +16,7 @@
 #ifndef _welcome_copyright_notice_h_
 #define _welcome_copyright_notice_h_
 
-#define COPYRIGHT_NOTICE_CURRENT_YEAR "2013"
+#define COPYRIGHT_NOTICE_CURRENT_YEAR "2015"
 
 /*
   This define specifies copyright notice which is displayed by every MySQL
diff -Nru mysql-5.5-5.5.35+dfsg/INSTALL-SOURCE mysql-5.5-5.5.43/INSTALL-SOURCE
--- mysql-5.5-5.5.35+dfsg/INSTALL-SOURCE	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/INSTALL-SOURCE	2015-02-27 08:30:42.000000000 +0000
@@ -1,384 +1,222 @@
+Chapter 2 Installing and Upgrading MySQL
 
-Chapter 2. Installing and Upgrading MySQL
-
-   This chapter describes how to obtain and install MySQL. A summary
-   of the procedure follows and later sections provide the details.
-   If you plan to upgrade an existing version of MySQL to a newer
-   version rather than install MySQL for the first time, see Section
-   2.12.1, "Upgrading MySQL," for information about upgrade
-   procedures and about issues that you should consider before
-   upgrading.
-
-   If you are interested in migrating to MySQL from another database
-   system, you may wish to read Section B.8, "MySQL 5.5 FAQ:
-   Migration," which contains answers to some common questions
-   concerning migration issues.
+   This chapter describes how to obtain and install MySQL. A
+   summary of the procedure follows and later sections provide
+   the details. If you plan to upgrade an existing version of
+   MySQL to a newer version rather than install MySQL for the
+   first time, see Section 2.11.1, "Upgrading MySQL," for
+   information about upgrade procedures and about issues that
+   you should consider before upgrading.
+
+   If you are interested in migrating to MySQL from another
+   database system, you may wish to read Section A.8, "MySQL 5.5
+   FAQ: Migration," which contains answers to some common
+   questions concerning migration issues.
 
    If you are migrating from MySQL Enterprise Edition to MySQL
-   Community Server, see Section 2.12.2.2, "Downgrading from MySQL
-   Enterprise Edition to MySQL Community Server."
+   Community Server, see Section 2.11.2.2, "Downgrading from
+   MySQL Enterprise Edition to MySQL Community Server."
 
-   Installation of MySQL generally follows the steps outlined here:
+   Installation of MySQL generally follows the steps outlined
+   here:
 
     1. Determine whether MySQL runs and is supported on your
        platform.
-       Please note that not all platforms are equally suitable for
-       running MySQL, and that not all platforms on which MySQL is
-       known to run are officially supported by Oracle Corporation:
+       Please note that not all platforms are equally suitable
+       for running MySQL, and that not all platforms on which
+       MySQL is known to run are officially supported by Oracle
+       Corporation:
 
     2. Choose which distribution to install.
        Several versions of MySQL are available, and most are
-       available in several distribution formats. You can choose from
-       pre-packaged distributions containing binary (precompiled)
-       programs or source code. When in doubt, use a binary
-       distribution. We also provide public access to our current
-       source tree for those who want to see our most recent
-       developments and help us test new code. To determine which
-       version and type of distribution you should use, see Section
-       2.1.2, "Choosing Which MySQL Distribution to Install."
+       available in several distribution formats. You can choose
+       from pre-packaged distributions containing binary
+       (precompiled) programs or source code. When in doubt, use
+       a binary distribution. We also provide public access to
+       our current source tree for those who want to see our
+       most recent developments and help us test new code. To
+       determine which version and type of distribution you
+       should use, see Section 2.1.1, "Which MySQL Version and
+       Distribution to Install."
 
     3. Download the distribution that you want to install.
-       For instructions, see Section 2.1.3, "How to Get MySQL." To
-       verify the integrity of the distribution, use the instructions
-       in Section 2.1.4, "Verifying Package Integrity Using MD5
-       Checksums or GnuPG."
+       For instructions, see Section 2.1.2, "How to Get MySQL."
+       To verify the integrity of the distribution, use the
+       instructions in Section 2.1.3, "Verifying Package
+       Integrity Using MD5 Checksums or GnuPG."
 
     4. Install the distribution.
        To install MySQL from a binary distribution, use the
-       instructions in Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."
+       instructions in Section 2.2, "Installing MySQL on
+       Unix/Linux Using Generic Binaries."
        To install MySQL from a source distribution or from the
        current development source tree, use the instructions in
-       Section 2.10, "Installing MySQL from Source."
+       Section 2.9, "Installing MySQL from Source."
 
     5. Perform any necessary postinstallation setup.
-       After installing MySQL, see Section 2.11, "Postinstallation
-       Setup and Testing" for information about making sure the MySQL
-       server is working properly. Also refer to the information
-       provided in Section 2.11.2, "Securing the Initial MySQL
-       Accounts." This section describes how to secure the initial
-       MySQL user accounts, which have no passwords until you assign
-       passwords. The section applies whether you install MySQL using
-       a binary or source distribution.
-
-    6. If you want to run the MySQL benchmark scripts, Perl support
-       for MySQL must be available. See Section 2.14, "Perl
-       Installation Notes."
+       After installing MySQL, see Section 2.10,
+       "Postinstallation Setup and Testing" for information
+       about making sure the MySQL server is working properly.
+       Also refer to the information provided in Section 2.10.2,
+       "Securing the Initial MySQL Accounts." This section
+       describes how to secure the initial MySQL user accounts,
+       which have no passwords until you assign passwords. The
+       section applies whether you install MySQL using a binary
+       or source distribution.
+
+    6. If you want to run the MySQL benchmark scripts, Perl
+       support for MySQL must be available. See Section 2.13,
+       "Perl Installation Notes."
 
    Instructions for installing MySQL on different platforms and
    environments is available on a platform by platform basis:
 
      * Unix, Linux, FreeBSD
-       For instructions on installing MySQL on most Linux and Unix
-       platforms using a generic binary (for example, a .tar.gz
-       package), see Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."
-       For information on building MySQL entirely from the source
-       code distributions or the source code repositories, see
-       Section 2.10, "Installing MySQL from Source"
-       For specific platform help on installation, configuration, and
-       building from source see the corresponding platform section:
-
-          + Linux, including notes on distribution specific methods,
-            see Section 2.5, "Installing MySQL on Linux."
-
-          + Solaris and OpenSolaris, including PKG and IPS formats,
-            see Section 2.7, "Installing MySQL on Solaris and
-            OpenSolaris."
-
-          + IBM AIX, see Section 2.7, "Installing MySQL on Solaris
-            and OpenSolaris."
+       For instructions on installing MySQL on most Linux and
+       Unix platforms using a generic binary (for example, a
+       .tar.gz package), see Section 2.2, "Installing MySQL on
+       Unix/Linux Using Generic Binaries."
+       For information on building MySQL entirely from the
+       source code distributions or the source code
+       repositories, see Section 2.9, "Installing MySQL from
+       Source"
+       For specific platform help on installation,
+       configuration, and building from source see the
+       corresponding platform section:
+
+          + Linux, including notes on distribution specific
+            methods, see Section 2.5, "Installing MySQL on
+            Linux."
+
+          + Solaris and OpenSolaris, including PKG and IPS
+            formats, see Section 2.7, "Installing MySQL on
+            Solaris and OpenSolaris."
 
-          + Hewlett-Packard HP-UX, including the DEPOT package
-            format, see Section 2.8, "Installing MySQL on HP-UX."
+          + IBM AIX, see Section 2.7, "Installing MySQL on
+            Solaris and OpenSolaris."
 
-          + FreeBSD, see Section 2.9, "Installing MySQL on FreeBSD."
+          + FreeBSD, see Section 2.8, "Installing MySQL on
+            FreeBSD."
 
      * Microsoft Windows
-       For instructions on installing MySQL on Microsoft Windows,
-       using either a Zipped binary or an MSI package, see Section
-       2.3, "Installing MySQL on Microsoft Windows."
-       For information on using the MySQL Server Instance Config
-       Wizard, see Section 2.3.6, "MySQL Server Instance
-       Configuration Wizard."
-       For details and instructions on building MySQL from source
-       code using Microsoft Visual Studio, see Section 2.10,
-       "Installing MySQL from Source."
-
-     * Mac OS X
-       For installation on Mac OS X, including using both the binary
-       package and native PKG formats, see Section 2.4, "Installing
-       MySQL on Mac OS X."
-       For information on making use of the MySQL Startup Item to
+       For instructions on installing MySQL on Microsoft
+       Windows, using either the MySQL Installer standalone MSI,
+       or Zipped binary, see Section 2.3, "Installing MySQL on
+       Microsoft Windows."
+       For information about managing MySQL instances, see
+       Section 2.3.4, "MySQL Notifier."
+       For details and instructions on building MySQL from
+       source code using Microsoft Visual Studio, see Section
+       2.9, "Installing MySQL from Source."
+
+     * OS X
+       For installation on OS X, including using both the binary
+       package and native PKG formats, see Section 2.4,
+       "Installing MySQL on OS X."
+       For information on making use of an OS X Launch Daemon to
        automatically start and stop MySQL, see Section 2.4.3,
-       "Installing the MySQL Startup Item."
+       "Installing a MySQL Launch Daemon."
        For information on the MySQL Preference Pane, see Section
-       2.4.4, "Installing and Using the MySQL Preference Pane."
+       2.4.5, "Installing and Using the MySQL Preference Pane."
 
-2.1. General Installation Guidance
+2.1 General Installation Guidance
 
    The immediately following sections contain the information
-   necessary to choose, download, and verify your distribution. The
-   instructions in later sections of the chapter describe how to
-   install the distribution that you choose. For binary
-   distributions, see the instructions at Section 2.2, "Installing
-   MySQL on Unix/Linux Using Generic Binaries" or the corresponding
-   section for your platform if available. To build MySQL from
-   source, use the instructions in Section 2.10, "Installing MySQL
-   from Source."
-
-2.1.1. Operating Systems Supported by MySQL Community Server
-
-   This section lists the operating systems on which MySQL Community
-   Server is known to run.
-   Important
-
-   Oracle Corporation does not necessarily provide official support
-   for all the platforms listed in this section. For information
-   about those platforms that are officially supported, see
-   http://www.mysql.com/support/supportedplatforms/database.html on
-   the MySQL Web site.
-
-   We use CMake, so it is possible to port MySQL to all modern
-   systems that have a C++ compiler and a working implementation of
-   POSIX threads. (Thread support is needed for the server. To
-   compile only the client code, the only requirement is a C++
-   compiler.)
-
-   MySQL has been reported to compile successfully on the following
-   systems:
-
-     * FreeBSD 5.x and up. See Section 2.9, "Installing MySQL on
-       FreeBSD."
+   necessary to choose, download, and verify your distribution.
+   The instructions in later sections of the chapter describe
+   how to install the distribution that you choose. For binary
+   distributions, see the instructions at Section 2.2,
+   "Installing MySQL on Unix/Linux Using Generic Binaries" or
+   the corresponding section for your platform if available. To
+   build MySQL from source, use the instructions in Section 2.9,
+   "Installing MySQL from Source."
+
+2.1.1 Which MySQL Version and Distribution to Install
+
+   MySQL is available on a number of operating systems and
+   platforms. For information about those platforms that are
+   officially supported, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   on the MySQL Web site.
+
+   When preparing to install MySQL, you should decide which
+   version to use, and which distribution format (binary or
+   source) to use for the installation.
+
+   First, decide if you want to install a development release or
+   a GA release. Development releases have the newest features,
+   but are not recommended for production use. GA (General
+   Availability) releases, also called production or stable
+   releases, are meant for production use. We recommend to use
+   the most recent GA release.
+
+   The naming scheme in MySQL 5.5 uses release names that
+   consist of three numbers and a suffix; for example,
+   mysql-5.6.1-m1. The numbers within the release name are
+   interpreted as follows:
+
+     * The first number (5) is the major version and describes
+       the file format. All MySQL 5 releases have the same file
+       format.
+
+     * The second number (6) is the release level. Taken
+       together, the major version and release level constitute
+       the release series number.
+
+     * The third number (1) is the version number within the
+       release series. This is incremented for each new release.
+       Usually you want the latest version for the series you
+       have chosen.
+
+   For each minor update, the last number in the version string
+   is incremented. When there are major new features or minor
+   incompatibilities with previous versions, the second number
+   in the version string is incremented. When the file format
+   changes, the first number is increased.
+
+   Release names can also include a suffix that indicates the
+   stability level of the release. Releases within a series
+   progress through a set of suffixes to indicate how the
+   stability level improves. The possible suffixes are:
 
-     * HP-UX 11.x. See Section 2.8, "Installing MySQL on HP-UX."
-
-     * Linux. Builds on all recent Linux distributions based on the
-       2.6 kernel. See Section 2.5, "Installing MySQL on Linux."
-
-     * Mac OS X. See Section 2.4, "Installing MySQL on Mac OS X."
-
-     * Solaris 2.8 on SPARC and x86. See Section 2.7, "Installing
-       MySQL on Solaris and OpenSolaris."
-
-     * Microsoft Windows. See Section 2.3, "Installing MySQL on
-       Microsoft Windows."
-
-   MySQL has also been known to run on other systems in the past. See
-   Section 2.1, "General Installation Guidance." Some porting effort
-   might be required for current versions of MySQL on these systems.
-
-   Not all platforms are equally well-suited for running MySQL. How
-   well a certain platform is suited for a high-load mission-critical
-   MySQL server is determined by the following factors:
-
-     * General stability of the thread library. A platform may have
-       an excellent reputation otherwise, but MySQL is only as stable
-       as the thread library it calls, even if everything else is
-       perfect.
-
-     * The capability of the kernel and the thread library to take
-       advantage of symmetric multi-processor (SMP) systems. In other
-       words, when a process creates a thread, it should be possible
-       for that thread to run on a CPU different from the original
-       process.
-
-     * The capability of the kernel and the thread library to run
-       many threads that acquire and release a mutex over a short
-       critical region frequently without excessive context switches.
-       If the implementation of pthread_mutex_lock() is too anxious
-       to yield CPU time, this hurts MySQL tremendously. If this
-       issue is not taken care of, adding extra CPUs actually makes
-       MySQL slower.
-
-     * General file system stability and performance.
-
-     * Table size. If your tables are large, performance is affected
-       by the ability of the file system to deal with large files and
-       dealing with them efficiently.
-
-     * Our level of expertise here at Oracle Corporation with the
-       platform. If we know a platform well, we enable
-       platform-specific optimizations and fixes at compile time. We
-       can also provide advice on configuring your system optimally
-       for MySQL.
-
-     * The amount of testing we have done internally for similar
-       configurations.
-
-     * The number of users that have run MySQL successfully on the
-       platform in similar configurations. If this number is high,
-       the likelihood of encountering platform-specific surprises is
-       much smaller.
-
-2.1.2. Choosing Which MySQL Distribution to Install
-
-   When preparing to install MySQL, you should decide which version
-   to use. MySQL development occurs in several release series, and
-   you can pick the one that best fits your needs. After deciding
-   which version to install, you can choose a distribution format.
-   Releases are available in binary or source format.
-
-2.1.2.1. Choosing Which Version of MySQL to Install
-
-   The first decision to make is whether you want to use a production
-   (stable) release or a development release. In the MySQL
-   development process, multiple release series co-exist, each at a
-   different stage of maturity.
-
-Production Releases
-
-
-     * MySQL 5.6: Latest General Availability (Production) release
-
-     * MySQL 5.5: Previous General Availability (Production) release
-
-     * MySQL 5.1: Older General Availability (Production) release
-
-     * MySQL 5.0: Older Production release nearing the end of the
-       product lifecycle
-
-   MySQL 4.1, 4.0, and 3.23 are old releases that are no longer
-   supported.
-
-   See http://www.mysql.com/about/legal/lifecycle/ for information
-   about support policies and schedules.
-
-   Normally, if you are beginning to use MySQL for the first time or
-   trying to port it to some system for which there is no binary
-   distribution, use the most recent General Availability series
-   listed in the preceding descriptions. All MySQL releases, even
-   those from development series, are checked with the MySQL
-   benchmarks and an extensive test suite before being issued.
-
-   If you are running an older system and want to upgrade, but do not
-   want to take the chance of having a nonseamless upgrade, you
-   should upgrade to the latest version in the same release series
-   you are using (where only the last part of the version number is
-   newer than yours). We have tried to fix only fatal bugs and make
-   only small, relatively "safe" changes to that version.
-
-   If you want to use new features not present in the production
-   release series, you can use a version from a development series.
-   Be aware that development releases are not as stable as production
-   releases.
-
-   We do not use a complete code freeze because this prevents us from
-   making bugfixes and other fixes that must be done. We may add
-   small things that should not affect anything that currently works
-   in a production release. Naturally, relevant bugfixes from an
-   earlier series propagate to later series.
-
-   If you want to use the very latest sources containing all current
-   patches and bugfixes, you can use one of our source code
-   repositories (see Section 2.10.3, "Installing MySQL Using a
-   Development Source Tree"). These are not "releases" as such, but
-   are available as previews of the code on which future releases are
-   to be based.
-
-   The naming scheme in MySQL 5.5 uses release names that consist of
-   three numbers and a suffix; for example, mysql-5.5.6-m3. The
-   numbers within the release name are interpreted as follows:
-
-     * The first number (5) is the major version and describes the
-       file format. All MySQL 5 releases have the same file format.
-
-     * The second number (5) is the release level. Taken together,
-       the major version and release level constitute the release
-       series number.
-
-     * The third number (6) is the version number within the release
-       series. This is incremented for each new release. Usually you
-       want the latest version for the series you have chosen.
-
-   For each minor update, the last number in the version string is
-   incremented. When there are major new features or minor
-   incompatibilities with previous versions, the second number in the
-   version string is incremented. When the file format changes, the
-   first number is increased.
-
-   Release names also include a suffix to indicates the stability
-   level of the release. Releases within a series progress through a
-   set of suffixes to indicate how the stability level improves. The
-   possible suffixes are:
-
-     * mN (for example, m1, m2, m3, ...) indicate a milestone number.
-       MySQL development uses a milestone model, in which each
-       milestone proceeds through a small number of versions with a
-       tight focus on a small subset of thoroughly tested features.
-       Following the releases for one milestone, development proceeds
-       with another small number of releases that focuses on the next
-       small set of features, also thoroughly tested. Features within
-       milestone releases may be considered to be of pre-production
-       quality.
+     * If there is no suffix, it indicates that the release is a
+       General Availability (GA) or Production release. GA
+       releases are stable, having successfully passed through
+       all earlier release stages and are believed to be
+       reliable, free of serious bugs, and suitable for use in
+       production systems. Only critical bugfixes are applied to
+       the release.
+
+     * mN (for example, m1, m2, m3, ...) indicate a milestone
+       number. MySQL development uses a milestone model, in
+       which each milestone proceeds through a small number of
+       versions with a tight focus on a small subset of
+       thoroughly tested features. Following the releases for
+       one milestone, development proceeds with another small
+       number of releases that focuses on the next small set of
+       features, also thoroughly tested. Features within
+       milestone releases may be considered to be of
+       pre-production quality.
 
      * rc indicates a Release Candidate. Release candidates are
-       believed to be stable, having passed all of MySQL's internal
-       testing, and with all known fatal runtime bugs fixed. However,
-       the release has not been in widespread use long enough to know
-       for sure that all bugs have been identified. Only minor fixes
-       are added.
-
-     * If there is no suffix, it indicates that the release is a
-       General Availability (GA) or Production release. GA releases
-       are stable, having successfully passed through all earlier
-       release stages and are believed to be reliable, free of
-       serious bugs, and suitable for use in production systems. Only
-       critical bugfixes are applied to the release.
-
-   All releases of MySQL are run through our standard tests and
-   benchmarks to ensure that they are relatively safe to use. Because
-   the standard tests are extended over time to check for all
-   previously found bugs, the test suite keeps getting better.
-
-   All releases have been tested at least with these tools:
-
-     * An internal test suite.  The mysql-test directory contains an
-       extensive set of test cases. We run these tests for every
-       server binary. See Section 23.1.2, "The MySQL Test Suite," for
-       more information about this test suite.
-
-     * The MySQL benchmark suite.  This suite runs a range of common
-       queries. It is also a test to determine whether the latest
-       batch of optimizations actually made the code faster. See
-       Section 8.12.2, "The MySQL Benchmark Suite."
-
-   We also perform additional integration and nonfunctional testing
-   of the latest MySQL version in our internal production
-   environment. Integration testing is done with different
-   connectors, storage engines, replication modes, backup,
-   partitioning, stored programs, and so forth in various
-   combinations. Additional nonfunctional testing is done in areas of
-   performance, concurrency, stress, high volume, upgrade and
-   downgrade.
-
-2.1.2.2. Choosing a Distribution Format
-
-   After choosing which version of MySQL to install, you should
-   decide whether to use a binary distribution or a source
-   distribution. In most cases, you should probably use a binary
-   distribution, if one exists for your platform. Binary
-   distributions are available in native format for many platforms,
-   such as RPM packages for Linux, DMG packages for Mac OS X, and PKG
-   packages for Solaris. Distributions are also available in more
-   generic formats such as Zip archives or compressed tar files.
-
-   Reasons to choose a binary distribution include the following:
-
-     * Binary distributions generally are easier to install than
-       source distributions.
-
-     * To satisfy different user requirements, we provide several
-       servers in binary distributions. mysqld is an optimized server
-       that is a smaller, faster binary. mysqld-debug is compiled
-       with debugging support.
-       Each of these servers is compiled from the same source
-       distribution, though with different configuration options. All
-       native MySQL clients can connect to servers from either MySQL
-       version.
+       believed to be stable, having passed all of MySQL's
+       internal testing, and with all known fatal runtime bugs
+       fixed. However, the release has not been in widespread
+       use long enough to know for sure that all bugs have been
+       identified. Only minor fixes are added.
+
+   Once you've chosen which MySQL version to install, you need
+   to decide which distribution to install for your operating
+   system. For most use cases, a binary distribution is the
+   right choice. Binary distributions are available in native
+   format for many platforms, such as RPM packages for Linux, or
+   DMG packages for OS X. Distributions are also available in
+   more generic formats such as Zip archives or compressed tar
+   files. On Windows, you can use the MySQL Installer to install
+   a binary distribution.
 
-   Under some circumstances, you may be better off installing MySQL
-   from a source distribution:
+   Under some circumstances, you may be better off installing
+   MySQL from a source distribution:
 
      * You want to install MySQL at some explicit location. The
        standard binary distributions are ready to run at any
@@ -386,103 +224,66 @@
        flexibility to place MySQL components where you want.
 
      * You want to configure mysqld to ensure that features are
-       available that might not be included in the standard binary
-       distributions. Here is a list of the most common extra options
-       that you may want to use to ensure feature availability:
+       available that might not be included in the standard
+       binary distributions. Here is a list of the most common
+       extra options that you may want to use to ensure feature
+       availability:
 
           + -DWITH_LIBWRAP=1 for TCP wrappers support.
 
-          + -DWITH_ZLIB={system|bundled} for features that depend on
-            compression
+          + -DWITH_ZLIB={system|bundled} for features that
+            depend on compression
 
           + -DWITH_DEBUG=1 for debugging support
-       For additional information, see Section 2.10.4, "MySQL
+       For additional information, see Section 2.9.4, "MySQL
        Source-Configuration Options."
 
-     * You want to configure mysqld without some features that are
-       included in the standard binary distributions. For example,
-       distributions normally are compiled with support for all
-       character sets. If you want a smaller MySQL server, you can
-       recompile it with support for only the character sets you
-       need.
+     * You want to configure mysqld without some features that
+       are included in the standard binary distributions. For
+       example, distributions normally are compiled with support
+       for all character sets. If you want a smaller MySQL
+       server, you can recompile it with support for only the
+       character sets you need.
 
-     * You want to use the latest sources from one of the Bazaar
+     * You want to use the latest sources from one of the Git
        repositories to have access to all current bugfixes. For
-       example, if you have found a bug and reported it to the MySQL
-       development team, the bugfix is committed to the source
-       repository and you can access it there. The bugfix does not
-       appear in a release until a release actually is issued.
-
-     * You want to read (or modify) the C and C++ code that makes up
-       MySQL. For this purpose, you should get a source distribution,
-       because the source code is always the ultimate manual.
+       example, if you have found a bug and reported it to the
+       MySQL development team, the bugfix is committed to the
+       source repository and you can access it there. The bugfix
+       does not appear in a release until a release actually is
+       issued.
+
+     * You want to read (or modify) the C and C++ code that
+       makes up MySQL. For this purpose, you should get a source
+       distribution.
 
      * Source distributions contain more tests and examples than
        binary distributions.
 
-2.1.2.3. How and When Updates Are Released
+2.1.2 How to Get MySQL
 
-   MySQL is evolving quite rapidly and we want to share new
-   developments with other MySQL users. We try to produce a new
-   release whenever we have new and useful features that others also
-   seem to have a need for.
-
-   We also try to help users who request features that are easy to
-   implement. We take note of what our licensed users want, and we
-   especially take note of what our support customers want and try to
-   help them in this regard.
-
-   No one is required to download a new release. The Release Notes
-   (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) help you
-   determine whether the new release has something you really want.
-
-   We use the following policy when updating MySQL:
-
-     * Enterprise Server releases are meant to appear every 18
-       months, supplemented by quarterly service packs and monthly
-       rapid updates. Community Server releases are meant to appear 2
-       to 3 times per year.
-
-     * Releases are issued within each series. For each release, the
-       last number in the version is one more than the previous
-       release within the same series.
-
-     * Binary distributions for some platforms are made by us for
-       major releases. Other people may make binary distributions for
-       other systems, but probably less frequently.
-
-     * We make fixes available as soon as we have identified and
-       corrected small or noncritical but annoying bugs. The fixes
-       are available in source form immediately from our public
-       Bazaar repositories, and are included in the next release.
-
-     * If by any chance a security vulnerability or critical bug is
-       found in a release, our policy is to fix it in a new release
-       as soon as possible. (We would like other companies to do
-       this, too!)
-
-2.1.3. How to Get MySQL
-
-   Check our downloads page at http://dev.mysql.com/downloads/ for
-   information about the current version of MySQL and for downloading
-   instructions. For a complete up-to-date list of MySQL download
-   mirror sites, see http://dev.mysql.com/downloads/mirrors.html. You
-   can also find information there about becoming a MySQL mirror site
-   and how to report a bad or out-of-date mirror.
+   Check our downloads page at http://dev.mysql.com/downloads/
+   for information about the current version of MySQL and for
+   downloading instructions. For a complete up-to-date list of
+   MySQL download mirror sites, see
+   http://dev.mysql.com/downloads/mirrors.html. You can also
+   find information there about becoming a MySQL mirror site and
+   how to report a bad or out-of-date mirror.
 
-   To obtain the latest development source, see Section 2.10.3,
+   To obtain the latest development source, see Section 2.9.3,
    "Installing MySQL Using a Development Source Tree."
 
-2.1.4. Verifying Package Integrity Using MD5 Checksums or GnuPG
+2.1.3 Verifying Package Integrity Using MD5 Checksums or GnuPG
 
-   After you have downloaded the MySQL package that suits your needs
-   and before you attempt to install it, you should make sure that it
-   is intact and has not been tampered with. There are three means of
-   integrity checking:
+   After you have downloaded the MySQL package that suits your
+   needs and before you attempt to install it, you should make
+   sure that it is intact and has not been tampered with. There
+   are three means of integrity checking:
 
      * MD5 checksums
 
-     * Cryptographic signatures using GnuPG, the GNU Privacy Guard
+     * Cryptographic signatures using GnuPG, the GNU Privacy
+       Guard
 
      * For RPM packages, the built-in RPM integrity verification
        mechanism
@@ -490,72 +291,74 @@
    The following sections describe how to use these methods.
 
    If you notice that the MD5 checksum or GPG signatures do not
-   match, first try to download the respective package one more time,
-   perhaps from another mirror site.
+   match, first try to download the respective package one more
+   time, perhaps from another mirror site.
 
-2.1.4.1. Verifying the MD5 Checksum
+2.1.3.1 Verifying the MD5 Checksum
 
-   After you have downloaded a MySQL package, you should make sure
-   that its MD5 checksum matches the one provided on the MySQL
-   download pages. Each package has an individual checksum that you
-   can verify against the package that you downloaded. The correct
-   MD5 checksum is listed on the downloads page for each MySQL
-   product, and you will compare it against the MD5 checksum of the
-   file (product) that you download.
-
-   Each operating system and setup offers its own version of tools
-   for checking the MD5 checksum. Typically the command is named
-   md5sum, or it may be named md5, and some operating systems do not
-   ship it at all. On Linux, it is part of the GNU Text Utilities
-   package, which is available for a wide range of platforms. You can
-   also download the source code from
-   http://www.gnu.org/software/textutils/. If you have OpenSSL
-   installed, you can use the command openssl md5 package_name
-   instead. A Windows implementation of the md5 command line utility
-   is available from http://www.fourmilab.ch/md5/. winMd5Sum is a
-   graphical MD5 checking tool that can be obtained from
-   http://www.nullriver.com/index/products/winmd5sum. Our Microsoft
-   Windows examples will assume the name md5.exe.
+   After you have downloaded a MySQL package, you should make
+   sure that its MD5 checksum matches the one provided on the
+   MySQL download pages. Each package has an individual checksum
+   that you can verify against the package that you downloaded.
+   The correct MD5 checksum is listed on the downloads page for
+   each MySQL product, and you will compare it against the MD5
+   checksum of the file (product) that you download.
+
+   Each operating system and setup offers its own version of
+   tools for checking the MD5 checksum. Typically the command is
+   named md5sum, or it may be named md5, and some operating
+   systems do not ship it at all. On Linux, it is part of the
+   GNU Text Utilities package, which is available for a wide
+   range of platforms. You can also download the source code
+   from http://www.gnu.org/software/textutils/. If you have
+   OpenSSL installed, you can use the command openssl md5
+   package_name instead. A Windows implementation of the md5
+   command line utility is available from
+   http://www.fourmilab.ch/md5/. winMd5Sum is a graphical MD5
+   checking tool that can be obtained from
+   http://www.nullriver.com/index/products/winmd5sum. Our
+   Microsoft Windows examples will assume the name md5.exe.
 
    Linux and Microsoft Windows examples:
-shell> md5sum mysql-standard-5.5.36-linux-i686.tar.gz
-aaab65abbec64d5e907dcd41b8699945  mysql-standard-5.5.36-linux-i686.ta
-r.gz
-shell> md5.exe mysql-installer-community-5.5.36.msi
-aaab65abbec64d5e907dcd41b8699945  mysql-installer-community-5.5.36.ms
-i
+shell> md5sum mysql-standard-5.5.44-linux-i686.tar.gz
+aaab65abbec64d5e907dcd41b8699945  mysql-standard-5.5.44-linux-i686.tar
+.gz
+
+shell> md5.exe mysql-installer-community-5.5.44.msi
+aaab65abbec64d5e907dcd41b8699945  mysql-installer-community-5.5.44.msi
 
    You should verify that the resulting checksum (the string of
-   hexadecimal digits) matches the one displayed on the download page
-   immediately below the respective package.
+   hexadecimal digits) matches the one displayed on the download
+   page immediately below the respective package.
    Note
 
-   Make sure to verify the checksum of the archive file (for example,
-   the .zip, .tar.gz, or .msi file) and not of the files that are
-   contained inside of the archive. In other words, verify the file
-   before extracting its contents.
+   Make sure to verify the checksum of the archive file (for
+   example, the .zip, .tar.gz, or .msi file) and not of the
+   files that are contained inside of the archive. In other
+   words, verify the file before extracting its contents.
 
-2.1.4.2. Signature Checking Using GnuPG
+2.1.3.2 Signature Checking Using GnuPG
 
-   Another method of verifying the integrity and authenticity of a
-   package is to use cryptographic signatures. This is more reliable
-   than using MD5 checksums, but requires more work.
+   Another method of verifying the integrity and authenticity of
+   a package is to use cryptographic signatures. This is more
+   reliable than using MD5 checksums, but requires more work.
 
    We sign MySQL downloadable packages with GnuPG (GNU Privacy
    Guard). GnuPG is an Open Source alternative to the well-known
    Pretty Good Privacy (PGP) by Phil Zimmermann. See
-   http://www.gnupg.org/ for more information about GnuPG and how to
-   obtain and install it on your system. Most Linux distributions
-   ship with GnuPG installed by default. For more information about
-   GnuPG, see http://www.openpgp.org/.
-
-   To verify the signature for a specific package, you first need to
-   obtain a copy of our public GPG build key, which you can download
-   from http://pgp.mit.edu/. The key that you want to obtain is named
-   mysql-build@oss.oracle.com. Alternatively, you can cut and paste
-   the key directly from the following text:
+   http://www.gnupg.org/ for more information about GnuPG and
+   how to obtain and install it on your system. Most Linux
+   distributions ship with GnuPG installed by default. For more
+   information about GnuPG, see http://www.openpgp.org/.
+
+   To verify the signature for a specific package, you first
+   need to obtain a copy of our public GPG build key, which you
+   can download from http://pgp.mit.edu/. The key that you want
+   to obtain is named mysql-build@oss.oracle.com. Alternatively,
+   you can cut and paste the key directly from the following
+   text:
 -----BEGIN PGP PUBLIC KEY BLOCK-----
-Version: PGP Universal 2.9.1 (Build 347)
+Version: GnuPG v1.4.9 (SunOS)
 
 mQGiBD4+owwRBAC14GIfUfCyEDSIePvEW3SAFUdJBtoQHH/nJKZyQT7h9bPlUWC3
 RODjQReyCITRrdwyrKUGku2FmeVGwn2u2WmDMNABLnpprWPkBdCk96+OmSLN9brZ
@@ -566,34 +369,95 @@
 kYpXBACmWpP8NJTkamEnPCia2ZoOHODANwpUkP43I7jsDmgtobZX9qnrAXw+uNDI
 QJEXM6FSbi0LLtZciNlYsafwAPEOMDKpMqAK6IyisNtPvaLd8lH0bPAnWqcyefep
 rv0sxxqUEMcM3o7wwgfN83POkDasDbs3pjwPhxvhz6//62zQJ7Q2TXlTUUwgUmVs
-ZWFzZSBFbmdpbmVlcmluZyA8bXlzcWwtYnVpbGRAb3NzLm9yYWNsZS5jb20+iGYE
-ExECACYCGyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAUCTnc+KgUJE/sCFQAKCRCM
-cY07UHLh9SbMAJ4l1+qBz2BZNSGCZwwA6YbhGPC7FwCgp8z5TzIw4YQuL5NGJ/sy
-0oSazqmJASIEEAECAAwFAk53QS4FAwASdQAACgkQlxC4m8pXrXwJ8Qf/be/UO9mq
-foc2sMyhwMpN4/fdBWwfLkA12FXQDOQMvwH9HsmEjnfUgYKXschZRi+DuHXe1P7l
-8G2aQLubhBsQf9ejKvRFTzuWMQkdIq+6Koulxv6ofkCcv3d1xtO2W7nb5yxcpVBP
-rRfGFGebJvZa58DymCNgyGtAU6AOz4veavNmI2+GIDQsY66+tYDvZ+CxwzdYu+HD
-V9HmrJfc6deM0mnBn7SRjqzxJPgoTQhihTav6q/R5/2p5NvQ/H84OgS6GjosfGc2
-duUDzCP/kheMRKfzuyKCOHQPtJuIj8++gfpHtEU7IDUX1So3c9n0PdpeBvclsDbp
-RnCNxQWU4mBot7kCDQQ+PqMdEAgA7+GJfxbMdY4wslPnjH9rF4N2qfWsEN/lxaZo
-JYc3a6M02WCnHl6ahT2/tBK2w1QI4YFteR47gCvtgb6O1JHffOo2HfLmRDRiRjd1
-DTCHqeyX7CHhcghj/dNRlW2Z0l5QFEcmV9U0Vhp3aFfWC4Ujfs3LU+hkAWzE7zaD
-5cH9J7yv/6xuZVw411x0h4UqsTcWMu0iM1BzELqX1DY7LwoPEb/O9Rkbf4fmLe11
-EzIaCa4PqARXQZc4dhSinMt6K3X4BrRsKTfozBu74F47D8Ilbf5vSYHbuE5p/1oI
-Dznkg/p8kW+3FxuWrycciqFTcNz215yyX39LXFnlLzKUb/F5GwADBQf+Lwqqa8CG
-rRfsOAJxim63CHfty5mUc5rUSnTslGYEIOCR1BeQauyPZbPDsDD9MZ1ZaSafanFv
-wFG6Llx9xkU7tzq+vKLoWkm4u5xf3vn55VjnSd1aQ9eQnUcXiL4cnBGoTbOWI39E
-cyzgslzBdC++MPjcQTcA7p6JUVsP6oAB3FQWg54tuUo0Ec8bsM8b3Ev42LmuQT5N
-dKHGwHsXTPtl0klk4bQk4OajHsiy1BMahpT27jWjJlMiJc+IWJ0mghkKHt926s/y
-mfdf5HkdQ1cyvsz5tryVI3Fx78XeSYfQvuuwqp2H139pXGEkg0n6KdUOetdZWhe7
-0YGNPw1yjWJT1IhUBBgRAgAMBQJOdz3tBQkT+wG4ABIHZUdQRwABAQkQjHGNO1By
-4fUUmwCbBYr2+bBEn/L2BOcnw9Z/QFWuhRMAoKVgCFm5fadQ3Afi+UQlAcOphrnJ
-=Eto8
+ZWFzZSBFbmdpbmVlcmluZyA8bXlzcWwtYnVpbGRAb3NzLm9yYWNsZS5jb20+iGkE
+ExECACkCGyMGCwkIBwMCBBUCCAMEFgIDAQIeAQIXgAIZAQUCUwHUZgUJGmbLywAK
+CRCMcY07UHLh9V+DAKCjS1gGwgVI/eut+5L+l2v3ybl+ZgCcD7ZoA341HtoroV3U
+6xRD09fUgeq0O015U1FMIFBhY2thZ2Ugc2lnbmluZyBrZXkgKHd3dy5teXNxbC5j
+b20pIDxidWlsZEBteXNxbC5jb20+iG8EMBECAC8FAk53Pa0oHSBidWlsZEBteXNx
+bC5jb20gd2lsbCBzdG9wIHdvcmtpbmcgc29vbgAKCRCMcY07UHLh9bU9AJ9xDK0o
+xJFL9vTl9OSZC4lX0K9AzwCcCrS9cnJyz79eaRjL0s2r/CcljdyIZQQTEQIAHQUC
+R6yUtAUJDTBYqAULBwoDBAMVAwIDFgIBAheAABIJEIxxjTtQcuH1B2VHUEcAAQGu
+kgCffz4GUEjzXkOi71VcwgCxASTgbe0An34LPr1j9fCbrXWXO14msIADfb5piEwE
+ExECAAwFAj4+o9EFgwlmALsACgkQSVDhKrJykfIk4QCfWbEeKN+3TRspe+5xKj+k
+QJSammIAnjUz0xFWPlVx0f8o38qNG1bq0cU9iEwEExECAAwFAj5CggMFgwliIokA
+CgkQtvXNTca6JD+WkQCgiGmnoGjMojynp5ppvMXkyUkfnykAoK79E6h8rwkSDZou
+iz7nMRisH8uyiEYEEBECAAYFAj+s468ACgkQr8UjSHiDdA/2lgCg21IhIMMABTYd
+p/IBiUsP/JQLiEoAnRzMywEtujQz/E9ono7H1DkebDa4iEYEEBECAAYFAj+0Q3cA
+CgkQhZavqzBzTmbGwwCdFqD1frViC7WRt8GKoOS7hzNN32kAnirlbwpnT7a6NOsQ
+83nk11a2dePhiEYEEBECAAYFAkNbs+oACgkQi9gubzC5S1x/dACdELKoXQKkwJN0
+gZztsM7kjsIgyFMAnRRMbHQ7V39XC90OIpaPjk3a01tgiEYEExECAAYFAkTxMyYA
+CgkQ9knE9GCTUwwKcQCgibak/SwhxWH1ijRhgYCo5GtM4vcAnAhtzL57wcw1Kg1X
+m7nVGetUqJ7fiEwEEBECAAwFAkGBywEFgwYi2YsACgkQGFnQH2d7oexCjQCcD8sJ
+NDc/mS8m8OGDUOx9VMWcnGkAnj1YWOD+Qhxo3mI/Ul9oEAhNkjcfiEwEEBECAAwF
+AkGByzQFgwYi2VgACgkQgcL36+ITtpIiIwCdFVNVUB8xe8mFXoPm4d9Z54PTjpMA
+niSPA/ZsfJ3oOMLKar4F0QPPrdrGiEwEEBECAAwFAkGBy2IFgwYi2SoACgkQa3Ds
+2V3D9HMJqgCbBYzr5GPXOXgP88jKzmdbjweqXeEAnRss4G2G/3qD7uhTL1SPT1SH
+jWUXiEwEEBECAAwFAkHQkyQFgwXUEWgACgkQfSXKCsEpp8JiVQCghvWvkPqowsw8
+w7WSseTcw1tflvkAni+vLHl/DqIly0LkZYn5jzK1dpvfiEwEEBECAAwFAkIrW7oF
+gwV5SNIACgkQ5hukiRXruavzEwCgkzL5QkLSypcw9LGHcFSx1ya0VL4An35nXkum
+g6cCJ1NP8r2I4NcZWIrqiEwEEhECAAwFAkAqWToFgwd6S1IACgkQPKEfNJT6+GEm
+XACcD+A53A5OGM7w750W11ukq4iZ9ckAnRMvndAqn3YTOxxlLPj2UPZiSgSqiEwE
+EhECAAwFAkA9+roFgwdmqdIACgkQ8tdcY+OcZZyy3wCgtDcwlaq20w0cNuXFLLNe
+EUaFFTwAni6RHN80moSVAdDTRkzZacJU3M5QiEwEEhECAAwFAkEOCoQFgwaWmggA
+CgkQOcor9D1qil/83QCeITZ9wIo7XAMjC6y4ZWUL4m+edZsAoMOhRIRi42fmrNFu
+vNZbnMGej81viEwEEhECAAwFAkKApTQFgwUj/1gACgkQBA3AhXyDn6jjJACcD1A4
+UtXk84J13JQyoH9+dy24714Aniwlsso/9ndICJOkqs2j5dlHFq6oiEwEExECAAwF
+Aj5NTYQFgwlXVwgACgkQLbt2v63UyTMFDACglT5G5NVKf5Mj65bFSlPzb92zk2QA
+n1uc2h19/IwwrsbIyK/9POJ+JMP7iEwEExECAAwFAkHXgHYFgwXNJBYACgkQZu/b
+yM2C/T4/vACfXe67xiSHB80wkmFZ2krb+oz/gBAAnjR2ucpbaonkQQgnC3GnBqmC
+vNaJiEwEExECAAwFAkIYgQ4FgwWMI34ACgkQdsEDHKIxbqGg7gCfQi2HcrHn+yLF
+uNlH1oSOh48ZM0oAn3hKV0uIRJphonHaUYiUP1ttWgdBiGUEExECAB0FCwcKAwQD
+FQMCAxYCAQIXgAUCS3AvygUJEPPzpwASB2VHUEcAAQEJEIxxjTtQcuH1sNsAniYp
+YBGqy/HhMnw3WE8kXahOOR5KAJ4xUmWPGYP4l3hKxyNK9OAUbpDVYIh7BDARAgA7
+BQJCdzX1NB0AT29wcy4uLiBzaG91bGQgaGF2ZSBiZWVuIGxvY2FsISBJJ20gKnNv
+KiBzdHVwaWQuLi4ACgkQOcor9D1qil/vRwCdFo08f66oKLiuEAqzlf9iDlPozEEA
+n2EgvCYLCCHjfGosrkrU3WK5NFVgiI8EMBECAE8FAkVvAL9IHQBTaG91bGQgaGF2
+ZSBiZWVuIGEgbG9jYWwgc2lnbmF0dXJlLCBvciBzb21ldGhpbmcgLSBXVEYgd2Fz
+IEkgdGhpbmtpbmc/AAoJEDnKK/Q9aopfoPsAn3BVqKOalJeF0xPSvLR90PsRlnmG
+AJ44oisY7Tl3NJbPgZal8W32fbqgbIkCIgQQAQIADAUCQYHLhQWDBiLZBwAKCRCq
+4+bOZqFEaKgvEACCErnaHGyUYa0wETjj6DLEXsqeOiXad4i9aBQxnD35GUgcFofC
+/nCY4XcnCMMEnmdQ9ofUuU3OBJ6BNJIbEusAabgLooebP/3KEaiCIiyhHYU5jarp
+ZAh+Zopgs3Oc11mQ1tIaS69iJxrGTLodkAsAJAeEUwTPq9fHFFzC1eGBysoyFWg4
+bIjz/zClI+qyTbFA5g6tRoiXTo8ko7QhY2AA5UGEg+83Hdb6akC04Z2QRErxKAqr
+phHzj8XpjVOsQAdAi/qVKQeNKROlJ+iq6+YesmcWGfzeb87dGNweVFDJIGA0qY27
+pTb2lExYjsRFN4Cb13NfodAbMTOxcAWZ7jAPCxAPlHUG++mHMrhQXEToZnBFE4nb
+nC7vOBNgWdjUgXcpkUCkop4b17BFpR+k8ZtYLSS8p2LLz4uAeCcSm2/msJxT7rC/
+FvoH8428oHincqs2ICo9zO/Ud4HmmO0O+SsZdVKIIjinGyOVWb4OOzkAlnnhEZ3o
+6hAHcREIsBgPwEYVTj/9ZdC0AO44Nj9cU7awaqgtrnwwfr/o4V2gl8bLSkltZU27
+/29HeuOeFGjlFe0YrDd/aRNsxbyb2O28H4sG1CVZmC5uK1iQBDiSyA7Q0bbdofCW
+oQzm5twlpKWnY8Oe0ub9XP5p/sVfck4FceWFHwv+/PC9RzSl33lQ6vM2wIkCIgQT
+AQIADAUCQp8KHAWDBQWacAAKCRDYwgoJWiRXzyE+D/9uc7z6fIsalfOYoLN60ajA
+bQbI/uRKBFugyZ5RoaItusn9Z2rAtn61WrFhu4uCSJtFN1ny2RERg40f56pTghKr
+D+YEt+Nze6+FKQ5AbGIdFsR/2bUk+ZZRSt83e14Lcb6ii/fJfzkoIox9ltkifQxq
+Y7Tvk4noKu4oLSc8O1Wsfc/y0B9sYUUCmUfcnq58DEmGie9ovUslmyt5NPnveXxp
+5UeaRc5Rqt9tK2B4A+7/cqENrdZJbAMSunt2+2fkYiRunAFPKPBdJBsY1sxeL/A9
+aKe0viKEXQdAWqdNZKNCi8rd/oOP99/9lMbFudAbX6nL2DSb1OG2Z7NWEqgIAzjm
+pwYYPCKeVz5Q8R+if9/fe5+STY/55OaI33fJ2H3v+U435VjYqbrerWe36xJItcJe
+qUzW71fQtXi1CTEl3w2ch7VF5oj/QyjabLnAlHgSlkSi6p7By5C2MnbCHlCfPnIi
+nPhFoRcRGPjJe9nFwGs+QblvS/Chzc2WX3s/2SWm4gEUKRX4zsAJ5ocyfa/vkxCk
+SxK/erWlCPf/J1T70+i5waXDN/E3enSet/WL7h94pQKpjz8OdGL4JSBHuAVGA+a+
+dknqnPF0KMKLhjrgV+L7O84FhbmAP7PXm3xmiMPriXf+el5fZZequQoIagf8rdRH
+HhRJxQgI0HNknkaOqs8dtrkCDQQ+PqMdEAgA7+GJfxbMdY4wslPnjH9rF4N2qfWs
+EN/lxaZoJYc3a6M02WCnHl6ahT2/tBK2w1QI4YFteR47gCvtgb6O1JHffOo2HfLm
+RDRiRjd1DTCHqeyX7CHhcghj/dNRlW2Z0l5QFEcmV9U0Vhp3aFfWC4Ujfs3LU+hk
+AWzE7zaD5cH9J7yv/6xuZVw411x0h4UqsTcWMu0iM1BzELqX1DY7LwoPEb/O9Rkb
+f4fmLe11EzIaCa4PqARXQZc4dhSinMt6K3X4BrRsKTfozBu74F47D8Ilbf5vSYHb
+uE5p/1oIDznkg/p8kW+3FxuWrycciqFTcNz215yyX39LXFnlLzKUb/F5GwADBQf+
+Lwqqa8CGrRfsOAJxim63CHfty5mUc5rUSnTslGYEIOCR1BeQauyPZbPDsDD9MZ1Z
+aSafanFvwFG6Llx9xkU7tzq+vKLoWkm4u5xf3vn55VjnSd1aQ9eQnUcXiL4cnBGo
+TbOWI39EcyzgslzBdC++MPjcQTcA7p6JUVsP6oAB3FQWg54tuUo0Ec8bsM8b3Ev4
+2LmuQT5NdKHGwHsXTPtl0klk4bQk4OajHsiy1BMahpT27jWjJlMiJc+IWJ0mghkK
+Ht926s/ymfdf5HkdQ1cyvsz5tryVI3Fx78XeSYfQvuuwqp2H139pXGEkg0n6KdUO
+etdZWhe70YGNPw1yjWJT1IhUBBgRAgAMBQJOdz3tBQkT+wG4ABIHZUdQRwABAQkQ
+jHGNO1By4fUUmwCbBYr2+bBEn/L2BOcnw9Z/QFWuhRMAoKVgCFm5fadQ3Afi+UQl
+AcOphrnJ
+=443I
 -----END PGP PUBLIC KEY BLOCK-----
 
-   To import the build key into your personal public GPG keyring, use
-   gpg --import. For example, if you have saved the key in a file
-   named mysql_pubkey.asc, the import command looks like this:
+   To import the build key into your personal public GPG
+   keyring, use gpg --import. For example, if you have saved the
+   key in a file named mysql_pubkey.asc, the import command
+   looks like this:
 shell> gpg --import mysql_pubkey.asc
 gpg: key 5072E1F5: public key "MySQL Release Engineering
 <mysql-build@oss.oracle.com>" imported
@@ -601,15 +465,15 @@
 gpg:               imported: 1
 gpg: no ultimately trusted keys found
 
-   You can also download the key from the public keyserver using the
-   public key id, 5072E1F5:
+   You can also download the key from the public keyserver using
+   the public key id, 5072E1F5:
 shell> gpg --recv-keys 5072E1F5
 gpg: requesting key 5072E1F5 from hkp server keys.gnupg.net
-gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle
-.com>"
+gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle.
+com>"
 1 new user ID
-gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle
-.com>"
+gpg: key 5072E1F5: "MySQL Release Engineering <mysql-build@oss.oracle.
+com>"
 53 new signatures
 gpg: no ultimately trusted keys found
 gpg: Total number processed: 1
@@ -617,214 +481,220 @@
 gpg:         new signatures: 53
 
    If you want to import the key into your RPM configuration to
-   validate RPM install packages, you should be able to import the
-   key directly:
+   validate RPM install packages, you should be able to import
+   the key directly:
 shell> rpm --import mysql_pubkey.asc
 
-   If you experience problems or require RPM specific information,
-   see Section 2.1.4.4, "Signature Checking Using RPM."
+   If you experience problems or require RPM specific
+   information, see Section 2.1.3.4, "Signature Checking Using
+   RPM."
 
    After you have downloaded and imported the public build key,
    download your desired MySQL package and the corresponding
-   signature, which also is available from the download page. The
-   signature file has the same name as the distribution file with an
-   .asc extension, as shown by the examples in the following table.
+   signature, which also is available from the download page.
+   The signature file has the same name as the distribution file
+   with an .asc extension, as shown by the examples in the
+   following table.
 
-   Table 2.1. MySQL Package and Signature Files for Source files
+   Table 2.1 MySQL Package and Signature Files for Source files
        File Type                      File Name
-   Distribution file mysql-standard-5.5.36-linux-i686.tar.gz
-   Signature file    mysql-standard-5.5.36-linux-i686.tar.gz.asc
+   Distribution file mysql-standard-5.5.44-linux-i686.tar.gz
+   Signature file    mysql-standard-5.5.44-linux-i686.tar.gz.asc
 
-   Make sure that both files are stored in the same directory and
-   then run the following command to verify the signature for the
-   distribution file:
+   Make sure that both files are stored in the same directory
+   and then run the following command to verify the signature
+   for the distribution file:
 shell> gpg --verify package_name.asc
 
    If the downloaded package is valid, you will see a "Good
    signature" similar to:
-shell> gpg --verify mysql-standard-5.5.36-linux-i686.tar.gz.asc
-gpg: Signature made Tue 01 Feb 2011 02:38:30 AM CST using DSA key ID
-5072E1F5
-gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.
-oracle.com>"
-
-   The Good signature message indicates that the file signature is
-   valid, when compared to the signature listed on our site. But you
-   might also see warnings, like so:
-shell> gpg --verify mysql-standard-5.5.36-linux-i686.tar.gz.asc
-gpg: Signature made Wed 23 Jan 2013 02:25:45 AM PST using DSA key ID
-5072E1F5
+shell> gpg --verify mysql-standard-5.5.44-linux-i686.tar.gz.asc
+gpg: Signature made Tue 01 Feb 2011 02:38:30 AM CST using DSA key ID 5
+072E1F5
+gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.o
+racle.com>"
+
+   The Good signature message indicates that the file signature
+   is valid, when compared to the signature listed on our site.
+   But you might also see warnings, like so:
+shell> gpg --verify mysql-standard-5.5.44-linux-i686.tar.gz.asc
+gpg: Signature made Wed 23 Jan 2013 02:25:45 AM PST using DSA key ID 5
+072E1F5
 gpg: checking the trustdb
 gpg: no ultimately trusted keys found
-gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.
-oracle.com>"
+gpg: Good signature from "MySQL Release Engineering <mysql-build@oss.o
+racle.com>"
 gpg: WARNING: This key is not certified with a trusted signature!
-gpg:          There is no indication that the signature belongs to th
-e owner.
-Primary key fingerprint: A4A9 4068 76FC BD3C 4567  70C8 8C71 8D3B 507
-2 E1F5
-
-   That is normal, as they depend on your setup and configuration.
-   Here are explanations for these warnings:
-
-     * gpg: no ultimately trusted keys found: This means that the
-       specific key is not "ultimately trusted" by you or your web of
-       trust, which is okay for the purposes of verifying file
-       signatures.
-
-     * WARNING: This key is not certified with a trusted signature!
-       There is no indication that the signature belongs to the
-       owner.: This refers to your level of trust in your belief that
-       you possess our real public key. This is a personal decision.
-       Ideally, a MySQL developer would hand you the key in person,
-       but more commonly, you downloaded it. Was the download
-       tampered with? Probably not, but this decision is up to you.
-       Setting up a web of trust is one method for trusting them.
-
-   See the GPG documentation for more information on how to work with
-   public keys.
-
-2.1.4.3. Signature Checking Using Gpg4win for Windows
-
-   The Section 2.1.4.2, "Signature Checking Using GnuPG" section
-   describes how to verify MySQL downloads using GPG. That guide also
-   applies to Microsoft Windows, but another option is to use a GUI
-   tool like Gpg4win (http://www.gpg4win.org/). You may use a
-   different tool but our examples are based on Gpg4win, and utilize
-   its bundled Kleopatra GUI.
+gpg:          There is no indication that the signature belongs to the
+ owner.
+Primary key fingerprint: A4A9 4068 76FC BD3C 4567  70C8 8C71 8D3B 5072
+ E1F5
+
+   That is normal, as they depend on your setup and
+   configuration. Here are explanations for these warnings:
+
+     * gpg: no ultimately trusted keys found: This means that
+       the specific key is not "ultimately trusted" by you or
+       your web of trust, which is okay for the purposes of
+       verifying file signatures.
+
+     * WARNING: This key is not certified with a trusted
+       signature! There is no indication that the signature
+       belongs to the owner.: This refers to your level of trust
+       in your belief that you possess our real public key. This
+       is a personal decision. Ideally, a MySQL developer would
+       hand you the key in person, but more commonly, you
+       downloaded it. Was the download tampered with? Probably
+       not, but this decision is up to you. Setting up a web of
+       trust is one method for trusting them.
+
+   See the GPG documentation for more information on how to work
+   with public keys.
+
+2.1.3.3 Signature Checking Using Gpg4win for Windows
+
+   The Section 2.1.3.2, "Signature Checking Using GnuPG" section
+   describes how to verify MySQL downloads using GPG. That guide
+   also applies to Microsoft Windows, but another option is to
+   use a GUI tool like Gpg4win (http://www.gpg4win.org/). You
+   may use a different tool but our examples are based on
+   Gpg4win, and utilize its bundled Kleopatra GUI.
 
-   Download and install Gpg4win, and then load Kleopatra. The dialog
-   should look similar to:
+   Download and install Gpg4win, and then load Kleopatra. The
+   dialog should look similar to:
 
-   Figure 2.1. Initial screen after loading Kleopatra
+   Figure 2.1 Initial screen after loading Kleopatra
    Initial screen after loading Kleopatra
 
-   Next, add the MySQL Release Engineering certificate. Do this by
-   clicking File, Lookup Certificates on Server. Type "Mysql Release
-   Engineering" into the search box and press Search.
+   Next, add the MySQL Release Engineering certificate. Do this
+   by clicking File, Lookup Certificates on Server. Type "Mysql
+   Release Engineering" into the search box and press Search.
 
-   Figure 2.2. Finding the MySQL Release Engineering certificate
+   Figure 2.2 Finding the MySQL Release Engineering certificate
    Finding the MySQL Release Engineering certificate
 
    Select the "MySQL Release Engineering" certificate. The
-   Fingerprint and Key-ID must be "5072E1F5", or choose Details... to
-   confirm the certificate is valid. Now, import it by clicking
-   Import. An import dialog will be displayed, choose Okay, and this
-   certificate will now be listed under the Imported Certificates
-   tab.
-
-   Next, configure the trust level for our certificate. Select our
-   certificate, then from the main menu select Certificates, Change
-   Owner Trust.... We suggest choosing I believe checks are very
-   accurate for our certificate, as otherwise you might not be able
-   to verify our signature. Select I believe checks are very accurate
-   and then press OK.
+   Fingerprint and Key-ID must be "5072E1F5", or choose
+   Details... to confirm the certificate is valid. Now, import
+   it by clicking Import. An import dialog will be displayed,
+   choose Okay, and this certificate will now be listed under
+   the Imported Certificates tab.
+
+   Next, configure the trust level for our certificate. Select
+   our certificate, then from the main menu select Certificates,
+   Change Owner Trust.... We suggest choosing I believe checks
+   are very accurate for our certificate, as otherwise you might
+   not be able to verify our signature. Select I believe checks
+   are very accurate and then press OK.
 
-   Figure 2.3. Changing the Trust level
+   Figure 2.3 Changing the Trust level
    Changing the Trust level
 
    Next, verify the downloaded MySQL package file. This requires
-   files for both the packaged file, and the signature. The signature
-   file must have the same name as the packaged file but with an
-   appended .asc extension, as shown by the example in the following
-   table. The signature is linked to on the downloads page for each
-   MySQL product. You must create the .asc file with this signature.
+   files for both the packaged file, and the signature. The
+   signature file must have the same name as the packaged file
+   but with an appended .asc extension, as shown by the example
+   in the following table. The signature is linked to on the
+   downloads page for each MySQL product. You must create the
+   .asc file with this signature.
 
-   Table 2.2. MySQL Package and Signature Files for MySQL Installer
-   for Microsoft Windows
+   Table 2.2 MySQL Package and Signature Files for MySQL
+   Installer for Microsoft Windows
        File Type                    File Name
-   Distribution file mysql-installer-community-5.5.36.msi
-   Signature file    mysql-installer-community-5.5.36.msi.asc
+   Distribution file mysql-installer-community-5.5.44.msi
+   Signature file    mysql-installer-community-5.5.44.msi.asc
 
-   Make sure that both files are stored in the same directory and
-   then run the following command to verify the signature for the
-   distribution file. Either drag and drop the signature (.asc) file
-   into Kleopatra, or load the dialog from File, Decrypt/Verify
-   Files..., and then choose either the .msi or .asc file.
+   Make sure that both files are stored in the same directory
+   and then run the following command to verify the signature
+   for the distribution file. Either drag and drop the signature
+   (.asc) file into Kleopatra, or load the dialog from File,
+   Decrypt/Verify Files..., and then choose either the .msi or
+   .asc file.
 
-   Figure 2.4. The Decrypt/Verify Files dialog
+   Figure 2.4 The Decrypt/Verify Files dialog
    The Decrypt/Verify Files dialog
 
    Click Decrypt/Verify to check the file. The two most common
    results will look like the following, and although the yellow
-   warning looks problematic, the following means that the file check
-   passed with success. You may now run this installer.
+   warning looks problematic, the following means that the file
+   check passed with success. You may now run this installer.
 
-   Figure 2.5. The Decrypt/Verify Results: Good
+   Figure 2.5 The Decrypt/Verify Results: Good
    The Decrypt/Verify Results: Good
 
    Seeing a red "The signature is bad" error means the file is
    invalid. Do not execute the MSI file if you see this error.
 
-   Figure 2.6. The Decrypt/Verify Results: Bad
+   Figure 2.6 The Decrypt/Verify Results: Bad
    The Decrypt/Verify Results: Bad
 
-   The Section 2.1.4.2, "Signature Checking Using GnuPG" section
-   explains why you probably don't see a green Good signature result.
-
-2.1.4.4. Signature Checking Using RPM
-
-   For RPM packages, there is no separate signature. RPM packages
-   have a built-in GPG signature and MD5 checksum. You can verify a
-   package by running the following command:
+   The Section 2.1.3.2, "Signature Checking Using GnuPG" section
+   explains why you probably don't see a green Good signature
+   result.
+
+2.1.3.4 Signature Checking Using RPM
+
+   For RPM packages, there is no separate signature. RPM
+   packages have a built-in GPG signature and MD5 checksum. You
+   can verify a package by running the following command:
 shell> rpm --checksig package_name.rpm
 
    Example:
-shell> rpm --checksig MySQL-server-5.5.36-0.glibc23.i386.rpm
-MySQL-server-5.5.36-0.glibc23.i386.rpm: md5 gpg OK
+shell> rpm --checksig MySQL-server-5.5.44-0.glibc23.i386.rpm
+MySQL-server-5.5.44-0.glibc23.i386.rpm: md5 gpg OK
 
    Note
 
    If you are using RPM 4.1 and it complains about (GPG) NOT OK
-   (MISSING KEYS: GPG#5072e1f5), even though you have imported the
-   MySQL public build key into your own GPG keyring, you need to
-   import the key into the RPM keyring first. RPM 4.1 no longer uses
-   your personal GPG keyring (or GPG itself). Rather, RPM maintains a
-   separate keyring because it is a system-wide application and a
-   user's GPG public keyring is a user-specific file. To import the
-   MySQL public key into the RPM keyring, first obtain the key, then
-   use rpm --import to import the key. For example:
+   (MISSING KEYS: GPG#5072e1f5), even though you have imported
+   the MySQL public build key into your own GPG keyring, you
+   need to import the key into the RPM keyring first. RPM 4.1 no
+   longer uses your personal GPG keyring (or GPG itself).
+   Rather, RPM maintains a separate keyring because it is a
+   system-wide application and a user's GPG public keyring is a
+   user-specific file. To import the MySQL public key into the
+   RPM keyring, first obtain the key, then use rpm --import to
+   import the key. For example:
 shell> gpg --export -a 5072e1f5 > 5072e1f5.asc
 shell> rpm --import 5072e1f5.asc
 
-   Alternatively, rpm also supports loading the key directly from a
-   URL, and you can use this manual page:
-shell> rpm --import http://dev.mysql.com/doc/refman/5.5/en/checking-g
-pg-signature.html
-
-   If you need to obtain the MySQL public key, see Section 2.1.4.2,
-   "Signature Checking Using GnuPG."
-
-2.1.5. Installation Layouts
-
-   The installation layout differs for different installation types
-   (for example, native packages, binary tarballs, and source
-   tarballs), which can lead to confusion when managing different
-   systems or using different installation sources. The individual
-   layouts are given in the corresponding installation type or
-   platform chapter, as described following. Note that the layout of
-   installations from vendors other than Oracle may differ from these
-   layouts.
+   Alternatively, rpm also supports loading the key directly
+   from a URL, and you can use this manual page:
+shell> rpm --import doc/refman/5.5/en/checking-gpg-signature.html
+
+   If you need to obtain the MySQL public key, see Section
+   2.1.3.2, "Signature Checking Using GnuPG."
+
+2.1.4 Installation Layouts
+
+   The installation layout differs for different installation
+   types (for example, native packages, binary tarballs, and
+   source tarballs), which can lead to confusion when managing
+   different systems or using different installation sources.
+   The individual layouts are given in the corresponding
+   installation type or platform chapter, as described
+   following. Note that the layout of installations from vendors
+   other than Oracle may differ from these layouts.
 
      * Section 2.3.1, "MySQL Installation Layout on Microsoft
        Windows"
 
-     * Section 2.10.1, "MySQL Layout for Source Installation"
+     * Section 2.9.1, "MySQL Layout for Source Installation"
 
-     * Section 2.2, "MySQL Installation Layout for Generic Unix/Linux
-       Binary Package"
+     * Section 2.2, "MySQL Installation Layout for Generic
+       Unix/Linux Binary Package"
 
      * Section 2.5.1, "MySQL Installation Layout for Linux RPM
        Packages"
 
-     * Section 2.4.2, "MySQL Installation Layout on Mac OS X"
+     * Section 2.4.2, "MySQL Installation Layout on OS X"
 
-2.1.6. Compiler-Specific Build Characteristics
+2.1.5 Compiler-Specific Build Characteristics
 
    In some cases, the compiler used to build MySQL affects the
-   features available for use. The notes in this section apply for
-   binary distributions provided by Oracle Corporation or that you
-   compile yourself from source.
+   features available for use. The notes in this section apply
+   for binary distributions provided by Oracle Corporation or
+   that you compile yourself from source.
 
    icc (Intel C++ Compiler) Builds
 
@@ -832,62 +702,79 @@
 
      * SSL support is not included.
 
-2.2. Installing MySQL on Unix/Linux Using Generic Binaries
+2.2 Installing MySQL on Unix/Linux Using Generic Binaries
 
    Oracle provides a set of binary distributions of MySQL. These
-   include binary distributions in the form of compressed tar files
-   (files with a .tar.gz extension) for a number of platforms, as
-   well as binaries in platform-specific package formats for selected
-   platforms.
-
-   This section covers the installation of MySQL from a compressed
-   tar file binary distribution. For other platform-specific package
-   formats, see the other platform-specific sections. For example,
-   for Windows distributions, see Section 2.3, "Installing MySQL on
+   include binary distributions in the form of compressed tar
+   files (files with a .tar.gz extension) for a number of
+   platforms, as well as binaries in platform-specific package
+   formats for selected platforms.
+
+   This section covers the installation of MySQL from a
+   compressed tar file binary distribution. For other
+   platform-specific package formats, see the other
+   platform-specific sections. For example, for Windows
+   distributions, see Section 2.3, "Installing MySQL on
    Microsoft Windows."
 
-   To obtain MySQL, see Section 2.1.3, "How to Get MySQL."
+   To obtain MySQL, see Section 2.1.2, "How to Get MySQL."
 
-   MySQL compressed tar file binary distributions have names of the
-   form mysql-VERSION-OS.tar.gz, where VERSION is a number (for
-   example, 5.5.36), and OS indicates the type of operating system
-   for which the distribution is intended (for example, pc-linux-i686
-   or winx64).
-
-   To install MySQL from a compressed tar file binary distribution,
-   your system must have GNU gunzip to uncompress the distribution
-   and a reasonable tar to unpack it. If your tar program supports
-   the z option, it can both uncompress and unpack the file.
+   MySQL compressed tar file binary distributions have names of
+   the form mysql-VERSION-OS.tar.gz, where VERSION is a number
+   (for example, 5.5.44), and OS indicates the type of operating
+   system for which the distribution is intended (for example,
+   pc-linux-i686 or winx64).
+
+   To install MySQL from a compressed tar file binary
+   distribution, your system must have GNU gunzip to uncompress
+   the distribution and a reasonable tar to unpack it. If your
+   tar program supports the z option, it can both uncompress and
+   unpack the file.
 
    GNU tar is known to work. The standard tar provided with some
-   operating systems is not able to unpack the long file names in the
-   MySQL distribution. You should download and install GNU tar, or if
-   available, use a preinstalled version of GNU tar. Usually this is
-   available as gnutar, gtar, or as tar within a GNU or Free Software
-   directory, such as /usr/sfw/bin or /usr/local/bin. GNU tar is
-   available from http://www.gnu.org/software/tar/.
+   operating systems is not able to unpack the long file names
+   in the MySQL distribution. You should download and install
+   GNU tar, or if available, use a preinstalled version of GNU
+   tar. Usually this is available as gnutar, gtar, or as tar
+   within a GNU or Free Software directory, such as /usr/sfw/bin
+   or /usr/local/bin. GNU tar is available from
+   http://www.gnu.org/software/tar/.
    Warning
 
-   If you have previously installed MySQL using your operating system
-   native package management system, such as yum or apt-get, you may
-   experience problems installing using a native binary. Make sure
-   your previous MySQL previous installation has been removed
-   entirely (using your package management system), and that any
-   additional files, such as old versions of your data files, have
-   also been removed. You should also check the existence of
-   configuration files such as /etc/my.cnf or the /etc/mysql
-   directory have been deleted.
-
-   If you run into problems and need to file a bug report, please use
-   the instructions in Section 1.7, "How to Report Bugs or Problems."
-
-   On Unix, to install a compressed tar file binary distribution,
-   unpack it at the installation location you choose (typically
-   /usr/local/mysql). This creates the directories shown in the
-   following table.
+   If you have previously installed MySQL using your operating
+   system native package management system, such as yum or
+   apt-get, you may experience problems installing using a
+   native binary. Make sure your previous MySQL installation has
+   been removed entirely (using your package management system),
+   and that any additional files, such as old versions of your
+   data files, have also been removed. You should also check the
+   existence of configuration files such as /etc/my.cnf or the
+   /etc/mysql directory have been deleted.
+   Warning
+
+   MySQL has a dependency on the libaio library. The
+   mysql_install_db and subsequent mysqld_safe steps will fail
+   if this library is not installed locally. If necessary,
+   install it using the appropriate package manager. For
+   example, on Yum-based systems:
+shell> yum search libaio  # search for info
+shell> yum install libaio # install library
+
+   Or, on APT-based systems:
+shell> apt-cache search libaio # search for info
+shell> apt-get install libaio1 # install library
+
+   If you run into problems and need to file a bug report,
+   please use the instructions in Section 1.7, "How to Report
+   Bugs or Problems."
 
-   Table 2.3. MySQL Installation Layout for Generic Unix/Linux Binary
-   Package
+   On Unix, to install a compressed tar file binary
+   distribution, unpack it at the installation location you
+   choose (typically /usr/local/mysql). This creates the
+   directories shown in the following table.
+
+   Table 2.3 MySQL Installation Layout for Generic Unix/Linux
+   Binary Package
    Directory Contents of Directory
    bin Client programs and the mysqld server
    data Log files, databases
@@ -900,25 +787,25 @@
    sample configuration files, SQL for database installation
    sql-bench Benchmarks
 
-   Debug versions of the mysqld binary are available as mysqld-debug.
-   To compile your own debug version of MySQL from a source
-   distribution, use the appropriate configuration options to enable
-   debugging support. For more information on compiling from source,
-   see Section 2.10, "Installing MySQL from Source."
+   Debug versions of the mysqld binary are available as
+   mysqld-debug. To compile your own debug version of MySQL from
+   a source distribution, use the appropriate configuration
+   options to enable debugging support. For more information on
+   compiling from source, see Section 2.9, "Installing MySQL
+   from Source."
 
-   To install and use a MySQL binary distribution, the basic command
-   sequence looks like this:
+   To install and use a MySQL binary distribution, the basic
+   command sequence looks like this:
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 shell> cd /usr/local
 shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
 shell> ln -s full-path-to-mysql-VERSION-OS mysql
 shell> cd mysql
-shell> chown -R mysql .
-shell> chgrp -R mysql .
-shell> scripts/mysql_install_db --user=mysql
 shell> chown -R root .
 shell> chown -R mysql data
+shell> chgrp -R mysql .
+shell> scripts/mysql_install_db --user=mysql
 # Next command is optional
 shell> cp support-files/my-medium.cnf /etc/my.cnf
 shell> bin/mysqld_safe --user=mysql &
@@ -929,694 +816,1092 @@
    installing a binary distribution follows.
    Note
 
-   This procedure assumes that you have root (administrator) access
-   to your system. Alternatively, you can prefix each command using
-   the sudo (Linux) or pfexec (OpenSolaris) command.
-
-   The procedure does not set up any passwords for MySQL accounts.
-   After following the procedure, proceed to Section 2.11.2,
-   "Securing the Initial MySQL Accounts."
+   This procedure assumes that you have root (administrator)
+   access to your system. Alternatively, you can prefix each
+   command using the sudo (Linux) or pfexec (OpenSolaris)
+   command.
+
+   The procedure does not set up any passwords for MySQL
+   accounts. After following the procedure, proceed to Section
+   2.10.2, "Securing the Initial MySQL Accounts."
 
 Create a mysql User and Group
 
-   If your system does not already have a user and group for mysqld
-   to run as, you may need to create one. The following commands add
-   the mysql group and the mysql user. You might want to call the
-   user and group something else instead of mysql. If so, substitute
-   the appropriate name in the following instructions. The syntax for
-   useradd and groupadd may differ slightly on different versions of
-   Unix, or they may have different names such as adduser and
-   addgroup.
+   If your system does not already have a user and group for
+   mysqld to run as, you may need to create one. The following
+   commands add the mysql group and the mysql user. You might
+   want to call the user and group something else instead of
+   mysql. If so, substitute the appropriate name in the
+   following instructions. The syntax for useradd and groupadd
+   may differ slightly on different versions of Unix, or they
+   may have different names such as adduser and addgroup.
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
 
    Note
 
    Because the user is required only for ownership purposes, not
-   login purposes, the useradd command uses the -r option to create a
-   user that does not have login permissions to your server host.
-   Omit this option to permit logins for the user (or if your useradd
-   does not support the option).
+   login purposes, the useradd command uses the -r option to
+   create a user that does not have login permissions to your
+   server host. Omit this option to permit logins for the user
+   (or if your useradd does not support the option).
 
 Obtain and Unpack the Distribution
 
-   Pick the directory under which you want to unpack the distribution
-   and change location into it. The example here unpacks the
-   distribution under /usr/local. The instructions, therefore, assume
-   that you have permission to create files and directories in
-   /usr/local. If that directory is protected, you must perform the
-   installation as root.
+   Pick the directory under which you want to unpack the
+   distribution and change location into it. The example here
+   unpacks the distribution under /usr/local. The instructions,
+   therefore, assume that you have permission to create files
+   and directories in /usr/local. If that directory is
+   protected, you must perform the installation as root.
 shell> cd /usr/local
 
    Obtain a distribution file using the instructions in Section
-   2.1.3, "How to Get MySQL." For a given release, binary
+   2.1.2, "How to Get MySQL." For a given release, binary
    distributions for all platforms are built from the same MySQL
    source distribution.
 
-   Unpack the distribution, which creates the installation directory.
-   Then create a symbolic link to that directory. tar can uncompress
-   and unpack the distribution if it has z option support:
+   Unpack the distribution, which creates the installation
+   directory. Then create a symbolic link to that directory. tar
+   can uncompress and unpack the distribution if it has z option
+   support:
 shell> tar zxvf /path/to/mysql-VERSION-OS.tar.gz
 shell> ln -s full-path-to-mysql-VERSION-OS mysql
 
-   The tar command creates a directory named mysql-VERSION-OS. The ln
-   command makes a symbolic link to that directory. This enables you
-   to refer more easily to the installation directory as
-   /usr/local/mysql.
-
-   If your tar does not have z option support, use gunzip to unpack
-   the distribution and tar to unpack it. Replace the preceding tar
-   command with the following alternative command to uncompress and
-   extract the distribution:
+   The tar command creates a directory named mysql-VERSION-OS.
+   The ln command makes a symbolic link to that directory. This
+   enables you to refer more easily to the installation
+   directory as /usr/local/mysql.
+
+   If your tar does not have z option support, use gunzip to
+   unpack the distribution and tar to unpack it. Replace the
+   preceding tar command with the following alternative command
+   to uncompress and extract the distribution:
 shell> gunzip < /path/to/mysql-VERSION-OS.tar.gz | tar xvf -
 
 Perform Postinstallation Setup
 
-   The remainder of the installation process involves setting up the
-   configuration file, creating the core databases, and starting the
-   MySQL server. For next steps, see Section 2.11, "Postinstallation
-   Setup and Testing."
-   Note
-
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11.2,
-   "Securing the Initial MySQL Accounts."
-
-2.3. Installing MySQL on Microsoft Windows
-
-   MySQL for Microsoft Windows is available in a number of different
-   forms. A Microsoft Windows operating system such as Windows XP,
-   Windows Vista, Windows 7, Windows 8, Windows Server 2003, Windows
-   Server 2008, or Windows Server 2012. Both 32-bit and 64-bit
-   versions are supported. For supported platform information, see
-   http://www.mysql.com/support/supportedplatforms/database.html.
-
-   In addition to running MySQL as a standard application, you can
-   also run the MySQL server as a Windows service. By using a service
-   you can monitor and control the operation of the server through
-   the standard Windows service management tools. For more
-   information, see Section 2.3.7.7, "Starting MySQL as a Windows
-   Service."
+   The remainder of the installation process involves setting up
+   the configuration file, creating the core databases, and
+   starting the MySQL server. For next steps, see Section 2.10,
+   "Postinstallation Setup and Testing."
+   Note
+
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
+
+2.3 Installing MySQL on Microsoft Windows
 
-   Generally, you should install MySQL on Windows using an account
-   that has administrator rights. Otherwise, you may encounter
-   problems with certain operations such as editing the PATH
-   environment variable or accessing the Service Control Manager.
-   Once installed, MySQL does not need to be executed using a user
-   with Administrator privileges.
+   There are several different methods to install MySQL on
+   Microsoft Windows.
 
-   For a list of limitations within the Windows version of MySQL, see
-   Section E.10.6, "Windows Platform Limitations."
+Simple Installation Method
+
+   The simplest and recommended method is to download MySQL
+   Installer (for Windows) and let it install and configure all
+   of the MySQL products on your system. Here is how:
+
+     * Download MySQL Installer from
+       http://dev.mysql.com/downloads/installer/ and execute it.
+       Note
+       Unlike the standard MySQL Installer, the smaller
+       "web-community" version does not bundle any MySQL
+       applications but it will download the MySQL products you
+       choose to install.
+
+     * Choose the appropriate Setup Type for your system.
+       Typically you will choose Developer Default to install
+       MySQL server and other MySQL tools related to MySQL
+       development, helpful tools like MySQL Workbench. Or,
+       choose the Custom setup type to manually select your
+       desired MySQL products.
+       Note
+       Multiple versions of MySQL server can exist on a single
+       system. You can choose one or multiple versions.
+
+     * Complete the installation process by following the MySQL
+       Installation wizard's instructions. This will install
+       several MySQL products and start the MySQL server.
+
+     * MySQL is now installed. You probably configured MySQL as
+       a service that will automatically start MySQL server
+       every time you restart your system.
+
+   Note
+
+   You probably also installed other helpful MySQL products like
+   MySQL Workbench and MySQL Notifier on your system. Consider
+   loading Chapter 26, "MySQL Workbench" to check your new MySQL
+   server connection, and Section 2.3.4, "MySQL Notifier" to
+   view the connection's status. By default, these two programs
+   automatically start after installing MySQL.
+
+   This process also installs the MySQL Installer application on
+   your system, and later you can use MySQL Installer to upgrade
+   or reconfigure your MySQL products.
+
+Additional Installation Information
+
+   MySQL is available for Microsoft Windows, for both 32-bit and
+   64-bit versions. For supported Windows platform information,
+   see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   It is possible to run MySQL as a standard application or as a
+   Windows service. By using a service, you can monitor and
+   control the operation of the server through the standard
+   Windows service management tools. For more information, see
+   Section 2.3.7.7, "Starting MySQL as a Windows Service."
+
+   Generally, you should install MySQL on Windows using an
+   account that has administrator rights. Otherwise, you may
+   encounter problems with certain operations such as editing
+   the PATH environment variable or accessing the Service
+   Control Manager. Once installed, MySQL does not need to be
+   executed using a user with Administrator privileges.
+
+   For a list of limitations on the use of MySQL on the Windows
+   platform, see Section D.10.6, "Windows Platform Limitations."
 
    In addition to the MySQL Server package, you may need or want
    additional components to use MySQL with your application or
-   development environment. These include, but are not limited to:
+   development environment. These include, but are not limited
+   to:
+
+     * To connect to the MySQL server using ODBC, you must have
+       a Connector/ODBC driver. For more information, including
+       installation and configuration instructions, see MySQL
+       Connector/ODBC Developer Guide
+       (http://dev.mysql.com/doc/connector-odbc/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/ODBC
+       for you.
 
-     * If you plan to connect to the MySQL server using ODBC, you
-       need a Connector/ODBC driver. For more information, including
-       installation and configuration instructions, see Section 22.1,
-       "MySQL Connector/ODBC."
-
-     * If you plan to use MySQL server with .NET applications, you
-       need the Connector/Net driver. For more information, including
-       installation and configuration instructions, see Section 22.2,
-       "MySQL Connector/Net."
+     * To use MySQL server with .NET applications, you must have
+       the Connector/Net driver. For more information, including
+       installation and configuration instructions, see MySQL
+       Connector/Net Developer Guide
+       (http://dev.mysql.com/doc/connector-net/en/index.html).
+       Note
+       MySQL Installer will install and configure Connector/NET
+       for you.
 
    MySQL distributions for Windows can be downloaded from
-   http://dev.mysql.com/downloads/. See Section 2.1.3, "How to Get
-   MySQL."
+   http://dev.mysql.com/downloads/. See Section 2.1.2, "How to
+   Get MySQL."
 
-   MySQL for Windows is available in several distribution formats,
-   detailed below. Generally speaking, you should use MySQL
-   Installer. It contains more features and MySQL products than the
-   older MSI, is simpler to use than the ZIP file, and you need no
-   additional tools to get MySQL up and running. MySQL Installer will
-   automatically install MySQL Server, install additional MySQL
-   products, create an options file, starts the server, and allow you
-   to create default user accounts. For more information on choosing
-   a package, see Section 2.3.2, "Choosing An Installation Package."
-
-   MySQL for Windows is available in several distribution formats,
-   detailed below. Generally speaking, you should use a binary
-   distribution that includes an installer. It is simpler to use than
-   the others, and you need no additional tools to get MySQL up and
-   running. The installer for the Windows version of MySQL, combined
-   with a GUI Config Wizard, automatically installs MySQL, creates an
-   option file, starts the server, and secures the default user
-   accounts.
-
-     * Binary installer distribution. There are two different
-       installable distributions that come packaged as a Microsoft
-       Windows Installer (MSI) package that you can install manually
-       or automatically on your systems. The older MSI package that
-       contains all the files you need to install and configure MySQL
-       server, but no additional components, and the preferred MySQL
-       Installer package that includes MySQL Server and additional
-       MySQL products including MySQL Workbench, MySQL Notifier, and
-       MySQL for Excel. And MySQL Installer can also be used to
-       upgrade these product in the future. For more information on
-       choosing a package, see Section 2.3.2, "Choosing An
-       Installation Package"
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
-
-     * Standard binary distribution format packaged as a Zip file
-       containing all of the necessary files that you unpack into
-       your chosen location. This package contains all of the files
-       in the full Windows MSI Installer package, but does not
-       include an installation program.
-       For instructions on installing MySQL using the Zip file, see
-       Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-       noinstall Zip Archive."
-
-     * The source distribution contains all the code and support
-       files for building the executables using the Visual Studio
-       compiler system.
-       For instructions on building MySQL from source on Windows, see
-       Section 2.10, "Installing MySQL from Source."
+   MySQL for Windows is available in several distribution
+   formats, detailed below. Generally speaking, you should use
+   MySQL Installer. It contains more features and MySQL products
+   than the older MSI, is simpler to use than the Zip file, and
+   you need no additional tools to get MySQL up and running.
+   MySQL Installer automatically installs MySQL Server and
+   additional MySQL products, creates an options file, starts
+   the server, and enables you to create default user accounts.
+   For more information on choosing a package, see Section
+   2.3.2, "Choosing An Installation Package."
+
+     * Binary installer distributions. There are two different
+       installable distributions that come packaged as a
+       Microsoft Windows Installer (MSI) package that you can
+       install manually or automatically on your systems. The
+       preferred MySQL Installer package includes MySQL Server
+       and additional MySQL products including MySQL Workbench,
+       MySQL Notifier, and MySQL for Excel. MySQL Installer can
+       also be used to upgrade these product in the future. The
+       older MSI package contains all the files you need to
+       install and configure MySQL server, but no additional
+       components.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+
+     * The standard binary distribution (packaged as a Zip file)
+       contains all of the necessary files that you unpack into
+       your chosen location. This package contains all of the
+       files in the full Windows MSI Installer package, but does
+       not include an installation program.
+       For instructions on installing MySQL using the Zip file,
+       see Section 2.3.7, "Installing MySQL on Microsoft Windows
+       Using a noinstall Zip Archive."
+
+     * The source distribution format contains all the code and
+       support files for building the executables using the
+       Visual Studio compiler system.
+       For instructions on building MySQL from source on
+       Windows, see Section 2.9, "Installing MySQL from Source."
 
    MySQL on Windows considerations:
 
      * Large Table Support
-       If you need tables with a size larger than 4GB, install MySQL
-       on an NTFS or newer file system. Do not forget to use MAX_ROWS
-       and AVG_ROW_LENGTH when you create tables. See Section
-       13.1.17, "CREATE TABLE Syntax."
+       If you need tables with a size larger than 4GB, install
+       MySQL on an NTFS or newer file system. Do not forget to
+       use MAX_ROWS and AVG_ROW_LENGTH when you create tables.
+       See Section 13.1.17, "CREATE TABLE Syntax."
 
      * MySQL and Virus Checking Software
-       Using virus scanning software such as Norton/Symantec
-       Anti-Virus on directories containing MySQL data and temporary
-       tables can cause issues, both in terms of the performance of
-       MySQL and the virus-scanning software mis-identifying the
-       contents of the files as containing spam. This is because of
-       the fingerprinting mechanism used by the virus scanning
-       software, and the way in which MySQL rapidly updates different
-       files, which may be identified as a potential security risk.
+       Virus-scanning software such as Norton/Symantec
+       Anti-Virus on directories containing MySQL data and
+       temporary tables can cause issues, both in terms of the
+       performance of MySQL and the virus-scanning software
+       misidentifying the contents of the files as containing
+       spam. This is due to the fingerprinting mechanism used by
+       the virus-scanning software, and the way in which MySQL
+       rapidly updates different files, which may be identified
+       as a potential security risk.
        After installing MySQL Server, it is recommended that you
-       disable virus scanning on the main directory (datadir) being
-       used to store your MySQL table data. There is usually a system
-       built into the virus scanning software to permit certain
-       directories to be specifically ignored during virus scanning.
-       In addition, by default, MySQL creates temporary files in the
-       standard Windows temporary directory. To prevent the temporary
-       files also being scanned, you should configure a separate
-       temporary directory for MySQL temporary files and add this to
-       the virus scanning exclusion list. To do this, add a
-       configuration option for the tmpdir parameter to your my.ini
-       configuration file. For more information, see Section 2.3.7.2,
-       "Creating an Option File."
-
-2.3.1. MySQL Installation Layout on Microsoft Windows
-
-   For MySQL 5.5 on Windows, the default installation directory is
-   C:\Program Files\MySQL\MySQL Server 5.5. Some Windows users prefer
-   to install in C:\mysql, the directory that formerly was used as
-   the default. However, the layout of the subdirectories remains the
-   same.
+       disable virus scanning on the main directory (datadir)
+       used to store your MySQL table data. There is usually a
+       system built into the virus-scanning software to enable
+       specific directories to be ignored.
+       In addition, by default, MySQL creates temporary files in
+       the standard Windows temporary directory. To prevent the
+       temporary files also being scanned, configure a separate
+       temporary directory for MySQL temporary files and add
+       this directory to the virus scanning exclusion list. To
+       do this, add a configuration option for the tmpdir
+       parameter to your my.ini configuration file. For more
+       information, see Section 2.3.7.2, "Creating an Option
+       File."
+
+2.3.1 MySQL Installation Layout on Microsoft Windows
+
+   For MySQL 5.5 on Windows, the default installation directory
+   is C:\Program Files\MySQL\MySQL Server 5.5. Some Windows
+   users prefer to install in C:\mysql, the directory that
+   formerly was used as the default. However, the layout of the
+   subdirectories remains the same.
 
-   All of the files are located within this parent directory, using
-   the structure shown in the following table.
+   All of the files are located within this parent directory,
+   using the structure shown in the following table.
 
-   Table 2.4. Default MySQL Installation Layout for Microsoft Windows
+   Table 2.4 Default MySQL Installation Layout for Microsoft
+   Windows
    Directory Contents of Directory Notes
    bin Client programs and the mysqld server
-   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files, databases
-   (Windows XP, Windows Server 2003) The Windows system variable
-   %ALLUSERSPROFILE% defaults to C:\Documents and Settings\All
-   Users\Application Data
-   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases (Vista,
-   Windows 7, Windows Server 2008, and newer) The Windows system
-   variable %PROGRAMDATA% defaults to C:\ProgramData
+   %ALLUSERSPROFILE%\MySQL\MySQL Server 5.5\ Log files,
+   databases (Windows XP, Windows Server 2003) The Windows
+   system variable %ALLUSERSPROFILE% defaults to C:\Documents
+   and Settings\All Users\Application Data
+   %PROGRAMDATA%\MySQL\MySQL Server 5.5\ Log files, databases
+   (Vista, Windows 7, Windows Server 2008, and newer) The
+   Windows system variable %PROGRAMDATA% defaults to
+   C:\ProgramData
    examples Example programs and scripts
    include Include (header) files
    lib Libraries
    scripts Utility scripts
    share Miscellaneous support files, including error messages,
-   character set files, sample configuration files, SQL for database
-   installation
+   character set files, sample configuration files, SQL for
+   database installation
 
-   If you install MySQL using a Windows MSI package, this package
-   creates and sets up the data directory that the installed server
-   will use, but as of MySQL 5.5.5, it also creates a pristine
-   "template" data directory named data under the installation
-   directory. This directory can be useful when the machine will be
-   used to run multiple instances of MySQL: After an installation has
-   been performed using an MSI package, the template data directory
-   can be copied to set up additional MySQL instances. See Section
-   5.3, "Running Multiple MySQL Instances on One Machine."
-
-2.3.2. Choosing An Installation Package
-
-   For MySQL 5.5, there are installation package formats to choose
-   from when installing MySQL on Windows:
-   Note
-
-   MySQL Installer and the "Complete Package" methods for installing
-   MySQL are similar, but different. The MySQL Installer is the newer
-   and more advanced option, and it includes all functionality found
-   within the "Complete Package."
+   If you install MySQL using a Windows MSI package, this
+   package creates and sets up the data directory that the
+   installed server will use, but as of MySQL 5.5.5, it also
+   creates a pristine "template" data directory named data under
+   the installation directory. This directory can be useful when
+   the machine will be used to run multiple instances of MySQL:
+   After an installation has been performed using an MSI
+   package, the template data directory can be copied to set up
+   additional MySQL instances. See Section 5.3, "Running
+   Multiple MySQL Instances on One Machine."
+
+2.3.2 Choosing An Installation Package
+
+   For MySQL 5.5, there are installation package formats to
+   choose from when installing MySQL on Windows:
+   Note
+
+   MySQL Installer and the "Complete Package" methods for
+   installing MySQL are similar, but different. The MySQL
+   Installer is the newer and more advanced option, and it
+   includes all functionality found within the "Complete
+   Package."
 
      * MySQL Installer: This package has a file name similar to
-       mysql-installer-community-5.5.36.0.msi or
-       mysql-installer-commercial-5.5.36.0.msi, and utilizes MSI's to
-       automatically install MySQL server and other products. It will
-       download and apply updates to itself, and for each of the
-       installed products. It also configures the additional
-       non-server products.
-       The installed products are configurable, and this includes:
-       documentation with samples and examples, connectors (such as
-       C, C++, J, NET, and ODBC), MySQL Workbench, MySQL Notifier for
-       Microsoft Windows, MySQL for Excel, and the MySQL Server with
-       its components.
-       MySQL Installer will run on all Windows platforms that are
-       supported by MySQL (see
-       http://www.mysql.com/support/supportedplatforms/database.html)
-       . Note: because MySQL is not a native component of Windows and
-       depends on .NET, it will not work on minimal installation
-       options like the "Server Core" version of Windows Server 2008.
-       For instructions on installing MySQL using MySQL Installer,
-       see Section 2.3.3, "Installing MySQL on Microsoft Windows
-       Using MySQL Installer."
-
-     * The Complete Package: This package has a file name similar to
-       mysql-5.5.36-win32.msi and contains all files needed for a
-       complete Windows installation, including the Configuration
-       Wizard. This package includes optional components such as the
-       embedded server and benchmark suite.
-
-     * The Noinstall Archive: This package has a file name similar to
-       mysql-5.5.36-win32.zip and contains all the files found in the
-       Complete install package, with the exception of the
-       Configuration Wizard. This package does not include an
-       automated installer, and must be manually installed and
-       configured.
-
-   MySQL Installer is recommended for most users. Both MySQL
-   Installer and the alternative "Complete distribution" versions are
-   available as .msi files for use with installations on Windows. The
-   Noinstall distribution is packaged as a Zip archive. To use a Zip
-   archive, you must have a tool that can unpack .zip files.
-
-   Your choice of install package affects the installation process
-   you must follow. If you choose to install using MySQL Installer,
-   see Section 2.3.3, "Installing MySQL on Microsoft Windows Using
-   MySQL Installer." If you choose to install a standard MSI package,
-   see Section 2.3.5, "Installing MySQL on Microsoft Windows Using an
-   MSI Package." If you choose to install a Noinstall archive, see
-   Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-   noinstall Zip Archive."
-
-2.3.3. Installing MySQL on Microsoft Windows Using MySQL Installer
-
-   MySQL Installer is an application that simplifies the installation
-   and updating process for a wide range of MySQL products, including
-   MySQL Notifier for Microsoft Windows, MySQL Workbench, and MySQL
-   for Excel. From this central application, you can see which MySQL
-   products are already installed, configure them, and update or
-   remove them if necessary. The installer can also install plugins,
-   documentation, tutorials, and example databases. The MySQL
-   Installer is only available for Microsoft Windows, and includes
-   both a GUI and command-line interface.
+       mysql-installer-community-5.5.44.0.msi or
+       mysql-installer-commercial-5.5.44.0.msi, and utilizes
+       MSIs to automatically install MySQL server and other
+       products. It will download and apply updates to itself,
+       and for each of the installed products. It also
+       configures the additional non-server products.
+       The installed products are configurable, and this
+       includes: documentation with samples and examples,
+       connectors (such as C, C++, J, NET, and ODBC), MySQL
+       Workbench, MySQL Notifier, MySQL for Excel, and the MySQL
+       Server with its components.
+       MySQL Installer will run on all Windows platforms that
+       are supported by MySQL (see
+       http://www.mysql.com/support/supportedplatforms/database.
+       html).
+       Note
+       Because MySQL Installer is not a native component of
+       Microsoft Windows and depends on .NET, it will not work
+       on minimal installation options like the "Server Core"
+       version of Windows Server 2008.
+       For instructions on installing MySQL using MySQL
+       Installer, see Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+
+     * The Complete Package: This package has a file name
+       similar to mysql-5.5.44-win32.msi or
+       mysql-5.5.44-winx64.zip, and contains all files needed
+       for a complete Windows installation, including the
+       Configuration Wizard. This package includes optional
+       components such as the embedded server and benchmark
+       suite.
+
+     * The Noinstall Archive: This package has a file name
+       similar to mysql-5.5.44-win32.zip or
+       mysql-5.5.44-winx64.zip, and contains all the files found
+       in the Complete install package, with the exception of
+       the GUI. This package does not include an automated
+       installer, and must be manually installed and configured.
+
+   MySQL Installer is recommended for most users.
+
+   Your choice of install package affects the installation
+   process you must follow. If you choose to use MySQL
+   Installer, see Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer." If you choose to install a
+   standard MSI package, see Section 2.3.5, "Installing MySQL on
+   Microsoft Windows Using an MSI Package." If you choose to
+   install a Noinstall archive, see Section 2.3.7, "Installing
+   MySQL on Microsoft Windows Using a noinstall Zip Archive."
+
+2.3.3 Installing MySQL on Microsoft Windows Using MySQL Installer
+
+   MySQL Installer simplifies the installation and updating
+   process for your MySQL products on Microsoft Windows. From
+   this central application, you can view, remove, update, and
+   reconfigure the existing MySQL products on your system. MySQL
+   Installer can also install plugins, documentation, tutorials,
+   and example databases. The MySQL Installer is only available
+   for Microsoft Windows, and includes both GUI and command-line
+   interfaces.
+
+   The supported products include:
+
+     * MySQL server (http://dev.mysql.com/doc/) (one or multiple
+       versions)
+
+     * MySQL Workbench
+
+     * MySQL Connectors
+       (http://dev.mysql.com/doc/index-connectors.html) (.Net /
+       Python / ODBC / Java / C / C++)
+
+     * MySQL Notifier
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html)
+
+     * MySQL for Visual Studio
+       (http://dev.mysql.com/doc/connector-net/en/connector-net-
+       visual-studio.html)
+
+     * MySQL Utilities and MySQL Fabric
+       (http://dev.mysql.com/doc/index-utils-fabric.html)
+
+     * MySQL Samples and Examples
+
+     * MySQL Documentation
+
+     * MySQL Installer is also installed and remains on the
+       system as its own application
 
 Installer package types
 
 
-     * Full: Bundles all of the MySQL products (including MySQL
-       Server). The file is over 160MB, and have names of the form
-       mysql-installer-community-VERSION.N.msi where VERSION is the
-       MySQL Server version number such as 5.6 and N is the package
-       number, which begins at 0.
-
-     * Web: Only contains the Installer and configuration files, and
-       it only downloads the MySQL products you choose to install.
-       The file is about 2MB, and have names of the form
-       mysql-installer-community-web-VERSION.N.msi where VERSION is
-       the MySQL Server version number such as 5.6 and N is the
-       package number, which begins at 0.
+     * Full: Bundles all of the MySQL products (including the
+       MySQL server). The file' size is over 200MB, and its name
+       has the form mysql-installer-community-VERSION.N.msi
+       where VERSION is the MySQL Server version number such as
+       5.6 and N is the package number, which begins at 0.
+
+     * Web: Only contains the Installer and configuration files,
+       and it only downloads the MySQL products you choose to
+       install. The size of this file is about 2MB; the name of
+       the file has the form
+       mysql-installer-community-web-VERSION.N.msi where VERSION
+       is the MySQL Server version number such as 5.6 and N is
+       the package number, which begins at 0.
 
 Installer editions
 
 
      * Community edition: Downloadable at
-       http://dev.mysql.com/downloads/installer/. It installs the
-       community edition of all MySQL products.
+       http://dev.mysql.com/downloads/installer/. It installs
+       the community edition of all MySQL products.
 
-     * Commercial edition: Downloadable at either My Oracle Support
-       (https://support.oracle.com/) (MOS) or
+     * Commercial edition: Downloadable at either My Oracle
+       Support (https://support.oracle.com/) (MOS) or
        https://edelivery.oracle.com/. It installs the commercial
-       version of all MySQL products, including Workbench SE. It also
-       integrates with your MOS account, so enter in your MOS
-       credentials to automatically receive updates for your
-       commercial MySQL products.
+       version of all MySQL products, including Workbench SE/EE.
+       It also integrates with your MOS account.
+       Note
+       Entering your MOS credentials is optional when installing
+       bundled MySQL products, but your credentials are required
+       when choosing non-bundled MySQL products that MySQL
+       Installer must download.
 
-   For release notes detailing the changes in each release of MySQL
+   For notes detailing the changes in each release of MySQL
    Installer, see MySQL Installer Release Notes
    (http://dev.mysql.com/doc/relnotes/mysql-installer/en/).
 
-   MySQL Installer is compatible with pre-existing installations, and
-   adds them to its list of installed components. And while the MySQL
-   Installer is bundled with a specific version of MySQL Server, a
-   single MySQL Installer instance can install and manage multiple
-   MySQL Server versions. For example, a single MySQL Installer
-   instance can install versions 5.1, 5.5, and 5.6. It can also
-   manage either commercial or community editions of the MySQL
-   Server.
+   MySQL Installer is compatible with pre-existing
+   installations, and adds them to its list of installed
+   components. While the standard MySQL Installer is bundled
+   with a specific version of MySQL Server, a single MySQL
+   Installer instance can install and manage multiple MySQL
+   Server versions. For example, a single MySQL Installer
+   instance can install (and update) versions 5.5, 5.6, and 5.7
+   on the host.
+   Note
+
+   A single host can not have both community and commercial
+   editions of MySQL Server installed. For example, if you want
+   both MySQL Server 5.5 and 5.6 installed on a single host,
+   then both must be the same edition.
+
+   MySQL Installer handles the initial configuration and set up
+   of the applications. For example:
+
+    1. It creates initial MySQL Server connections in MySQL
+       Workbench.
+
+    2. It creates the configuration file (my.ini) that is used
+       to configure the MySQL Server. The values written to this
+       file are influenced by choices you make during the
+       installation process.
+
+    3. It can optionally import example databases.
+
+    4. It can optionally create MySQL Server user accounts with
+       configurable permissions based on general roles, such as
+       DB Administrator, DB Designer, and Backup Admin. It
+       optionally creates a Windows user named MysqlSys with
+       limited privileges, which would then run the MySQL
+       Server.
+       User accounts may also be added and configured in MySQL
+       Workbench.
+
+    5. If the "Advanced Configuration" option is checked, then
+       the Logging Options are also configured. This includes
+       defining file paths for the error log, general log, slow
+       query log (including the configuration of seconds it
+       requires to execute a query), and the binary log.
+
+   MySQL Installer can optionally check for updated components
+   and download them for you.
+
+2.3.3.1 MySQL Installer GUI
+
+   Installing MySQL Installer adds a link to the Start menu
+   under the MySQL group. Click Start, All Programs MySQL, MySQL
+   Installer to reload the MySQL Installer GUI.
+   Note
+
+   Files that are generated by MySQL Installer grant full
+   permissions to the user that executes MySQL Installer,
+   including my.ini. This does not apply to files and
+   directories for specific products such as the MySQL Server
+   data directory in %ProgramData% that is owned by SYSTEM.
+
+   The initial execution of MySQL Installer requires you to
+   accept the license agreement before installing MySQL
+   products.
+
+   Figure 2.7 MySQL Installer - License Agreement
+   MySQL Installer - License Agreement
+
+Installing New Packages
+
+   Choose the appropriate Setup Type for your system. The
+   selected type determines which MySQL products are installed
+   on your system, or select Custom to manually choose
+   individual products.
+
+     * Developer: Install all products needed to develop
+       applications with MySQL. This is the default option.
+
+     * Server only: Only install the MySQL server.
+
+     * Client only: Only install the MySQL client products,
+       which does not include the MySQL server.
+
+     * Full: Install all MySQL products.
+
+     * Custom: Manually select the MySQL products to install.
+       Note
+       After the initial installation, you may use MySQL
+       Installer to manually select MySQL products to install or
+       remove. In other words, MySQL Installer becomes a MySQL
+       product management system.
+
+   Figure 2.8 MySQL Installer - Choosing a Setup Type
+   MySQL Installer - Choosing a Setup Type
+
+   After you select a setup type, the MySQL Installer will check
+   your system for the necessary external requirements for each
+   of the selected MySQL products. MySQL Installer will either
+   download and install the missing components onto your system,
+   or point you to the download location and set Status to
+   "Manual".
+
+   The next window lists the MySQL products that are scheduled
+   to be installed:
+
+   Figure 2.9 MySQL Installer - Installation Progress
+   MySQL Installer - Installation Progress
+
+   As components are installed, their Status changes from a
+   progress percentage to "Complete".
+
+   After all components are installed, the next step configures
+   some of the recently installed MySQL products. The
+   Configuration Overview window displays the progress and then
+   loads a configuration window, if required. Our example
+   configures MySQL Server 5.6.x.
+
+Configuring MySQL Server
+
+   Configuring the MySQL server begins with defining several
+   Type and Networking options.
+
+   Figure 2.10 MySQL Installer - Configuration Overview
+   MySQL Installer - Configuration Overview
+
+   Server Configuration Type
+
+   Choose the MySQL server configuration type that describes
+   your setup. This setting defines the amount of system
+   resources that will be assigned to your MySQL server
+   instance.
+
+     * Developer: A machine that will host many other
+       applications, and typically this is your personal
+       workstation. This option configures MySQL to use the
+       least amount of memory.
+
+     * Server: Several other applications will be running on
+       this machine, such as a web server. This option
+       configures MySQL to use a medium amount of memory.
+
+     * Dedicated: A machine that is dedicated to running the
+       MySQL server. Because no other major applications are
+       running on the server, such as web servers, this option
+       configures MySQL to use all available memory.
+
+   Connectivity
+
+   Connectivity options control how you will connect to MySQL.
+   Options include:
+
+     * TCP/IP: You may enable TCP/IP Networking here as
+       otherwise only localhost connections are allowed. Also
+       define the Port Number and whether to open the firewall
+       port for network access.
+
+     * Named Pipe: Enable and define the pipe name, similar to
+       using the --enable-named-pipe option.
+
+     * Shared Memory: Enable and then define the memory name,
+       similar to using the --shared-memory option.
+
+   Advanced Configuration
+
+   Checking the "Advanced Configuration" option provides
+   additional Logging Options to configure. This includes
+   defining file paths for the error log, general log, slow
+   query log (including the configuration of seconds it requires
+   to execute a query), and the binary log.
+
+   Figure 2.11 MySQL Installer - MySQL Server Configuration:
+   Type and Networking
+   MySQL Installer- MySQL Server Configuration: Type and
+   Networking
+
+Accounts and Roles
+
+   Next, define your MySQL account information. Assigning a root
+   password is required.
+
+   Optionally, you can add additional MySQL user accounts with
+   predefined user roles. Each predefined role, such as "DB
+   Admin", are configured with their own set of privileges. For
+   example, the "DB Admin" role has more privileges than the "DB
+   Designer" role. Click the Role dropdown for a list of role
+   descriptions.
+   Note
+
+   If the MySQL Server is already installed, then you must also
+   enter the Current Root Password.
+
+   Figure 2.12 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles
+
+   Figure 2.13 MySQL Installer - MySQL Server Configuration:
+   User Accounts and Roles: Adding a User
+   MySQL Installer - MySQL Server Configuration: User Accounts
+   and Roles: Adding a User
+
+Windows Service
+
+   Next, configure the Windows Service details. This includes
+   the service name, whether the MySQL Server should be loaded
+   at startup, and how the Windows Service for MySQL Server is
+   executed.
+
+   Figure 2.14 MySQL Installer - MySQL Server Configuration:
+   Windows Service
+   MySQL Installer - MySQL Server Configuration: Windows Service
    Note
 
-   A single host can not have both community and commercial editions
-   of MySQL Server installed. For example, if you want both MySQL
-   Server 5.5 and 5.6 installed on a single host, then both must be
-   the same commercial or community edition.
+   When configuring Run Windows Services as ... using a Custom
+   User, the custom user must have privileges to log on to
+   Microsoft Windows as a service. And the Next button will be
+   disabled until this user is configured with these user
+   rights.
+
+   On Microsoft Windows 7, this is configured by loading the
+   Start Menu, Control Panel, Administrative Tools, Local
+   Security Policy, Local Policies, User Rights Assignment, then
+   Log On As A Service. Choose Add User or Group here to add the
+   custom user, and then OK, OK to save.
+
+Advanced Options
+
+   The next configuration step is available if the Advanced
+   Configuration option was checked. This section includes
+   options that are related to the MySQL log files:
+
+   Figure 2.15 MySQL Installer - MySQL Server Configuration:
+   Logging Options
+   MySQL Installer - MySQL Server Configuration: Logging Options
+
+   Click Next to continue on to the final page before all of the
+   requested changes are applied. This Apply Server
+   Configuration page details the configuration steps that will
+   be performed.
 
-   MySQL Installer handles the initial configuration and setup of the
-   applications. For example:
+   Figure 2.16 MySQL Installer - MySQL Server Configuration:
+   Apply Server Configuration
+   MySQL Installer - MySQL Server Configuration: Apply Server
+   Configuration
 
-    1. It will create MySQL Server connections in MySQL Workbench.
+   Click Execute to execute the configuration steps. The icon
+   for each step toggles from white to green on success, or the
+   process stops on failure. Click the Log tab to view the log.
 
-    2. It creates the configuration file (my.ini) that is used to
-       configure the MySQL Server. The values written to this file
-       are influenced by choices you make during the installation
-       process.
+   After the MySQL Installer configuration process is finished,
+   MySQL Installer reloads the opening page where you can
+   execute other installation and configuration related actions.
 
-    3. It imports example databases.
+   MySQL Installer is added to the Microsoft Windows Start menu
+   under the MySQL group. Opening MySQL Installer loads its
+   dashboard where installed MySQL products are listed, and
+   other MySQL Installer actions are available:
 
-    4. It creates MySQL Server user accounts with configurable
-       permissions based on general roles, such as DB Administrator,
-       DB Designer, and Backup Admin. It optionally creates a Windows
-       user named MysqlSys with limited privileges, which would then
-       run the MySQL Server.
-       This feature is only available during the initial installation
-       of the MySQL Server, and not during future updates. User
-       accounts may also be added with MySQL Workbench.
+   Figure 2.17 MySQL Installer - Main Dashboard
+   MySQL Installer - Main Dashboard
 
-    5. If the "Advanced Configuration" option is checked, then the
-       Logging Options are also configured. This includes defining
-       file paths for the error log, general log, slow query log
-       (including the configuration of seconds it requires to execute
-       a query), and the binary log.
+Adding MySQL Products
 
-   MySQL Installer can optionally check for updated components and
-   download them for you automatically.
+   Click Add to add new products. This loads the Select Products
+   and Features page:
 
-2.3.3.1. MySQL Installer GUI
+   Figure 2.18 MySQL Installer - Select Products and Features
+   MySQL Installer - Select Products and Features
 
-   After installation of the GUI version, the installer will have add
-   its own Start Menu item under MySQL.
+   From here, choose the MySQL products you want to install from
+   the left Available Products pane, and then click the green
+   right arrow to queue products for installation.
+
+   Optionally, click Edit to open the product and features
+   search filter:
+
+   Figure 2.19 MySQL Installer - Select Products and Features
+   Filter
+   MySQL Installer - Select Products and Features Filter
+
+   For example, you might choose to include Pre-Release products
+   in your selections, such as a Beta product that has not yet
+   reached GA status.
    Note
 
-   Files that are generated by MySQL Installer grant full permissions
-   to the user that executes MySQL Installer, including my.ini. This
-   does not apply to files and directories for specific products such
-   as the MySQL Server data directory in ProgramData, that is owned
-   by SYSTEM.
+   The ability to install Pre-Release versions of MySQL products
+   was added in MySQL Installer 1.4.0.
+
+   Select all of the MySQL products you want to install, then
+   click Next to continue, and then Execute to execute the
+   installation process to install all of the selected products.
 
-   After the installer itself has been installed and started, the
-   following screen is displayed:
+2.3.3.1.1 MySQL Product Catalog
 
-   Figure 2.7. MySQL Installer - Welcome Screen
-   MySQL Installer - Welcome Screen
+   MySQL Installer stores a MySQL product catalog. The catalog
+   can be updated either manually or automatically, and the
+   catalog change history is also available.
+   Note
 
-   There are three main options:
+   The MySQL product catalog was added in MySQL Installer 1.4.0.
 
-    1. Install MySQL Products - The Installation Wizard.
+   Manual updates
 
-    2. About MySQL - Learn about MySQL products and features.
+   You can update the MySQL product catalog at any time by
+   clicking Catalog on the Installer dashboard.
 
-    3. Resources - Information to help install and configure MySQL.
+   Figure 2.20 MySQL Installer - Open the MySQL Product Catalog
+   MySQL Installer - Open the MySQL Product Catalog
 
-   To Install MySQL Products after executing MySQL Installer for the
-   first time, you must accept the license agreement before
-   proceeding with the installation process.
+   From there, click Execute to update the product catalog.
 
-   Figure 2.8. MySQL Installer - License Agreement
-   MySQL Installer - License Agreement
+   Automatic updates
 
-   If you are connected to the Internet, then the Installer will
-   search for the latest MySQL components and add them to the
-   installation bundle. Click Connect to the Internet to complete
-   this step, or otherwise check the Skip checkbox and then Continue.
-
-   Figure 2.9. MySQL Installer - Find latest products
-   MySQL Installer - Find latest products
-
-   If you chose "Connect to the Internet," the next page will show
-   the progress of MySQL Installer's search for available updates.
-   When the search is complete (or if you opted to skip the search),
-   you will be taken to the Choose Setup Type page:
+   You can configure MySQL Installer to automatically update the
+   MySQL product catalog once per day. To enable this feature
+   and set the update time, click the wrench icon on the
+   Installer dashboard.
 
-   Figure 2.10. MySQL Installer - Choosing a Setup Type
-   MySQL Installer - Choosing a Setup Type
+   The next window configures the Automatic Catalog Update.
+   Enable or disable this feature, and also set the hour.
 
-   Determine the option most compatible with your preferences by
-   reading the Setup Type Description descriptions.
+   Figure 2.21 MySQL Installer - Configure the Catalog Scheduler
+   MySQL Installer - Configure the Catalog Scheduler
 
-   The Installation and Data paths are also defined here, and a
-   caution flag will notify you if the data path you define already
-   exists.
+   This option uses the Windows Task Scheduler to schedule a
+   task named "ManifestUpdate".
 
-   After you select a setup type, the MySQL Installer will check your
-   system for the necessary external requirements and download then
-   install missing components onto your system.
+   Change History
 
-   Figure 2.11. MySQL Installer - Check Requirements
-   MySQL Installer - Check Requirements
+   MySQL Installer tracks the change history for all of the
+   MySQL products. Click Catalog from the dashboard, optionally
+   update the catalog (or, toggle the Do not update at this time
+   checkbox), click Next/Execute, and then view the change
+   history.
 
-   The next window lists the MySQL products that are scheduled to be
-   installed:
+   Figure 2.22 MySQL Installer - Catalog Change History
+   MySQL Installer - Catalog Change History
 
-   Figure 2.12. MySQL Installer - Installation Progress
-   MySQL Installer - Installation Progress
+2.3.3.1.2 Remove MySQL Products
 
-   As components are installed, you'll see their status change from
-   "to be installed" to "install success."
+   MySQL Installer can also remove MySQL products from your
+   system. To remove a MySQL product, click Remove from the
+   Installer dashboard. This opens a window with a list of
+   installed MySQL products. Select the MySQL products you want
+   to remove (uninstall), and then click Execute to begin the
+   removal process.
+   Note
 
-   Figure 2.13. MySQL Installer - Installation Progress status
-   MySQL Installer - Installation Progress status
+   To select all MySQL products, click the [ ] checkbox to the
+   left of the Product label.
 
-   After all components are installed, the next step involves
-   configuring the products. The Configuration Overview window
-   displays the progress and then loads a configuration window if it
-   is required.
+   Figure 2.23 MySQL Installer - Removing Products: Select
+   MySQL Installer - Removing Products: Select
 
-   Figure 2.14. MySQL Installer - Configuration Overview
-   MySQL Installer - Configuration Overview
+   Figure 2.24 MySQL Installer - Removing Products: Executed
+   MySQL Installer - Removing Products: Executed
+
+2.3.3.1.3 Alter MySQL Products
+
+   MySQL Installer offers several options to alter your MySQL
+   product installations.
+
+Upgrade
+
+   MySQL products with an available upgrade are highlighted on
+   the main dashboard. Products with available upgrades will
+   have an upgrade icon next to their version number.
+
+   Figure 2.25 MySQL Installer - Upgrade a MySQL Product
+   MySQL Installer - Upgrade a MySQL Product
+   Note
+
+   Available upgrades are determined by having a current
+   catalog. For information about keeping your MySQL product
+   catalog current, see Section 2.3.3.1.1, "MySQL Product
+   Catalog."
+
+   Click Upgrade to view a list upgradable products. Our example
+   indicates that MySQL server 5.6.19 can be upgraded to version
+   5.6.20.
+
+   Figure 2.26 MySQL Installer - Select Products To Upgrade
+   MySQL Installer - Select Products To Upgrade
+
+   Select (check) the products to upgrade, and optionally click
+   the changes link to view the product's release notes in your
+   browser. Click Next to begin the upgrade process.
+
+   Figure 2.27 MySQL Installer - Apply Updates
+   MySQL Installer - Apply Updates
+
+   A MySQL server upgrade will also check and upgrade the
+   server's database. Although optional, this step is
+   recommended.
+
+   Figure 2.28 MySQL Installer - Check and Upgrade Database
+   MySQL Installer - Check and Upgrade Database
+
+   Upon completion, your upgraded products will be upgraded and
+   available to use. A MySQL server upgrade also restarts the
+   MySQL server.
+
+Reconfigure
+
+   Some MySQL products, such as the MySQL server, include a
+   Reconfigure option. It opens the same configuration options
+   that were set when the MySQL product was installed, and is
+   pre-populated with the current values.
+
+   To execute, click the Reconfigure link under the Quick Action
+   column on the main dashboard for the MySQL product that you
+   want to reconfigure.
+
+   Figure 2.29 MySQL Installer - Reconfigure a MySQL Product
+   MySQL Installer - Reconfigure a MySQL Product
+
+   In the case of the MySQL server, this opens the familiar
+   configuration wizard.
+
+   Figure 2.30 MySQL Installer - Reconfiguration Wizard
+   MySQL Installer - Reconfiguration Wizard
 
-   The ideal MySQL Server configuration depends on your intended use,
-   as explained in the next window. Choose the description that most
-   closely applies to your machine.
-
-   You may enable TCP/IP Networking here as otherwise only localhost
-   connections are allowed.
-
-   Checking the "Advanced Configuration" option provides additional
-   Logging Options to configure. This includes defining file paths
-   for the error log, general log, slow query log (including the
-   configuration of seconds it requires to execute a query), and the
-   binary log.
-
-   Figure 2.15. MySQL Installer - MySQL Server Configuration: Define
-   platform, networking, and logging options
-   MySQL Installer- MySQL Server Configuration: Define platform,
-   networking, and logging options
-
-   Next, choose your account information. Defining a root password is
-   required, whereas it's optional to create additional users. There
-   are several different predefined user roles that each have
-   different permission levels. For example, a "DB Admin" will have
-   more privileges than a "DB Designer.".
-
-   Figure 2.16. MySQL Installer - MySQL Server Configuration: User
-   accounts
-   MySQL Installer - MySQL Server Configuration: User accounts
-   Note
-
-   If the MySQL Server is already installed, then the Current Root
-   Password will also be needed.
-
-   Next, configure the Windows Service Details. This includes the
-   service name, how the MySQL Server should be loaded at startup,
-   and how the Windows Service for MySQL Server will be run.
-
-   Figure 2.17. MySQL Installer - MySQL Server Configuration: Windows
-   service details
-   MySQL Installer - MySQL Server Configuration: Windows service
-   details
-   Note
-
-   When configuring Run Windows Services as ... using a Custom User,
-   the custom user must have privileges to log on to Windows as a
-   service. And the Next button will be disabled until this user is
-   given these user rights.
-
-   On Microsoft Windows 7, this is configured by loading the Start
-   Menu, Control Panel, Administrative Tools, Local Security Policy,
-   Local Policies, User Rights Assignment, then Log On As A Service.
-   Choose Add User or Group here to add the custom user, and then OK,
-   OK to save.
-
-   The final configuration step is available if the Advanced
-   Configuration option was checked, and it includes configuration
-   options related to log file names:
-
-   Figure 2.18. MySQL Installer - MySQL Server Configuration: Logging
-   options
-   MySQL Installer - MySQL Server Configuration: Logging options
-
-   After the MySQL Installer configuration process is completed, you
-   may save the installation log, and then load MySQL Workbench if
-   the Start MySQL Workbench after Setup option is checked:
-
-   Figure 2.19. MySQL Installer - Installation Complete
-   MySQL Installer - Installation Complete
-
-   You can now open MySQL Installer from the Microsoft Windows Start
-   menu under the MySQL group, which will load the MySQL Installer
-   Maintenance Screen. This is used to add, update, and remove
-   features.
-
-   Figure 2.20. MySQL Installer - Maintenance Screen
-   MySQL Installer - Maintenance Screen
-   Note
-
-   An Update Screen screen is shown if MySQL Installer is used on a
-   machine with older products installed, as opposed to the
-   Maintenance Screen shown above. However, the functionality remains
-   the same.
-
-   Add/Modify Products and Features will list all installed and
-   available MySQL products.
-
-   Figure 2.21. MySQL Installer - Add/Modify Products and Features
-   MySQL Installer - Add/Modify Products and Features
-
-   The installation is now complete. MySQL Server should be running,
-   and most MySQL products installed and available for use.
-
-   See also the MySQL Workbench documentation
-   (http://dev.mysql.com/doc/workbench/en/).
-
-2.3.3.2. MySQL Installer Console
-
-   MySQLInstallerConsole provides functionality similar to the GUI
-   version of MySQL Installer, but from the command-line. It is
-   installed when MySQL Installer is initially executed, and then
-   available within the MySQL Installer directory. Typically that is
-   in C:\Program Files (x86)\MySQL\MySQL Installer\, and the console
-   must be executed with administrative privileges.
-
-   To use, invoke the Command Prompt with administrative privileges
-   by choosing Start, Accessories, then right-click on Command Prompt
-   and choose Run as administrator. And from the command-line,
-   optionally change the directory to where MySQLInstallerConsole is
-   located:
+Modify
+
+   Many MySQL products contain feature components that can be
+   added or removed. For example, Debug binaries and Client
+   Programs are subcomponents of the MySQL server.
+
+   The modify the features of a product, click Modify on the
+   main dashboard.
+
+   Figure 2.31 MySQL Installer - Modify Product Features
+   MySQL Installer - Modify Product Features
+
+   Click Execute to execute the modification request.
+
+2.3.3.2 MySQL Installer Console
+
+   MySQLInstallerConsole provides functionality similar to the
+   GUI version of MySQL Installer, but from the command-line. It
+   is installed when MySQL Installer is initially executed, and
+   then available within the MySQL Installer directory.
+   Typically that is in C:\Program Files (x86)\MySQL\MySQL
+   Installer\, and the console must be executed with
+   administrative privileges.
+
+   To use, invoke the Command Prompt with administrative
+   privileges by choosing Start, Accessories, then right-click
+   on Command Prompt and choose Run as administrator. And from
+   the command-line, optionally change the directory to where
+   MySQLInstallerConsole is located:
 C:\> cd "C:\Program Files (x86)\MySQL\MySQL Installer"
+C:\> MySQLInstallerConsole.exe help
 
-   MySQLInstallerConsole supports the following options, which are
-   specified on the command line:
+C:\Program Files (x86)\MySQL\MySQL Installer for Windows>MySQLInstalle
+rConsole.exe help
 
-     * --help, -h, or -?
-       Displays a help message with usage examples, and then exits.
-C:\> MySQLInstallerConsole --help
-
-     * --updates (or -u)
-       Checks for new products before any further action is taken.
-       Disabled by default.
-
-     * --nowait
-       Skips the final pause when the program finishes. Otherwise, a
-       "Press Enter to continue." dialogue is generated. It is used
-       in conjunction with other options.
-
-     * --catalog=catalog_name (or -c)
-       Sets the default catalog. Use --list to view a list of
-       available catalogs.
-
-     * --type=installation_type (or -t)
-       Sets the installation type.
-       The possible values for installation_type are: developer,
-       server, client, full, and custom.
-
-     * --action=action_name
-       The action being performed.
-       The possible values are: install, remove, upgrade, list, and
-       status.
-
-          + install: Installs a product or products, as defined by
-            --products
-
-          + upgrade: Upgrades a product or products, as defined by
-            --products.
-
-          + remove: Removes a product or products, as defined by
-            --products.
-
-          + list: Lists the product manifest, both installed and
-            available products.
-
-          + status: Shows the status after another action is
-            performed.
-
-     * --product=product_name[:feature1],[feature2], [...] (or -p)
-       Set the feature list of a product. Use --list to view
-       available products, or pass in --product=* (an asterisk) to
-       install all available products.
-
-     * --config=product_name:passwd=root_password[;parameter1=value],
-       [;parameter2=value], ...
-       The configuration parameters for the most recently listed
-       products.
+The following commands are available:
+
+Configure - Configures one or more of your installed programs.
+Help      - Provides list of available commands.
+Install   - Install and configure one or more available MySQL programs
+.
+List      - Provides an interactive way to list all products available
+.
+Modify    - Modifies the features of installed products.
+Remove    - Removes one or more products from your system.
+Status    - Shows the status of all installed products.
+Update    - Update the current product catalog.
+Upgrade   - Upgrades one or more of your installed programs.
+
+   MySQLInstallerConsole supports the following options, which
+   are specified on the command line:
+
+     * configure [product1]:[setting]=[value];
+       [product2]:[setting]=[value]; [...]
+       Configure one or more MySQL products on your system.
+       Switches include:
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole configure -showsettings server
+C:\> MySQLInstallerConsole configure server:port=3307
+
+
+     * help [command]
+       Displays a help message with usage examples, and then
+       exits. Pass in an additional command to receive help
+       specific to that command.
+C:\> MySQLInstallerConsole help
+C:\> MySQLInstallerConsole help install
+
+
+     * install [product]:[features]:[config block]:[config
+       block]:[config block]; [...]
+       Install one or more MySQL products on your system.
+       Switches and syntax options include:
+
+          + -type=[SetupType] : Installs a predefined set of
+            software. The "SetupType" can be one of the
+            following:
+            Note
+            Non-custom setup types can only be chosen if no
+            other MySQL products are installed.
+               o Developer: Installs a complete development
+                 environment.
+               o Server: Installs a single MySQL server
+               o Client: Installs client programs and libraries
+               o Full: Installs everything
+               o Custom: Installs user selected products. This
+                 is the default option.
+
+          + -showsettings : Displays the available options for
+            the selected product, by passing in the product name
+            after -showsettings.
+
+          + -silent : Disable confirmation prompts.
+
+          + [config block]: One or more configuration blocks can
+            be specified. Each configuration block is a
+            semicolon separated list of key value pairs. A block
+            can include either a "config" or "user" type key,
+            where "config" is the default type if one is not
+            defined.
+            Only one "config" type block can be defined per
+            product. A "user" block should be defined for each
+            user that should be created during the product's
+            installation.
+            Note
+            Adding users is not supported when a product is
+            being reconfigured.
+
+          + [feature]: The feature block is a semicolon
+            separated list of features, or '*' to select all
+            features.
+C:\> MySQLInstallerConsole install server;5.6.22:*:port=3307;serverid=
+2:type=user;username=foo;password=bar;role=DBManager
+C:\> MySQLInstallerConsole install server;5.6.22;x64 -silent
+
+
+     * list
+       Lists an interactive console where all of the available
+       MySQL products can be searched. Execute
+       MySQLInstallerConsole list to launch the console, and
+       enter in a substring to search.
+C:\> MySQLInstallerConsole list
+
+
+     * modify [product1:-removelist|+addlist]
+       [product2:-removelist|+addlist] [...]
+       Modifies or displays features of a previously installed
+       MySQL product.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole modify server
+C:\> MySQLInstallerConsole modify server:+documentation
+C:\> MySQLInstallerConsole modify server:-debug
+
+
+     * remove [product1] [product2] [...]
+       Removes one ore more products from your system.
+
+          + * : Pass in * to remove all of the MySQL products.
+
+          + -continue : Continue the operation even if an error
+            occurs.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole remove *
+C:\> MySQLInstallerConsole remove server
+
+
+     * status
+       Provides a quick overview of the MySQL products that are
+       installed on the system. Information includes product
+       name and version, architecture, date installed, and
+       install location.
+C:\> MySQLInstallerConsole status
+
+
+     * upgrade [product1:version] [product2:version], [...]
+       Upgrades one or more products on your system. Syntax
+       options include:
+
+          + * : Pass in * to upgrade all products to the latest
+            version, or pass in specific products.
+
+          + ! : Pass in ! as a version number to upgrade the
+            MySQL product to its latest version.
+
+          + -silent : Disable confirmation prompts.
+C:\> MySQLInstallerConsole upgrade *
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2
+C:\> MySQLInstallerConsole upgrade workbench:!
+C:\> MySQLInstallerConsole upgrade workbench:6.2.2 excel:1.3.2
+
+
+     * update
+       Downloads the latest MySQL product catalog to your
+       system. On success, the download catalog will be applied
+       the next time either MySQLInstaller or
+       MySQLInstallerConsole is executed.
+C:\> MySQLInstallerConsole update
+
+       Note
+       The Automatic Catalog Update GUI option executes this
+       command from the Windows Task Scheduler.
+
+2.3.4 MySQL Notifier
 
-     * --user=product_name:name=username,host:hostname,role=rolename,
-       password=password or
-       --user=product_name:name=username,host:hostname,role=rolename,
-       tokens=tokens
-       Creates a new user.
-       Requires: name, host, role, and the password or tokens. Tokens
-       are separated by pipe ("|") characters.
-
-2.3.4. MySQL Notifier for Microsoft Windows
-
-   The MySQL Notifier for Microsoft Windows is a tool that enables
-   you to monitor and adjust the status of your local and remote
-   MySQL Server instances through an indicator that resides in the
-   system tray. The MySQL Notifier for Microsoft Windows also gives
-   quick access to several MySQL GUI tools (such as MySQL Workbench)
-   through its context menu.
-
-   The MySQL Notifier for Microsoft Windows is installed by MySQL
-   Installer, and (by default) will start-up when Microsoft Windows
-   is started.
+   The MySQL Notifier is a tool that enables you to monitor and
+   adjust the status of your local and remote MySQL Server
+   instances through an indicator that resides in the system
+   tray. The MySQL Notifier also gives quick access to several
+   MySQL GUI tools (such as MySQL Workbench) through its context
+   menu.
+
+   The MySQL Notifier is installed by MySQL Installer, and (by
+   default) will start-up when Microsoft Windows is started.
    Note
 
    To install, download and execute the MySQL Installer
-   (http://dev.mysql.com/downloads/installer/), be sure the MySQL
-   Notifier for Microsoft Windows product is selected, then proceed
-   with the installation. See the MySQL Installer manual for
-   additional details.
-
-   For release notes detailing the changes in each release of MySQL
-   Notifier for Microsoft Windows, see the MySQL Notifier Release
-   Notes (http://dev.mysql.com/doc/relnotes/mysql-notifier/en/).
+   (http://dev.mysql.com/downloads/installer/), be sure the
+   MySQL Notifier product is selected, then proceed with the
+   installation. See the MySQL Installer manual for additional
+   details.
+
+   For notes detailing the changes in each release of MySQL
+   Notifier, see the MySQL Notifier Release Notes
+   (http://dev.mysql.com/doc/relnotes/mysql-notifier/en/).
 
    Visit the MySQL Notifier forum
    (http://forums.mysql.com/list.php?173) for additional MySQL
-   Notifier for Microsoft Windows help and support.
+   Notifier help and support.
 
    Features include:
 
      * Start, Stop, and Restart instances of the MySQL Server.
 
-     * Automatically detects (and adds) new MySQL Server services.
-       These are listed under Manage Monitored Items, and may also be
-       configured.
-
-     * The Tray icon changes, depending on the status. It's green if
-       all monitored MySQL Server instances are running, or red if at
-       least one service is stopped. The Update MySQL Notifier tray
-       icon based on service status option, which dictates this
-       behavior, is enabled by default for each service.
+     * Automatically detects (and adds) new MySQL Server
+       services. These are listed under Manage Monitored Items,
+       and may also be configured.
+
+     * The Tray icon changes, depending on the status. It's
+       green if all monitored MySQL Server instances are
+       running, or red if at least one service is stopped. The
+       Update MySQL Notifier tray icon based on service status
+       option, which dictates this behavior, is enabled by
+       default for each service.
 
      * Links to other applications like MySQL Workbench, MySQL
        Installer, and the MySQL Utilities. For example, choosing
@@ -1624,463 +1909,481 @@
        Administration window for that particular instance.
 
      * If MySQL Workbench is also installed, then the Configure
-       Instance and SQL Editor options are available for local (but
-       not remote) MySQL instances.
+       Instance and SQL Editor options are available for local
+       (but not remote) MySQL instances.
 
      * Monitoring of both local and remote MySQL instances.
 
    Note
 
-   Remote monitoring is available since MySQL Notifier for Microsoft
-   Windows 1.1.0.
+   Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   The MySQL Notifier for Microsoft Windows resides in the system
-   tray and provides visual status information for your MySQL Server
-   instances. A green icon is displayed at the top left corner of the
-   tray icon if the current MySQL Server is running, or a red icon if
+   The MySQL Notifier resides in the system tray and provides
+   visual status information for your MySQL Server instances. A
+   green icon is displayed at the top left corner of the tray
+   icon if the current MySQL Server is running, or a red icon if
    the service is stopped.
 
-   The MySQL Notifier for Microsoft Windows automatically adds
-   discovered MySQL Services on the local machine, and each service
-   is saved and configurable. By default, the Automatically add new
-   services whose name contains option is enabled and set to mysql.
+   The MySQL Notifier automatically adds discovered MySQL
+   Services on the local machine, and each service is saved and
+   configurable. By default, the Automatically add new services
+   whose name contains option is enabled and set to mysql.
    Related Notifications Options include being notified when new
-   services are either discovered or experience status changes, and
-   are also enabled by default. And uninstalling a service will also
-   remove the service from the MySQL Notifier for Microsoft Windows.
+   services are either discovered or experience status changes,
+   and are also enabled by default. And uninstalling a service
+   will also remove the service from the MySQL Notifier.
    Note
 
    The Automatically add new services whose name contains option
-   default changed from ".*mysqld.*" to "mysql" in Notifier 1.1.0.
-
-   Clicking the system tray icon will reveal several options, as seen
-   in the screenshots below:
+   default changed from ".*mysqld.*" to "mysql" in Notifier
+   1.1.0.
 
-   The Service Instance menu is the main MySQL Notifier for Microsoft
-   Windows window, and enables you to Stop, Start, and Restart the
-   MySQL Server.
+   Clicking the system tray icon will reveal several options, as
+   seen in the screenshots below:
 
-   Figure 2.22. MySQL Notifier for Microsoft Windows Service Instance
-   menu
-   MySQL Notifier for Microsoft Windows Service Instance menu
+   The Service Instance menu is the main MySQL Notifier window,
+   and enables you to Stop, Start, and Restart the MySQL Server.
 
-   The Actions menu includes several links to external applications
-   (if they are installed), and a a Refresh Status option to manually
-   refresh the status of all monitored services (in both local and
-   remote computers) and MySQL instances.
+   Figure 2.32 MySQL Notifier Service Instance menu
+   MySQL Notifier Service Instance menu
+
+   The Actions menu includes several links to external
+   applications (if they are installed), and a Refresh Status
+   option to manually refresh the status of all monitored
+   services (in both local and remote computers) and MySQL
+   instances.
    Note
 
-   The main menu will not show the Actions menu when there are no
-   services being monitored by MySQL Notifier for Microsoft Windows.
+   The main menu will not show the Actions menu when there are
+   no services being monitored by MySQL Notifier.
    Note
 
-   The Refresh Status feature is available since MySQL Notifier for
-   Microsoft Windows 1.1.0.
-
-   Figure 2.23. MySQL Notifier for Microsoft Windows Actions menu
-   MySQL Notifier for Microsoft Windows Actions menu
-
-   The Actions, Options menu configures MySQL Notifier for Microsoft
-   Windows and includes options to:
-
-     * Use colorful status icons: Enables a colorful style of icons
-       for the tray of the MySQL Notifier for Microsoft Windows.
+   The Refresh Status feature is available since MySQL Notifier
+   1.1.0.
 
-     * Run at Windows Startup: Allows the application to be loaded
-       when Microsoft Windows starts.
-
-     * Automatically Check For Updates Every # Weeks: Checks for a
-       new version of MySQL Notifier for Microsoft Windows, and runs
-       this check every # weeks.
-
-     * Automatically add new services whose name contains: The text
-       used to filter services and add them automatically to the
-       monitored list of the local computer running MySQL Notifier,
-       and on remote computers already monitoring Windows services.
-       monitored services, and also filters the list of the Microsoft
-       Windows services for the Add New Service dialog.
-       Prior to version 1.1.0, this option was named "Automatically
-       add new services that match this pattern."
-
-     * Notify me when a service is automatically added: Will display
-       a balloon notification from the taskbar when a newly
-       discovered service is added to the monitored services list.
+   Figure 2.33 MySQL Notifier Actions menu
+   MySQL Notifier Actions menu
+
+   The Actions, Options menu configures MySQL Notifier and
+   includes options to:
+
+     * Use colorful status icons: Enables a colorful style of
+       icons for the tray of the MySQL Notifier.
+
+     * Run at Windows Startup: Allows the application to be
+       loaded when Microsoft Windows starts.
+
+     * Automatically Check For Updates Every # Weeks: Checks for
+       a new version of MySQL Notifier, and runs this check
+       every # weeks.
+
+     * Automatically add new services whose name contains: The
+       text used to filter services and add them automatically
+       to the monitored list of the local computer running MySQL
+       Notifier, and on remote computers already monitoring
+       Windows services. monitored services, and also filters
+       the list of the Microsoft Windows services for the Add
+       New Service dialog.
+       Prior to version 1.1.0, this option was named
+       "Automatically add new services that match this pattern."
+
+     * Notify me when a service is automatically added: Will
+       display a balloon notification from the taskbar when a
+       newly discovered service is added to the monitored
+       services list.
 
      * Notify me when a service changes status: Will display a
-       balloon notification from the taskbar when a monitored service
-       changes its status.
+       balloon notification from the taskbar when a monitored
+       service changes its status.
+
+   Figure 2.34 MySQL Notifier Options menu
+   MySQL Notifier Options menu
 
-   Figure 2.24. MySQL Notifier for Microsoft Windows Options menu
-   MySQL Notifier for Microsoft Windows Options menu
+   The Actions, Manage Monitored Items menu enables you to
+   configure the monitored services and MySQL instances. First,
+   with the Services tab open:
 
-   The Actions, Manage Monitored Items menu enables you to configure
-   the monitored services and MySQL instances. First, with the
-   Services tab open:
-
-   Figure 2.25. MySQL Notifier for Microsoft Windows Manage Services
-   menu
-   MySQL Notifier for Microsoft Windows Manage Services menu
+   Figure 2.35 MySQL Notifier Manage Services menu
+   MySQL Notifier Manage Services menu
 
    The Instances tab is similar:
 
-   Figure 2.26. MySQL Notifier for Microsoft Windows Manage Instances
-   menu
-   MySQL Notifier for Microsoft Windows Manage Instances menu
-
-   Adding a service or instance (after clicking Add in the Manage
-   Monitored Items window) enables you to select a running Microsoft
-   Windows service or instance connection, and configure MySQL
-   Notifier for Microsoft Windows to monitor it. Add a new service or
+   Figure 2.36 MySQL Notifier Manage Instances menu
+   MySQL Notifier Manage Instances menu
+
+   Adding a service or instance (after clicking Add in the
+   Manage Monitored Items window) enables you to select a
+   running Microsoft Windows service or instance connection, and
+   configure MySQL Notifier to monitor it. Add a new service or
    instance by clicking service name from the list, then OK to
    accept. Multiple services and instances may be selected.
 
-   Figure 2.27. MySQL Notifier for Microsoft Windows Adding new
-   services
-   MySQL Notifier for Microsoft Windows Adding new services
+   Figure 2.37 MySQL Notifier Adding new services
+   MySQL Notifier Adding new services
 
    And instances:
 
-   Figure 2.28. MySQL Notifier for Microsoft Windows Adding new
-   instances
-   MySQL Notifier for Microsoft Windows Adding new instances
+   Figure 2.38 MySQL Notifier Adding new instances
+   MySQL Notifier Adding new instances
    Note
 
-   The Instances tab available since MySQL Notifier for Microsoft
-   Windows 1.1.0.
+   The Instances tab available since MySQL Notifier 1.1.0.
 
-2.3.4.1. Remote monitoring set up and installation instructions
+2.3.4.1 Remote monitoring set up and installation instructions
 
-   The MySQL Notifier for Microsoft Windows uses Windows Management
-   Instrumentation (WMI) to manage and monitor services in remote
-   computers running Windows XP or later. This guide explains how it
+   The MySQL Notifier uses Windows Management Instrumentation
+   (WMI) to manage and monitor services in remote computers
+   running Windows XP or later. This guide explains how it
    works, and how to set up your system to monitor remote MySQL
    instances.
    Note
 
-   Remote monitoring is available since MySQL Notifier for Microsoft
-   Windows 1.1.0.
+   Remote monitoring is available since MySQL Notifier 1.1.0.
 
-   In order to configure WMI, it is important to understand that the
-   underlying Distributed Component Object Model (DCOM) architecture
-   is doing the WMI work. Specifically, MySQL Notifier for Microsoft
-   Windows is using asynchronous notification queries on remote
+   In order to configure WMI, it is important to understand that
+   the underlying Distributed Component Object Model (DCOM)
+   architecture is doing the WMI work. Specifically, MySQL
+   Notifier is using asynchronous notification queries on remote
    Microsoft Windows hosts as .NET events. These events send an
-   asynchronous callback to the computer running the MySQL Notifier
-   for Microsoft Windows so it knows when a service status has
-   changed on the remote computer. Asynchronous notifications offer
-   the best performance compared to semi-synchronous notifications or
+   asynchronous callback to the computer running the MySQL
+   Notifier so it knows when a service status has changed on the
+   remote computer. Asynchronous notifications offer the best
+   performance compared to semisynchronous notifications or
    synchronous notifications that use timers.
 
-   Asynchronous notifications requires the remote computer to send a
-   callback to the client computer (thus opening a reverse
-   connection), so the Windows Firewall and DCOM settings must be
-   properly configured for the communication to function properly.
-
-   Figure 2.29. MySQL Notifier for Microsoft Windows Distributed
-   Component Object Model (DCOM)
-   MySQL Notifier for Microsoft Windows Distributed Component Object
-   Model (DCOM)
-
-   Most of the common errors thrown by asynchronous WMI notifications
-   are related to Windows Firewall blocking the communication, or to
-   DCOM / WMI settings not being set up properly. For a list of
-   common errors with solutions, see Section 2.3.4.1, "."
-
-   The following steps are required to make WMI function. These steps
-   are divided between two machines. A single host computer that runs
-   MySQL Notifier for Microsoft Windows (Computer A), and multiple
+   Asynchronous notifications requires the remote computer to
+   send a callback to the client computer (thus opening a
+   reverse connection), so the Windows Firewall and DCOM
+   settings must be properly configured for the communication to
+   function properly.
+
+   Figure 2.39 MySQL Notifier Distributed Component Object Model
+   (DCOM)
+   MySQL Notifier Distributed Component Object Model (DCOM)
+
+   Most of the common errors thrown by asynchronous WMI
+   notifications are related to Windows Firewall blocking the
+   communication, or to DCOM / WMI settings not being set up
+   properly. For a list of common errors with solutions, see
+   Section 2.3.4.1, "."
+
+   The following steps are required to make WMI function. These
+   steps are divided between two machines. A single host
+   computer that runs MySQL Notifier (Computer A), and multiple
    remote machines that are being monitored (Computer B).
 
-Computer running MySQL Notifier for Microsoft Windows (Computer A)
+Computer running MySQL Notifier (Computer A)
 
 
-    1. Allow for remote administration by either editing the Group
-       Policy Editor, or using NETSH:
+    1. Allow for remote administration by either editing the
+       Group Policy Editor, or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
+
     2. Open the DCOM port TCP 135:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator) .
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator) .
          b. Execute the following command:
 NETSH firewall add portopening protocol=tcp port=135 name=DCOM_TCP135
 
-    3. Add the client application which contains the sink for the
-       callback (MySqlNotifier.exe) to the Windows Firewall
-       Exceptions List (use either the Windows Firewall configuration
-       or NETSH):
+
+    3. Add the client application which contains the sink for
+       the callback (MySqlNotifier.exe) to the Windows Firewall
+       Exceptions List (use either the Windows Firewall
+       configuration or NETSH):
        Using the Windows Firewall configuration:
          a. In the Control Panel, double-click Windows Firewall.
-         b. In the Windows Firewall window's left panel, click Allow
-            a program or feature through Windows Firewall.
-         c. In the Allowed Programs window, click Change Settings.
+         b. In the Windows Firewall window's left panel, click
+            Allow a program or feature through Windows Firewall.
+         c. In the Allowed Programs window, click Change
+            Settings.
          d. If MySqlNotifier.exe is in the Allowed programs and
-            features list, make sure it is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+            features list, make sure it is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
          e. If MySqlNotifier.exe is not in the list, click Allow
             another program....
-         f. In the Add a Program window, select the MySqlNotifier.exe
-            if it exists in the Programs list, otherwise click
-            Browse... and go to the directory where MySqlNotifier.exe
-            was installed to select it, then click Add.
-         g. Make sure MySqlNotifier.exe is checked for the type of
-            networks the computer connects to (Private, Public or
-            both).
+         f. In the Add a Program window, select the
+            MySqlNotifier.exe if it exists in the Programs list,
+            otherwise click Browse... and go to the directory
+            where MySqlNotifier.exe was installed to select it,
+            then click Add.
+         g. Make sure MySqlNotifier.exe is checked for the type
+            of networks the computer connects to (Private,
+            Public or both).
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command, where you change
             "[YOUR_INSTALL_DIRECTORY]":
-NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\My
-SqlNotifier.exe name=MySqlNotifier
+NETSH firewall add allowedprogram program=[YOUR_INSTALL_DIRECTORY]\MyS
+qlNotifier.exe name=MySqlNotifier
+
 
     4. If Computer B is either a member of WORKGROUP or is in a
-       different domain that is untrusted by Computer A, then the
-       callback connection (Connection 2) is created as an Anonymous
-       connection. To grant Anonymous connections DCOM Remote Access
-       permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+       different domain that is untrusted by Computer A, then
+       the callback connection (Connection 2) is created as an
+       Anonymous connection. To grant Anonymous connections DCOM
+       Remote Access permissions:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
 Monitored Remote Computer (Computer B)
 
-   If the user account that is logged into the computer running the
-   MySQL Notifier for Microsoft Windows (Computer A) is a local
-   administrator on the remote computer (Computer B), such that the
-   same account is an administrator on Computer B, you can skip to
-   the "Allow for remote administration" step.
-
-   Setting DCOM security to allow a non-administrator user to access
-   a computer remotely:
-
-    1. Grant "DCOM remote launch" and activation permissions for a
-       user or group:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+   If the user account that is logged into the computer running
+   the MySQL Notifier (Computer A) is a local administrator on
+   the remote computer (Computer B), such that the same account
+   is an administrator on Computer B, you can skip to the "Allow
+   for remote administration" step.
+
+   Setting DCOM security to allow a non-administrator user to
+   access a computer remotely:
+
+    1. Grant "DCOM remote launch" and activation permissions for
+       a user or group:
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Launch Permission dialog box, follow these steps
-            if your name or your group does not appear in the Groups
-            or user names list:
+         e. In the Launch Permission dialog box, follow these
+            steps if your name or your group does not appear in
+            the Groups or user names list:
               i. In the Launch Permission dialog box, click Add.
-             ii. In the Select Users, Computers, or Groups dialog
-                 box, add your name and the group in the "Enter the
-                 object names to select" box, and then click OK.
-         f. In the Launch Permission dialog box, select your user and
-            group in the Group or user names box. In the Allow column
-            under Permissions for User, select Remote Launch, select
-            Remote Activation, and then click OK.
+             ii. In the Select Users, Computers, or Groups
+                 dialog box, add your name and the group in the
+                 "Enter the object names to select" box, and
+                 then click OK.
+         f. In the Launch Permission dialog box, select your
+            user and group in the Group or user names box. In
+            the Allow column under Permissions for User, select
+            Remote Launch, select Remote Activation, and then
+            click OK.
        Grant DCOM remote access permissions:
-         a. Click Start, click Run, type DCOMCNFG, and then click OK.
-         b. In the Component Services dialog box, expand Component
-            Services, expand Computers, and then right-click My
-            Computer and click Properties.
-         c. In the My Computer Properties dialog box, click the COM
-            Security tab.
+         a. Click Start, click Run, type DCOMCNFG, and then
+            click OK.
+         b. In the Component Services dialog box, expand
+            Component Services, expand Computers, and then
+            right-click My Computer and click Properties.
+         c. In the My Computer Properties dialog box, click the
+            COM Security tab.
          d. Under Access Permissions, click Edit Limits.
-         e. In the Access Permission dialog box, select ANONYMOUS
-            LOGON name in the Group or user names box. In the Allow
-            column under Permissions for User, select Remote Access,
-            and then click OK.
+         e. In the Access Permission dialog box, select
+            ANONYMOUS LOGON name in the Group or user names box.
+            In the Allow column under Permissions for User,
+            select Remote Access, and then click OK.
 
     2. Allowing non-administrator users access to a specific WMI
        namespace:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
-         c. In the Computer Management window, expand the Services
-            and Applications tree and double-click the WMI Control.
-         d. Right-click the WMI Control icon and select Properties.
-         e. In the WMI Control Properties window, click the Security
-            tab.
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
+         c. In the Computer Management window, expand the
+            Services and Applications tree and double-click the
+            WMI Control.
+         d. Right-click the WMI Control icon and select
+            Properties.
+         e. In the WMI Control Properties window, click the
+            Security tab.
          f. In the Security tab, select the namespace and click
             Security.
-         g. Locate the appropriate account and check Remote Enable in
-            the Permissions list.
+         g. Locate the appropriate account and check Remote
+            Enable in the Permissions list.
 
-    3. Allow for remote administration by either editing the Group
-       Policy Editor or using NETSH:
+    3. Allow for remote administration by either editing the
+       Group Policy Editor or using NETSH:
        Using the Group Policy Editor:
-         a. Click Start, click Run, type GPEDIT.MSC, and then click
-            OK.
-         b. Under the Local Computer Policy heading, double-click
-            Computer Configuration.
+         a. Click Start, click Run, type GPEDIT.MSC, and then
+            click OK.
+         b. Under the Local Computer Policy heading,
+            double-click Computer Configuration.
          c. Double-click Administrative Templates, then Network,
             Network Connections, and then Windows Firewall.
          d. If the computer is in the domain, then double-click
-            Domain Profile; otherwise, double-click Standard Profile.
+            Domain Profile; otherwise, double-click Standard
+            Profile.
          e. Click Windows Firewall: Allow inbound remote
             administration exception.
-         f. On the Action menu either select Edit, or double-click
-            the selection from the previous step.
+         f. On the Action menu either select Edit, or
+            double-click the selection from the previous step.
          g. Check the Enabled radio button, and then click OK.
        Using the NETSH command:
-         a. Open a command prompt window with Administrative rights
-            (you can right-click the Command Prompt icon and click
-            Run as Administrator).
+         a. Open a command prompt window with Administrative
+            rights (you can right-click the Command Prompt icon
+            and click Run as Administrator).
          b. Execute the following command:
 NETSH firewall set service RemoteAdmin enable
 
-    4. Now, be sure the user you are logging in with uses the Name
-       value and not the Full Name value:
-         a. In the Control Panel, double-click Administrative Tools.
-         b. In the Administrative Tools window, double-click Computer
-            Management.
+
+    4. Now, be sure the user you are logging in with uses the
+       Name value and not the Full Name value:
+         a. In the Control Panel, double-click Administrative
+            Tools.
+         b. In the Administrative Tools window, double-click
+            Computer Management.
          c. In the Computer Management window, expand the System
             Tools then Local Users and Groups.
-         d. Click the Users node, and on the right side panel locate
-            your user and make sure it uses the Name value to
-            connect, and not the Full Name value.
-
-    5. If the remote computer is running on Windows XP Professional,
-       make sure that remote logins are not being forcefully changed
-       to the guest account user (also known as ForceGuest), which is
-       enabled by default on computers that are not attached to a
-       domain.
-         a. Click Start, click Run, type SECPOL.MSC, and then click
-            OK.
+         d. Click the Users node, and on the right side panel
+            locate your user and make sure it uses the Name
+            value to connect, and not the Full Name value.
+
+    5. If the remote computer is running on Windows XP
+       Professional, make sure that remote logins are not being
+       forcefully changed to the guest account user (also known
+       as ForceGuest), which is enabled by default on computers
+       that are not attached to a domain.
+         a. Click Start, click Run, type SECPOL.MSC, and then
+            click OK.
          b. Under the Local Policies node, double-click Security
             Options.
-         c. Select Network Access: Sharing and security model for
-            local accounts and save.
+         c. Select Network Access: Sharing and security model
+            for local accounts and save.
 
 Common Errors
 
 
      * 0x80070005
 
-          + DCOM Security was not configured properly (see Computer
-            B, the Setting DCOM security... step).
+          + DCOM Security was not configured properly (see
+            Computer B, the Setting DCOM security... step).
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x8007000E
 
-          + The remote computer (Computer B) is a member of WORKGROUP
-            or is in a domain that is untrusted by the client
-            computer (Computer A) (see Computer A, the Grant
-            Anonymous connections DCOM Remote Access permissions
-            step).
+          + The remote computer (Computer B) is a member of
+            WORKGROUP or is in a domain that is untrusted by the
+            client computer (Computer A) (see Computer A, the
+            Grant Anonymous connections DCOM Remote Access
+            permissions step).
 
      * 0x80041003
 
-          + Access to the remote WMI namespace was not configured
-            properly (see Computer B, the Allowing non-administrator
-            users access to a specific WMI namespace step).
+          + Access to the remote WMI namespace was not
+            configured properly (see Computer B, the Allowing
+            non-administrator users access to a specific WMI
+            namespace step).
 
      * 0x800706BA
 
           + The DCOM port is not open on the client computers
-            (Computer A) firewall. See the Open the DCOM port TCP 135
-            step for Computer A.
+            (Computer A) firewall. See the Open the DCOM port
+            TCP 135 step for Computer A.
 
-          + The remote computer (Computer B) is inaccessible because
-            its network location is set to Public. Make sure you can
-            access it through the Windows Explorer.
-
-2.3.5. Installing MySQL on Microsoft Windows Using an MSI Package
-
-   The MSI package is designed to install and configure MySQL in such
-   a way that you can immediately get started using MySQL.
-
-   The MySQL Installation Wizard and MySQL Configuration Wizard are
-   available in the Complete install package, which is recommended
-   for most standard MySQL installations. Exceptions include users
-   who need to install multiple instances of MySQL on a single server
-   host and advanced users who want complete control of server
-   configuration.
+          + The remote computer (Computer B) is inaccessible
+            because its network location is set to Public. Make
+            sure you can access it through the Windows Explorer.
+
+2.3.5 Installing MySQL on Microsoft Windows Using an MSI Package
+
+   The MSI package is designed to install and configure MySQL in
+   such a way that you can immediately get started using MySQL.
+
+   The MySQL Installation Wizard and MySQL Configuration Wizard
+   are available in the Complete install package, which is
+   recommended for most standard MySQL installations. Exceptions
+   include users who need to install multiple instances of MySQL
+   on a single server host and advanced users who want complete
+   control of server configuration.
 
      * For information on installing using the GUI MSI installer
-       process, see Section 2.3.5.1, "Using the MySQL Installation
-       Wizard."
+       process, see Section 2.3.5.1, "Using the MySQL
+       Installation Wizard."
 
-     * For information on installing using the command line using the
-       MSI package, see Section 2.3.5.2, "Automating MySQL
-       Installation on Microsoft Windows Using the MSI Package."
-
-     * If you have previously installed MySQL using the MSI package
-       and want to remove MySQL, see Section 2.3.5.3, "Removing MySQL
-       When Installed from the MSI Package."
+     * For information on installing using the command line
+       using the MSI package, see Section 2.3.5.2, "Automating
+       MySQL Installation on Microsoft Windows Using the MSI
+       Package."
+
+     * If you have previously installed MySQL using the MSI
+       package and want to remove MySQL, see Section 2.3.5.3,
+       "Removing MySQL When Installed from the MSI Package."
 
    The workflow sequence for using the installer is shown in the
    figure below:
 
-   Figure 2.30. Installation Workflow for Windows Using MSI Installer
+   Figure 2.40 Installation Workflow for Windows Using MSI
+   Installer
    Installation Workflow for Windows using MSI Installer
    Note
 
    Microsoft Windows XP and later include a firewall which
-   specifically blocks ports. If you plan on using MySQL through a
-   network port then you should open and create an exception for this
-   port before performing the installation. To check and if necessary
-   add an exception to the firewall settings:
+   specifically blocks ports. If you plan on using MySQL through
+   a network port then you should open and create an exception
+   for this port before performing the installation. To check
+   and if necessary add an exception to the firewall settings:
 
-    1. First ensure that you are logged in as an Administrator or a
-       user with Administrator privileges.
+    1. First ensure that you are logged in as an Administrator
+       or a user with Administrator privileges.
 
-    2. Go to the Control Panel, and double click the Windows Firewall
-       icon.
+    2. Go to the Control Panel, and double click the Windows
+       Firewall icon.
 
-    3. Choose the Allow a program through Windows Firewall option and
-       click the Add port button.
+    3. Choose the Allow a program through Windows Firewall
+       option and click the Add port button.
 
-    4. Enter MySQL into the Name text box and 3306 (or the port of
-       your choice) into the Port number text box.
+    4. Enter MySQL into the Name text box and 3306 (or the port
+       of your choice) into the Port number text box.
 
-    5. Also ensure that the TCP protocol radio button is selected.
+    5. Also ensure that the TCP protocol radio button is
+       selected.
 
-    6. If you wish, you can also limit access to the MySQL server by
-       choosing the Change scope button.
+    6. If you wish, you can also limit access to the MySQL
+       server by choosing the Change scope button.
 
     7. Confirm your choices by clicking the OK button.
 
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
    Note
 
-   When using Windows Vista or newer, you may want to disable User
-   Account Control (UAC) before performing the installation. If you
-   do not do so, then MySQL may be identified as a security risk,
-   which will mean that you need to enable MySQL. You can disable the
-   security checking by following these instructions:
+   When using Windows Vista or newer, you may want to disable
+   User Account Control (UAC) before performing the
+   installation. If you do not do so, then MySQL may be
+   identified as a security risk, which will mean that you need
+   to enable MySQL. You can disable the security checking by
+   following these instructions:
 
     1. Open Control Panel.
 
@@ -2090,199 +2393,213 @@
     3. Click the Got to the main User Accounts page link.
 
     4. Click on Turn User Account Control on or off. You may be
-       prompted to provide permission to change this setting. Click
-       Continue.
+       prompted to provide permission to change this setting.
+       Click Continue.
 
-    5. Deselect or uncheck the check box next to Use User Account
-       Control (UAC) to help protect your computer. Click OK to save
-       the setting.
-
-   You will need to restart to complete the process. Click Restart
-   Now to reboot the machine and apply the changes. You can then
-   follow the instructions below for installing Windows.
-
-2.3.5.1. Using the MySQL Installation Wizard
-
-   MySQL Installation Wizard is an installer for the MySQL server
-   that uses the latest installer technologies for Microsoft Windows.
-   The MySQL Installation Wizard, in combination with the MySQL
-   Configuration Wizard, enables a user to install and configure a
-   MySQL server that is ready for use immediately after installation.
-
-   The MySQL Installation Wizard is the standard installer for all
-   MySQL server distributions, version 4.1.5 and higher. Users of
-   previous versions of MySQL need to shut down and remove their
-   existing MySQL installations manually before installing MySQL with
-   the MySQL Installation Wizard. See Section 2.3.5.1.6, "Upgrading
-   MySQL with the Installation Wizard," for more information on
-   upgrading from a previous version.
+    5. Deselect or uncheck the check box next to Use User
+       Account Control (UAC) to help protect your computer.
+       Click OK to save the setting.
+
+   You will need to restart to complete the process. Click
+   Restart Now to reboot the machine and apply the changes. You
+   can then follow the instructions below for installing
+   Windows.
+
+2.3.5.1 Using the MySQL Installation Wizard
+
+   MySQL Installation Wizard is an installer for the MySQL
+   server that uses the latest installer technologies for
+   Microsoft Windows. The MySQL Installation Wizard, in
+   combination with the MySQL Configuration Wizard, enables a
+   user to install and configure a MySQL server that is ready
+   for use immediately after installation.
+
+   The MySQL Installation Wizard is the standard installer for
+   all MySQL server distributions, version 4.1.5 and higher.
+   Users of previous versions of MySQL need to shut down and
+   remove their existing MySQL installations manually before
+   installing MySQL with the MySQL Installation Wizard. See
+   Section 2.3.5.1.6, "Upgrading MySQL with the Installation
+   Wizard," for more information on upgrading from a previous
+   version.
 
    Microsoft has included an improved version of their Microsoft
-   Windows Installer (MSI) in the recent versions of Windows. MSI has
-   become the de-facto standard for application installations on
-   Windows 2000, Windows XP, and Windows Server 2003. The MySQL
-   Installation Wizard makes use of this technology to provide a
-   smoother and more flexible installation process.
+   Windows Installer (MSI) in the recent versions of Windows.
+   MSI has become the de-facto standard for application
+   installations on Windows 2000, Windows XP, and Windows Server
+   2003. The MySQL Installation Wizard makes use of this
+   technology to provide a smoother and more flexible
+   installation process.
 
    The Microsoft Windows Installer Engine was updated with the
-   release of Windows XP; those using a previous version of Windows
-   can reference this Microsoft Knowledge Base article
-   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;292539)
-   for information on upgrading to the latest version of the Windows
-   Installer Engine.
-
-   In addition, Microsoft has introduced the WiX (Windows Installer
-   XML) toolkit recently. This is the first highly acknowledged Open
-   Source project from Microsoft. We have switched to WiX because it
-   is an Open Source project and it enables us to handle the complete
-   Windows installation process in a flexible manner using scripts.
-
-   Improving the MySQL Installation Wizard depends on the support and
-   feedback of users like you. If you find that the MySQL
-   Installation Wizard is lacking some feature important to you, or
-   if you discover a bug, please report it in our bugs database using
-   the instructions given in Section 1.7, "How to Report Bugs or
-   Problems."
+   release of Windows XP; those using a previous version of
+   Windows can reference this Microsoft Knowledge Base article
+   (http://support.microsoft.com/default.aspx?scid=kb;EN-US;2925
+   39) for information on upgrading to the latest version of the
+   Windows Installer Engine.
+
+   In addition, Microsoft has introduced the WiX (Windows
+   Installer XML) toolkit recently. This is the first highly
+   acknowledged Open Source project from Microsoft. We have
+   switched to WiX because it is an Open Source project and it
+   enables us to handle the complete Windows installation
+   process in a flexible manner using scripts.
+
+   Improving the MySQL Installation Wizard depends on the
+   support and feedback of users like you. If you find that the
+   MySQL Installation Wizard is lacking some feature important
+   to you, or if you discover a bug, please report it in our
+   bugs database using the instructions given in Section 1.7,
+   "How to Report Bugs or Problems."
 
-2.3.5.1.1. Downloading and Starting the MySQL Installation Wizard
+2.3.5.1.1 Downloading and Starting the MySQL Installation Wizard
 
    The MySQL installation packages can be downloaded from
-   http://dev.mysql.com/downloads/. If the package you download is
-   contained within a Zip archive, you need to extract the archive
-   first.
-   Note
-
-   If you are installing on Windows Vista or newer, it is best to
-   open a network port before beginning the installation. To do this,
-   first ensure that you are logged in as an Administrator, go to the
-   Control Panel, and double-click the Windows Firewall icon. Choose
-   the Allow a program through Windows Firewall option and click the
-   Add port button. Enter MySQL into the Name text box and 3306 (or
-   the port of your choice) into the Port number text box. Also
-   ensure that the TCP protocol radio button is selected. If you
-   wish, you can also limit access to the MySQL server by choosing
-   the Change scope button. Confirm your choices by clicking the OK
-   button. If you do not open a port prior to installation, you
-   cannot configure the MySQL server immediately after installation.
+   http://dev.mysql.com/downloads/. If the package you download
+   is contained within a Zip archive, you need to extract the
+   archive first.
+   Note
+
+   If you are installing on Windows Vista or newer, it is best
+   to open a network port before beginning the installation. To
+   do this, first ensure that you are logged in as an
+   Administrator, go to the Control Panel, and double-click the
+   Windows Firewall icon. Choose the Allow a program through
+   Windows Firewall option and click the Add port button. Enter
+   MySQL into the Name text box and 3306 (or the port of your
+   choice) into the Port number text box. Also ensure that the
+   TCP protocol radio button is selected. If you wish, you can
+   also limit access to the MySQL server by choosing the Change
+   scope button. Confirm your choices by clicking the OK button.
+   If you do not open a port prior to installation, you cannot
+   configure the MySQL server immediately after installation.
    Additionally, when running the MySQL Installation Wizard on
-   Windows Vista or newer, ensure that you are logged in as a user
-   with administrative rights.
+   Windows Vista or newer, ensure that you are logged in as a
+   user with administrative rights.
 
-   The process for starting the wizard depends on the contents of the
-   installation package you download. If there is a setup.exe file
-   present, double-click it to start the installation process. If
-   there is an .msi file present, double-click it to start the
-   installation process.
-
-2.3.5.1.2. Choosing an Install Type
-
-   There are three installation types available: Typical, Complete,
-   and Custom.
+   The process for starting the wizard depends on the contents
+   of the installation package you download. If there is a
+   setup.exe file present, double-click it to start the
+   installation process. If there is an .msi file present,
+   double-click it to start the installation process.
+
+2.3.5.1.2 Choosing an Install Type
+
+   There are three installation types available: Typical,
+   Complete, and Custom.
+
+   The Typical installation type installs the MySQL server, the
+   mysql command-line client, and the command-line utilities.
+   The command-line clients and utilities include mysqldump,
+   myisamchk, and several other tools to help you manage the
+   MySQL server.
 
-   The Typical installation type installs the MySQL server, the mysql
-   command-line client, and the command-line utilities. The
-   command-line clients and utilities include mysqldump, myisamchk,
-   and several other tools to help you manage the MySQL server.
-
-   The Complete installation type installs all components included in
-   the installation package. The full installation package includes
-   components such as the embedded server library, the benchmark
-   suite, support scripts, and documentation.
-
-   The Custom installation type gives you complete control over which
-   packages you wish to install and the installation path that is
-   used. See Section 2.3.5.1.3, "The Custom Install Dialog," for more
-   information on performing a custom install.
-
-   If you choose the Typical or Complete installation types and click
-   the Next button, you advance to the confirmation screen to verify
-   your choices and begin the installation. If you choose the Custom
-   installation type and click the Next button, you advance to the
-   custom installation dialog, described in Section 2.3.5.1.3, "The
-   Custom Install Dialog."
+   The Complete installation type installs all components
+   included in the installation package. The full installation
+   package includes components such as the embedded server
+   library, the benchmark suite, support scripts, and
+   documentation.
+
+   The Custom installation type gives you complete control over
+   which packages you wish to install and the installation path
+   that is used. See Section 2.3.5.1.3, "The Custom Install
+   Dialog," for more information on performing a custom install.
+
+   If you choose the Typical or Complete installation types and
+   click the Next button, you advance to the confirmation screen
+   to verify your choices and begin the installation. If you
+   choose the Custom installation type and click the Next
+   button, you advance to the custom installation dialog,
+   described in Section 2.3.5.1.3, "The Custom Install Dialog."
 
-2.3.5.1.3. The Custom Install Dialog
+2.3.5.1.3 The Custom Install Dialog
 
    If you wish to change the installation path or the specific
-   components that are installed by the MySQL Installation Wizard,
-   choose the Custom installation type.
+   components that are installed by the MySQL Installation
+   Wizard, choose the Custom installation type.
 
-   A tree view on the left side of the custom install dialog lists
-   all available components. Components that are not installed have a
-   red X icon; components that are installed have a gray icon. To
-   change whether a component is installed, click that component's
-   icon and choose a new option from the drop-down list that appears.
+   A tree view on the left side of the custom install dialog
+   lists all available components. Components that are not
+   installed have a red X icon; components that are installed
+   have a gray icon. To change whether a component is installed,
+   click that component's icon and choose a new option from the
+   drop-down list that appears.
 
    You can change the default installation path by clicking the
-   Change... button to the right of the displayed installation path.
+   Change... button to the right of the displayed installation
+   path.
 
-   After choosing your installation components and installation path,
-   click the Next button to advance to the confirmation dialog.
-
-2.3.5.1.4. The Confirmation Dialog
-
-   Once you choose an installation type and optionally choose your
-   installation components, you advance to the confirmation dialog.
-   Your installation type and installation path are displayed for you
-   to review.
-
-   To install MySQL if you are satisfied with your settings, click
-   the Install button. To change your settings, click the Back
-   button. To exit the MySQL Installation Wizard without installing
-   MySQL, click the Cancel button.
+   After choosing your installation components and installation
+   path, click the Next button to advance to the confirmation
+   dialog.
+
+2.3.5.1.4 The Confirmation Dialog
+
+   Once you choose an installation type and optionally choose
+   your installation components, you advance to the confirmation
+   dialog. Your installation type and installation path are
+   displayed for you to review.
+
+   To install MySQL if you are satisfied with your settings,
+   click the Install button. To change your settings, click the
+   Back button. To exit the MySQL Installation Wizard without
+   installing MySQL, click the Cancel button.
 
    The final screen of the installer provides a summary of the
    installation and gives you the option to launch the MySQL
-   Configuration Wizard, which you can use to create a configuration
-   file, install the MySQL service, and configure security settings.
-
-2.3.5.1.5. Changes Made by MySQL Installation Wizard
-
-   Once you click the Install button, the MySQL Installation Wizard
-   begins the installation process and makes certain changes to your
-   system which are described in the sections that follow.
+   Configuration Wizard, which you can use to create a
+   configuration file, install the MySQL service, and configure
+   security settings.
+
+2.3.5.1.5 Changes Made by MySQL Installation Wizard
+
+   Once you click the Install button, the MySQL Installation
+   Wizard begins the installation process and makes certain
+   changes to your system which are described in the sections
+   that follow.
 
    Changes to the Registry
 
-   The MySQL Installation Wizard creates one Windows registry key in
-   a typical install situation, located in
+   The MySQL Installation Wizard creates one Windows registry
+   key in a typical install situation, located in
    HKEY_LOCAL_MACHINE\SOFTWARE\MySQL AB.
 
-   The MySQL Installation Wizard creates a key named after the major
-   version of the server that is being installed, such as MySQL
-   Server 5.5. It contains two string values, Location and Version.
-   The Location string contains the path to the installation
-   directory. In a default installation it contains C:\Program
-   Files\MySQL\MySQL Server 5.5\. The Version string contains the
-   release number. For example, for an installation of MySQL Server
-   5.5.36, the key contains a value of 5.5.36.
-
-   These registry keys are used to help external tools identify the
-   installed location of the MySQL server, preventing a complete scan
-   of the hard-disk to determine the installation path of the MySQL
-   server. The registry keys are not required to run the server, and
-   if you install MySQL using the noinstall Zip archive, the registry
-   keys are not created.
+   The MySQL Installation Wizard creates a key named after the
+   major version of the server that is being installed, such as
+   MySQL Server 5.5. It contains two string values, Location and
+   Version. The Location string contains the path to the
+   installation directory. In a default installation it contains
+   C:\Program Files\MySQL\MySQL Server 5.5\. The Version string
+   contains the release number. For example, for an installation
+   of MySQL Server 5.5.44, the key contains a value of 5.5.44.
+
+   These registry keys are used to help external tools identify
+   the installed location of the MySQL server, preventing a
+   complete scan of the hard-disk to determine the installation
+   path of the MySQL server. The registry keys are not required
+   to run the server, and if you install MySQL using the
+   noinstall Zip archive, the registry keys are not created.
 
    Changes to the Start Menu
 
-   The MySQL Installation Wizard creates a new entry in the Windows
-   Start menu under a common MySQL menu heading named after the major
-   version of MySQL that you have installed. For example, if you
-   install MySQL 5.5, the MySQL Installation Wizard creates a MySQL
-   Server 5.5 section in the Start menu.
+   The MySQL Installation Wizard creates a new entry in the
+   Windows Start menu under a common MySQL menu heading named
+   after the major version of MySQL that you have installed. For
+   example, if you install MySQL 5.5, the MySQL Installation
+   Wizard creates a MySQL Server 5.5 section in the Start menu.
 
    The following entries are created within the new Start menu
    section:
 
-     * MySQL Command-Line Client: This is a shortcut to the mysql
-       command-line client and is configured to connect as the root
-       user. The shortcut prompts for a root user password when you
-       connect.
-
-     * MySQL Server Instance Config Wizard: This is a shortcut to the
-       MySQL Configuration Wizard. Use this shortcut to configure a
-       newly installed server, or to reconfigure an existing server.
+     * MySQL Command-Line Client: This is a shortcut to the
+       mysql command-line client and is configured to connect as
+       the root user. The shortcut prompts for a root user
+       password when you connect.
+
+     * MySQL Server Instance Config Wizard: This is a shortcut
+       to the MySQL Configuration Wizard. Use this shortcut to
+       configure a newly installed server, or to reconfigure an
+       existing server.
 
      * MySQL Documentation: This is a link to the MySQL server
        documentation that is stored locally in the MySQL server
@@ -2290,118 +2607,122 @@
 
    Changes to the File System
 
-   The MySQL Installation Wizard by default installs the MySQL 5.5
-   server to C:\Program Files\MySQL\MySQL Server 5.5, where Program
-   Files is the default location for applications in your system, and
-   5.5 is the major version of your MySQL server. This is the
-   recommended location for the MySQL server, replacing the former
-   default location C:\mysql.
+   The MySQL Installation Wizard by default installs the MySQL
+   5.5 server to C:\Program Files\MySQL\MySQL Server 5.5, where
+   Program Files is the default location for applications in
+   your system, and 5.5 is the major version of your MySQL
+   server. This is the recommended location for the MySQL
+   server, replacing the former default location C:\mysql.
 
    By default, all MySQL applications are stored in a common
-   directory at C:\Program Files\MySQL, where Program Files is the
-   default location for applications in your Windows installation. A
-   typical MySQL installation on a developer machine might look like
-   this:
+   directory at C:\Program Files\MySQL, where Program Files is
+   the default location for applications in your Windows
+   installation. A typical MySQL installation on a developer
+   machine might look like this:
 C:\Program Files\MySQL\MySQL Server 5.5
 C:\Program Files\MySQL\MySQL Workbench 5.1 OSS
 
-   This approach makes it easier to manage and maintain all MySQL
-   applications installed on a particular system.
+   This approach makes it easier to manage and maintain all
+   MySQL applications installed on a particular system.
 
    The default location of the data directory is the AppData
    directory configured for the user that installed the MySQL
    application.
 
-2.3.5.1.6. Upgrading MySQL with the Installation Wizard
+2.3.5.1.6 Upgrading MySQL with the Installation Wizard
 
    The MySQL Installation Wizard can perform server upgrades
-   automatically using the upgrade capabilities of MSI. That means
-   you do not need to remove a previous installation manually before
-   installing a new release. The installer automatically shuts down
-   and removes the previous MySQL service before installing the new
-   version.
+   automatically using the upgrade capabilities of MSI. That
+   means you do not need to remove a previous installation
+   manually before installing a new release. The installer
+   automatically shuts down and removes the previous MySQL
+   service before installing the new version.
 
    Automatic upgrades are available only when upgrading between
-   installations that have the same major and minor version numbers.
-   For example, you can upgrade automatically from MySQL 5.5.5 to
-   MySQL 5.5.6, but not from MySQL 5.1 to MySQL 5.5.
+   installations that have the same major and minor version
+   numbers. For example, you can upgrade automatically from
+   MySQL 5.5.5 to MySQL 5.5.6, but not from MySQL 5.1 to MySQL
+   5.5.
 
    See Section 2.3.9, "Upgrading MySQL on Windows."
 
-2.3.5.2. Automating MySQL Installation on Microsoft Windows Using the
-MSI Package
+2.3.5.2 Automating MySQL Installation on Microsoft Windows Using
+the MSI Package
 
    The Microsoft Installer (MSI) supports a both a quiet and a
    passive mode that can be used to install MySQL automatically
-   without requiring intervention. You can use this either in scripts
-   to automatically install MySQL or through a terminal connection
-   such as Telnet where you do not have access to the standard
-   Windows user interface. The MSI packages can also be used in
-   combination with Microsoft's Group Policy system (part of Windows
-   Server 2003 and Windows Server 2008) to install MySQL across
-   multiple machines.
-
-   To install MySQL from one of the MSI packages automatically from
-   the command line (or within a script), you need to use the
-   msiexec.exe tool. For example, to perform a quiet installation
-   (which shows no dialog boxes or progress):
-shell> msiexec /i mysql-5.5.36.msi /quiet
-
-   The /i indicates that you want to perform an installation. The
-   /quiet option indicates that you want no interactive elements.
-
-   To provide a dialog box showing the progress during installation,
-   and the dialog boxes providing information on the installation and
-   registration of MySQL, use /passive mode instead of /quiet:
-shell> msiexec /i mysql-5.5.36.msi /passive
-
-   Regardless of the mode of the installation, installing the package
-   in this manner performs a 'Typical' installation, and installs the
-   default components into the standard location.
+   without requiring intervention. You can use this either in
+   scripts to automatically install MySQL or through a terminal
+   connection such as Telnet where you do not have access to the
+   standard Windows user interface. The MSI packages can also be
+   used in combination with Microsoft's Group Policy system
+   (part of Windows Server 2003 and Windows Server 2008) to
+   install MySQL across multiple machines.
+
+   To install MySQL from one of the MSI packages automatically
+   from the command line (or within a script), you need to use
+   the msiexec.exe tool. For example, to perform a quiet
+   installation (which shows no dialog boxes or progress):
+shell> msiexec /i mysql-5.5.44.msi /quiet
+
+   The /i indicates that you want to perform an installation.
+   The /quiet option indicates that you want no interactive
+   elements.
+
+   To provide a dialog box showing the progress during
+   installation, and the dialog boxes providing information on
+   the installation and registration of MySQL, use /passive mode
+   instead of /quiet:
+shell> msiexec /i mysql-5.5.44.msi /passive
+
+   Regardless of the mode of the installation, installing the
+   package in this manner performs a 'Typical' installation, and
+   installs the default components into the standard location.
 
    You can also use this method to uninstall MySQL by using the
    /uninstall or /x options:
-shell> msiexec /x mysql-5.5.36.msi /uninstall
+shell> msiexec /x mysql-5.5.44.msi /uninstall
 
-   To install MySQL and configure a MySQL instance from the command
-   line, see Section 2.3.6.13, "MySQL Server Instance Config Wizard:
-   Creating an Instance from the Command Line."
+   To install MySQL and configure a MySQL instance from the
+   command line, see Section 2.3.6.13, "MySQL Server Instance
+   Config Wizard: Creating an Instance from the Command Line."
 
    For information on using MSI packages to install software
-   automatically using Group Policy, see How to use Group Policy to
-   remotely install software in Windows Server 2003
+   automatically using Group Policy, see How to use Group Policy
+   to remotely install software in Windows Server 2003
    (http://support.microsoft.com/kb/816102).
 
-2.3.5.3. Removing MySQL When Installed from the MSI Package
+2.3.5.3 Removing MySQL When Installed from the MSI Package
 
-   To uninstall a MySQL where you have used the MSI packages, you
-   must use the Add/Remove Programs tool within Control Panel. To do
-   this:
+   To uninstall a MySQL where you have used the MSI packages,
+   you must use the Add/Remove Programs tool within Control
+   Panel. To do this:
 
     1. Right-click the start menu and choose Control Panel.
 
-    2. If the Control Panel is set to category mode (you will see
-       Pick a category at the top of the Control Panel window),
-       double-click Add or Remove Programs. If the Control is set to
-       classic mode, double-click the Add or Remove Programs icon.
-
-    3. Find MySQL in the list of installed software. MySQL Server is
-       installed against major version numbers (MySQL 5.1, MySQL 5.5,
-       etc.). Select the version that you want to remove and click
-       Remove.
+    2. If the Control Panel is set to category mode (you will
+       see Pick a category at the top of the Control Panel
+       window), double-click Add or Remove Programs. If the
+       Control is set to classic mode, double-click the Add or
+       Remove Programs icon.
+
+    3. Find MySQL in the list of installed software. MySQL
+       Server is installed against major version numbers (MySQL
+       5.1, MySQL 5.5, etc.). Select the version that you want
+       to remove and click Remove.
 
     4. You will be prompted to confirm the removal. Click Yes to
        remove MySQL.
 
    When MySQL is removed using this method, only the installed
-   components are removed. Any database information (including the
-   tables and data), import or export files, log files, and binary
-   logs produced during execution are kept in their configured
-   location.
-
-   If you try to install MySQL again the information will be retained
-   and you will be prompted to enter the password configured with the
-   original installation.
+   components are removed. Any database information (including
+   the tables and data), import or export files, log files, and
+   binary logs produced during execution are kept in their
+   configured location.
+
+   If you try to install MySQL again the information will be
+   retained and you will be prompted to enter the password
+   configured with the original installation.
 
    If you want to delete MySQL completely:
 
@@ -2413,86 +2734,92 @@
      * On Windows 7 and Windows Server 2008, the default data
        directory location is C:\ProgramData\Mysql.
        Note
-       The C:\ProgramData directory is hidden by default. You must
-       change your folder options to view the hidden file. Choose
-       Organize, Folder and search options, Show hidden folders.
-
-2.3.6. MySQL Server Instance Configuration Wizard
-
-   The MySQL Server Instance Configuration Wizard helps automate the
-   process of configuring your server. It creates a custom MySQL
-   configuration file (my.ini or my.cnf) by asking you a series of
-   questions and then applying your responses to a template to
-   generate the configuration file that is tuned to your
-   installation.
-
-   The MySQL Server Instance Configuration Wizard is included with
-   the MySQL 5.5 server. The MySQL Server Instance Configuration
-   Wizard is only available for Windows.
-
-2.3.6.1. Starting the MySQL Server Instance Configuration Wizard
-
-   The MySQL Server Instance Configuration Wizard is normally started
-   as part of the installation process. You should only need to run
-   the MySQL Server Instance Configuration Wizard again when you need
-   to change the configuration parameters of your server.
+       The C:\ProgramData directory is hidden by default. You
+       must change your folder options to view the hidden file.
+       Choose Organize, Folder and search options, Show hidden
+       folders.
+
+2.3.6 MySQL Server Instance Configuration Wizard
+
+   The MySQL Server Instance Configuration Wizard helps automate
+   the process of configuring your server. It creates a custom
+   MySQL configuration file (my.ini or my.cnf) by asking you a
+   series of questions and then applying your responses to a
+   template to generate the configuration file that is tuned to
+   your installation.
+
+   The MySQL Server Instance Configuration Wizard is included
+   with the MySQL 5.5 server. The MySQL Server Instance
+   Configuration Wizard is only available for Windows.
+
+2.3.6.1 Starting the MySQL Server Instance Configuration Wizard
+
+   The MySQL Server Instance Configuration Wizard is normally
+   started as part of the installation process. You should only
+   need to run the MySQL Server Instance Configuration Wizard
+   again when you need to change the configuration parameters of
+   your server.
 
    If you chose not to open a port prior to installing MySQL on
-   Windows Vista or newer, you can choose to use the MySQL Server
-   Configuration Wizard after installation. However, you must open a
-   port in the Windows Firewall. To do this see the instructions
-   given in Section 2.3.5.1.1, "Downloading and Starting the MySQL
-   Installation Wizard." Rather than opening a port, you also have
-   the option of adding MySQL as a program that bypasses the Windows
-   Firewall. One or the other option is sufficient---you need not do
-   both. Additionally, when running the MySQL Server Configuration
-   Wizard on Windows Vista or newer, ensure that you are logged in as
-   a user with administrative rights.
+   Windows Vista or newer, you can choose to use the MySQL
+   Server Configuration Wizard after installation. However, you
+   must open a port in the Windows Firewall. To do this see the
+   instructions given in Section 2.3.5.1.1, "Downloading and
+   Starting the MySQL Installation Wizard." Rather than opening
+   a port, you also have the option of adding MySQL as a program
+   that bypasses the Windows Firewall. One or the other option
+   is sufficient---you need not do both. Additionally, when
+   running the MySQL Server Configuration Wizard on Windows
+   Vista or newer, ensure that you are logged in as a user with
+   administrative rights.
    MySQL Server Instance Configuration Wizard
 
    You can launch the MySQL Configuration Wizard by clicking the
-   MySQL Server Instance Config Wizard entry in the MySQL section of
-   the Windows Start menu.
-
-   Alternatively, you can navigate to the bin directory of your MySQL
-   installation and launch the MySQLInstanceConfig.exe file directly.
-
-   The MySQL Server Instance Configuration Wizard places the my.ini
-   file in the installation directory for the MySQL server. This
-   helps associate configuration files with particular server
-   instances.
+   MySQL Server Instance Config Wizard entry in the MySQL
+   section of the Windows Start menu.
 
-   To ensure that the MySQL server knows where to look for the my.ini
-   file, an argument similar to this is passed to the MySQL server as
-   part of the service installation:
+   Alternatively, you can navigate to the bin directory of your
+   MySQL installation and launch the MySQLInstanceConfig.exe
+   file directly.
+
+   The MySQL Server Instance Configuration Wizard places the
+   my.ini file in the installation directory for the MySQL
+   server. This helps associate configuration files with
+   particular server instances.
+
+   To ensure that the MySQL server knows where to look for the
+   my.ini file, an argument similar to this is passed to the
+   MySQL server as part of the service installation:
 --defaults-file="C:\Program Files\MySQL\MySQL Server 5.5\my.ini"
 
-   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced with the
-   installation path to the MySQL Server. The --defaults-file option
-   instructs the MySQL server to read the specified file for
-   configuration options when it starts.
-
-   Apart from making changes to the my.ini file by running the MySQL
-   Server Instance Configuration Wizard again, you can modify it by
-   opening it with a text editor and making any necessary changes.
-   You can also modify the server configuration with the
-   http://www.mysql.com/products/administrator/ utility. For more
-   information about server configuration, see Section 5.1.3, "Server
-   Command Options."
+   Here, C:\Program Files\MySQL\MySQL Server 5.5 is replaced
+   with the installation path to the MySQL Server. The
+   --defaults-file option instructs the MySQL server to read the
+   specified file for configuration options when it starts.
+
+   Apart from making changes to the my.ini file by running the
+   MySQL Server Instance Configuration Wizard again, you can
+   modify it by opening it with a text editor and making any
+   necessary changes. You can also modify the server
+   configuration with the
+   http://www.mysql.com/products/administrator/ utility. For
+   more information about server configuration, see Section
+   5.1.3, "Server Command Options."
 
    MySQL clients and utilities such as the mysql and mysqldump
    command-line clients are not able to locate the my.ini file
-   located in the server installation directory. To configure the
-   client and utility applications, create a new my.ini file in the
-   Windows installation directory (for example, C:\WINDOWS).
-
-   Under Windows Server 2003, Windows Server 2000, Windows XP, and
-   Windows Vista, MySQL Server Instance Configuration Wizard will
-   configure MySQL to work as a Windows service. To start and stop
-   MySQL you use the Services application that is supplied as part of
-   the Windows Administrator Tools.
+   located in the server installation directory. To configure
+   the client and utility applications, create a new my.ini file
+   in the Windows installation directory (for example,
+   C:\WINDOWS).
+
+   Under Windows Server 2003, Windows Server 2000, Windows XP,
+   and Windows Vista, MySQL Server Instance Configuration Wizard
+   will configure MySQL to work as a Windows service. To start
+   and stop MySQL you use the Services application that is
+   supplied as part of the Windows Administrator Tools.
 
-2.3.6.2. Choosing a Maintenance Option
+2.3.6.2 Choosing a Maintenance Option
 
    If the MySQL Server Instance Configuration Wizard detects an
    existing configuration file, you have the option of either
@@ -2502,118 +2829,119 @@
 
    To reconfigure an existing server, choose the Re-configure
    Instance option and click the Next button. Any existing
-   configuration file is not overwritten, but renamed (within the
-   same directory) using a timestamp (Windows) or sequential number
-   (Linux). To remove the existing server instance, choose the Remove
-   Instance option and click the Next button.
+   configuration file is not overwritten, but renamed (within
+   the same directory) using a timestamp (Windows) or sequential
+   number (Linux). To remove the existing server instance,
+   choose the Remove Instance option and click the Next button.
 
    If you choose the Remove Instance option, you advance to a
-   confirmation window. Click the Execute button. The MySQL Server
-   Configuration Wizard stops and removes the MySQL service, and then
-   deletes the configuration file. The server installation and its
-   data folder are not removed.
-
-   If you choose the Re-configure Instance option, you advance to the
-   Configuration Type dialog where you can choose the type of
-   installation that you wish to configure.
-
-2.3.6.3. Choosing a Configuration Type
-
-   When you start the MySQL Server Instance Configuration Wizard for
-   a new MySQL installation, or choose the Re-configure Instance
-   option for an existing installation, you advance to the
-   Configuration Type dialog.
-   MySQL Server Instance Configuration Wizard: Configuration Type
+   confirmation window. Click the Execute button. The MySQL
+   Server Configuration Wizard stops and removes the MySQL
+   service, and then deletes the configuration file. The server
+   installation and its data folder are not removed.
+
+   If you choose the Re-configure Instance option, you advance
+   to the Configuration Type dialog where you can choose the
+   type of installation that you wish to configure.
+
+2.3.6.3 Choosing a Configuration Type
+
+   When you start the MySQL Server Instance Configuration Wizard
+   for a new MySQL installation, or choose the Re-configure
+   Instance option for an existing installation, you advance to
+   the Configuration Type dialog.
+   MySQL Server Instance Configuration Wizard: Configuration
+   Type
 
    There are two configuration types available: Detailed
    Configuration and Standard Configuration. The Standard
-   Configuration option is intended for new users who want to get
-   started with MySQL quickly without having to make many decisions
-   about server configuration. The Detailed Configuration option is
-   intended for advanced users who want more fine-grained control
-   over server configuration.
+   Configuration option is intended for new users who want to
+   get started with MySQL quickly without having to make many
+   decisions about server configuration. The Detailed
+   Configuration option is intended for advanced users who want
+   more fine-grained control over server configuration.
 
    If you are new to MySQL and need a server configured as a
-   single-user developer machine, the Standard Configuration should
-   suit your needs. Choosing the Standard Configuration option causes
-   the MySQL Configuration Wizard to set all configuration options
-   automatically with the exception of Service Options and Security
-   Options.
-
-   The Standard Configuration sets options that may be incompatible
-   with systems where there are existing MySQL installations. If you
-   have an existing MySQL installation on your system in addition to
-   the installation you wish to configure, the Detailed Configuration
-   option is recommended.
+   single-user developer machine, the Standard Configuration
+   should suit your needs. Choosing the Standard Configuration
+   option causes the MySQL Configuration Wizard to set all
+   configuration options automatically with the exception of
+   Service Options and Security Options.
+
+   The Standard Configuration sets options that may be
+   incompatible with systems where there are existing MySQL
+   installations. If you have an existing MySQL installation on
+   your system in addition to the installation you wish to
+   configure, the Detailed Configuration option is recommended.
 
    To complete the Standard Configuration, please refer to the
    sections on Service Options and Security Options in Section
-   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11, "The
-   Security Options Dialog," respectively.
+   2.3.6.10, "The Service Options Dialog," and Section 2.3.6.11,
+   "The Security Options Dialog," respectively.
 
-2.3.6.4. The Server Type Dialog
+2.3.6.4 The Server Type Dialog
 
-   There are three different server types available to choose from.
-   The server type that you choose affects the decisions that the
-   MySQL Server Instance Configuration Wizard makes with regard to
-   memory, disk, and processor usage.
+   There are three different server types available to choose
+   from. The server type that you choose affects the decisions
+   that the MySQL Server Instance Configuration Wizard makes
+   with regard to memory, disk, and processor usage.
    MySQL Server Instance Configuration Wizard: Server Type
 
-     * Developer Machine: Choose this option for a typical desktop
-       workstation where MySQL is intended only for personal use. It
-       is assumed that many other desktop applications are running.
-       The MySQL server is configured to use minimal system
-       resources.
-
-     * Server Machine: Choose this option for a server machine where
-       the MySQL server is running alongside other server
-       applications such as FTP, email, and Web servers. The MySQL
-       server is configured to use a moderate portion of the system
-       resources.
+     * Developer Machine: Choose this option for a typical
+       desktop workstation where MySQL is intended only for
+       personal use. It is assumed that many other desktop
+       applications are running. The MySQL server is configured
+       to use minimal system resources.
+
+     * Server Machine: Choose this option for a server machine
+       where the MySQL server is running alongside other server
+       applications such as FTP, email, and Web servers. The
+       MySQL server is configured to use a moderate portion of
+       the system resources.
 
      * Dedicated MySQL Server Machine: Choose this option for a
-       server machine that is intended to run only the MySQL server.
-       It is assumed that no other applications are running. The
-       MySQL server is configured to use all available system
-       resources.
+       server machine that is intended to run only the MySQL
+       server. It is assumed that no other applications are
+       running. The MySQL server is configured to use all
+       available system resources.
 
    Note
 
-   By selecting one of the preconfigured configurations, the values
-   and settings of various options in your my.cnf or my.ini will be
-   altered accordingly. The default values and options as described
-   in the reference manual may therefore be different to the options
-   and values that were created during the execution of the
-   configuration wizard.
+   By selecting one of the preconfigured configurations, the
+   values and settings of various options in your my.cnf or
+   my.ini will be altered accordingly. The default values and
+   options as described in the reference manual may therefore be
+   different to the options and values that were created during
+   the execution of the configuration wizard.
 
-2.3.6.5. The Database Usage Dialog
+2.3.6.5 The Database Usage Dialog
 
    The Database Usage dialog enables you to indicate the storage
-   engines that you expect to use when creating MySQL tables. The
-   option you choose determines whether the InnoDB storage engine is
-   available and what percentage of the server resources are
-   available to InnoDB.
+   engines that you expect to use when creating MySQL tables.
+   The option you choose determines whether the InnoDB storage
+   engine is available and what percentage of the server
+   resources are available to InnoDB.
    MySQL Server Instance Configuration Wizard: Usage Dialog
 
-     * Multifunctional Database: This option enables both the InnoDB
-       and MyISAM storage engines and divides resources evenly
-       between the two. This option is recommended for users who use
-       both storage engines on a regular basis.
+     * Multifunctional Database: This option enables both the
+       InnoDB and MyISAM storage engines and divides resources
+       evenly between the two. This option is recommended for
+       users who use both storage engines on a regular basis.
 
      * Transactional Database Only: This option enables both the
-       InnoDB and MyISAM storage engines, but dedicates most server
-       resources to the InnoDB storage engine. This option is
-       recommended for users who use InnoDB almost exclusively and
-       make only minimal use of MyISAM.
+       InnoDB and MyISAM storage engines, but dedicates most
+       server resources to the InnoDB storage engine. This
+       option is recommended for users who use InnoDB almost
+       exclusively and make only minimal use of MyISAM.
 
      * Non-Transactional Database Only: This option disables the
        InnoDB storage engine completely and dedicates all server
        resources to the MyISAM storage engine. This option is
        recommended for users who do not use InnoDB.
 
-   The Configuration Wizard uses a template to generate the server
-   configuration file. The Database Usage dialog sets one of the
-   following option strings:
+   The Configuration Wizard uses a template to generate the
+   server configuration file. The Database Usage dialog sets one
+   of the following option strings:
 Multifunctional Database:        MIXED
 Transactional Database Only:     INNODB
 Non-Transactional Database Only: MYISAM
@@ -2637,213 +2965,229 @@
    resources dedicated to MyISAM. The remaining resources are
    allocated to InnoDB.
 
-2.3.6.6. The InnoDB Tablespace Dialog
+2.3.6.6 The InnoDB Tablespace Dialog
 
-   Some users may want to locate the InnoDB tablespace files in a
-   different location than the MySQL server data directory. Placing
-   the tablespace files in a separate location can be desirable if
-   your system has a higher capacity or higher performance storage
-   device available, such as a RAID storage system.
-   MySQL Server Instance Configuration Wizard: InnoDB Data Tablespace
-
-   To change the default location for the InnoDB tablespace files,
-   choose a new drive from the drop-down list of drive letters and
-   choose a new path from the drop-down list of paths. To create a
-   custom path, click the ... button.
-
-   If you are modifying the configuration of an existing server, you
-   must click the Modify button before you change the path. In this
-   situation you must move the existing tablespace files to the new
-   location manually before starting the server.
+   Some users may want to locate the InnoDB tablespace files in
+   a different location than the MySQL server data directory.
+   Placing the tablespace files in a separate location can be
+   desirable if your system has a higher capacity or higher
+   performance storage device available, such as a RAID storage
+   system.
+   MySQL Server Instance Configuration Wizard: InnoDB Data
+   Tablespace
+
+   To change the default location for the InnoDB tablespace
+   files, choose a new drive from the drop-down list of drive
+   letters and choose a new path from the drop-down list of
+   paths. To create a custom path, click the ... button.
+
+   If you are modifying the configuration of an existing server,
+   you must click the Modify button before you change the path.
+   In this situation you must move the existing tablespace files
+   to the new location manually before starting the server.
 
-2.3.6.7. The Concurrent Connections Dialog
+2.3.6.7 The Concurrent Connections Dialog
 
    To prevent the server from running out of resources, it is
-   important to limit the number of concurrent connections to the
-   MySQL server that can be established. The Concurrent Connections
-   dialog enables you to choose the expected usage of your server,
-   and sets the limit for concurrent connections accordingly. It is
-   also possible to set the concurrent connection limit manually.
+   important to limit the number of concurrent connections to
+   the MySQL server that can be established. The Concurrent
+   Connections dialog enables you to choose the expected usage
+   of your server, and sets the limit for concurrent connections
+   accordingly. It is also possible to set the concurrent
+   connection limit manually.
    MySQL Server Instance Configuration Wizard: Connections
 
-     * Decision Support (DSS)/OLAP: Choose this option if your server
-       does not require a large number of concurrent connections. The
-       maximum number of connections is set at 100, with an average
-       of 20 concurrent connections assumed.
-
-     * Online Transaction Processing (OLTP): Choose this option if
-       your server requires a large number of concurrent connections.
-       The maximum number of connections is set at 500.
-
-     * Manual Setting: Choose this option to set the maximum number
-       of concurrent connections to the server manually. Choose the
-       number of concurrent connections from the drop-down box
-       provided, or enter the maximum number of connections into the
-       drop-down box if the number you desire is not listed.
+     * Decision Support (DSS)/OLAP: Choose this option if your
+       server does not require a large number of concurrent
+       connections. The maximum number of connections is set at
+       100, with an average of 20 concurrent connections
+       assumed.
+
+     * Online Transaction Processing (OLTP): Choose this option
+       if your server requires a large number of concurrent
+       connections. The maximum number of connections is set at
+       500.
+
+     * Manual Setting: Choose this option to set the maximum
+       number of concurrent connections to the server manually.
+       Choose the number of concurrent connections from the
+       drop-down box provided, or enter the maximum number of
+       connections into the drop-down box if the number you
+       desire is not listed.
 
-2.3.6.8. The Networking and Strict Mode Options Dialog
+2.3.6.8 The Networking and Strict Mode Options Dialog
 
    Use the Networking Options dialog to enable or disable TCP/IP
    networking and to configure the port number that is used to
    connect to the MySQL server.
-   MySQL Server Instance Configuration Wizard: Network Configuration
+   MySQL Server Instance Configuration Wizard: Network
+   Configuration
 
    TCP/IP networking is enabled by default. To disable TCP/IP
-   networking, uncheck the box next to the Enable TCP/IP Networking
-   option.
+   networking, uncheck the box next to the Enable TCP/IP
+   Networking option.
 
-   Port 3306 is used by default. To change the port used to access
-   MySQL, choose a new port number from the drop-down box or type a
-   new port number directly into the drop-down box. If the port
-   number you choose is in use, you are prompted to confirm your
-   choice of port number.
-
-   Set the Server SQL Mode to either enable or disable strict mode.
-   Enabling strict mode (default) makes MySQL behave more like other
-   database management systems. If you run applications that rely on
-   MySQL's old "forgiving" behavior, make sure to either adapt those
-   applications or to disable strict mode. For more information about
-   strict mode, see Section 5.1.7, "Server SQL Modes."
+   Port 3306 is used by default. To change the port used to
+   access MySQL, choose a new port number from the drop-down box
+   or type a new port number directly into the drop-down box. If
+   the port number you choose is in use, you are prompted to
+   confirm your choice of port number.
+
+   Set the Server SQL Mode to either enable or disable strict
+   mode. Enabling strict mode (default) makes MySQL behave more
+   like other database management systems. If you run
+   applications that rely on MySQL's old "forgiving" behavior,
+   make sure to either adapt those applications or to disable
+   strict mode. For more information about strict mode, see
+   Section 5.1.7, "Server SQL Modes."
 
-2.3.6.9. The Character Set Dialog
+2.3.6.9 The Character Set Dialog
 
    The MySQL server supports multiple character sets and it is
-   possible to set a default server character set that is applied to
-   all tables, columns, and databases unless overridden. Use the
-   Character Set dialog to change the default character set of the
-   MySQL server.
+   possible to set a default server character set that is
+   applied to all tables, columns, and databases unless
+   overridden. Use the Character Set dialog to change the
+   default character set of the MySQL server.
    MySQL Server Instance Configuration Wizard: Character Set
 
-     * Standard Character Set: Choose this option if you want to use
-       latin1 as the default server character set. latin1 is used for
-       English and many Western European languages.
-
-     * Best Support For Multilingualism: Choose this option if you
-       want to use utf8 as the default server character set. This is
-       a Unicode character set that can store characters from many
-       different languages.
-
-     * Manual Selected Default Character Set / Collation: Choose this
-       option if you want to pick the server's default character set
-       manually. Choose the desired character set from the provided
-       drop-down list.
+     * Standard Character Set: Choose this option if you want to
+       use latin1 as the default server character set. latin1 is
+       used for English and many Western European languages.
+
+     * Best Support For Multilingualism: Choose this option if
+       you want to use utf8 as the default server character set.
+       This is a Unicode character set that can store characters
+       from many different languages.
+
+     * Manual Selected Default Character Set / Collation: Choose
+       this option if you want to pick the server's default
+       character set manually. Choose the desired character set
+       from the provided drop-down list.
 
-2.3.6.10. The Service Options Dialog
+2.3.6.10 The Service Options Dialog
 
    On Windows platforms, the MySQL server can be installed as a
-   Windows service. When installed this way, the MySQL server can be
-   started automatically during system startup, and even restarted
-   automatically by Windows in the event of a service failure.
-
-   The MySQL Server Instance Configuration Wizard installs the MySQL
-   server as a service by default, using the service name MySQL. If
-   you do not wish to install the service, uncheck the box next to
-   the Install As Windows Service option. You can change the service
-   name by picking a new service name from the drop-down box provided
-   or by entering a new service name into the drop-down box.
-   Note
-
-   Service names can include any legal character except forward (/)
-   or backward (\) slashes, and must be less than 256 characters
-   long.
+   Windows service. When installed this way, the MySQL server
+   can be started automatically during system startup, and even
+   restarted automatically by Windows in the event of a service
+   failure.
+
+   The MySQL Server Instance Configuration Wizard installs the
+   MySQL server as a service by default, using the service name
+   MySQL. If you do not wish to install the service, uncheck the
+   box next to the Install As Windows Service option. You can
+   change the service name by picking a new service name from
+   the drop-down box provided or by entering a new service name
+   into the drop-down box.
+   Note
+
+   Service names can include any legal character except forward
+   (/) or backward (\) slashes, and must be less than 256
+   characters long.
    Warning
 
-   If you are installing multiple versions of MySQL onto the same
-   machine, you must choose a different service name for each version
-   that you install. If you do not choose a different service for
-   each installed version then the service manager information will
-   be inconsistent and this will cause problems when you try to
-   uninstall a previous version.
-
-   If you have already installed multiple versions using the same
-   service name, you must manually edit the contents of the
-   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services parameters
-   within the Windows registry to update the association of the
-   service name with the correct server version.
-
-   Typically, when installing multiple versions you create a service
-   name based on the version information. For example, you might
-   install MySQL 5.x as mysql5, or specific versions such as MySQL
-   5.5.0 as mysql50500.
-
-   To install the MySQL server as a service but not have it started
-   automatically at startup, uncheck the box next to the Launch the
-   MySQL Server Automatically option.
-
-2.3.6.11. The Security Options Dialog
-
-   The content of the security options portion of the MySQL Server
-   Instance Configuration Wizard will depend on whether this is a new
-   installation, or modifying an existing installation.
+   If you are installing multiple versions of MySQL onto the
+   same machine, you must choose a different service name for
+   each version that you install. If you do not choose a
+   different service for each installed version then the service
+   manager information will be inconsistent and this will cause
+   problems when you try to uninstall a previous version.
+
+   If you have already installed multiple versions using the
+   same service name, you must manually edit the contents of the
+   HKEY_LOCAL_MACHINE\SYSTEM\CurrentControlSet\Services
+   parameters within the Windows registry to update the
+   association of the service name with the correct server
+   version.
+
+   Typically, when installing multiple versions you create a
+   service name based on the version information. For example,
+   you might install MySQL 5.x as mysql5, or specific versions
+   such as MySQL 5.5.0 as mysql50500.
+
+   To install the MySQL server as a service but not have it
+   started automatically at startup, uncheck the box next to the
+   Launch the MySQL Server Automatically option.
+
+2.3.6.11 The Security Options Dialog
+
+   The content of the security options portion of the MySQL
+   Server Instance Configuration Wizard will depend on whether
+   this is a new installation, or modifying an existing
+   installation.
 
      * Setting the root password for a new installation
-       It is strongly recommended that you set a root password for
-       your MySQL server, and the MySQL Server Instance Config Wizard
-       requires by default that you do so. If you do not wish to set
-       a root password, uncheck the box next to the Modify Security
-       Settings option.
+       It is strongly recommended that you set a root password
+       for your MySQL server, and the MySQL Server Instance
+       Config Wizard requires by default that you do so. If you
+       do not wish to set a root password, uncheck the box next
+       to the Modify Security Settings option.
        MySQL Server Instance Config Wizard: Security
 
-     * To set the root password, enter the desired password into both
-       the New root password and Confirm boxes.
+     * To set the root password, enter the desired password into
+       both the New root password and Confirm boxes.
        Setting the root password for an existing installation
        If you are modifying the configuration of an existing
-       configuration, or you are installing an upgrade and the MySQL
-       Server Instance Configuration Wizard has detected an existing
-       MySQL system, then you must enter the existing password for
-       root before changing the configuration information.
+       configuration, or you are installing an upgrade and the
+       MySQL Server Instance Configuration Wizard has detected
+       an existing MySQL system, then you must enter the
+       existing password for root before changing the
+       configuration information.
        MySQL Server Instance Config Wizard: Security (Existing
        Installation)
-       If you want to change the current root password, enter the
-       desired new password into both the New root password and
-       Confirm boxes.
-
-   To permit root logins from across the network, check the box next
-   to the Enable root access from remote machines option. This
-   decreases the security of your root account.
-
-   To create an anonymous user account, check the box next to the
-   Create An Anonymous Account option. Creating an anonymous account
-   can decrease server security and cause login and permission
-   difficulties. For this reason, it is not recommended.
-
-2.3.6.12. The Confirmation Dialog
-
-   The final dialog in the MySQL Server Instance Configuration Wizard
-   is the Confirmation Dialog. To start the configuration process,
-   click the Execute button. To return to a previous dialog, click
-   the Back button. To exit the MySQL Server Instance Configuration
-   Wizard without configuring the server, click the Cancel button.
+       If you want to change the current root password, enter
+       the desired new password into both the New root password
+       and Confirm boxes.
+
+   To permit root logins from across the network, check the box
+   next to the Enable root access from remote machines option.
+   This decreases the security of your root account.
+
+   To create an anonymous user account, check the box next to
+   the Create An Anonymous Account option. Creating an anonymous
+   account can decrease server security and cause login and
+   permission difficulties. For this reason, it is not
+   recommended.
+
+2.3.6.12 The Confirmation Dialog
+
+   The final dialog in the MySQL Server Instance Configuration
+   Wizard is the Confirmation Dialog. To start the configuration
+   process, click the Execute button. To return to a previous
+   dialog, click the Back button. To exit the MySQL Server
+   Instance Configuration Wizard without configuring the server,
+   click the Cancel button.
    MySQL Server Instance Configuration Wizard: Confirmation
 
    After you click the Execute button, the MySQL Server Instance
-   Configuration Wizard performs a series of tasks and displays the
-   progress onscreen as the tasks are performed.
-
-   The MySQL Server Instance Configuration Wizard first determines
-   configuration file options based on your choices using a template
-   prepared by MySQL developers and engineers. This template is named
-   my-template.ini and is located in your server installation
-   directory.
-
-   The MySQL Configuration Wizard then writes these options to the
-   corresponding configuration file.
+   Configuration Wizard performs a series of tasks and displays
+   the progress onscreen as the tasks are performed.
 
-   If you chose to create a service for the MySQL server, the MySQL
-   Server Instance Configuration Wizard creates and starts the
-   service. If you are reconfiguring an existing service, the MySQL
-   Server Instance Configuration Wizard restarts the service to apply
-   your configuration changes.
+   The MySQL Server Instance Configuration Wizard first
+   determines configuration file options based on your choices
+   using a template prepared by MySQL developers and engineers.
+   This template is named my-template.ini and is located in your
+   server installation directory.
+
+   The MySQL Configuration Wizard then writes these options to
+   the corresponding configuration file.
+
+   If you chose to create a service for the MySQL server, the
+   MySQL Server Instance Configuration Wizard creates and starts
+   the service. If you are reconfiguring an existing service,
+   the MySQL Server Instance Configuration Wizard restarts the
+   service to apply your configuration changes.
 
    If you chose to set a root password, the MySQL Configuration
-   Wizard connects to the server, sets your new root password, and
-   applies any other security settings you may have selected.
+   Wizard connects to the server, sets your new root password,
+   and applies any other security settings you may have
+   selected.
+
+   After the MySQL Server Instance Configuration Wizard has
+   completed its tasks, it displays a summary. Click the Finish
+   button to exit the MySQL Server Configuration Wizard.
 
-   After the MySQL Server Instance Configuration Wizard has completed
-   its tasks, it displays a summary. Click the Finish button to exit
-   the MySQL Server Configuration Wizard.
-
-2.3.6.13. MySQL Server Instance Config Wizard: Creating an Instance
+2.3.6.13 MySQL Server Instance Config Wizard: Creating an Instance
 from the Command Line
 
    In addition to using the GUI interface to the MySQL Server
@@ -2851,25 +3195,27 @@
    automatically from the command line.
 
    To use the MySQL Server Instance Config Wizard on the command
-   line, you need to use the MySQLInstanceConfig.exe command that is
-   installed with MySQL in the bin directory within the installation
-   directory. MySQLInstanceConfig.exe takes a number of command-line
-   arguments the set the properties that would normally be selected
-   through the GUI interface, and then creates a new configuration
-   file (my.ini) by combining these selections with a template
-   configuration file to produce the working configuration file.
-
-   The main command line options are provided in the table below.
-   Some of the options are required, while some options are optional.
+   line, you need to use the MySQLInstanceConfig.exe command
+   that is installed with MySQL in the bin directory within the
+   installation directory. MySQLInstanceConfig.exe takes a
+   number of command-line arguments the set the properties that
+   would normally be selected through the GUI interface, and
+   then creates a new configuration file (my.ini) by combining
+   these selections with a template configuration file to
+   produce the working configuration file.
+
+   The main command line options are provided in the table
+   below. Some of the options are required, while some options
+   are optional.
 
-   Table 2.5. MySQL Server Instance Config Wizard Command Line
+   Table 2.5 MySQL Server Instance Config Wizard Command Line
    Options
    Option Description
    Required Parameters
    -nPRODUCTNAME The name of the instance when installed
    -pPATH Path of the base directory for installation. This is
-   equivalent to the directory when using the basedir configuration
-   parameter
+   equivalent to the directory when using the basedir
+   configuration parameter
    -vVERSION The version tag to use for this installation
    Action to Perform
    -i Install an instance
@@ -2878,95 +3224,97 @@
    -q Perform the operation quietly
    -lFILENAME Sae the installation progress in a logfile
    Config File to Use
-   -tFILENAME Path to the template config file that will be used to
-   generate the installed configuration file
+   -tFILENAME Path to the template config file that will be used
+   to generate the installed configuration file
    -cFILENAME Path to a config file to be generated
 
    The -t and -c options work together to set the configuration
    parameters for a new instance. The -t option specifies the
-   template configuration file to use as the basic configuration,
-   which are then merged with the configuration parameters generated
-   by the MySQL Server Instance Config Wizard into the configuration
-   file specified by the -c option.
+   template configuration file to use as the basic
+   configuration, which are then merged with the configuration
+   parameters generated by the MySQL Server Instance Config
+   Wizard into the configuration file specified by the -c
+   option.
 
    A sample template file, my-template.ini is provided in the
-   toplevel MySQL installation directory. The file contains elements
-   are replaced automatically by the MySQL Server Instance Config
-   Wizard during configuration.
+   toplevel MySQL installation directory. The file contains
+   elements are replaced automatically by the MySQL Server
+   Instance Config Wizard during configuration.
 
    If you specify a configuration file that already exists, the
-   existing configuration file will be saved in the file with the
-   original, with the date and time added. For example, the mysql.ini
-   will be copied to mysql 2009-10-27 1646.ini.bak.
+   existing configuration file will be saved in the file with
+   the original, with the date and time added. For example, the
+   mysql.ini will be copied to mysql 2009-10-27 1646.ini.bak.
 
-   The parameters that you can specify on the command line are listed
-   in the table below.
+   The parameters that you can specify on the command line are
+   listed in the table below.
 
-   Table 2.6. MySQL Server Instance Config Wizard Parameters
+   Table 2.6 MySQL Server Instance Config Wizard Parameters
    Parameter Description
    ServiceName=$ Specify the name of the service to be created
    AddBinToPath={yes | no} Specifies whether to add the binary
    directory of MySQL to the standard PATH environment variable
-   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the server
-   type. For more information, see Section 2.3.6.4, "The Server Type
-   Dialog"
+   ServerType={DEVELOPMENT | SERVER | DEDICATED} Specify the
+   server type. For more information, see Section 2.3.6.4, "The
+   Server Type Dialog"
    DatabaseType={MIXED | INNODB | MYISAM} Specify the default
-   database type. For more information, see Section 2.3.6.5, "The
-   Database Usage Dialog"
+   database type. For more information, see Section 2.3.6.5,
+   "The Database Usage Dialog"
    ConnectionUsage={DSS | OLTP} Specify the type of connection
-   support, this automates the setting for the number of concurrent
-   connections (see the ConnectionCount parameter). For more
-   information, see Section 2.3.6.7, "The Concurrent Connections
-   Dialog"
-   ConnectionCount=# Specify the number of concurrent connections to
-   support. For more information, see Section 2.3.6.4, "The Server
-   Type Dialog"
-   SkipNetworking={yes | no} Specify whether network support should
-   be supported. Specifying yes disables network access altogether
+   support, this automates the setting for the number of
+   concurrent connections (see the ConnectionCount parameter).
+   For more information, see Section 2.3.6.7, "The Concurrent
+   Connections Dialog"
+   ConnectionCount=# Specify the number of concurrent
+   connections to support. For more information, see Section
+   2.3.6.4, "The Server Type Dialog"
+   SkipNetworking={yes | no} Specify whether network support
+   should be supported. Specifying yes disables network access
+   altogether
    Port=# Specify the network port number to use for network
    connections. For more information, see Section 2.3.6.8, "The
    Networking and Strict Mode Options Dialog"
-   StrictMode={yes | no} Specify whether to use the strict SQL mode.
-   For more information, see Section 2.3.6.8, "The Networking and
-   Strict Mode Options Dialog"
-   Charset=$ Specify the default character set. For more information,
-   see Section 2.3.6.9, "The Character Set Dialog"
+   StrictMode={yes | no} Specify whether to use the strict SQL
+   mode. For more information, see Section 2.3.6.8, "The
+   Networking and Strict Mode Options Dialog"
+   Charset=$ Specify the default character set. For more
+   information, see Section 2.3.6.9, "The Character Set Dialog"
    RootPassword=$ Specify the root password
    RootCurrentPassword=$ Specify the current root password then
    stopping or reconfiguring an existing service
    Note
 
-   When specifying options on the command line, you can enclose the
-   entire command-line option and the value you are specifying using
-   double quotation marks. This enables you to use spaces in the
-   options. For example, "-cC:\mysql.ini".
-
-   The following command installs a MySQL Server 5.5 instance from
-   the directory C:\Program Files\MySQL\MySQL Server 5.5 using the
-   service name MySQL55 and setting the root password to 1234.
+   When specifying options on the command line, you can enclose
+   the entire command-line option and the value you are
+   specifying using double quotation marks. This enables you to
+   use spaces in the options. For example, "-cC:\mysql.ini".
+
+   The following command installs a MySQL Server 5.5 instance
+   from the directory C:\Program Files\MySQL\MySQL Server 5.5
+   using the service name MySQL55 and setting the root password
+   to 1234.
 shell> MySQLInstanceConfig.exe -i -q "-lC:\mysql_install_log.txt" »
-   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -
-v5.5.36 »
-   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Datab
-aseType=MIXED »
-   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=123
-4
+   "-nMySQL Server 5.5" "-pC:\Program Files\MySQL\MySQL Server 5.5" -v
+5.5.44 »
+   "-tmy-template.ini" "-cC:\mytest.ini" ServerType=DEVELOPMENT Databa
+seType=MIXED »
+   ConnectionUsage=DSS Port=3311 ServiceName=MySQL55 RootPassword=1234
 
    In the above example, a log file will be generated in
    mysql_install_log.txt containing the information about the
-   instance creation process. The log file generated by the above
-   example is shown below:
+   instance creation process. The log file generated by the
+   above example is shown below:
 Welcome to the MySQL Server Instance Configuration Wizard 1.0.16.0
 Date: 2009-10-27 17:07:21
 
 Installing service ...
 
 Product Name:         MySQL Server 5.5
-Version:              5.5.36
+Version:              5.5.44
 Installation Path:    C:\Program Files\MySQL\MySQL Server 5.5\
 
-Creating configuration file C:\mytest.ini using template my-template.
-ini.
+Creating configuration file C:\mytest.ini using template my-template.i
+ni.
 Options:
 DEVELOPMENT
 MIXED
@@ -2982,14 +3330,16 @@
 
 Creating Windows service entry.
 Service name: "MySQL55"
-Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --
-defaults-file="C:\mytest.ini" MySQL55.
+Parameters:   "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --d
+efaults-file="C:\mytest.ini" MySQL55.
 Windows service MySQL55 installed.
 
-   When using the command line, the return values in the following
-   table indicate an error performing the specified option.
+   When using the command line, the return values in the
+   following table indicate an error performing the specified
+   option.
 
-   Table 2.7. Return Value from MySQL Server Instance Config Wizard
+   Table 2.7 Return Value from MySQL Server Instance Config
+   Wizard
    Value                   Description
    2     Configuration template file cannot be found
    3     The Windows service entry cannot be created
@@ -3000,17 +3350,18 @@
    8     The configuration file cannot be written
    9     The Windows service entry cannot be removed
 
-   You can perform an installation of MySQL automatically using the
-   MSI package. For more information, see Section 2.3.5.2,
-   "Automating MySQL Installation on Microsoft Windows Using the MSI
-   Package."
+   You can perform an installation of MySQL automatically using
+   the MSI package. For more information, see Section 2.3.5.2,
+   "Automating MySQL Installation on Microsoft Windows Using the
+   MSI Package."
 
-2.3.7. Installing MySQL on Microsoft Windows Using a noinstall Zip
+2.3.7 Installing MySQL on Microsoft Windows Using a noinstall Zip
 Archive
 
-   Users who are installing from the noinstall package can use the
-   instructions in this section to manually install MySQL. The
-   process for installing MySQL from a Zip archive is as follows:
+   Users who are installing from the noinstall package can use
+   the instructions in this section to manually install MySQL.
+   The process for installing MySQL from a Zip archive is as
+   follows:
 
     1. Extract the archive to the desired install directory
 
@@ -3024,195 +3375,208 @@
 
    This process is described in the sections that follow.
 
-2.3.7.1. Extracting the Install Archive
+2.3.7.1 Extracting the Install Archive
 
    To install MySQL manually, do the following:
 
-    1. If you are upgrading from a previous version please refer to
-       Section 2.3.9, "Upgrading MySQL on Windows," before beginning
-       the upgrade process.
+    1. If you are upgrading from a previous version please refer
+       to Section 2.3.9, "Upgrading MySQL on Windows," before
+       beginning the upgrade process.
 
-    2. Make sure that you are logged in as a user with administrator
-       privileges.
+    2. Make sure that you are logged in as a user with
+       administrator privileges.
 
     3. Choose an installation location. Traditionally, the MySQL
-       server is installed in C:\mysql. The MySQL Installation Wizard
-       installs MySQL under C:\Program Files\MySQL. If you do not
-       install MySQL at C:\mysql, you must specify the path to the
-       install directory during startup or in an option file. See
-       Section 2.3.7.2, "Creating an Option File."
+       server is installed in C:\mysql. The MySQL Installation
+       Wizard installs MySQL under C:\Program Files\MySQL. If
+       you do not install MySQL at C:\mysql, you must specify
+       the path to the install directory during startup or in an
+       option file. See Section 2.3.7.2, "Creating an Option
+       File."
+       Note
+       The MySQL Installer installs MySQL under C:\Program
+       Files\MySQL.
 
     4. Extract the install archive to the chosen installation
-       location using your preferred Zip archive tool. Some tools may
-       extract the archive to a folder within your chosen
-       installation location. If this occurs, you can move the
-       contents of the subfolder into the chosen installation
-       location.
-
-2.3.7.2. Creating an Option File
-
-   If you need to specify startup options when you run the server,
-   you can indicate them on the command line or place them in an
-   option file. For options that are used every time the server
-   starts, you may find it most convenient to use an option file to
-   specify your MySQL configuration. This is particularly true under
-   the following circumstances:
-
-     * The installation or data directory locations are different
-       from the default locations (C:\Program Files\MySQL\MySQL
-       Server 5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data).
-
-     * You need to tune the server settings, such as memory, cache,
-       or InnoDB configuration information.
-
-   When the MySQL server starts on Windows, it looks for option files
-   in several locations, such as the Windows directory, C:\, and the
-   MySQL installation directory (for the full list of locations, see
-   Section 4.2.3.3, "Using Option Files"). The Windows directory
-   typically is named something like C:\WINDOWS. You can determine
-   its exact location from the value of the WINDIR environment
-   variable using the following command:
+       location using your preferred Zip archive tool. Some
+       tools may extract the archive to a folder within your
+       chosen installation location. If this occurs, you can
+       move the contents of the subfolder into the chosen
+       installation location.
+
+2.3.7.2 Creating an Option File
+
+   If you need to specify startup options when you run the
+   server, you can indicate them on the command line or place
+   them in an option file. For options that are used every time
+   the server starts, you may find it most convenient to use an
+   option file to specify your MySQL configuration. This is
+   particularly true under the following circumstances:
+
+     * The installation or data directory locations are
+       different from the default locations (C:\Program
+       Files\MySQL\MySQL Server 5.5 and C:\Program
+       Files\MySQL\MySQL Server 5.5\data).
+
+     * You need to tune the server settings, such as memory,
+       cache, or InnoDB configuration information.
+
+   When the MySQL server starts on Windows, it looks for option
+   files in several locations, such as the Windows directory,
+   C:\, and the MySQL installation directory (for the full list
+   of locations, see Section 4.2.6, "Using Option Files"). The
+   Windows directory typically is named something like
+   C:\WINDOWS. You can determine its exact location from the
+   value of the WINDIR environment variable using the following
+   command:
 C:\> echo %WINDIR%
 
-   MySQL looks for options in each location first in the my.ini file,
-   and then in the my.cnf file. However, to avoid confusion, it is
-   best if you use only one file. If your PC uses a boot loader where
-   C: is not the boot drive, your only option is to use the my.ini
-   file. Whichever option file you use, it must be a plain text file.
-   Note
-
-   When using the MySQL Installer to install MySQL Server, it will
-   create the my.ini at the default location. And as of MySQL Server
-   5.5.27, the user running MySQL Installer is granted full
-   permissions to this new my.ini.
-
-   In other words, be sure that the MySQL Server user has permission
-   to read the my.ini file.
-
-   You can also make use of the example option files included with
-   your MySQL distribution; see Section 5.1.2, "Server Configuration
-   Defaults."
-
-   An option file can be created and modified with any text editor,
-   such as Notepad. For example, if MySQL is installed in E:\mysql
-   and the data directory is in E:\mydata\data, you can create an
-   option file containing a [mysqld] section to specify values for
-   the basedir and datadir options:
+   MySQL looks for options in each location first in the my.ini
+   file, and then in the my.cnf file. However, to avoid
+   confusion, it is best if you use only one file. If your PC
+   uses a boot loader where C: is not the boot drive, your only
+   option is to use the my.ini file. Whichever option file you
+   use, it must be a plain text file.
+   Note
+
+   When using the MySQL Installer to install MySQL Server, it
+   will create the my.ini at the default location. And as of
+   MySQL Server 5.5.27, the user running MySQL Installer is
+   granted full permissions to this new my.ini.
+
+   In other words, be sure that the MySQL Server user has
+   permission to read the my.ini file.
+
+   You can also make use of the example option files included
+   with your MySQL distribution; see Section 5.1.2, "Server
+   Configuration Defaults."
+
+   An option file can be created and modified with any text
+   editor, such as Notepad. For example, if MySQL is installed
+   in E:\mysql and the data directory is in E:\mydata\data, you
+   can create an option file containing a [mysqld] section to
+   specify values for the basedir and datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=E:/mydata/data
 
-   Note that Windows path names are specified in option files using
-   (forward) slashes rather than backslashes. If you do use
-   backslashes, double them:
+   Microsoft Windows path names are specified in option files
+   using (forward) slashes rather than backslashes. If you do
+   use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=E:\\mysql
 # set datadir to the location of your data directory
 datadir=E:\\mydata\\data
 
-   The rules for use of backslash in option file values are given in
-   Section 4.2.3.3, "Using Option Files."
+   The rules for use of backslash in option file values are
+   given in Section 4.2.6, "Using Option Files."
 
-   The data directory is located within the AppData directory for the
-   user running MySQL.
+   The data directory is located within the AppData directory
+   for the user running MySQL.
 
-   If you would like to use a data directory in a different location,
-   you should copy the entire contents of the data directory to the
-   new location. For example, if you want to use E:\mydata as the
-   data directory instead, you must do two things:
-
-    1. Move the entire data directory and all of its contents from
-       the default location (for example C:\Program Files\MySQL\MySQL
-       Server 5.5\data) to E:\mydata.
+   If you would like to use a data directory in a different
+   location, you should copy the entire contents of the data
+   directory to the new location. For example, if you want to
+   use E:\mydata as the data directory instead, you must do two
+   things:
+
+    1. Move the entire data directory and all of its contents
+       from the default location (for example C:\Program
+       Files\MySQL\MySQL Server 5.5\data) to E:\mydata.
 
     2. Use a --datadir option to specify the new data directory
        location each time you start the server.
 
-2.3.7.3. Selecting a MySQL Server Type
+2.3.7.3 Selecting a MySQL Server Type
 
-   The following table shows the available servers for Windows in
-   MySQL 5.5.
+   The following table shows the available servers for Windows
+   in MySQL 5.5.
    Binary Description
    mysqld Optimized binary with named-pipe support
-   mysqld-debug Like mysqld, but compiled with full debugging and
-   automatic memory allocation checking
+   mysqld-debug Like mysqld, but compiled with full debugging
+   and automatic memory allocation checking
 
    All of the preceding binaries are optimized for modern Intel
    processors, but should work on any Intel i386-class or higher
    processor.
 
    Each of the servers in a distribution support the same set of
-   storage engines. The SHOW ENGINES statement displays which engines
-   a given server supports.
+   storage engines. The SHOW ENGINES statement displays which
+   engines a given server supports.
 
-   All Windows MySQL 5.5 servers have support for symbolic linking of
-   database directories.
+   All Windows MySQL 5.5 servers have support for symbolic
+   linking of database directories.
 
-   MySQL supports TCP/IP on all Windows platforms. MySQL servers on
-   Windows support named pipes as indicated in the following list.
-   However, the default is to use TCP/IP regardless of platform.
-   (Named pipes are slower than TCP/IP in many Windows
-   configurations.)
-
-   Named pipes are enabled only if you start the server with the
-   --enable-named-pipe option. It is necessary to use this option
-   explicitly because some users have experienced problems with
-   shutting down the MySQL server when named pipes were used.
+   MySQL supports TCP/IP on all Windows platforms. MySQL servers
+   on Windows also support named pipes, if you start the server
+   with the --enable-named-pipe option. It is necessary to use
+   this option explicitly because some users have experienced
+   problems with shutting down the MySQL server when named pipes
+   were used. The default is to use TCP/IP regardless of
+   platform because named pipes are slower than TCP/IP in many
+   Windows configurations.
 
-2.3.7.4. Starting the Server for the First Time
+2.3.7.4 Starting the Server for the First Time
 
    This section gives a general overview of starting the MySQL
-   server. The following sections provide more specific information
-   for starting the MySQL server from the command line or as a
-   Windows service.
+   server. The following sections provide more specific
+   information for starting the MySQL server from the command
+   line or as a Windows service.
 
    The information here applies primarily if you installed MySQL
-   using the Noinstall version, or if you wish to configure and test
-   MySQL manually rather than with the GUI tools.
+   using the Noinstall version, or if you wish to configure and
+   test MySQL manually rather than with the GUI tools.
+   Note
+
+   The MySQL server will automatically start after using the
+   MySQL Installer, and the MySQL Notifier GUI can be used to
+   start/stop/restart at any time.
 
    The examples in these sections assume that MySQL is installed
-   under the default location of C:\Program Files\MySQL\MySQL Server
-   5.5. Adjust the path names shown in the examples if you have MySQL
-   installed in a different location.
-
-   Clients have two options. They can use TCP/IP, or they can use a
-   named pipe if the server supports named-pipe connections.
-
-   MySQL for Windows also supports shared-memory connections if the
-   server is started with the --shared-memory option. Clients can
-   connect through shared memory by using the --protocol=MEMORY
-   option.
+   under the default location of C:\Program Files\MySQL\MySQL
+   Server 5.5. Adjust the path names shown in the examples if
+   you have MySQL installed in a different location.
+
+   Clients have two options. They can use TCP/IP, or they can
+   use a named pipe if the server supports named-pipe
+   connections.
+
+   MySQL for Windows also supports shared-memory connections if
+   the server is started with the --shared-memory option.
+   Clients can connect through shared memory by using the
+   --protocol=MEMORY option.
 
    For information about which server binary to run, see Section
    2.3.7.3, "Selecting a MySQL Server Type."
 
-   Testing is best done from a command prompt in a console window (or
-   "DOS window"). In this way you can have the server display status
-   messages in the window where they are easy to see. If something is
-   wrong with your configuration, these messages make it easier for
-   you to identify and fix any problems.
+   Testing is best done from a command prompt in a console
+   window (or "DOS window"). In this way you can have the server
+   display status messages in the window where they are easy to
+   see. If something is wrong with your configuration, these
+   messages make it easier for you to identify and fix any
+   problems.
 
    To start the server, enter this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --console
 
    For a server that includes InnoDB support, you should see the
-   messages similar to those following as it starts (the path names
-   and sizes may differ):
+   messages similar to those following as it starts (the path
+   names and sizes may differ):
 InnoDB: The first specified datafile c:\ibdata\ibdata1 did not exist:
 InnoDB: a new database to be created!
 InnoDB: Setting file c:\ibdata\ibdata1 size to 209715200
 InnoDB: Database physically writes the file full: wait...
-InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile0 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile0 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile1 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile1 size to 31457280
-InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be creat
-ed
+InnoDB: Log file c:\iblogs\ib_logfile2 did not exist: new to be create
+d
 InnoDB: Setting log file c:\iblogs\ib_logfile2 size to 31457280
 InnoDB: Doublewrite buffer not found: creating new
 InnoDB: Doublewrite buffer created
@@ -3221,151 +3585,170 @@
 011024 10:58:25  InnoDB: Started
 
    When the server finishes its startup sequence, you should see
-   something like this, which indicates that the server is ready to
-   service client connections:
+   something like this, which indicates that the server is ready
+   to service client connections:
 mysqld: ready for connections
-Version: '5.5.36'  socket: ''  port: 3306
+Version: '5.5.44'  socket: ''  port: 3306
 
    The server continues to write to the console any further
-   diagnostic output it produces. You can open a new console window
-   in which to run client programs.
+   diagnostic output it produces. You can open a new console
+   window in which to run client programs.
 
-   If you omit the --console option, the server writes diagnostic
-   output to the error log in the data directory (C:\Program
-   Files\MySQL\MySQL Server 5.5\data by default). The error log is
-   the file with the .err extension, or may be specified by passing
-   in the --log-error option.
+   If you omit the --console option, the server writes
+   diagnostic output to the error log in the data directory
+   (C:\Program Files\MySQL\MySQL Server 5.5\data by default).
+   The error log is the file with the .err extension, and may be
+   set using the --log-error option.
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11.2,
-   "Securing the Initial MySQL Accounts."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10.2, "Securing the Initial MySQL Accounts."
 
-2.3.7.5. Starting MySQL from the Windows Command Line
+2.3.7.5 Starting MySQL from the Windows Command Line
 
-   The MySQL server can be started manually from the command line.
-   This can be done on any version of Windows.
+   The MySQL server can be started manually from the command
+   line. This can be done on any version of Windows.
+   Note
+
+   The MySQL Notifier GUI can also be used to start/stop/restart
+   the MySQL server.
 
-   To start the mysqld server from the command line, you should start
-   a console window (or "DOS window") and enter this command:
+   To start the mysqld server from the command line, you should
+   start a console window (or "DOS window") and enter this
+   command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
 
-   The path to mysqld may vary depending on the install location of
-   MySQL on your system.
+   The path to mysqld may vary depending on the install location
+   of MySQL on your system.
 
    You can stop the MySQL server by executing this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" -u root
- shutdown
+shutdown
+
+   Note
+
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
 
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
-
-   If mysqld doesn't start, check the error log to see whether the
-   server wrote any messages there to indicate the cause of the
-   problem. By default, the error log is located in the C:\Program
-   Files\MySQL\MySQL Server 5.5\data directory. It is the file with a
-   suffix of .err, or may be specified by passing in the --log-error
-   option. Alternatively, you can try to start the server as mysqld
-   --console; in this case, you may get some useful information on
-   the screen that may help solve the problem.
+   Users in the MySQL grant system are wholly independent from
+   any login users under Microsoft Windows.
+
+   If mysqld doesn't start, check the error log to see whether
+   the server wrote any messages there to indicate the cause of
+   the problem. By default, the error log is located in the
+   C:\Program Files\MySQL\MySQL Server 5.5\data directory. It is
+   the file with a suffix of .err, or may be specified by
+   passing in the --log-error option. Alternatively, you can try
+   to start the server with the --console option; in this case,
+   the server may display some useful information on the screen
+   that will help solve the problem.
 
    The last option is to start mysqld with the --standalone and
    --debug options. In this case, mysqld writes a log file
-   C:\mysqld.trace that should contain the reason why mysqld doesn't
-   start. See Section 23.4.3, "The DBUG Package."
+   C:\mysqld.trace that should contain the reason why mysqld
+   doesn't start. See Section 24.4.3, "The DBUG Package."
 
-   Use mysqld --verbose --help to display all the options that mysqld
-   supports.
+   Use mysqld --verbose --help to display all the options that
+   mysqld supports.
 
-2.3.7.6. Customizing the PATH for MySQL Tools
+2.3.7.6 Customizing the PATH for MySQL Tools
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
 
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
 
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
 
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin)
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin)
        Note
-       There must be a semicolon separating this path from any values
-       present in this field.
-       Dismiss this dialogue, and each dialogue in turn, by clicking
-       OK until all of the dialogues that were opened have been
-       dismissed. You should now be able to invoke any MySQL
-       executable program by typing its name at the DOS prompt from
-       any directory on the system, without having to supply the
-       path. This includes the servers, the mysql client, and all
-       MySQL command-line utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       There must be a semicolon separating this path from any
+       values present in this field.
+       Dismiss this dialogue, and each dialogue in turn, by
+       clicking OK until all of the dialogues that were opened
+       have been dismissed. You should now be able to invoke any
+       MySQL executable program by typing its name at the DOS
+       prompt from any directory on the system, without having
+       to supply the path. This includes the servers, the mysql
+       client, and all MySQL command-line utilities such as
+       mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
-
-2.3.7.7. Starting MySQL as a Windows Service
-
-   On Windows, the recommended way to run MySQL is to install it as a
-   Windows service, so that MySQL starts and stops automatically when
-   Windows starts and stops. A MySQL server installed as a service
-   can also be controlled from the command line using NET commands,
-   or with the graphical Services utility. Generally, to install
-   MySQL as a Windows service you should be logged in using an
-   account that has administrator rights.
-
-   The Services utility (the Windows Service Control Manager) can be
-   found in the Windows Control Panel (under Administrative Tools on
-   Windows 2000, XP, Vista, and Server 2003). To avoid conflicts, it
-   is advisable to close the Services utility while performing server
-   installation or removal operations from the command line.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
+
+2.3.7.7 Starting MySQL as a Windows Service
+
+   On Windows, the recommended way to run MySQL is to install it
+   as a Windows service, so that MySQL starts and stops
+   automatically when Windows starts and stops. A MySQL server
+   installed as a service can also be controlled from the
+   command line using NET commands, or with the graphical
+   Services utility. Generally, to install MySQL as a Windows
+   service you should be logged in using an account that has
+   administrator rights.
+   Note
+
+   The MySQL Notifier GUI can also be used to monitor the status
+   of the MySQL service.
+
+   The Services utility (the Windows Service Control Manager)
+   can be found in the Windows Control Panel (under
+   Administrative Tools on Windows 2000, XP, Vista, and Server
+   2003). To avoid conflicts, it is advisable to close the
+   Services utility while performing server installation or
+   removal operations from the command line.
 
 Installing the service
 
-   Before installing MySQL as a Windows service, you should first
-   stop the current server if it is running by using the following
-   command:
+   Before installing MySQL as a Windows service, you should
+   first stop the current server if it is running by using the
+   following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin"
           -u root shutdown
 
    Note
 
-   If the MySQL root user account has a password, you need to invoke
-   mysqladmin with the -p option and supply the password when
-   prompted.
-
-   This command invokes the MySQL administrative utility mysqladmin
-   to connect to the server and tell it to shut down. The command
-   connects as the MySQL root user, which is the default
-   administrative account in the MySQL grant system. Note that users
-   in the MySQL grant system are wholly independent from any login
-   users under Windows.
+   If the MySQL root user account has a password, you need to
+   invoke mysqladmin with the -p option and supply the password
+   when prompted.
+
+   This command invokes the MySQL administrative utility
+   mysqladmin to connect to the server and tell it to shut down.
+   The command connects as the MySQL root user, which is the
+   default administrative account in the MySQL grant system.
+   Note
+
+   Users in the MySQL grant system are wholly independent from
+   any login users under Windows.
 
    Install the server as a service using this command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install
@@ -3373,406 +3756,477 @@
    The service-installation command does not start the server.
    Instructions for that are given later in this section.
 
-   To make it easier to invoke MySQL programs, you can add the path
-   name of the MySQL bin directory to your Windows system PATH
-   environment variable:
-
-     * On the Windows desktop, right-click the My Computer icon, and
-       select Properties.
-
-     * Next select the Advanced tab from the System Properties menu
-       that appears, and click the Environment Variables button.
-
-     * Under System Variables, select Path, and then click the Edit
-       button. The Edit System Variable dialogue should appear.
+   To make it easier to invoke MySQL programs, you can add the
+   path name of the MySQL bin directory to your Windows system
+   PATH environment variable:
+
+     * On the Windows desktop, right-click the My Computer icon,
+       and select Properties.
+
+     * Next select the Advanced tab from the System Properties
+       menu that appears, and click the Environment Variables
+       button.
+
+     * Under System Variables, select Path, and then click the
+       Edit button. The Edit System Variable dialogue should
+       appear.
 
      * Place your cursor at the end of the text appearing in the
-       space marked Variable Value. (Use the End key to ensure that
-       your cursor is positioned at the very end of the text in this
-       space.) Then enter the complete path name of your MySQL bin
-       directory (for example, C:\Program Files\MySQL\MySQL Server
-       5.5\bin), Note that there should be a semicolon separating
-       this path from any values present in this field. Dismiss this
-       dialogue, and each dialogue in turn, by clicking OK until all
-       of the dialogues that were opened have been dismissed. You
-       should now be able to invoke any MySQL executable program by
-       typing its name at the DOS prompt from any directory on the
-       system, without having to supply the path. This includes the
-       servers, the mysql client, and all MySQL command-line
-       utilities such as mysqladmin and mysqldump.
-       You should not add the MySQL bin directory to your Windows
-       PATH if you are running multiple MySQL servers on the same
-       machine.
+       space marked Variable Value. (Use the End key to ensure
+       that your cursor is positioned at the very end of the
+       text in this space.) Then enter the complete path name of
+       your MySQL bin directory (for example, C:\Program
+       Files\MySQL\MySQL Server 5.5\bin), and there should be a
+       semicolon separating this path from any values present in
+       this field. Dismiss this dialogue, and each dialogue in
+       turn, by clicking OK until all of the dialogues that were
+       opened have been dismissed. You should now be able to
+       invoke any MySQL executable program by typing its name at
+       the DOS prompt from any directory on the system, without
+       having to supply the path. This includes the servers, the
+       mysql client, and all MySQL command-line utilities such
+       as mysqladmin and mysqldump.
+       You should not add the MySQL bin directory to your
+       Windows PATH if you are running multiple MySQL servers on
+       the same machine.
 
    Warning
 
    You must exercise great care when editing your system PATH by
-   hand; accidental deletion or modification of any portion of the
-   existing PATH value can leave you with a malfunctioning or even
-   unusable system.
+   hand; accidental deletion or modification of any portion of
+   the existing PATH value can leave you with a malfunctioning
+   or even unusable system.
 
-   The following additional arguments can be used when installing the
-   service:
+   The following additional arguments can be used when
+   installing the service:
 
      * You can specify a service name immediately following the
        --install option. The default service name is MySQL.
 
-     * If a service name is given, it can be followed by a single
-       option. By convention, this should be
-       --defaults-file=file_name to specify the name of an option
-       file from which the server should read options when it starts.
+     * If a service name is given, it can be followed by a
+       single option. By convention, this should be
+       --defaults-file=file_name to specify the name of an
+       option file from which the server should read options
+       when it starts.
        The use of a single option other than --defaults-file is
-       possible but discouraged. --defaults-file is more flexible
-       because it enables you to specify multiple startup options for
-       the server by placing them in the named option file.
+       possible but discouraged. --defaults-file is more
+       flexible because it enables you to specify multiple
+       startup options for the server by placing them in the
+       named option file.
 
-     * You can also specify a --local-service option following the
-       service name. This causes the server to run using the
+     * You can also specify a --local-service option following
+       the service name. This causes the server to run using the
        LocalService Windows account that has limited system
-       privileges. This account is available only for Windows XP or
-       newer. If both --defaults-file and --local-service are given
-       following the service name, they can be in any order.
-
-   For a MySQL server that is installed as a Windows service, the
-   following rules determine the service name and option files that
-   the server uses:
-
-     * If the service-installation command specifies no service name
-       or the default service name (MySQL) following the --install
-       option, the server uses the a service name of MySQL and reads
-       options from the [mysqld] group in the standard option files.
-
-     * If the service-installation command specifies a service name
-       other than MySQL following the --install option, the server
-       uses that service name. It reads options from the [mysqld]
-       group and the group that has the same name as the service in
-       the standard option files. This enables you to use the
-       [mysqld] group for options that should be used by all MySQL
-       services, and an option group with the service name for use by
-       the server installed with that service name.
+       privileges. This account is available only for Windows XP
+       or newer. If both --defaults-file and --local-service are
+       given following the service name, they can be in any
+       order.
+
+   For a MySQL server that is installed as a Windows service,
+   the following rules determine the service name and option
+   files that the server uses:
+
+     * If the service-installation command specifies no service
+       name or the default service name (MySQL) following the
+       --install option, the server uses the a service name of
+       MySQL and reads options from the [mysqld] group in the
+       standard option files.
+
+     * If the service-installation command specifies a service
+       name other than MySQL following the --install option, the
+       server uses that service name. It reads options from the
+       [mysqld] group and the group that has the same name as
+       the service in the standard option files. This enables
+       you to use the [mysqld] group for options that should be
+       used by all MySQL services, and an option group with the
+       service name for use by the server installed with that
+       service name.
 
      * If the service-installation command specifies a
        --defaults-file option after the service name, the server
-       reads options the same way as described in the previous item,
-       except that it reads options only from the the named file and
-       ignores the standard option files.
+       reads options the same way as described in the previous
+       item, except that it reads options only from the named
+       file and ignores the standard option files.
 
    As a more complex example, consider the following command:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld"
           --install MySQL --defaults-file=C:\my-opts.cnf
 
    Here, the default service name (MySQL) is given after the
-   --install option. If no --defaults-file option had been given,
-   this command would have the effect of causing the server to read
-   the [mysqld] group from the standard option files. However,
-   because the --defaults-file option is present, the server reads
-   options from the [mysqld] option group, and only from the named
-   file.
+   --install option. If no --defaults-file option had been
+   given, this command would have the effect of causing the
+   server to read the [mysqld] group from the standard option
+   files. However, because the --defaults-file option is
+   present, the server reads options from the [mysqld] option
+   group, and only from the named file.
    Note
 
-   On Windows, if the server is started with the --defaults-file and
-   --install options, --install must be first. Otherwise, mysqld.exe
-   will attempt to start the MySQL server.
+   On Windows, if the server is started with the --defaults-file
+   and --install options, --install must be first. Otherwise,
+   mysqld.exe will attempt to start the MySQL server.
 
-   You can also specify options as Start parameters in the Windows
-   Services utility before you start the MySQL service.
+   You can also specify options as Start parameters in the
+   Windows Services utility before you start the MySQL service.
 
 Starting the service
 
    Once a MySQL server has been installed as a service, Windows
    starts the service automatically whenever Windows starts. The
-   service also can be started immediately from the Services utility,
-   or by using a NET START MySQL command. The NET command is not case
-   sensitive.
-
-   When run as a service, mysqld has no access to a console window,
-   so no messages can be seen there. If mysqld does not start, check
-   the error log to see whether the server wrote any messages there
-   to indicate the cause of the problem. The error log is located in
-   the MySQL data directory (for example, C:\Program
-   Files\MySQL\MySQL Server 5.5\data). It is the file with a suffix
-   of .err.
+   service also can be started immediately from the Services
+   utility, or by using a NET START MySQL command. The NET
+   command is not case sensitive.
+
+   When run as a service, mysqld has no access to a console
+   window, so no messages can be seen there. If mysqld does not
+   start, check the error log to see whether the server wrote
+   any messages there to indicate the cause of the problem. The
+   error log is located in the MySQL data directory (for
+   example, C:\Program Files\MySQL\MySQL Server 5.5\data). It is
+   the file with a suffix of .err.
 
    When a MySQL server has been installed as a service, and the
-   service is running, Windows stops the service automatically when
-   Windows shuts down. The server also can be stopped manually by
-   using the Services utility, the NET STOP MySQL command, or the
-   mysqladmin shutdown command.
+   service is running, Windows stops the service automatically
+   when Windows shuts down. The server also can be stopped
+   manually by using the Services utility, the NET STOP MySQL
+   command, or the mysqladmin shutdown command.
 
    You also have the choice of installing the server as a manual
    service if you do not wish for the service to be started
    automatically during the boot process. To do this, use the
    --install-manual option rather than the --install option:
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-m
-anual
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --install-ma
+nual
 
 Removing the service
 
-   To remove a server that is installed as a service, first stop it
-   if it is running by executing NET STOP MySQL. Then use the
+   To remove a server that is installed as a service, first stop
+   it if it is running by executing NET STOP MySQL. Then use the
    --remove option to remove it:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqld" --remove
 
-   If mysqld is not running as a service, you can start it from the
-   command line. For instructions, see Section 2.3.7.5, "Starting
-   MySQL from the Windows Command Line."
-
-   Please see Section 2.3.8, "Troubleshooting a Microsoft Windows
-   MySQL Server Installation," if you encounter difficulties during
-   installation.
+   If mysqld is not running as a service, you can start it from
+   the command line. For instructions, see Section 2.3.7.5,
+   "Starting MySQL from the Windows Command Line."
+
+   If you encounter difficulties during installation. see
+   Section 2.3.8, "Troubleshooting a Microsoft Windows MySQL
+   Server Installation."
 
-2.3.7.8. Testing The MySQL Installation
+2.3.7.8 Testing The MySQL Installation
 
-   You can test whether the MySQL server is working by executing any
-   of the following commands:
+   You can test whether the MySQL server is working by executing
+   any of the following commands:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow"
-C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root
-mysql
+C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqlshow" -u root m
+ysql
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysqladmin" version
- status proc
+status proc
 C:\> "C:\Program Files\MySQL\MySQL Server 5.5\bin\mysql" test
 
-   If mysqld is slow to respond to TCP/IP connections from client
-   programs, there is probably a problem with your DNS. In this case,
-   start mysqld with the --skip-name-resolve option and use only
-   localhost and IP addresses in the Host column of the MySQL grant
-   tables.
-
-   You can force a MySQL client to use a named-pipe connection rather
-   than TCP/IP by specifying the --pipe or --protocol=PIPE option, or
-   by specifying . (period) as the host name. Use the --socket option
-   to specify the name of the pipe if you do not want to use the
-   default pipe name.
-
-   Note that if you have set a password for the root account, deleted
-   the anonymous account, or created a new user account, then you
-   must use the appropriate -u and -p options with the commands shown
-   above to connect with the MySQL Server. See Section 4.2.2,
-   "Connecting to the MySQL Server."
+   If mysqld is slow to respond to TCP/IP connections from
+   client programs, there is probably a problem with your DNS.
+   In this case, start mysqld with the --skip-name-resolve
+   option and use only localhost and IP addresses in the Host
+   column of the MySQL grant tables.
+
+   You can force a MySQL client to use a named-pipe connection
+   rather than TCP/IP by specifying the --pipe or
+   --protocol=PIPE option, or by specifying . (period) as the
+   host name. Use the --socket option to specify the name of the
+   pipe if you do not want to use the default pipe name.
+
+   If you have set a password for the root account, deleted the
+   anonymous account, or created a new user account, then to
+   connect to the MySQL server you must use the appropriate -u
+   and -p options with the commands shown previously. See
+   Section 4.2.2, "Connecting to the MySQL Server."
 
    For more information about mysqlshow, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information."
+   "mysqlshow --- Display Database, Table, and Column
+   Information."
 
-2.3.8. Troubleshooting a Microsoft Windows MySQL Server Installation
+2.3.8 Troubleshooting a Microsoft Windows MySQL Server Installation
 
    When installing and running MySQL for the first time, you may
    encounter certain errors that prevent the MySQL server from
-   starting. The purpose of this section is to help you diagnose and
-   correct some of these errors.
+   starting. This section helps you diagnose and correct some of
+   these errors.
 
    Your first resource when troubleshooting server issues is the
    error log. The MySQL server uses the error log to record
-   information relevant to the error that prevents the server from
-   starting. The error log is located in the data directory specified
-   in your my.ini file. The default data directory location is
-   C:\Program Files\MySQL\MySQL Server 5.5\data, or
-   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008. The
-   C:\ProgramData directory is hidden by default. You need to change
-   your folder options to see the directory and contents. For more
-   information on the error log and understanding the content, see
-   Section 5.2.2, "The Error Log."
-
-   Another source of information regarding possible errors is the
-   console messages displayed when the MySQL service is starting. Use
-   the NET START MySQL command from the command line after installing
-   mysqld as a service to see any error messages regarding the
-   starting of the MySQL server as a service. See Section 2.3.7.7,
-   "Starting MySQL as a Windows Service."
-
-   The following examples show other common error messages you may
-   encounter when installing MySQL and starting the server for the
-   first time:
+   information relevant to the error that prevents the server
+   from starting. The error log is located in the data directory
+   specified in your my.ini file. The default data directory
+   location is C:\Program Files\MySQL\MySQL Server 5.5\data, or
+   C:\ProgramData\Mysql on Windows 7 and Windows Server 2008.
+   The C:\ProgramData directory is hidden by default. You need
+   to change your folder options to see the directory and
+   contents. For more information on the error log and
+   understanding the content, see Section 5.2.2, "The Error
+   Log."
+
+   For information regarding possible errors, also consult the
+   console messages displayed when the MySQL service is
+   starting. Use the NET START MySQL command from the command
+   line after installing mysqld as a service to see any error
+   messages regarding the starting of the MySQL server as a
+   service. See Section 2.3.7.7, "Starting MySQL as a Windows
+   Service."
 
-     * If the MySQL server cannot find the mysql privileges database
-       or other critical files, you may see these messages:
+   The following examples show other common error messages you
+   might encounter when installing MySQL and starting the server
+   for the first time:
+
+     * If the MySQL server cannot find the mysql privileges
+       database or other critical files, it displays these
+       messages:
 System error 1067 has occurred.
-Fatal error: Can't open privilege tables: Table 'mysql.host' doesn't
-exist
+Fatal error: Can't open and lock privilege tables:
+Table 'mysql.user' doesn't exist
+
        These messages often occur when the MySQL base or data
        directories are installed in different locations than the
-       default locations (C:\Program Files\MySQL\MySQL Server 5.5 and
-       C:\Program Files\MySQL\MySQL Server 5.5\data, respectively).
-       This situation may occur when MySQL is upgraded and installed
-       to a new location, but the configuration file is not updated
-       to reflect the new location. In addition, there may be old and
-       new configuration files that conflict. Be sure to delete or
-       rename any old configuration files when upgrading MySQL.
+       default locations (C:\Program Files\MySQL\MySQL Server
+       5.5 and C:\Program Files\MySQL\MySQL Server 5.5\data,
+       respectively).
+       This situation can occur when MySQL is upgraded and
+       installed to a new location, but the configuration file
+       is not updated to reflect the new location. In addition,
+       old and new configuration files might conflict. Be sure
+       to delete or rename any old configuration files when
+       upgrading MySQL.
        If you have installed MySQL to a directory other than
-       C:\Program Files\MySQL\MySQL Server 5.5, you need to ensure
-       that the MySQL server is aware of this through the use of a
-       configuration (my.ini) file. The my.ini file needs to be
-       located in your Windows directory, typically C:\WINDOWS. You
-       can determine its exact location from the value of the WINDIR
-       environment variable by issuing the following command from the
-       command prompt:
+       C:\Program Files\MySQL\MySQL Server 5.5, ensure that the
+       MySQL server is aware of this through the use of a
+       configuration (my.ini) file. Put the my.ini file in your
+       Windows directory, typically C:\WINDOWS. To determine its
+       exact location from the value of the WINDIR environment
+       variable, issue the following command from the command
+       prompt:
 C:\> echo %WINDIR%
-       An option file can be created and modified with any text
-       editor, such as Notepad. For example, if MySQL is installed in
-       E:\mysql and the data directory is D:\MySQLdata, you can
-       create the option file and set up a [mysqld] section to
-       specify values for the basedir and datadir options:
+
+       You can create or modify an option file with any text
+       editor, such as Notepad. For example, if MySQL is
+       installed in E:\mysql and the data directory is
+       D:\MySQLdata, you can create the option file and set up a
+       [mysqld] section to specify values for the basedir and
+       datadir options:
 [mysqld]
 # set basedir to your installation path
 basedir=E:/mysql
 # set datadir to the location of your data directory
 datadir=D:/MySQLdata
-       Note that Windows path names are specified in option files
-       using (forward) slashes rather than backslashes. If you do use
-       backslashes, double them:
+
+       Microsoft Windows path names are specified in option
+       files using (forward) slashes rather than backslashes. If
+       you do use backslashes, double them:
 [mysqld]
 # set basedir to your installation path
 basedir=C:\\Program Files\\MySQL\\MySQL Server 5.5
 # set datadir to the location of your data directory
 datadir=D:\\MySQLdata
-       The rules for use of backslash in option file values are given
-       in Section 4.2.3.3, "Using Option Files."
-       If you change the datadir value in your MySQL configuration
-       file, you must move the contents of the existing MySQL data
-       directory before restarting the MySQL server.
+
+       The rules for use of backslash in option file values are
+       given in Section 4.2.6, "Using Option Files."
+       If you change the datadir value in your MySQL
+       configuration file, you must move the contents of the
+       existing MySQL data directory before restarting the MySQL
+       server.
        See Section 2.3.7.2, "Creating an Option File."
 
-     * If you reinstall or upgrade MySQL without first stopping and
-       removing the existing MySQL service and install MySQL using
-       the MySQL Configuration Wizard, you may see this error:
+     * If you reinstall or upgrade MySQL without first stopping
+       and removing the existing MySQL service and install MySQL
+       using the MySQL Installer, you might see this error:
 Error: Cannot create Windows service for MySql. Error: 0
-       This occurs when the Configuration Wizard tries to install the
-       service and finds an existing service with the same name.
-       One solution to this problem is to choose a service name other
-       than mysql when using the configuration wizard. This enables
-       the new service to be installed correctly, but leaves the
-       outdated service in place. Although this is harmless, it is
-       best to remove old services that are no longer in use.
+
+       This occurs when the Configuration Wizard tries to
+       install the service and finds an existing service with
+       the same name.
+       One solution to this problem is to choose a service name
+       other than mysql when using the configuration wizard.
+       This enables the new service to be installed correctly,
+       but leaves the outdated service in place. Although this
+       is harmless, it is best to remove old services that are
+       no longer in use.
        To permanently remove the old mysql service, execute the
-       following command as a user with administrative privileges, on
-       the command-line:
+       following command as a user with administrative
+       privileges, on the command line:
 C:\> sc delete mysql
 [SC] DeleteService SUCCESS
+
        If the sc utility is not available for your version of
        Windows, download the delsrv utility from
-       http://www.microsoft.com/windows2000/techinfo/reskit/tools/exi
-       sting/delsrv-o.asp and use the delsrv mysql syntax.
+       http://www.microsoft.com/windows2000/techinfo/reskit/tool
+       s/existing/delsrv-o.asp and use the delsrv mysql syntax.
 
-2.3.9. Upgrading MySQL on Windows
+2.3.9 Upgrading MySQL on Windows
 
-   This section lists some of the steps you should take when
-   upgrading MySQL on Windows.
+   To upgrade MySQL on Windows, follow these steps:
 
-    1. Review Section 2.12.1, "Upgrading MySQL," for additional
+    1. Review Section 2.11.1, "Upgrading MySQL," for additional
        information on upgrading MySQL that is not specific to
        Windows.
 
-    2. You should always back up your current MySQL installation
-       before performing an upgrade. See Section 7.2, "Database
-       Backup Methods."
+    2. Always back up your current MySQL installation before
+       performing an upgrade. See Section 7.2, "Database Backup
+       Methods."
 
     3. Download the latest Windows distribution of MySQL from
        http://dev.mysql.com/downloads/.
 
-    4. Before upgrading MySQL, you must stop the server. If the
-       server is installed as a service, stop the service with the
+    4. Before upgrading MySQL, stop the server. If the server is
+       installed as a service, stop the service with the
        following command from the command prompt:
 C:\> NET STOP MySQL
+
        If you are not running the MySQL server as a service, use
        mysqladmin to stop it. For example, before upgrading from
-       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as follows:
+       MySQL 5.1 to 5.5, use mysqladmin from MySQL 5.1 as
+       follows:
 C:\> "C:\Program Files\MySQL\MySQL Server 5.1\bin\mysqladmin" -u root
- shutdown
+shutdown
+
        Note
-       If the MySQL root user account has a password, you need to
-       invoke mysqladmin with the -p option and supply the password
-       when prompted.
-
-    5. Before upgrading a MySQL service from MySQL 5.1 to 5.5, you
-       should stop the 5.1 server and remove the instance. Run the
-       MySQL Instance Configuration Wizard, choose the Remove
-       Instance option and in the next screen, confirm removal. After
-       that it is safe to uninstall MySQL Server 5.1.
-
-    6. Before upgrading to MySQL 5.5 from a version previous to
-       4.1.5, or from a version of MySQL installed from a Zip archive
-       to a version of MySQL installed with the MySQL Installation
-       Wizard, you must first manually remove the previous
-       installation and MySQL service (if the server is installed as
-       a service).
+       If the MySQL root user account has a password, invoke
+       mysqladmin with the -p option and enter the password when
+       prompted.
+
+    5. Before upgrading to MySQL 5.5 from a version previous to
+       4.1.5, or from a version of MySQL installed from a Zip
+       archive to a version of MySQL installed with the MySQL
+       Installation Wizard, you must first manually remove the
+       previous installation and MySQL service (if the server is
+       installed as a service).
        To remove the MySQL service, use the following command:
 C:\> C:\mysql\bin\mysqld --remove
+
        If you do not remove the existing service, the MySQL
-       Installation Wizard may fail to properly install the new MySQL
-       service.
+       Installation Wizard may fail to properly install the new
+       MySQL service.
 
-    7. If you are using the MySQL Installation Wizard, start the
+    6. If you are using the MySQL Installer, start it as
+       described in Section 2.3.3, "Installing MySQL on
+       Microsoft Windows Using MySQL Installer."
+       If you are using the MySQL Installation Wizard, start the
        wizard as described in Section 2.3.5.1, "Using the MySQL
        Installation Wizard."
 
-    8. If you are installing MySQL from a Zip archive, extract the
-       archive. You may either overwrite your existing MySQL
-       installation (usually located at C:\mysql), or install it into
-       a different directory, such as C:\mysql5. Overwriting the
-       existing installation is recommended.
-
-    9. If you were running MySQL as a Windows service and you had to
-       remove the service earlier in this procedure, reinstall the
-       service. (See Section 2.3.7.7, "Starting MySQL as a Windows
-       Service.")
-   10. Restart the server. For example, use NET START MySQL if you
-       run MySQL as a service, or invoke mysqld directly otherwise.
-   11. As Administrator, run mysql_upgrade to check your tables,
-       attempt to repair them if necessary, and update your grant
-       tables if they have changed so that you can take advantage of
-       any new capabilities. See Section 4.4.7, "mysql_upgrade ---
-       Check and Upgrade MySQL Tables."
-   12. If you encounter errors, see Section 2.3.8, "Troubleshooting a
-       Microsoft Windows MySQL Server Installation."
-
-2.3.10. Windows Postinstallation Procedures
-
-   On Windows, you need not create the data directory and the grant
-   tables. MySQL Windows distributions include the grant tables with
-   a set of preinitialized accounts in the mysql database under the
-   data directory. Regarding passwords, if you installed MySQL using
-   the Windows Installation Wizard, you may have already assigned
-   passwords to the accounts. (See Section 2.3.5.1, "Using the MySQL
-   Installation Wizard.") Otherwise, use the password-assignment
-   procedure given in Section 2.11.2, "Securing the Initial MySQL
-   Accounts."
+    7. If you are upgrading MySQL from a Zip archive, extract
+       the archive. You may either overwrite your existing MySQL
+       installation (usually located at C:\mysql), or install it
+       into a different directory, such as C:\mysql5.
+       Overwriting the existing installation is recommended.
+       However, for upgrades (as opposed to installing for the
+       first time), you must remove the data directory from your
+       existing MySQL installation to avoid replacing your
+       current data files. To do so, follow these steps:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Rezip the Zip archive
+         d. Unzip the modified Zip archive on top of your
+            existing installation
+       Alternatively:
+         a. Unzip the Zip archive in some location other than
+            your current MySQL installation
+         b. Remove the data directory
+         c. Move the data directory from the current MySQL
+            installation to the location of the just-removed
+            data directory
+         d. Remove the current MySQL installation
+         e. Move the unzipped installation to the location of
+            the just-removed installation
+
+    8. If you were running MySQL as a Windows service and you
+       had to remove the service earlier in this procedure,
+       reinstall the service. (See Section 2.3.7.7, "Starting
+       MySQL as a Windows Service.")
+
+    9. Restart the server. For example, use NET START MySQL if
+       you run MySQL as a service, or invoke mysqld directly
+       otherwise.
+   10. As Administrator, run mysql_upgrade to check your tables,
+       attempt to repair them if necessary, and update your
+       grant tables if they have changed so that you can take
+       advantage of any new capabilities. See Section 4.4.7,
+       "mysql_upgrade --- Check and Upgrade MySQL Tables."
+   11. If you encounter errors, see Section 2.3.8,
+       "Troubleshooting a Microsoft Windows MySQL Server
+       Installation."
 
-   Before setting up passwords, you might want to try running some
-   client programs to make sure that you can connect to the server
-   and that it is operating properly. Make sure that the server is
-   running (see Section 2.3.7.4, "Starting the Server for the First
-   Time"), and then issue the following commands to verify that you
-   can retrieve information from the server. You may need to specify
-   directory different from C:\mysql\bin on the command line. If you
-   used the Windows Installation Wizard, the default directory is
-   C:\Program Files\MySQL\MySQL Server 5.5, and the mysql and
-   mysqlshow client programs are in C:\Program Files\MySQL\MySQL
-   Server 5.5\bin. See Section 2.3.5.1, "Using the MySQL Installation
-   Wizard," for more information.
+2.3.10 Windows Postinstallation Procedures
 
-   Use mysqlshow to see what databases exist:
-C:\> C:\mysql\bin\mysqlshow
-+--------------------+
-|     Databases      |
+   GUI tools exist that perform most of the tasks described
+   below, including:
+
+     * MySQL Installer: Used to install and upgrade MySQL
+       products.
+
+     * MySQL Workbench: Manages the MySQL server and edits SQL
+       statements.
+
+     * MySQL Notifier: Starts, stops, or restarts the MySQL
+       server, and monitors its status.
+
+     * MySQL for Excel
+       (http://dev.mysql.com/doc/mysql-for-excel/en/index.html):
+       Edits MySQL data with Microsoft Excel.
+
+   On Windows, you need not create the data directory and the
+   grant tables. MySQL Windows distributions include the grant
+   tables with a set of preinitialized accounts in the mysql
+   database under the data directory. Regarding passwords, if
+   you installed MySQL using the MySQL Installer, you may have
+   already assigned passwords to the accounts. (See Section
+   2.3.3, "Installing MySQL on Microsoft Windows Using MySQL
+   Installer.") Otherwise, use the password-assignment procedure
+   given in Section 2.10.2, "Securing the Initial MySQL
+   Accounts."
+
+   Before setting up passwords, you might want to try running
+   some client programs to make sure that you can connect to the
+   server and that it is operating properly. Make sure that the
+   server is running (see Section 2.3.7.4, "Starting the Server
+   for the First Time"). If you are running a version of Windows
+   that supports services, you can set up the MySQL server to
+   run automatically when Windows starts (see Section 2.3.7.7,
+   "Starting MySQL as a Windows Service").
+
+   With the server running, issue the following commands to
+   verify that you can retrieve information from the server. You
+   may need to specify a directory different from C:\mysql\bin
+   on the command line. If you installed MySQL using MySQL
+   Installer, the default directory is C:\Program
+   Files\MySQL\MySQL Server 5.5, and the mysql and mysqlshow
+   client programs are in C:\Program Files\MySQL\MySQL Server
+   5.5\bin. See Section 2.3.3, "Installing MySQL on Microsoft
+   Windows Using MySQL Installer," for more information.
+
+   Use mysqlshow to see what databases exist:
+C:\> C:\mysql\bin\mysqlshow
++--------------------+
+|     Databases      |
 +--------------------+
 | information_schema |
 | mysql              |
 | test               |
 +--------------------+
 
-   The list of installed databases may vary, but will always include
-   the minimum of mysql and information_schema. In most cases, the
-   test database will also be installed automatically.
-
-   The preceding command (and commands for other MySQL programs such
-   as mysql) may not work if the correct MySQL account does not
-   exist. For example, the program may fail with an error, or you may
-   not be able to view all databases. If you installed using the MSI
-   packages and used the MySQL Server Instance Config Wizard, then
-   the root user will have been created automatically with the
-   password you supplied. In this case, you should use the -u root
-   and -p options. (You will also need to use the -u root and -p
-   options if you have already secured the initial MySQL accounts.)
-   With -p, you will be prompted for the root password. For example:
+   The list of installed databases may vary, but will always
+   include the minimum of mysql and information_schema. In most
+   cases, the test database will also be installed
+   automatically.
+
+   The preceding command (and commands for other MySQL programs
+   such as mysql) may not work if the correct MySQL account does
+   not exist. For example, the program may fail with an error,
+   or you may not be able to view all databases. If you
+   installed MySQL using MySQL Installer, the root user will
+   have been created automatically with the password you
+   supplied. In this case, you should use the -u root and -p
+   options. (You must use those options if you have already
+   secured the initial MySQL accounts.) With -p, the client
+   program prompts for the root password. For example:
 C:\> C:\mysql\bin\mysqlshow -u root -p
 Enter password: (enter root password here)
 +--------------------+
@@ -3783,8 +4237,8 @@
 | test               |
 +--------------------+
 
-   If you specify a database name, mysqlshow displays a list of the
-   tables within the database:
+   If you specify a database name, mysqlshow displays a list of
+   the tables within the database:
 C:\> C:\mysql\bin\mysqlshow mysql
 Database: mysql
 +---------------------------+
@@ -3812,8 +4266,8 @@
 | user                      |
 +---------------------------+
 
-   Use the mysql program to select information from a table in the
-   mysql database:
+   Use the mysql program to select information from a table in
+   the mysql database:
 C:\> C:\mysql\bin\mysql -e "SELECT Host,Db,User FROM mysql.db"
 +------+--------+------+
 | host | db     | user |
@@ -3822,180 +4276,155 @@
 | %    | test_% |      |
 +------+--------+------+
 
-   For more information about mysqlshow and mysql, see Section 4.5.6,
-   "mysqlshow --- Display Database, Table, and Column Information,"
-   and Section 4.5.1, "mysql --- The MySQL Command-Line Tool."
-
-   If you are running a version of Windows that supports services,
-   you can set up the MySQL server to run automatically when Windows
-   starts. See Section 2.3.7.7, "Starting MySQL as a Windows
-   Service."
-
-2.4. Installing MySQL on Mac OS X
-
-   MySQL for Mac OS X is available in a number of different forms:
+   For more information about mysqlshow and mysql, see Section
+   4.5.6, "mysqlshow --- Display Database, Table, and Column
+   Information," and Section 4.5.1, "mysql --- The MySQL
+   Command-Line Tool."
+
+2.4 Installing MySQL on OS X
+
+   For a list of supported OS X versions that the MySQL server
+   supports, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   MySQL for OS X is available in a number of different forms:
+
+     * Native Package Installer format, which uses the native OS
+       X installer (DMG) to walk you through the installation of
+       MySQL. For more information, see Section 2.4.2,
+       "Installing MySQL on OS X Using Native Packages." You can
+       use the package installer with OS X. The user you use to
+       perform the installation must have administrator
+       privileges.
 
-     * Native Package Installer format, which uses the native Mac OS
-       X installer to walk you through the installation of MySQL. For
-       more information, see Section 2.4.2, "Installing MySQL on Mac
-       OS X Using Native Packages." You can use the package installer
-       with Mac OS X 10.3 and later, and the package is available for
-       both PowerPC and Intel architectures, and 32-bit and 64-bit
-       architectures. There is no Universal Binary available using
-       the package installation method. The user you use to perform
-       the installation must have administrator privileges.
-
-     * Tar package format, which uses a file packaged using the Unix
-       tar and gzip commands. To use this method, you will need to
-       open a Terminal window. You do not need administrator
-       privileges using this method, as you can install the MySQL
-       server anywhere using this method. For more information on
-       using this method, you can use the generic instructions for
-       using a tarball, Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."You can use the package installer with
-       Mac OS X 10.3 and later, and available for both PowerPC and
-       Intel architectures, and both 32-bit and 64-bit architectures.
-       A Universal Binary, incorporating both Power PC and Intel
-       architectures and 32-bit and 64-bit binaries is available.
-       In addition to the core installation, the Package Installer
-       also includes Section 2.4.3, "Installing the MySQL Startup
-       Item" and Section 2.4.4, "Installing and Using the MySQL
-       Preference Pane," both of which simplify the management of
-       your installation.
-
-     * Mac OS X server includes a version of MySQL as standard. If
-       you want to use a more recent version than that supplied with
-       the Mac OS X server release, you can make use of the package
-       or tar formats. For more information on using the MySQL
-       bundled with Mac OS X, see Section 2.4.5, "Using the Bundled
-       MySQL on Mac OS X Server."
+     * Tar package format, which uses a file packaged using the
+       Unix tar and gzip commands. To use this method, you will
+       need to open a Terminal window. You do not need
+       administrator privileges using this method, as you can
+       install the MySQL server anywhere using this method. For
+       more information on using this method, you can use the
+       generic instructions for using a tarball, Section 2.2,
+       "Installing MySQL on Unix/Linux Using Generic Binaries."
+       In addition to the core installation, the Package
+       Installer also includes Section 2.4.4, "Installing the
+       MySQL Startup Item" and Section 2.4.5, "Installing and
+       Using the MySQL Preference Pane," both of which simplify
+       the management of your installation.
 
-   For additional information on using MySQL on Mac OS X, see Section
-   2.4.1, "General Notes on Installing MySQL on Mac OS X."
+   For additional information on using MySQL on OS X, see
+   Section 2.4.1, "General Notes on Installing MySQL on OS X."
 
-2.4.1. General Notes on Installing MySQL on Mac OS X
+2.4.1 General Notes on Installing MySQL on OS X
 
    You should keep the following issues and notes in mind:
 
-     * The default location for the MySQL Unix socket is different on
-       Mac OS X and Mac OS X Server depending on the installation
-       type you chose. The following table shows the default
-       locations by installation type.
-       Table 2.8. MySQL Unix Socket Locations on Mac OS X by
-       Installation Type
-
-               Installation Type             Socket Location
-       Package Installer from MySQL       /tmp/mysql.sock
-       Tarball from MySQL                 /tmp/mysql.sock
-       MySQL Bundled with Mac OS X Server /var/mysql/mysql.sock
-       To prevent issues, you should either change the configuration
-       of the socket used within your application (for example,
-       changing php.ini), or you should configure the socket location
-       using a MySQL configuration file and the socket option. For
-       more information, see Section 5.1.3, "Server Command Options."
-
-     * You may need (or want) to create a specific mysql user to own
-       the MySQL directory and data. On Mac OS X 10.4 and lower you
-       can do this by using the Netinfo Manager application, located
-       within the Utilities folder within the Applications folder. On
-       Mac OS X 10.5 and later you can do this through the Directory
-       Utility. From Mac OS X 10.5 and later (including Mac OS X
-       Server 10.5) the mysql should already exist. For use in single
-       user mode, an entry for _mysql (note the underscore prefix)
-       should already exist within the system /etc/passwd file.
-
-     * Due to a bug in the Mac OS X package installer, you may see
-       this error message in the destination disk selection dialog:
-You cannot install this software on this disk. (null)
-       If this error occurs, click the Go Back button once to return
-       to the previous screen. Then click Continue to advance to the
-       destination disk selection again, and you should be able to
-       choose the destination disk correctly. We have reported this
-       bug to Apple and it is investigating this problem.
+     * OS X 10.4 deprecated startup items in favor of launchd
+       daemons, and as of OS X 10.10 (Yosemite), startup items
+       do not function. For these reasons, using launchd daemons
+       is preferred over startup items.
+
+     * You may need (or want) to create a specific mysql user to
+       own the MySQL directory and data. You can do this through
+       the Directory Utility, and the mysql user should already
+       exist. For use in single user mode, an entry for _mysql
+       (note the underscore prefix) should already exist within
+       the system /etc/passwd file.
 
      * If you get an "insecure startup item disabled" error when
        MySQL launches, use the following procedure. Adjust the
        pathnames appropriately for your system.
 
-         1. Modify the mysql.script using this command (enter it on a
-            single line):
+         1. Modify the mysql.script using this command (enter it
+            on a single line):
 shell> sudo /Applications/TextEdit.app/Contents/MacOS/TextEdit
   /usr/local/mysql/support-files/mysql.server
 
-         2. Locate the option file that defines the basedir value and
-            modify it to contain these lines:
+
+         2. Locate the option file that defines the basedir
+            value and modify it to contain these lines:
 basedir=/usr/local/mysql
 datadir=/usr/local/mysql/data
-            In the /Library/StartupItems/MySQLCOM/ directory, make
-            the following group ID changes from staff to wheel:
+
+            In the /Library/StartupItems/MySQLCOM/ directory,
+            make the following group ID changes from staff to
+            wheel:
 shell> sudo chgrp wheel MySQLCOM StartupParameters.plist
 
-         3. Start the server from System Preferences or Terminal.app.
 
-     * Because the MySQL package installer installs the MySQL
-       contents into a version and platform specific directory, you
-       can use this to upgrade and migrate your database between
-       versions. You will need to either copy the data directory from
-       the old version to the new version, or alternatively specify
-       an alternative datadir value to set location of the data
-       directory.
+         3. Start the server from System Preferences or
+            Terminal.app.
 
-     * You might want to add aliases to your shell's resource file to
-       make it easier to access commonly used programs such as mysql
-       and mysqladmin from the command line. The syntax for bash is:
+     * Because the MySQL package installer installs the MySQL
+       contents into a version and platform specific directory,
+       you can use this to upgrade and migrate your database
+       between versions. You will need to either copy the data
+       directory from the old version to the new version, or
+       alternatively specify an alternative datadir value to set
+       location of the data directory. By default, the MySQL
+       directories are installed under /usr/local/.
+
+     * You might want to add aliases to your shell's resource
+       file to make it easier to access commonly used programs
+       such as mysql and mysqladmin from the command line. The
+       syntax for bash is:
 alias mysql=/usr/local/mysql/bin/mysql
 alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+
        For tcsh, use:
 alias mysql /usr/local/mysql/bin/mysql
 alias mysqladmin /usr/local/mysql/bin/mysqladmin
-       Even better, add /usr/local/mysql/bin to your PATH environment
-       variable. You can do this by modifying the appropriate startup
-       file for your shell. For more information, see Section 4.2.1,
-       "Invoking MySQL Programs."
-
-     * After you have copied over the MySQL database files from the
-       previous installation and have successfully started the new
-       server, you should consider removing the old installation
-       files to save disk space. Additionally, you should also remove
-       older versions of the Package Receipt directories located in
+
+       Even better, add /usr/local/mysql/bin to your PATH
+       environment variable. You can do this by modifying the
+       appropriate startup file for your shell. For more
+       information, see Section 4.2.1, "Invoking MySQL
+       Programs."
+
+     * After you have copied over the MySQL database files from
+       the previous installation and have successfully started
+       the new server, you should consider removing the old
+       installation files to save disk space. Additionally, you
+       should also remove older versions of the Package Receipt
+       directories located in
        /Library/Receipts/mysql-VERSION.pkg.
 
-2.4.2. Installing MySQL on Mac OS X Using Native Packages
+     * Prior to OS X 10.7, MySQL server was bundled with OS X
+       Server.
 
-   You can install MySQL on Mac OS X 10.3.x ("Panther") or newer
-   using a Mac OS X binary package in DMG format instead of the
-   binary tarball distribution. Please note that older versions of
-   Mac OS X (for example, 10.1.x or 10.2.x) are not supported by this
-   package.
-
-   The package is located inside a disk image (.dmg) file that you
-   first need to mount by double-clicking its icon in the Finder. It
-   should then mount the image and display its contents.
+2.4.2 Installing MySQL on OS X Using Native Packages
+
+   The package is located inside a disk image (.dmg) file that
+   you first need to mount by double-clicking its icon in the
+   Finder. It should then mount the image and display its
+   contents.
    Note
 
    Before proceeding with the installation, be sure to stop all
-   running MySQL server instances by using either the MySQL Manager
-   Application (on Mac OS X Server) or mysqladmin shutdown on the
-   command line.
-
-   When installing from the package version, you should also install
-   the MySQL Preference Pane, which will enable you to control the
-   startup and execution of your MySQL server from System
-   Preferences. For more information, see Section 2.4.4, "Installing
-   and Using the MySQL Preference Pane."
+   running MySQL server instances by using either the MySQL
+   Manager Application (on OS X Server) or mysqladmin shutdown
+   on the command line.
+
+   When installing from the package version, you can also
+   install the MySQL Preference Pane, which will enable you to
+   control the startup and execution of your MySQL server from
+   System Preferences. For more information, see Section 2.4.5,
+   "Installing and Using the MySQL Preference Pane."
 
    When installing using the package installer, the files are
-   installed into a directory within /usr/local matching the name of
-   the installation version and platform. For example, the installer
-   file mysql-5.1.39-osx10.5-x86_64.pkg installs MySQL into
-   /usr/local/mysql-5.1.39-osx10.5-x86_64 . The following table shows
-   the layout of the installation directory.
+   installed into a directory within /usr/local matching the
+   name of the installation version and platform. For example,
+   the installer file mysql-5.5-osx10.8-x86_64.dmg installs
+   MySQL into /usr/local/mysql-5.5-osx10.8-x86_64/ . The
+   following table shows the layout of the installation
+   directory.
 
-   Table 2.9. MySQL Installation Layout on Mac OS X
+   Table 2.8 MySQL Installation Layout on OS X
    Directory Contents of Directory
    bin Client programs and the mysqld server
    data Log files, databases
-   docs Manual in Info format
+   docs Helper documents, like the Release Notes and build
+   information
    include Include (header) files
    lib Libraries
    man Unix manual pages
@@ -4012,300 +4441,319 @@
    created during installation will be created automatically.
 
     1. Download and open the MySQL package installer, which is
-       provided on a disk image (.dmg) that includes the main MySQL
-       installation package, the MySQLStartupItem.pkg installation
-       package, and the MySQL.prefPane. Double-click the disk image
-       to open it.
-
-    2. Double-click the MySQL installer package. It will be named
-       according to the version of MySQL you have downloaded. For
-       example, if you have downloaded MySQL 5.1.39, double-click
-       mysql-5.1.39-osx10.5-x86.pkg.
-
-    3. You will be presented with the opening installer dialog. Click
-       Continue to begin installation.
-       MySQL Package Installer: Step 1
-
-    4. A copy of the installation instructions and other important
-       information relevant to this installation are displayed. Click
-       Continue .
-
-    5. If you have downloaded the community version of MySQL, you
-       will be shown a copy of the relevant GNU General Public
-       License. Click Continue .
-
-    6. Select the drive you want to use to install the MySQL Startup
-       Item. The drive must have a valid, bootable, Mac OS X
-       operating system installed. Click Continue.
-       MySQL Package Installer: Step 4
-
-    7. You will be asked to confirm the details of the installation,
-       including the space required for the installation. To change
-       the drive on which the startup item is installed, click either
-       Go Back or Change Install Location.... To install the startup
-       item, click Install.
-
-    8. Once the installation has been completed successfully, you
-       will be shown an Install Succeeded message.
-
-   For convenience, you may also want to install the startup item and
-   preference pane. See Section 2.4.3, "Installing the MySQL Startup
-   Item," and Section 2.4.4, "Installing and Using the MySQL
-   Preference Pane."
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package file. Double-click the disk
+       image to open it.
+       Figure 2.41 MySQL Package Installer: DMG Contents
+       MySQL Package Installer: DMG Contents
+
+    2. Double-click the MySQL installer package. It will be
+       named according to the version of MySQL you have
+       downloaded. For example, if you have downloaded MySQL
+       server 5.5.44, double-click
+       mysql-5.5.44-osx-10.8-x86_64.pkg.
+
+    3. You will be presented with the opening installer dialog.
+       Click Continue to begin installation.
+       Figure 2.42 MySQL Package Installer: Introduction
+       MySQL Package Installer: Introduction
+
+    4. If you have downloaded the community version of MySQL,
+       you will be shown a copy of the relevant GNU General
+       Public License. Click Continue and then Agree to
+       continue.
+
+    5. From the Installation Type page you can either click
+       Install to execute the installation wizard using all
+       defaults, click Customize to alter which components to
+       install (MySQL server, Startup Item, Preference Pane --
+       all enabled by default), or click Change Installation
+       Location to change the type of installation for either
+       all users, only the user executing the Installer, or
+       define a custom location.
+       Figure 2.43 MySQL Package Installer: Installation Type
+       MySQL Package Installer: Installation Type
+       Figure 2.44 MySQL Package Installer: Destination Select
+       (Change Installation Location)
+       MySQL Package Installer: Destination Select (Change
+       Installation Location)
+       Figure 2.45 MySQL Package Installer: Customize
+       MySQL Package Installer: Customize
+
+    6. Click Install to begin the installation process.
+
+    7. Once the installation has been completed successfully,
+       you will be shown an Install Succeeded message with a
+       short summary. Now, Close the wizard and begin using the
+       MySQL server.
+       Figure 2.46 MySQL Package Installer: Summary
+       MySQL Package Installer: Summary
+
+   For convenience, you may also want to install a launch daemon
+   and preference pane. See Section 2.4.3, "Installing a MySQL
+   Launch Daemon," and Section 2.4.5, "Installing and Using the
+   MySQL Preference Pane."
+
+2.4.3 Installing a MySQL Launch Daemon
+
+   OS X uses launch daemons to automatically start, stop, and
+   manage processes and applications such as MySQL. Using launch
+   daemons is recommended over startup items on OS X.
+   Note
+
+   OS X 10.4 deprecated startup items in favor of launchd
+   daemons, and as of OS X 10.10 (Yosemite), startup items do
+   not function. For these reasons, using launchd daemons is
+   preferred over startup items.
+
+   Here is an example launchd file that starts MySQL:
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>com.mysql.mysqld</string>
+    <key>ProgramArguments</key>
+    <array>
+    <string>/usr/local/mysql/bin/mysqld_safe</string>
+    <string>--user=mysql</string>
+    </array>
+  </dict>
+</plist>
+
+
+   Adjust the ProgramArguments array according to your system,
+   as for example your path to mysqld_safe might be different.
+   After making the proper adjustments, do the following:
+
+     * Save the XML as a file named
+       /Library/LaunchDaemons/com.mysql.mysql.plist
+
+     * Adjust the file permissions using the Apple recommended
+       owner "root", owning group "wheel", and file permissions
+       "644"
+shell> sudo chown root:wheel /Library/LaunchDaemons/com.mysql.mysql.pl
+ist
+shell> sudo chmod 644 /Library/LaunchDaemons/com.mysql.mysql.plist
+
+
+     * Enable this new MySQL service
+shell> sudo launchctl load -w /Library/LaunchDaemons/com.mysql.mysql.p
+list
+
+   The MySQL daemon is now running, and automatically starts
+   when your system is rebooted.
 
-2.4.3. Installing the MySQL Startup Item
+2.4.4 Installing the MySQL Startup Item
 
-   The MySQL Installation Package includes a startup item that can be
-   used to automatically start and stop MySQL.
+   The MySQL Installation Package includes a startup item that
+   can be used to automatically start and stop MySQL.
+   Important
+
+   Startup items are deprecated in favor of launchd daemons. For
+   additional information, see Section 2.4.3, "Installing a
+   MySQL Launch Daemon."
 
    To install the MySQL Startup Item:
 
     1. Download and open the MySQL package installer, which is
-       provided on a disk image (.dmg) that includes the main MySQL
-       installation package, the MySQLStartupItem.pkg installation
-       package, and the MySQL.prefPane. Double-click the disk image
-       to open it.
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package.
+       Note
+       Previously, the OS X packages included separate
+       MySQLStartupItem.pkg and MySQL.prefPane files. They have
+       since been merged into the main package file.
+       Figure 2.47 MySQL Package Installer: DMG Contents
+       MySQL Package Installer: DMG Contents
+
+    2. Go through the process of installing the MySQL server as
+       described in the documentation at Section 2.4.2,
+       "Installing MySQL on OS X Using Native Packages."
 
-    2. Double-click the MySQLStartItem.pkg file to start the
-       installation process.
+    3. Click Customize at the Installation Type step. The
+       "Startup Item" option is listed there and enabled by
+       default.
+       Figure 2.48 MySQL Installer on OS X: Customize
+       MySQL Installer on OS X: Customize
 
-    3. You will be presented with the Install MySQL Startup Item
-       dialog.
-       MySQL Startup Item Installer: Step 1
-       Click Continue to continue the installation process.
-
-    4. A copy of the installation instructions and other important
-       information relevant to this installation are displayed. Click
-       Continue .
-
-    5. Select the drive you want to use to install the MySQL Startup
-       Item. The drive must have a valid, bootable, Mac OS X
-       operating system installed. Click Continue.
-       MySQL Startup Item Installer: Step 3
-
-    6. You will be asked to confirm the details of the installation.
-       To change the drive on which the startup item is installed,
-       click either Go Back or Change Install Location.... To install
-       the startup item, click Install.
-
-    7. Once the installation has been completed successfully, you
-       will be shown an Install Succeeded message.
-       MySQL Startup Item Installer: Step 5
+    4. Complete the MySQL server installation process.
 
    The Startup Item for MySQL is installed into
-   /Library/StartupItems/MySQLCOM. The Startup Item installation adds
-   a variable MYSQLCOM=-YES- to the system configuration file
-   /etc/hostconfig. If you want to disable the automatic startup of
-   MySQL, change this variable to MYSQLCOM=-NO-.
-
-   After the installation, you can start and stop MySQL by running
-   the following commands in a terminal window. You must have
-   administrator privileges to perform these tasks, and you may be
-   prompted for your password.
+   /Library/StartupItems/MySQLCOM. The Startup Item installation
+   adds a variable MYSQLCOM=-YES- to the system configuration
+   file /etc/hostconfig. If you want to disable the automatic
+   startup of MySQL, change this variable to MYSQLCOM=-NO-.
+   Note
+
+   Deselecting Automatically Start MySQL Server on Startup from
+   the MySQL Preference Pane sets the MYSQLCOM variable to -NO-.
+
+   After the installation, you can start and stop the MySQL
+   server from the MySQL Preference Pane (preferred), or by
+   running the following commands in a terminal window. You must
+   have administrator privileges to perform these tasks, and you
+   may be prompted for your password.
 
-   If you have installed the Startup Item, use this command to start
-   the server:
+   If you have installed the Startup Item, use this command to
+   start the server:
 shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM start
 
-   If you have installed the Startup Item, use this command to stop
-   the server:
+   If you have installed the Startup Item, use this command to
+   stop the server:
 shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM stop
 
-2.4.4. Installing and Using the MySQL Preference Pane
+2.4.5 Installing and Using the MySQL Preference Pane
 
-   The MySQL Package installer disk image also includes a custom
-   MySQL Preference Pane that enables you to start, stop, and control
-   automated startup during boot of your MySQL installation.
+   The MySQL Installation Package includes a MySQL preference
+   Pane that enables you to start, stop, and control automated
+   startup during boot of your MySQL installation.
 
    To install the MySQL Preference Pane:
 
-    1. Download and open the MySQL package installer package, which
-       is provided on a disk image (.dmg) that includes the main
-       MySQL installation package, the MySQLStartupItem.pkg
-       installation package, and the MySQL.prefPane. Double-click the
-       disk image to open it.
-
-    2. Double-click the MySQL.prefPane. The MySQL System Preferences
-       will open.
-
-    3. If this is the first time you have installed the preference
-       pane, you will be asked to confirm installation and whether
-       you want to install the preference pane for all users, or only
-       the current user. To install the preference pane for all users
-       you will need administrator privileges. If necessary, you will
-       be prompted for the username and password for a user with
-       administrator privileges.
+    1. Download and open the MySQL package installer, which is
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package.
+       Note
+       Previously, the OS X packages included separate
+       MySQLStartupItem.pkg and MySQL.prefPane files. They have
+       since been merged into the main package file.
+       Figure 2.49 MySQL Package Installer: DMG Contents
+       MySQL Package Installer: DMG Contents
+
+    2. Go through the process of installing the MySQL server, as
+       described in the documentation at Section 2.4.2,
+       "Installing MySQL on OS X Using Native Packages."
 
-    4. If you already have the MySQL Preference Pane installed, you
-       will be asked to confirm whether you want to overwrite the
-       existing MySQL Preference Pane.
+    3. Click Customize at the Installation Type step. The
+       "Preference Pane" option is listed there and enabled by
+       default.
+       Figure 2.50 MySQL Installer on OS X: Customize
+       MySQL Installer on OS X: Customize
 
-   Note
+    4. Complete the MySQL server installation process.
 
-   The MySQL Preference Pane only starts and stops MySQL installation
-   installed from the MySQL package installation that have been
-   installed in the default location.
-
-   Once the MySQL Preference Pane has been installed, you can control
-   your MySQL server instance using the preference pane. To use the
-   preference pane, open the System Preferences... from the Apple
-   menu. Select the MySQL preference pane by clicking the MySQL logo
-   within the Other section of the preference panes list.
-   MySQL Preference Pane
-
-   The MySQL Preference Pane shows the current status of the MySQL
-   server, showing stopped (in red) if the server is not running and
-   running (in green) if the server has already been started. The
-   preference pane also shows the current setting for whether the
-   MySQL server has been set to start automatically.
-
-     * To start MySQL using the preference pane: 
-       Click Start MySQL Server. You may be prompted for the username
-       and password of a user with administrator privileges to start
-       the MySQL server.
-
-     * To stop MySQL using the preference pane: 
-       Click Stop MySQL Server. You may be prompted for the username
-       and password of a user with administrator privileges to stop
-       the MySQL server.
-
-     * To automatically start the MySQL server when the system boots:
-       Check the check box next to Automatically Start MySQL Server
-       on Startup.
+   Note
 
-     * To disable automatic MySQL server startup when the system
-       boots:
-       Uncheck the check box next to Automatically Start MySQL Server
-       on Startup.
+   The MySQL Preference Pane only starts and stops MySQL
+   installation installed from the MySQL package installation
+   that have been installed in the default location.
 
-   You can close the System Preferences... window once you have
-   completed your settings.
+   Once the MySQL Preference Pane has been installed, you can
+   control your MySQL server instance using the preference pane.
+   To use the preference pane, open the System Preferences...
+   from the Apple menu. Select the MySQL preference pane by
+   clicking the MySQL logo within the bottom section of the
+   preference panes list.
 
-2.4.5. Using the Bundled MySQL on Mac OS X Server
+   Figure 2.51 MySQL Preference Pane: Location
+   MySQL Preference Pane: Location
 
-   If you are running Mac OS X Server, a version of MySQL should
-   already be installed. The following table shows the versions of
-   MySQL that ship with Mac OS X Server versions.
-
-   Table 2.10. MySQL Versions Preinstalled with Mac OS X Server
-   Mac OS X Server Version MySQL Version
-   10.2-10.2.2             3.23.51
-   10.2.3-10.2.6           3.23.53
-   10.3                    4.0.14
-   10.3.2                  4.0.16
-   10.4.0                  4.1.10a
-   10.5.0                  5.0.45
-   10.6.0                  5.0.82
+   The MySQL Preference Pane shows the current status of the
+   MySQL server, showing stopped (in red) if the server is not
+   running and running (in green) if the server has already been
+   started. The preference pane also shows the current setting
+   for whether the MySQL server has been set to start
+   automatically.
 
-   The following table shows the installation layout of MySQL on Mac
-   OS X Server.
+     * To start the MySQL server using the preference pane:
+       Click Start MySQL Server. You may be prompted for the
+       username and password of a user with administrator
+       privileges to start the MySQL server.
 
-   Table 2.11. MySQL Directory Layout for Preinstalled MySQL
-   Installations on Mac OS X Server
-   Directory Contents of Directory
-   /usr/bin Client programs
-   /var/mysql Log files, databases
-   /usr/libexec The mysqld server
-   /usr/share/man Unix manual pages
-   /usr/share/mysql/mysql-test MySQL test suite
-   /usr/share/mysql Miscellaneous support files, including error
-   messages, character set files, sample configuration files, SQL for
-   database installation
-   /var/mysql/mysql.sock Location of the MySQL Unix socket
+     * To stop the MySQL server using the preference pane:
+       Click Stop MySQL Server. You may be prompted for the
+       username and password of a user with administrator
+       privileges to stop the MySQL server.
 
-Additional Resources
+     * To automatically start the MySQL server when the system
+       boots:
+       Check the check box next to Automatically Start MySQL
+       Server on Startup.
 
+     * To disable automatic MySQL server startup when the system
+       boots:
+       Uncheck the check box next to Automatically Start MySQL
+       Server on Startup.
 
-     * For more information on managing the bundled MySQL instance in
-       Mac OS X Server 10.5, see Mac OS X Server: Web Technologies
-       Administration For Version 10.5 Leopard
-       (http://images.apple.com/server/macosx/docs/Web_Technologies_A
-       dmin_v10.5.pdf).
-
-     * For more information on managing the bundled MySQL instance in
-       Mac OS X Server 10.6, see Mac OS X Server: Web Technologies
-       Administration Version 10.6 Snow Leopard
-       (http://manuals.info.apple.com/en_US/WebTech_v10.6.pdf).
-
-     * The MySQL server bundled with Mac OS X Server does not include
-       the MySQL client libraries and header files required to access
-       and use MySQL from a third-party driver, such as Perl DBI or
-       PHP. For more information on obtaining and installing MySQL
-       libraries, see Mac OS X Server version 10.5: MySQL libraries
-       available for download (http://support.apple.com/kb/TA25017).
-       Alternatively, you can ignore the bundled MySQL server and
-       install MySQL from the package or tarball installation.
+   You can close the System Preferences... window once you have
+   completed your settings.
 
-2.5. Installing MySQL on Linux
+2.5 Installing MySQL on Linux
 
    Linux supports a number of different solutions for installing
-   MySQL. The recommended method is to use one of the distributions
-   from Oracle. If you choose this method, there are several options
-   available:
-
-     * Installing from a generic binary package in .tar.gz format.
-       See Section 2.2, "Installing MySQL on Unix/Linux Using Generic
-       Binaries" for more information.
-
-     * Extracting and compiling MySQL from a source distribution. For
-       detailed instructions, see Section 2.10, "Installing MySQL
-       from Source."
+   MySQL. The recommended method is to use one of the
+   distributions from Oracle. If you choose this method, there
+   are several options available:
+
+     * Installing from a generic binary package in .tar.gz
+       format. See Section 2.2, "Installing MySQL on Unix/Linux
+       Using Generic Binaries" for more information.
+
+     * Extracting and compiling MySQL from a source
+       distribution. For detailed instructions, see Section 2.9,
+       "Installing MySQL from Source."
 
      * Installing using a precompiled RPM package. For more
-       information, see Section 2.5.1, "Installing MySQL on Linux
-       Using RPM Packages."
+       information, see Section 2.5.1, "Installing MySQL on
+       Linux Using RPM Packages."
 
      * Installing using a precompiled Debian package. For more
-       information, see Section 2.5.2, "Installing MySQL on Linux
-       Using Debian Packages."
+       information, see Section 2.5.2, "Installing MySQL on
+       Linux Using Debian Packages."
 
-     * Installing using Oracle's Unbreakable Linux Network (ULN). For
-       more information, see Section 2.6, "Installing MySQL Using
-       Unbreakable Linux Network (ULN)."
-
-   As an alternative, you can use the native package manager within
-   your Linux distribution to automatically download and install
-   MySQL for you. Native package installations can take care of the
-   download and dependencies required to run MySQL, but the MySQL
-   version will often be some versions behind the currently available
-   release. You will also normally be unable to install development
-   releases, as these are not usually made available in the native
-   repository. For more information on using the native package
-   installers, see Section 2.5.3, "Installing MySQL on Linux Using
-   Native Package Managers."
-   Note
-
-   For many Linux installations, you will want to set up MySQL to be
-   started automatically when your machine starts. Many of the native
-   package installations perform this operation for you, but for
-   source, binary and RPM solutions you may need to set this up
-   separately. The required script, mysql.server, can be found in the
-   support-files directory under the MySQL installation directory or
-   in a MySQL source tree. You can install it as /etc/init.d/mysql
-   for automatic MySQL startup and shutdown. See Section 2.11.1.2,
-   "Starting and Stopping MySQL Automatically."
+     * Installing using Oracle's Unbreakable Linux Network
+       (ULN). For more information, see Section 2.6, "Installing
+       MySQL Using Unbreakable Linux Network (ULN)."
+
+   As an alternative, you can use the native package manager
+   within your Linux distribution to automatically download and
+   install MySQL for you. Native package installations can take
+   care of the download and dependencies required to run MySQL,
+   but the MySQL version will often be some versions behind the
+   currently available release. You will also normally be unable
+   to install development releases, as these are not usually
+   made available in the native repository. For more information
+   on using the native package installers, see Section 2.5.3,
+   "Installing MySQL on Linux Using Native Package Managers."
+   Note
+
+   For many Linux installations, you will want to set up MySQL
+   to be started automatically when your machine starts. Many of
+   the native package installations perform this operation for
+   you, but for source, binary and RPM solutions you may need to
+   set this up separately. The required script, mysql.server,
+   can be found in the support-files directory under the MySQL
+   installation directory or in a MySQL source tree. You can
+   install it as /etc/init.d/mysql for automatic MySQL startup
+   and shutdown. See Section 2.10.3, "Starting and Stopping
+   MySQL Automatically."
 
-2.5.1. Installing MySQL on Linux Using RPM Packages
+2.5.1 Installing MySQL on Linux Using RPM Packages
 
    Note
 
-   To install or upgrade to MySQL 5.5.31, be sure to read the special
-   instructions at the end of this section.
+   To install or upgrade to MySQL 5.5.31, be sure to read the
+   special instructions at the end of this section.
 
    The recommended way to install MySQL on RPM-based Linux
    distributions is by using the RPM packages. The RPMs that we
-   provide to the community should work on all versions of Linux that
-   support RPM packages and use glibc 2.3. To obtain RPM packages,
-   see Section 2.1.3, "How to Get MySQL."
+   provide to the community should work on all versions of Linux
+   that support RPM packages and use glibc 2.3. To obtain RPM
+   packages, see Section 2.1.2, "How to Get MySQL."
 
-   For non-RPM Linux distributions, you can install MySQL using a
-   .tar.gz package. See Section 2.2, "Installing MySQL on Unix/Linux
-   Using Generic Binaries."
+   For non-RPM Linux distributions, you can install MySQL using
+   a .tar.gz package. See Section 2.2, "Installing MySQL on
+   Unix/Linux Using Generic Binaries."
 
-   Installations created from our Linux RPM distributions result in
-   files under the system directories shown in the following table.
+   Installations created from our Linux RPM distributions result
+   in files under the system directories shown in the following
+   table.
 
-   Table 2.12. MySQL Installation Layout for Linux RPM Packages
+   Table 2.9 MySQL Installation Layout for Linux RPM Packages
    Directory Contents of Directory
    /usr/bin Client programs and scripts
    /usr/sbin The mysqld server
@@ -4315,93 +4763,141 @@
    /usr/include/mysql Include (header) files
    /usr/lib/mysql Libraries
    /usr/share/mysql Miscellaneous support files, including error
-   messages, character set files, sample configuration files, SQL for
-   database installation
+   messages, character set files, sample configuration files,
+   SQL for database installation
    /usr/share/sql-bench Benchmarks
    Note
 
-   RPM distributions of MySQL are also provided by other vendors. Be
-   aware that they may differ from those built by us in features,
-   capabilities, and conventions (including communication setup), and
-   that the instructions in this manual do not necessarily apply to
-   installing them. The vendor's instructions should be consulted
-   instead. Because of these differences, RPM packages built by us
-   check whether such RPMs built by other vendors are installed. If
-   so, the RPM does not install and produces a message explaining
-   this.
+   RPM distributions of MySQL are also provided by other
+   vendors. Be aware that they may differ from those built by us
+   in features, capabilities, and conventions (including
+   communication setup), and that the instructions in this
+   manual do not necessarily apply to installing them. The
+   vendor's instructions should be consulted instead. Because of
+   these differences, RPM packages built by us check whether
+   such RPMs built by other vendors are installed. If so, the
+   RPM does not install and produces a message explaining this.
+
+   Conflicts can arise when an RPM from another vendor is
+   already installed, such as when a vendor's convention about
+   which files belong with the server and which belong with the
+   client library differ from the breakdown used for Oracle
+   packages. In such cases, attempts to install an Oracle RPM
+   with rpm -i may result in messages that files in the RPM to
+   be installed conflict with files from an installed package
+   (denoted mysql-libs in the following paragraphs).
+
+   We provide a MySQL-shared-compat package with each MySQL
+   release. This package is meant to replace mysql-libs and
+   provides a replacement-compatible client library for older
+   MySQL series. MySQL-shared-compat is set up to make
+   mysql-libs obsolete, but rpm explicitly refuses to replace
+   obsoleted packages when invoked with -i (unlike -U), which is
+   why installation with rpm -i produces a conflict.
+
+   MySQL-shared-compat can safely be installed alongside
+   mysql-libs because libraries are installed to different
+   locations. Therefore, it is possible to install shared-compat
+   first, then manually remove mysql-libs before continuing with
+   the installation. After mysql-libs is removed, the dynamic
+   linker stops looking for the client library in the location
+   where mysql-libs puts it, and the library provided by the
+   MySQL-shared-compat package takes over.
+
+   Another alternative is to install packages using yum. In a
+   directory containing all RPM packages for a MySQL release,
+   yum install MySQL*rpm installs them in the correct order and
+   removes mysql-libs in one step without conflicts.
 
    In most cases, you need to install only the MySQL-server and
-   MySQL-client packages to get a functional MySQL installation. The
-   other packages are not required for a standard installation.
+   MySQL-client packages to get a functional MySQL installation.
+   The other packages are not required for a standard
+   installation.
 
-   RPMs for MySQL Cluster.  Standard MySQL server RPMs built by MySQL
-   do not provide support for the NDBCLUSTER storage engine.
+   RPMs for MySQL Cluster.  Standard MySQL server RPMs built by
+   MySQL do not provide support for the NDBCLUSTER storage
+   engine.
    Important
 
-   When upgrading a MySQL Cluster RPM installation, you must upgrade
-   all installed RPMs, including the Server and Client RPMs.
-
-   For more information about installing MySQL Cluster from RPMs, see
-   Section 17.2, "MySQL Cluster Installation and Upgrades."
+   When upgrading a MySQL Cluster RPM installation, you must
+   upgrade all installed RPMs, including the Server and Client
+   RPMs.
+
+   For more information about installing MySQL Cluster from
+   RPMs, see Section 18.2, "MySQL Cluster Installation and
+   Upgrades."
 
    For upgrades, if your installation was originally produced by
-   installing multiple RPM packages, it is best to upgrade all the
-   packages, not just some. For example, if you previously installed
-   the server and client RPMs, do not upgrade just the server RPM.
+   installing multiple RPM packages, it is best to upgrade all
+   the packages, not just some. For example, if you previously
+   installed the server and client RPMs, do not upgrade just the
+   server RPM.
+
+   If the data directory exists at RPM installation time, the
+   installation process does not modify existing data. This has
+   the effect, for example, that accounts in the grant tables
+   are not initialized to the default set of accounts.
 
    If you get a dependency failure when trying to install MySQL
-   packages (for example, error: removing these packages would break
-   dependencies: libmysqlclient.so.10 is needed by ...), you should
-   also install the MySQL-shared-compat package, which includes the
-   shared libraries for older releases for backward compatibility.
-
-   The RPM packages shown in the following list are available. The
-   names shown here use a suffix of .glibc23.i386.rpm, but particular
-   packages can have different suffixes, described later.
+   packages (for example, error: removing these packages would
+   break dependencies: libmysqlclient.so.10 is needed by ...),
+   you should also install the MySQL-shared-compat package,
+   which includes the shared libraries for older releases for
+   backward compatibility.
+
+   The RPM packages shown in the following list are available.
+   The names shown here use a suffix of .glibc23.i386.rpm, but
+   particular packages can have different suffixes, described
+   later. If you plan to install multiple RPM packages, you may
+   wish to download the RPM Bundle tar file instead, which
+   contains multiple RPM packages to that you need not download
+   them separately.
 
      * MySQL-server-VERSION.glibc23.i386.rpm
        The MySQL server. You need this unless you only want to
        connect to a MySQL server running on another machine.
 
      * MySQL-client-VERSION.glibc23.i386.rpm
-       The standard MySQL client programs. You probably always want
-       to install this package.
+       The standard MySQL client programs. You probably always
+       want to install this package.
 
      * MySQL-devel-VERSION.glibc23.i386.rpm
-       The libraries and include files that are needed if to compile
-       other MySQL clients, such as the Perl modules. Install this
-       RPM if you intend to compile C API applications.
+       The libraries and include files that are needed if to
+       compile other MySQL clients, such as the Perl modules.
+       Install this RPM if you intend to compile C API
+       applications.
 
      * MySQL-shared-VERSION.glibc23.i386.rpm
        This package contains the shared libraries
-       (libmysqlclient.so*) that certain languages and applications
-       need to dynamically load and use MySQL. It contains
-       single-threaded and thread-safe libraries. Install this RPM if
-       you intend to compile or run C API applications that depend on
-       the shared client library. Prior to MySQL 5.5.6, if you
-       install this package, do not install the MySQL-shared-compat
-       package.
+       (libmysqlclient.so*) that certain languages and
+       applications need to dynamically load and use MySQL. It
+       contains single-threaded and thread-safe libraries.
+       Install this RPM if you intend to compile or run C API
+       applications that depend on the shared client library.
+       Prior to MySQL 5.5.6, if you install this package, do not
+       install the MySQL-shared-compat package.
 
      * MySQL-shared-compat-VERSION.glibc23.i386.rpm
-       This package includes the shared libraries for older releases.
-       It contains single-threaded and thread-safe libraries. Install
-       this package if you have applications installed that are
-       dynamically linked against older versions of MySQL but you
-       want to upgrade to the current version without breaking the
-       library dependencies. Before MySQL 5.5.6, MySQL-shared-compat
-       also includes the libraries for the current release, so if you
-       install it, you should not also install MySQL-shared. As of
-       5.5.6, MySQL-shared-compat does not include the current
-       library version, so there is no conflict.
+       This package includes the shared libraries for older
+       releases. It contains single-threaded and thread-safe
+       libraries. Install this package if you have applications
+       installed that are dynamically linked against older
+       versions of MySQL but you want to upgrade to the current
+       version without breaking the library dependencies. Before
+       MySQL 5.5.6, MySQL-shared-compat also includes the
+       libraries for the current release, so if you install it,
+       you should not also install MySQL-shared. As of 5.5.6,
+       MySQL-shared-compat does not include the current library
+       version, so there is no conflict.
        As of MySQL 5.5.23, the MySQL-shared-compat RPM package
-       enables users of Red Hat-provided mysql-*-5.1 RPM packages to
-       migrate to Oracle-provided MySQL-*-5.5 packages.
-       MySQL-shared-compat replaces the Red Hat mysql-libs package by
-       replacing libmysqlclient.so files of the latter package, thus
-       satisfying dependencies of other packages on mysql-libs. This
-       change affects only users of Red Hat (or Red Hat-compatible)
-       RPM packages. Nothing is different for users of Oracle RPM
-       packages.
+       enables users of Red Hat-provided mysql-*-5.1 RPM
+       packages to migrate to Oracle-provided MySQL-*-5.5
+       packages. MySQL-shared-compat replaces the Red Hat
+       mysql-libs package by replacing libmysqlclient.so files
+       of the latter package, thus satisfying dependencies of
+       other packages on mysql-libs. This change affects only
+       users of Red Hat (or Red Hat-compatible) RPM packages.
+       Nothing is different for users of Oracle RPM packages.
 
      * MySQL-embedded-VERSION.glibc23.i386.rpm
        The embedded MySQL server library.
@@ -4411,210 +4907,226 @@
 
      * MySQL-VERSION.src.rpm
        This contains the source code for all of the previous
-       packages. It can also be used to rebuild the RPMs on other
-       architectures (for example, Alpha or SPARC).
+       packages. It can also be used to rebuild the RPMs on
+       other architectures (for example, Alpha or SPARC).
 
-   The suffix of RPM package names (following the VERSION value) has
-   the following syntax:
+   The suffix of RPM package names (following the VERSION value)
+   has the following syntax:
 .PLATFORM.CPU.rpm
 
-   The PLATFORM and CPU values indicate the type of system for which
-   the package is built. PLATFORM indicates the platform and CPU
-   indicates the processor type or family.
+   The PLATFORM and CPU values indicate the type of system for
+   which the package is built. PLATFORM indicates the platform
+   and CPU indicates the processor type or family.
 
    All packages are dynamically linked against glibc 2.3. The
    PLATFORM value indicates whether the package is platform
-   independent or intended for a specific platform, as shown in the
-   following table.
+   independent or intended for a specific platform, as shown in
+   the following table.
 
-   Table 2.13. MySQL Linux Installation Packages
+   Table 2.10 MySQL Linux Installation Packages
    PLATFORM Value Intended Use
-   glibc23 Platform independent, should run on any Linux distribution
-   that supports glibc 2.3
+   glibc23 Platform independent, should run on any Linux
+   distribution that supports glibc 2.3
    rhel4, rhel5 Red Hat Enterprise Linux 4 or 5
    el6 Enterprise Linux 6
    sles10, sles11 SuSE Linux Enterprise Server 10 or 11
 
    In MySQL 5.5, only glibc23 packages are available currently.
 
-   The CPU value indicates the processor type or family for which the
-   package is built.
+   The CPU value indicates the processor type or family for
+   which the package is built.
 
-   Table 2.14. MySQL Installation Packages for Linux CPU Identifiers
+   Table 2.11 MySQL Installation Packages for Linux CPU
+   Identifiers
       CPU Value      Intended Processor Type or Family
    i386, i586, i686 Pentium processor or better, 32 bit
    x86_64           64-bit x86 processor
    ia64             Itanium (IA-64) processor
 
-   To see all files in an RPM package (for example, a MySQL-server
-   RPM), run a command like this:
+   To see all files in an RPM package (for example, a
+   MySQL-server RPM), run a command like this:
 shell> rpm -qpl MySQL-server-VERSION.glibc23.i386.rpm
 
-   To perform a standard minimal installation, install the server and
-   client RPMs:
+   To perform a standard minimal installation, install the
+   server and client RPMs:
 shell> rpm -i MySQL-server-VERSION.glibc23.i386.rpm
 shell> rpm -i MySQL-client-VERSION.glibc23.i386.rpm
 
-   To install only the client programs, install just the client RPM:
+   To install only the client programs, install just the client
+   RPM:
 shell> rpm -i MySQL-client-VERSION.glibc23.i386.rpm
 
-   RPM provides a feature to verify the integrity and authenticity of
-   packages before installing them. To learn more about this feature,
-   see Section 2.1.4, "Verifying Package Integrity Using MD5
-   Checksums or GnuPG."
-
-   The server RPM places data under the /var/lib/mysql directory. The
-   RPM also creates a login account for a user named mysql (if one
-   does not exist) to use for running the MySQL server, and creates
-   the appropriate entries in /etc/init.d/ to start the server
-   automatically at boot time. (This means that if you have performed
-   a previous installation and have made changes to its startup
-   script, you may want to make a copy of the script so that you do
-   not lose it when you install a newer RPM.) See Section 2.11.1.2,
-   "Starting and Stopping MySQL Automatically," for more information
-   on how MySQL can be started automatically on system startup.
-
-   In MySQL 5.5.5 and later, during a new installation, the server
-   boot scripts are installed, but the MySQL server is not started at
-   the end of the installation, since the status of the server during
-   an unattended installation is not known.
-
-   In MySQL 5.5.5 and later, during an upgrade installation using the
-   RPM packages, if the MySQL server is running when the upgrade
-   occurs, the MySQL server is stopped, the upgrade occurs, and the
-   MySQL server is restarted. If the MySQL server is not already
-   running when the RPM upgrade occurs, the MySQL server is not
-   started at the end of the installation.
+   RPM provides a feature to verify the integrity and
+   authenticity of packages before installing them. To learn
+   more about this feature, see Section 2.1.3, "Verifying
+   Package Integrity Using MD5 Checksums or GnuPG."
+
+   The server RPM places data under the /var/lib/mysql
+   directory. The RPM also creates a login account for a user
+   named mysql (if one does not exist) to use for running the
+   MySQL server, and creates the appropriate entries in
+   /etc/init.d/ to start the server automatically at boot time.
+   (This means that if you have performed a previous
+   installation and have made changes to its startup script, you
+   may want to make a copy of the script so that you do not lose
+   it when you install a newer RPM.) See Section 2.10.3,
+   "Starting and Stopping MySQL Automatically," for more
+   information on how MySQL can be started automatically on
+   system startup.
+
+   In MySQL 5.5.5 and later, during a new installation, the
+   server boot scripts are installed, but the MySQL server is
+   not started at the end of the installation, since the status
+   of the server during an unattended installation is not known.
+
+   In MySQL 5.5.5 and later, during an upgrade installation
+   using the RPM packages, if the MySQL server is running when
+   the upgrade occurs, the MySQL server is stopped, the upgrade
+   occurs, and the MySQL server is restarted. If the MySQL
+   server is not already running when the RPM upgrade occurs,
+   the MySQL server is not started at the end of the
+   installation.
 
    If something goes wrong, you can find more information in the
-   binary installation section. See Section 2.2, "Installing MySQL on
-   Unix/Linux Using Generic Binaries."
+   binary installation section. See Section 2.2, "Installing
+   MySQL on Unix/Linux Using Generic Binaries."
    Note
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11,
-   "Postinstallation Setup and Testing."
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10, "Postinstallation Setup and Testing."
 
    During RPM installation, a user named mysql and a group named
-   mysql are created on the system. This is done using the useradd,
-   groupadd, and usermod commands. Those commands require appropriate
-   administrative privileges, which is required for locally managed
-   users and groups (as listed in the /etc/passwd and /etc/group
-   files) by the RPM installation process being run by root.
-
-   If you log in as the mysql user, you may find that MySQL displays
-   "Invalid (old?) table or database name" errors that mention
-   .mysqlgui, lost+found, .mysqlgui, .bash_history, .fonts.cache-1,
-   .lesshst, .mysql_history, .profile, .viminfo, and similar files
-   created by MySQL or operating system utilities. You can safely
-   ignore these error messages or remove the files or directories
-   that cause them if you do not need them.
+   mysql are created on the system. This is done using the
+   useradd, groupadd, and usermod commands. Those commands
+   require appropriate administrative privileges, which is
+   required for locally managed users and groups (as listed in
+   the /etc/passwd and /etc/group files) by the RPM installation
+   process being run by root.
+
+   If you log in as the mysql user, you may find that MySQL
+   displays "Invalid (old?) table or database name" errors that
+   mention .mysqlgui, lost+found, .mysqlgui, .bash_history,
+   .fonts.cache-1, .lesshst, .mysql_history, .profile, .viminfo,
+   and similar files created by MySQL or operating system
+   utilities. You can safely ignore these error messages or
+   remove the files or directories that cause them if you do not
+   need them.
 
    For nonlocal user management (LDAP, NIS, and so forth), the
-   administrative tools may require additional authentication (such
-   as a password), and will fail if the installing user does not
-   provide this authentication. Even if they fail, the RPM
-   installation will not abort but succeed, and this is intentional.
-   If they failed, some of the intended transfer of ownership may be
-   missing, and it is recommended that the system administrator then
-   manually ensures some appropriate user and group exists and
-   manually transfers ownership following the actions in the RPM spec
-   file.
+   administrative tools may require additional authentication
+   (such as a password), and will fail if the installing user
+   does not provide this authentication. Even if they fail, the
+   RPM installation will not abort but succeed, and this is
+   intentional. If they failed, some of the intended transfer of
+   ownership may be missing, and it is recommended that the
+   system administrator then manually ensures some appropriate
+   user and group exists and manually transfers ownership
+   following the actions in the RPM spec file.
 
-   In MySQL 5.5.31, the RPM spec file has been updated, which has the
-   following consequences:
+   In MySQL 5.5.31, the RPM spec file has been updated, which
+   has the following consequences:
 
      * For a non-upgrade installation (no existing MySQL version
        installed), it possible to install MySQL using yum.
 
-     * For upgrades, it is necessary to clean up any earlier MySQL
-       installations. In effect, the update is performed by removing
-       the old installations and installing the new one.
+     * For upgrades, it is necessary to clean up any earlier
+       MySQL installations. In effect, the update is performed
+       by removing the old installations and installing the new
+       one.
 
    Additional details follow.
 
-   For a non-upgrade installation of MySQL 5.5.31, it is possible to
-   install using yum:
+   For a non-upgrade installation of MySQL 5.5.31, it is
+   possible to install using yum:
 shell> yum install MySQL-server-NEWVERSION.glibc23.i386.rpm
 
-   For upgrades to MySQL 5.5.31, the upgrade is performed by removing
-   the old installation and installing the new one. To do this, use
-   the following procedure:
+   For upgrades to MySQL 5.5.31, the upgrade is performed by
+   removing the old installation and installing the new one. To
+   do this, use the following procedure:
 
     1. Remove the existing 5.5.X installation. OLDVERSION is the
        version to remove.
 shell> rpm -e MySQL-server-OLDVERSION.glibc23.i386.rpm
+
        Repeat this step for all installed MySQL RPMs.
 
-    2. Install the new version. NEWVERSION is the version to install.
+    2. Install the new version. NEWVERSION is the version to
+       install.
 shell> rpm -ivh MySQL-server-NEWVERSION.glibc23.i386.rpm
 
-   Alternatively, the removal and installation can be done using yum:
+   Alternatively, the removal and installation can be done using
+   yum:
 shell> yum remove MySQL-server-OLDVERSION.glibc23.i386.rpm
 shell> yum install MySQL-server-NEWVERSION.glibc23.i386.rpm
 
-2.5.2. Installing MySQL on Linux Using Debian Packages
+2.5.2 Installing MySQL on Linux Using Debian Packages
 
    Oracle provides Debian packages for installation on Debian or
-   Debian-like Linux systems. To obtain a package, see Section 2.1.3,
-   "How to Get MySQL."
+   Debian-like Linux systems. To obtain a package, see Section
+   2.1.2, "How to Get MySQL."
    Note
 
-   Debian distributions of MySQL are also provided by other vendors.
-   Be aware that they may differ from those built by us in features,
-   capabilities, and conventions (including communication setup), and
-   that the instructions in this manual do not necessarily apply to
-   installing them. The vendor's instructions should be consulted
-   instead.
-
-   Debian package files have names in mysql-MVER-DVER-CPU.deb format.
-   MVER is the MySQL version and DVER is the Debian version. The CPU
-   value indicates the processor type or family for which the package
-   is built, as shown in the following table.
+   Debian distributions of MySQL are also provided by other
+   vendors. Be aware that they may differ from those built by us
+   in features, capabilities, and conventions (including
+   communication setup), and that the instructions in this
+   manual do not necessarily apply to installing them. The
+   vendor's instructions should be consulted instead.
+
+   Debian package files have names in mysql-MVER-DVER-CPU.deb
+   format. MVER is the MySQL version and DVER is the Debian
+   version. The CPU value indicates the processor type or family
+   for which the package is built, as shown in the following
+   table.
 
-   Table 2.15. MySQL Installation Packages for Linux CPU Identifiers
+   Table 2.12 MySQL Installation Packages for Linux CPU
+   Identifiers
    CPU Value  Intended Processor Type or Family
    i686      Pentium processor or better, 32 bit
    x86_64    64-bit x86 processor
 
-   After downloading a Debian package, use the following command to
-   install it;
+   After downloading a Debian package, use the following command
+   to install it;
 shell> dpkg -i mysql-MVER-DVER-CPU.deb
 
-   The Debian package installs files in the /opt/mysql/server-5.5
-   directory.
+   The Debian package installs files in the
+   /opt/mysql/server-5.5 directory.
 
    You may also need to install the libaio library if it is not
    already present on your system:
-shell> apt-get install libaio1
+shell> sudo apt-get install libaio1
 
-2.5.3. Installing MySQL on Linux Using Native Package Managers
+2.5.3 Installing MySQL on Linux Using Native Package Managers
 
-   Many Linux distributions include a version of the MySQL server,
-   client tools, and development components into the standard package
-   management system built into distributions such as Fedora, Debian,
-   Ubuntu, and Gentoo. This section provides basic instructions for
-   installing MySQL using these systems.
+   Many Linux distributions include a version of the MySQL
+   server, client tools, and development components into the
+   standard package management system built into distributions
+   such as Fedora, Debian, Ubuntu, and Gentoo. This section
+   provides basic instructions for installing MySQL using these
+   systems.
    Important
 
-   Native package installations can take care of the download and
-   dependencies required to run MySQL, but the MySQL version will
-   often be some way behind the currently available release. You will
-   also normally be unable to install development releases, as these
-   are not usually made available in the native repository.
+   Native package installations can take care of the download
+   and dependencies required to run MySQL, but the MySQL version
+   will often be some way behind the currently available
+   release. You will also normally be unable to install
+   development releases, as these are not usually made available
+   in the native repository.
 
    Distribution specific instructions are shown below:
 
      * Red Hat Linux, Fedora, CentOS
-       For Red Hat and similar distributions, the MySQL distribution
-       is divided into a number of separate packages, mysql for the
-       client tools, mysql-server for the server and associated
-       tools, and mysql-libs for the libraries. The libraries are
-       required if you want to provide connectivity from different
-       languages and environments such as Perl, Python and others.
-       To install, use the yum command to specify the packages that
-       you want to install. For example:
+       For Red Hat and similar distributions, the MySQL
+       distribution is divided into a number of separate
+       packages, mysql for the client tools, mysql-server for
+       the server and associated tools, and mysql-libs for the
+       libraries. The libraries are required if you want to
+       provide connectivity from different languages and
+       environments such as Perl, Python and others.
+       To install, use the yum command to specify the packages
+       that you want to install. For example:
 root-shell> yum install mysql mysql-server mysql-libs mysql-server
 Loaded plugins: presto, refresh-packagekit
 Setting up Install Process
@@ -4623,34 +5135,34 @@
 ---> Package mysql.x86_64 0:5.1.48-2.fc13 set to be updated
 ---> Package mysql-libs.x86_64 0:5.1.48-2.fc13 set to be updated
 ---> Package mysql-server.x86_64 0:5.1.48-2.fc13 set to be updated
---> Processing Dependency: perl-DBD-MySQL for package: mysql-server-5
-.1.48-2.fc13.x86_64
+--> Processing Dependency: perl-DBD-MySQL for package: mysql-server-5.
+1.48-2.fc13.x86_64
 --> Running transaction check
 ---> Package perl-DBD-MySQL.x86_64 0:4.017-1.fc13 set to be updated
 --> Finished Dependency Resolution
 
 Dependencies Resolved
 
-=====================================================================
-===========
+======================================================================
+==========
  Package               Arch          Version               Repository
-      Size
-=====================================================================
-===========
+     Size
+======================================================================
+==========
 Installing:
  mysql                 x86_64        5.1.48-2.fc13         updates
-     889 k
+    889 k
  mysql-libs            x86_64        5.1.48-2.fc13         updates
-     1.2 M
+    1.2 M
  mysql-server          x86_64        5.1.48-2.fc13         updates
-     8.1 M
+    8.1 M
 Installing for dependencies:
  perl-DBD-MySQL        x86_64        4.017-1.fc13          updates
-     136 k
+    136 k
 
 Transaction Summary
-=====================================================================
-===========
+======================================================================
+==========
 Install       4 Package(s)
 Upgrade       0 Package(s)
 
@@ -4662,33 +5174,33 @@
 Processing delta metadata
 Package(s) data still to download: 10 M
 (1/4): mysql-5.1.48-2.fc13.x86_64.rpm                    | 889 kB
- 00:04
+00:04
 (2/4): mysql-libs-5.1.48-2.fc13.x86_64.rpm               | 1.2 MB
- 00:06
+00:06
 (3/4): mysql-server-5.1.48-2.fc13.x86_64.rpm             | 8.1 MB
- 00:40
+00:40
 (4/4): perl-DBD-MySQL-4.017-1.fc13.x86_64.rpm            | 136 kB
- 00:00
----------------------------------------------------------------------
------------
+00:00
+----------------------------------------------------------------------
+----------
 Total                                           201 kB/s |  10 MB
- 00:52
+00:52
 Running rpm_check_debug
 Running Transaction Test
 Transaction Test Succeeded
 Running Transaction
   Installing     : mysql-libs-5.1.48-2.fc13.x86_64
-       1/4
+      1/4
   Installing     : mysql-5.1.48-2.fc13.x86_64
-       2/4
+      2/4
   Installing     : perl-DBD-MySQL-4.017-1.fc13.x86_64
-       3/4
+      3/4
   Installing     : mysql-server-5.1.48-2.fc13.x86_64
-       4/4
+      4/4
 
 Installed:
-  mysql.x86_64 0:5.1.48-2.fc13            mysql-libs.x86_64 0:5.1.48-
-2.fc13
+  mysql.x86_64 0:5.1.48-2.fc13            mysql-libs.x86_64 0:5.1.48-2
+.fc13
   mysql-server.x86_64 0:5.1.48-2.fc13
 
 Dependency Installed:
@@ -4696,73 +5208,76 @@
 
 
 Complete!
-       MySQL and the MySQL server should now be installed. A sample
-       configuration file is installed into /etc/my.cnf. An init
-       script, to start and stop the server, will have been installed
-       into /etc/init.d/mysqld. To start the MySQL server use
-       service:
+
+       MySQL and the MySQL server should now be installed. A
+       sample configuration file is installed into /etc/my.cnf.
+       An init script, to start and stop the server, will have
+       been installed into /etc/init.d/mysqld. To start the
+       MySQL server use service:
 root-shell> service mysqld start
-       To enable the server to be started and stopped automatically
-       during boot, use chkconfig:
+
+       To enable the server to be started and stopped
+       automatically during boot, use chkconfig:
 root-shell> chkconfig --levels 235 mysqld on
-       Which enables the MySQL server to be started (and stopped)
-       automatically at the specified the run levels.
-       The database tables will have been automatically created for
-       you, if they do not already exist. You should, however, run
-       mysql_secure_installation to set the root passwords on your
-       server.
+
+       Which enables the MySQL server to be started (and
+       stopped) automatically at the specified the run levels.
+       The database tables will have been automatically created
+       for you, if they do not already exist. You should,
+       however, run mysql_secure_installation to set the root
+       passwords on your server.
 
      * Debian, Ubuntu, Kubuntu
-       On Debian and related distributions, there are two packages,
-       mysql-client and mysql-server, for the client and server
-       components respectively. You should specify an explicit
-       version, for example mysql-client-5.1, to ensure that you
-       install the version of MySQL that you want.
-       To download and install, including any dependencies, use the
-       apt-get command, specifying the packages that you want to
-       install.
+       On Debian and related distributions, there are two
+       packages, mysql-client and mysql-server, for the client
+       and server components respectively. You should specify an
+       explicit version, for example mysql-client-5.1, to ensure
+       that you install the version of MySQL that you want.
+       To download and install, including any dependencies, use
+       the apt-get command, specifying the packages that you
+       want to install.
        Note
        Before installing, make sure that you update your apt-get
-       index files to ensure you are downloading the latest available
-       version.
-       A sample installation of the MySQL packages might look like
-       this (some sections trimmed for clarity):
+       index files to ensure you are downloading the latest
+       available version.
+       A sample installation of the MySQL packages might look
+       like this (some sections trimmed for clarity):
 root-shell> apt-get install mysql-client-5.1 mysql-server-5.1
 Reading package lists... Done
 Building dependency tree
 Reading state information... Done
 The following packages were automatically installed and are no longer
- required:
+required:
   linux-headers-2.6.28-11 linux-headers-2.6.28-11-generic
 Use 'apt-get autoremove' to remove them.
 The following extra packages will be installed:
   bsd-mailx libdbd-mysql-perl libdbi-perl libhtml-template-perl
-  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-pe
-rl mailx
+  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-per
+l mailx
   mysql-common postfix
 Suggested packages:
-  dbishell libipc-sharedcache-perl tinyca procmail postfix-mysql post
-fix-pgsql
+  dbishell libipc-sharedcache-perl tinyca procmail postfix-mysql postf
+ix-pgsql
   postfix-ldap postfix-pcre sasl2-bin resolvconf postfix-cdb
 The following NEW packages will be installed
   bsd-mailx libdbd-mysql-perl libdbi-perl libhtml-template-perl
-  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-pe
-rl mailx
+  libmysqlclient15off libmysqlclient16 libnet-daemon-perl libplrpc-per
+l mailx
   mysql-client-5.1 mysql-common mysql-server-5.1 postfix
 0 upgraded, 13 newly installed, 0 to remove and 182 not upgraded.
 Need to get 1907kB/25.3MB of archives.
 After this operation, 59.5MB of additional disk space will be used.
 Do you want to continue [Y/n]? Y
-Get: 1 http://gb.archive.ubuntu.com jaunty-updates/main mysql-common
-5.1.30really5.0.75-0ubuntu10.5 [63.6kB]
-Get: 2 http://gb.archive.ubuntu.com jaunty-updates/main libmysqlclien
-t15off 5.1.30really5.0.75-0ubuntu10.5 [1843kB]
+Get: 1 http://gb.archive.ubuntu.com jaunty-updates/main mysql-common 5
+.1.30really5.0.75-0ubuntu10.5 [63.6kB]
+Get: 2 http://gb.archive.ubuntu.com jaunty-updates/main libmysqlclient
+15off 5.1.30really5.0.75-0ubuntu10.5 [1843kB]
 Fetched 1907kB in 9s (205kB/s)
 
 Preconfiguring packages ...
 Selecting previously deselected package mysql-common.
-(Reading database ... 121260 files and directories currently installe
-d.)
+(Reading database ... 121260 files and directories currently installed
+.)
 ...
 Processing 1 added doc-base file(s)...
 Registering documents with scrollkeeper...
@@ -4782,48 +5297,50 @@
    ...done.
 100825 11:46:15  InnoDB: Started; log sequence number 0 46409
 100825 11:46:15  InnoDB: Starting shutdown...
-100825 11:46:17  InnoDB: Shutdown completed; log sequence number 0 46
-409
+100825 11:46:17  InnoDB: Shutdown completed; log sequence number 0 464
+09
 100825 11:46:17 [Warning] Forcing shutdown of 1 plugins
 
  * Starting MySQL database server mysqld
    ...done.
 
- * Checking for corrupt, not cleanly closed and upgrade needing table
-s.
+ * Checking for corrupt, not cleanly closed and upgrade needing tables
+.
 ...
 Processing triggers for libc6 ...
 ldconfig deferred processing now taking place
+
        Note
        The apt-get command will install a number of packages,
-       including the MySQL server, in order to provide the typical
-       tools and application environment. This can mean that you
-       install a large number of packages in addition to the main
-       MySQL package.
-       During installation, the initial database will be created, and
-       you will be prompted for the MySQL root password (and
-       confirmation). A configuration file will have been created in
-       /etc/mysql/my.cnf. An init script will have been created in
-       /etc/init.d/mysql.
-       The server will already be started. You can manually start and
-       stop the server using:
+       including the MySQL server, in order to provide the
+       typical tools and application environment. This can mean
+       that you install a large number of packages in addition
+       to the main MySQL package.
+       During installation, the initial database will be
+       created, and you will be prompted for the MySQL root
+       password (and confirmation). A configuration file will
+       have been created in /etc/mysql/my.cnf. An init script
+       will have been created in /etc/init.d/mysql.
+       The server will already be started. You can manually
+       start and stop the server using:
 root-shell> service mysql [start|stop]
-       The service will automatically be added to the 2, 3 and 4 run
-       levels, with stop scripts in the single, shutdown and restart
-       levels.
+
+       The service will automatically be added to the 2, 3 and 4
+       run levels, with stop scripts in the single, shutdown and
+       restart levels.
 
      * Gentoo Linux
-       As a source-based distribution, installing MySQL on Gentoo
-       involves downloading the source, patching the Gentoo
-       specifics, and then compiling the MySQL server and installing
-       it. This process is handled automatically by the emerge
-       command. Depending on the version of MySQL that you want to
-       install, you may need to unmask the specific version that you
-       want for your chosen platform.
-       The MySQL server and client tools are provided within a single
-       package, dev-db/mysql. You can obtain a list of the versions
-       available to install by looking at the portage directory for
-       the package:
+       As a source-based distribution, installing MySQL on
+       Gentoo involves downloading the source, patching the
+       Gentoo specifics, and then compiling the MySQL server and
+       installing it. This process is handled automatically by
+       the emerge command. Depending on the version of MySQL
+       that you want to install, you may need to unmask the
+       specific version that you want for your chosen platform.
+       The MySQL server and client tools are provided within a
+       single package, dev-db/mysql. You can obtain a list of
+       the versions available to install by looking at the
+       portage directory for the package:
 root-shell> ls /usr/portage/dev-db/mysql/mysql-5.1*
 mysql-5.1.39-r1.ebuild
 mysql-5.1.44-r1.ebuild
@@ -4833,356 +5350,294 @@
 mysql-5.1.45-r1.ebuild
 mysql-5.1.45.ebuild
 mysql-5.1.46.ebuild
+
        To install a specific MySQL version, you must specify the
        entire atom. For example:
 root-shell> emerge =dev-db/mysql-5.1.46
-       A simpler alternative is to use the virtual/mysql-5.1 package,
-       which will install the latest version:
+
+       A simpler alternative is to use the virtual/mysql-5.1
+       package, which will install the latest version:
 root-shell> emerge =virtual/mysql-5.1
+
        If the package is masked (because it is not tested or
-       certified for the current platform), use the ACCEPT_KEYWORDS
-       environment variable. For example:
+       certified for the current platform), use the
+       ACCEPT_KEYWORDS environment variable. For example:
 root-shell> ACCEPT_KEYWORDS="~x86" emerge =virtual/mysql-5.1
-       After installation, you should create a new database using
-       mysql_install_db, and set the password for the root user on
-       MySQL. You can use the configuration interface to set the
-       password and create the initial database:
+
+       After installation, you should create a new database
+       using mysql_install_db, and set the password for the root
+       user on MySQL. You can use the configuration interface to
+       set the password and create the initial database:
 root-shell> emerge --config =dev-db/mysql-5.1.46
-       A sample configuration file will have been created for you in
-       /etc/mysql/my.cnf, and an init script will have been created
-       in /etc/init.d/mysql.
-       To enable MySQL to start automatically at the normal (default)
-       run levels, you can use:
+
+       A sample configuration file will have been created for
+       you in /etc/mysql/my.cnf, and an init script will have
+       been created in /etc/init.d/mysql.
+       To enable MySQL to start automatically at the normal
+       (default) run levels, you can use:
 root-shell> rc-update add mysql default
 
-2.6. Installing MySQL Using Unbreakable Linux Network (ULN)
+2.6 Installing MySQL Using Unbreakable Linux Network (ULN)
 
    Linux supports a number of different solutions for installing
-   MySQL, covered in Section 2.5, "Installing MySQL on Linux." One of
-   the methods, covered in this section, is installing from Oracles's
-   Unbreakable Linux Network (ULN). You can find information about
-   Oracle Linux and ULN under http://linux.oracle.com/.
+   MySQL, covered in Section 2.5, "Installing MySQL on Linux."
+   One of the methods, covered in this section, is installing
+   from Oracle's Unbreakable Linux Network (ULN). You can find
+   information about Oracle Linux and ULN under
+   http://linux.oracle.com/.
 
    To use ULN, you need to obtain a ULN login and register the
    machine used for installation with ULN. This is described in
-   detail in the ULN FAQ (https://linux.oracle.com/uln_faq.html). The
-   page also describes how to install and update packages.The MySQL
-   packages are in the "MySQL for Oracle Linux 6" channel for your
-   system architecture on ULN.
+   detail in the ULN FAQ
+   (https://linux.oracle.com/uln_faq.html). The page also
+   describes how to install and update packages.The MySQL
+   packages are in the "MySQL for Oracle Linux 6" channel for
+   your system architecture on ULN.
    Note
 
-   At the time of writing this (September 2012), ULN provides MySQL
-   5.5 for Oracle Linux 6.
-
-   Once MySQL has been installed using ULN, you can find information
-   on starting and stopping the server, and more, in this section,
-   particularly under Section 2.5.1, "Installing MySQL on Linux Using
-   RPM Packages."
+   At the time of this writing, ULN provides MySQL 5.5 for
+   Oracle Linux 6.
+
+   Once MySQL has been installed using ULN, you can find
+   information on starting and stopping the server, and more, in
+   this section, particularly under Section 2.5.1, "Installing
+   MySQL on Linux Using RPM Packages."
 
    If you're updating an existing MySQL installation to an
-   installation using ULN, the recommended procedure is to export
-   your data using mysqldump, remove the existing installation,
-   install MySQL from ULN, and load the exported data into your
-   freshly installed MySQL.
-
-   If the existing MySQL installation you're upgrading from is from a
-   previous release series (prior to MySQL 5.5), make sure to read
-   the section on upgrading MySQL, Section 2.12.1, "Upgrading MySQL."
+   installation using ULN, the recommended procedure is to
+   export your data using mysqldump, remove the existing
+   installation, install MySQL from ULN, and load the exported
+   data into your freshly installed MySQL.
+
+   If the existing MySQL installation you're upgrading from is
+   from a previous release series (prior to MySQL 5.5), make
+   sure to read the section on upgrading MySQL, Section 2.11.1,
+   "Upgrading MySQL."
 
-2.7. Installing MySQL on Solaris and OpenSolaris
+2.7 Installing MySQL on Solaris and OpenSolaris
 
    MySQL on Solaris and OpenSolaris is available in a number of
    different formats.
 
-     * For information on installing using the native Solaris PKG
-       format, see Section 2.7.1, "Installing MySQL on Solaris Using
-       a Solaris PKG."
+     * For information on installing using the native Solaris
+       PKG format, see Section 2.7.1, "Installing MySQL on
+       Solaris Using a Solaris PKG."
 
      * On OpenSolaris, the standard package repositories include
-       MySQL packages specially built for OpenSolaris that include
-       entries for the Service Management Framework (SMF) to enable
-       control of the installation using the SMF administration
-       commands. For more information, see Section 2.7.2, "Installing
-       MySQL on OpenSolaris Using IPS."
+       MySQL packages specially built for OpenSolaris that
+       include entries for the Service Management Framework
+       (SMF) to enable control of the installation using the SMF
+       administration commands. For more information, see
+       Section 2.7.2, "Installing MySQL on OpenSolaris Using
+       IPS."
 
      * To use a standard tar binary installation, use the notes
-       provided in Section 2.2, "Installing MySQL on Unix/Linux Using
-       Generic Binaries." Check the notes and hints at the end of
-       this section for Solaris specific notes that you may need
-       before or after installation.
+       provided in Section 2.2, "Installing MySQL on Unix/Linux
+       Using Generic Binaries." Check the notes and hints at the
+       end of this section for Solaris specific notes that you
+       may need before or after installation.
 
-   To obtain a binary MySQL distribution for Solaris in tarball or
-   PKG format, http://dev.mysql.com/downloads/mysql/5.5.html.
+   To obtain a binary MySQL distribution for Solaris in tarball
+   or PKG format, http://dev.mysql.com/downloads/mysql/5.5.html.
 
-   Additional notes to be aware of when installing and using MySQL on
-   Solaris:
+   Additional notes to be aware of when installing and using
+   MySQL on Solaris:
 
-     * If you want to use MySQL with the mysql user and group, use
-       the groupadd and useradd commands:
+     * If you want to use MySQL with the mysql user and group,
+       use the groupadd and useradd commands:
 groupadd mysql
 useradd -g mysql mysql
 
-     * If you install MySQL using a binary tarball distribution on
-       Solaris, you may run into trouble even before you get the
-       MySQL distribution unpacked, as the Solaris tar cannot handle
-       long file names. This means that you may see errors when you
-       try to unpack MySQL.
-       If this occurs, you must use GNU tar (gtar) to unpack the
-       distribution. In Solaris 10 and OpenSolaris gtar is normally
-       located in /usr/sfw/bin/gtar, but may not be included in the
-       default path definition.
-
-     * When using Solaris 10 for x86_64, you should mount any file
-       systems on which you intend to store InnoDB files with the
-       forcedirectio option. (By default mounting is done without
-       this option.) Failing to do so will cause a significant drop
-       in performance when using the InnoDB storage engine on this
-       platform.
 
-     * If you would like MySQL to start automatically, you can copy
-       support-files/mysql.server to /etc/init.d and create a
-       symbolic link to it named /etc/rc3.d/S99mysql.server.
+     * If you install MySQL using a binary tarball distribution
+       on Solaris, you may run into trouble even before you get
+       the MySQL distribution unpacked, as the Solaris tar
+       cannot handle long file names. This means that you may
+       see errors when you try to unpack MySQL.
+       If this occurs, you must use GNU tar (gtar) to unpack the
+       distribution. In Solaris 10 and OpenSolaris gtar is
+       normally located in /usr/sfw/bin/gtar, but may not be
+       included in the default path definition.
+
+     * When using Solaris 10 for x86_64, you should mount any
+       file systems on which you intend to store InnoDB files
+       with the forcedirectio option. (By default mounting is
+       done without this option.) Failing to do so will cause a
+       significant drop in performance when using the InnoDB
+       storage engine on this platform.
+
+     * If you would like MySQL to start automatically, you can
+       copy support-files/mysql.server to /etc/init.d and create
+       a symbolic link to it named /etc/rc3.d/S99mysql.server.
 
-     * If too many processes try to connect very rapidly to mysqld,
-       you should see this error in the MySQL log:
+     * If too many processes try to connect very rapidly to
+       mysqld, you should see this error in the MySQL log:
 Error in accept: Protocol error
+
        You might try starting the server with the --back_log=50
        option as a workaround for this.
 
      * To configure the generation of core files on Solaris you
        should use the coreadm command. Because of the security
-       implications of generating a core on a setuid() application,
-       by default, Solaris does not support core files on setuid()
-       programs. However, you can modify this behavior using coreadm.
-       If you enable setuid() core files for the current user, they
-       will be generated using the mode 600 and owned by the
-       superuser.
-
-2.7.1. Installing MySQL on Solaris Using a Solaris PKG
-
-   You can install MySQL on Solaris and OpenSolaris using a binary
-   package using the native Solaris PKG format instead of the binary
-   tarball distribution.
+       implications of generating a core on a setuid()
+       application, by default, Solaris does not support core
+       files on setuid() programs. However, you can modify this
+       behavior using coreadm. If you enable setuid() core files
+       for the current user, they will be generated using the
+       mode 600 and owned by the superuser.
+
+2.7.1 Installing MySQL on Solaris Using a Solaris PKG
+
+   You can install MySQL on Solaris and OpenSolaris using a
+   binary package using the native Solaris PKG format instead of
+   the binary tarball distribution.
 
    To use this package, download the corresponding
-   mysql-VERSION-solaris10-PLATFORM.pkg.gz file, then uncompress it.
-   For example:
-shell> gunzip mysql-5.5.36-solaris10-x86_64.pkg.gz
+   mysql-VERSION-solaris10-PLATFORM.pkg.gz file, then uncompress
+   it. For example:
+shell> gunzip mysql-5.5.44-solaris10-x86_64.pkg.gz
 
    To install a new package, use pkgadd and follow the onscreen
-   prompts. You must have root privileges to perform this operation:
-shell> pkgadd -d mysql-5.5.36-solaris10-x86_64.pkg
+   prompts. You must have root privileges to perform this
+   operation:
+shell> pkgadd -d mysql-5.5.44-solaris10-x86_64.pkg
 
 The following packages are available:
   1  mysql     MySQL Community Server (GPL)
-               (i86pc) 5.5.36
+               (i86pc) 5.5.44
 
 Select package(s) you wish to process (or 'all' to process
 all packages). (default: all) [?,??,q]:
 
-   The PKG installer installs all of the files and tools needed, and
-   then initializes your database if one does not exist. To complete
-   the installation, you should set the root password for MySQL as
-   provided in the instructions at the end of the installation.
-   Alternatively, you can run the mysql_secure_installation script
-   that comes with the installation.
-
-   By default, the PKG package installs MySQL under the root path
-   /opt/mysql. You can change only the installation root path when
-   using pkgadd, which can be used to install MySQL in a different
-   Solaris zone. If you need to install in a specific directory, use
-   a binary tar file distribution.
-
-   The pkg installer copies a suitable startup script for MySQL into
-   /etc/init.d/mysql. To enable MySQL to startup and shutdown
-   automatically, you should create a link between this file and the
-   init script directories. For example, to ensure safe startup and
-   shutdown of MySQL you could use the following commands to add the
-   right links:
+   The PKG installer installs all of the files and tools needed,
+   and then initializes your database if one does not exist. To
+   complete the installation, you should set the root password
+   for MySQL as provided in the instructions at the end of the
+   installation. Alternatively, you can run the
+   mysql_secure_installation script that comes with the
+   installation.
+
+   By default, the PKG package installs MySQL under the root
+   path /opt/mysql. You can change only the installation root
+   path when using pkgadd, which can be used to install MySQL in
+   a different Solaris zone. If you need to install in a
+   specific directory, use a binary tar file distribution.
+
+   The pkg installer copies a suitable startup script for MySQL
+   into /etc/init.d/mysql. To enable MySQL to startup and
+   shutdown automatically, you should create a link between this
+   file and the init script directories. For example, to ensure
+   safe startup and shutdown of MySQL you could use the
+   following commands to add the right links:
 shell> ln /etc/init.d/mysql /etc/rc3.d/S91mysql
 shell> ln /etc/init.d/mysql /etc/rc0.d/K02mysql
 
-   To remove MySQL, the installed package name is mysql. You can use
-   this in combination with the pkgrm command to remove the
+   To remove MySQL, the installed package name is mysql. You can
+   use this in combination with the pkgrm command to remove the
    installation.
 
-   To upgrade when using the Solaris package file format, you must
-   remove the existing installation before installing the updated
-   package. Removal of the package does not delete the existing
-   database information, only the server, binaries and support files.
-   The typical upgrade sequence is therefore:
+   To upgrade when using the Solaris package file format, you
+   must remove the existing installation before installing the
+   updated package. Removal of the package does not delete the
+   existing database information, only the server, binaries and
+   support files. The typical upgrade sequence is therefore:
 shell> mysqladmin shutdown
 shell> pkgrm mysql
-shell> pkgadd -d mysql-5.5.36-solaris10-x86_64.pkg
+shell> pkgadd -d mysql-5.5.44-solaris10-x86_64.pkg
 shell> mysqld_safe &
 shell> mysql_upgrade
 
-   You should check the notes in Section 2.12, "Upgrading or
+   You should check the notes in Section 2.11, "Upgrading or
    Downgrading MySQL" before performing any upgrade.
 
-2.7.2. Installing MySQL on OpenSolaris Using IPS
+2.7.2 Installing MySQL on OpenSolaris Using IPS
 
    OpenSolaris includes standard packages for MySQL in the core
-   repository. The MySQL packages are based on a specific release of
-   MySQL and updated periodically. For the latest release you must
-   use either the native Solaris PKG, tar, or source installations.
-   The native OpenSolaris packages include SMF files so that you can
-   easily control your MySQL installation, including automatic
-   startup and recovery, using the native service management tools.
-
-   To install MySQL on OpenSolaris, use the pkg command. You will
-   need to be logged in as root, or use the pfexec tool, as shown in
-   the example below:
+   repository. The MySQL packages are based on a specific
+   release of MySQL and updated periodically. For the latest
+   release you must use either the native Solaris PKG, tar, or
+   source installations. The native OpenSolaris packages include
+   SMF files so that you can easily control your MySQL
+   installation, including automatic startup and recovery, using
+   the native service management tools.
+
+   To install MySQL on OpenSolaris, use the pkg command. You
+   will need to be logged in as root, or use the pfexec tool, as
+   shown in the example below:
 shell> pfexec pkg install SUNWmysql55
 
    The package set installs three individual packages,
    SUNWmysql55lib, which contains the MySQL client libraries;
-   SUNWmysql55r which contains the root components, including SMF and
-   configuration files; and SUNWmysql55u which contains the scripts,
-   binary tools and other files. You can install these packages
-   individually if you only need the corresponding components.
-
-   The MySQL files are installed into /usr/mysql which symbolic links
-   for the sub directories (bin, lib, etc.) to a version specific
-   directory. For MySQL 5.5, the full installation is located in
-   /usr/mysql/5.5. The default data directory is /var/mysql/5.5/data.
-   The configuration file is installed in /etc/mysql/5.5/my.cnf. This
-   layout permits multiple versions of MySQL to be installed, without
-   overwriting the data and binaries from other versions.
-
-   Once installed, you must run mysql_install_db to initialize the
-   database, and use the mysql_secure_installation to secure your
-   installation.
+   SUNWmysql55r which contains the root components, including
+   SMF and configuration files; and SUNWmysql55u which contains
+   the scripts, binary tools and other files. You can install
+   these packages individually if you only need the
+   corresponding components.
+
+   The MySQL files are installed into /usr/mysql which symbolic
+   links for the sub directories (bin, lib, etc.) to a version
+   specific directory. For MySQL 5.5, the full installation is
+   located in /usr/mysql/5.5. The default data directory is
+   /var/mysql/5.5/data. The configuration file is installed in
+   /etc/mysql/5.5/my.cnf. This layout permits multiple versions
+   of MySQL to be installed, without overwriting the data and
+   binaries from other versions.
+
+   Once installed, you must run mysql_install_db to initialize
+   the database, and use the mysql_secure_installation to secure
+   your installation.
 
 Using SMF to manage your MySQL installation
 
-   Once installed, you can start and stop your MySQL server using the
-   installed SMF configuration. The service name is mysql, or if you
-   have multiple versions installed, you should use the full version
-   name, for example mysql:version_55. To start and enable MySQL to
-   be started at boot time:
+   Once installed, you can start and stop your MySQL server
+   using the installed SMF configuration. The service name is
+   mysql, or if you have multiple versions installed, you should
+   use the full version name, for example mysql:version_55. To
+   start and enable MySQL to be started at boot time:
 shell> svcadm enable mysql
 
    To disable MySQL from starting during boot time, and shut the
    MySQL server down if it is running, use:
 shell> svcadm disable mysql
 
-   To restart MySQL, for example after a configuration file changes,
-   use the restart option:
+   To restart MySQL, for example after a configuration file
+   changes, use the restart option:
 shell> svcadm restart mysql
 
-   You can also use SMF to configure the data directory and enable
-   full 64-bit mode. For example, to set the data directory used by
-   MySQL:
-shell> svccfg 
-svc:> select mysql:version_55 
-svc:/application/database/mysql:version_55> setprop mysql/data=/data0
-/mysql
-
+   You can also use SMF to configure the data directory and
+   enable full 64-bit mode. For example, to set the data
+   directory used by MySQL:
+shell> svccfg
+svc:> select mysql:version_55
+svc:/application/database/mysql:version_55> setprop mysql/data=/data0/
+mysql
 
-   By default, the 32-bit binaries are used. To enable the 64-bit
-   server on 64-bit platforms, set the enable_64bit parameter. For
-   example:
-svc:/application/database/mysql:version_55> setprop mysql/enable_64bi
-t=1
+   By default, the 32-bit binaries are used. To enable the
+   64-bit server on 64-bit platforms, set the enable_64bit
+   parameter. For example:
+svc:/application/database/mysql:version_55> setprop mysql/enable_64bit
+=1
 
    You need to refresh the SMF after settings these options:
 shell> svcadm refresh mysql
 
-2.8. Installing MySQL on HP-UX
-
-   MySQL for HP-UX is available in a number of different forms:
-
-     * Using a DEPOT distribution provided at
-       http://dev.mysql.com/downloads/. Please read the general notes
-       on HP-UX installation before continuing. For more information
-       on DEPOT installations, see Section 2.8.2, "Installing MySQL
-       on HP-UX Using DEPOT Packages."
-
-     * Using a binary tarball distribution provided at
-       http://dev.mysql.com/downloads/. Please read the general notes
-       on HP-UX installation before continuing. For more information
-       on binary installations, see Section 2.2, "Installing MySQL on
-       Unix/Linux Using Generic Binaries."
-
-2.8.1. General Notes on Installing MySQL on HP-UX
-
-   Some additional notes on installing and using MySQL on HP-UX:
-
-     * If you install MySQL using a binary tarball distribution on
-       HP-UX, you may run into trouble even before you get the MySQL
-       distribution unpacked, as the HP-UX tar cannot handle long
-       file names. This means that you may see errors when you try to
-       unpack MySQL.
-       If this occurs, you must use GNU tar (gtar) to unpack the
-       distribution.
-
-     * Because of some critical bugs in the standard HP-UX libraries,
-       you should install the following patches before trying to run
-       MySQL on HP-UX 11.0:
-PHKL_22840 Streams cumulative
-PHNE_22397 ARPA cumulative
-       This solves the problem of getting EWOULDBLOCK from recv() and
-       EBADF from accept() in threaded applications.
-
-2.8.2. Installing MySQL on HP-UX Using DEPOT Packages
-
-   The HP-UX DEPOT format packages can be installed using the
-   swinstall command. You should install the ncurses and zlib
-   libraries before installing the MySQL DEPOT package. You can use
-   the free software depothelper tool to install these packages and
-   any dependencies for you automatically.
-
-   To install using the MySQL DEPOT packages, follow this guide:
-
-    1. Download the MySQL DEPOT package from
-       http://dev.mysql.com/downloads/. You must uncompress the
-       package before installation:
-root-shell> gunzip mysql-5.1.48-hpux11.31-ia64-64bit.depot.gz
-
-    2. Install the DEPOT package using swinstall:
-root-shell> swinstall -s mysql-5.1.49-hpux11.31-ia64-64bit.depot
-       MySQL will be installed into a directory matching the depot
-       package name, within /usr/local. For convenience, you may want
-       to create a symbolic link to the installed directory, for
-       example:
-root-shell> ln -s mysql-5.1.49-hpux11.31-ia64-64bit mysql
-
-    3. Your package is now installed. You should complete the
-       configuration of MySQL by creating a user and group:
-root-shell> /usr/sbin/groupadd mysql
-root-shell> /usr/sbin/useradd -g mysql -d /var/lib/mysql/ -s /bin/fal
-se mysql
-
-    4. Create the standard database using the new user/group you have
-       created, and set the permissions:
-root-shell> cd /usr/local/
-root-shell> scripts/mysql_install_db --user=mysql
-root-shell> chown -R root .
-root-shell> chown -R mysql data
-
-    5. Finally, secure your new installation by setting the root
-       passwords, and then start your MySQL server using the mysql
-       user:
-root-shell> mysql_secure_installation
-root-shell> mysqld_safe --user=mysql &
-
-2.9. Installing MySQL on FreeBSD
+2.8 Installing MySQL on FreeBSD
 
    This section provides information about installing MySQL on
    variants of FreeBSD Unix.
 
-   You can install MySQL on FreeBSD by using the binary distribution
-   provided by Oracle. For more information, see Section 2.2,
-   "Installing MySQL on Unix/Linux Using Generic Binaries."
-
-   The easiest (and preferred) way to install MySQL is to use the
-   mysql-server and mysql-client ports available at
-   http://www.freebsd.org/. Using these ports gives you the following
-   benefits:
+   You can install MySQL on FreeBSD by using the binary
+   distribution provided by Oracle. For more information, see
+   Section 2.2, "Installing MySQL on Unix/Linux Using Generic
+   Binaries."
+
+   The easiest (and preferred) way to install MySQL is to use
+   the mysql-server and mysql-client ports available at
+   http://www.freebsd.org/. Using these ports gives you the
+   following benefits:
 
-     * A working MySQL with all optimizations enabled that are known
-       to work on your version of FreeBSD.
+     * A working MySQL with all optimizations enabled that are
+       known to work on your version of FreeBSD.
 
      * Automatic configuration and build.
 
@@ -5191,12 +5646,12 @@
      * The ability to use pkg_info -L to see which files are
        installed.
 
-     * The ability to use pkg_delete to remove MySQL if you no longer
-       want it on your machine.
+     * The ability to use pkg_delete to remove MySQL if you no
+       longer want it on your machine.
 
-   The MySQL build process requires GNU make (gmake) to work. If GNU
-   make is not available, you must install it first before compiling
-   MySQL.
+   The MySQL build process requires GNU make (gmake) to work. If
+   GNU make is not available, you must install it first before
+   compiling MySQL.
 
    To install using the ports system:
 # cd /usr/ports/databases/mysql51-server
@@ -5207,12 +5662,13 @@
 ...
 
    The standard port installation places the server into
-   /usr/local/libexec/mysqld, with the startup script for the MySQL
-   server placed in /usr/local/etc/rc.d/mysql-server.
+   /usr/local/libexec/mysqld, with the startup script for the
+   MySQL server placed in /usr/local/etc/rc.d/mysql-server.
 
    Some additional notes on the BSD implementation:
 
-     * To remove MySQL after installation using the ports system:
+     * To remove MySQL after installation using the ports
+       system:
 # cd /usr/ports/databases/mysql51-server
 # make deinstall
 ...
@@ -5220,205 +5676,230 @@
 # make deinstall
 ...
 
-     * If you get problems with the current date in MySQL, setting
-       the TZ variable should help. See Section 2.13, "Environment
-       Variables."
 
-2.10. Installing MySQL from Source
+     * If you get problems with the current date in MySQL,
+       setting the TZ variable should help. See Section 2.12,
+       "Environment Variables."
+
+2.9 Installing MySQL from Source
+
+   Building MySQL from the source code enables you to customize
+   build parameters, compiler optimizations, and installation
+   location. For a list of systems on which MySQL is known to
+   run, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   Before you proceed with an installation from source, check
+   whether Oracle produces a precompiled binary distribution for
+   your platform and whether it works for you. We put a great
+   deal of effort into ensuring that our binaries are built with
+   the best possible options for optimal performance.
+   Instructions for installing binary distributions are
+   available in Section 2.2, "Installing MySQL on Unix/Linux
+   Using Generic Binaries."
+   Note
 
-   Building MySQL from the source code enables you to customize build
-   parameters, compiler optimizations, and installation location. For
-   a list of systems on which MySQL is known to run, see Section
-   2.1.1, "Operating Systems Supported by MySQL Community Server."
-
-   Before you proceed with an installation from source, check whether
-   Oracle produces a precompiled binary distribution for your
-   platform and whether it works for you. We put a great deal of
-   effort into ensuring that our binaries are built with the best
-   possible options for optimal performance. Instructions for
-   installing binary distributions are available in Section 2.2,
-   "Installing MySQL on Unix/Linux Using Generic Binaries."
-   Note
-
-   This section describes how to build MySQL from source using CMake.
-   Before MySQL 5.5, source builds used the GNU autotools on
-   Unix-like systems. Source builds on Windows used CMake, but the
-   process was different from that described here. For
+   This section describes how to build MySQL from source using
+   CMake. Before MySQL 5.5, source builds used the GNU autotools
+   on Unix-like systems. Source builds on Windows used CMake,
+   but the process was different from that described here. For
    source-building instructions for older versions of MySQL, see
    Installing MySQL from Source
-   (http://dev.mysql.com/doc/refman/5.1/en/source-installation.html),
-   in the MySQL 5.1 Reference Manual. If you are familiar with
-   autotools but not CMake, you might find these transition
+   (http://dev.mysql.com/doc/refman/5.1/en/source-installation.h
+   tml), in the MySQL 5.1 Reference Manual. If you are familiar
+   with autotools but not CMake, you might find these transition
    instructions helpful: Autotools to CMake Transition Guide
-   (http://dev.mysql.com/doc/internals/en/autotools-to-cmake.html)
+   (http://dev.mysql.com/doc/internals/en/autotools-to-cmake.htm
+   l)
 
 Source Installation Methods
 
    There are two methods for installing MySQL from source:
 
-     * Use a standard MySQL source distribution. To obtain a standard
-       distribution, see Section 2.1.3, "How to Get MySQL." For
-       instructions on building from a standard distribution, see
-       Section 2.10.2, "Installing MySQL Using a Standard Source
-       Distribution."
-       Standard distributions are available as compressed tar files,
-       Zip archives, or RPM packages. Distribution files have names
-       of the form mysql-VERSION.tar.gz, mysql-VERSION.zip, or
-       mysql-VERSION.rpm, where VERSION is a number like 5.5.36. File
-       names for source distributions can be distinguished from those
-       for precompiled binary distributions in that source
-       distribution names are generic and include no platform name,
-       whereas binary distribution names include a platform name
-       indicating the type of system for which the distribution is
-       intended (for example, pc-linux-i686 or winx64).
-
-     * Use a MySQL development tree. Development trees have not
-       necessarily received the same level of testing as standard
-       release distributions, so this installation method is usually
-       required only if you need the most recent code changes. For
-       information on building from one of the development trees, see
-       Section 2.10.3, "Installing MySQL Using a Development Source
-       Tree."
+     * Use a standard MySQL source distribution. To obtain a
+       standard distribution, see Section 2.1.2, "How to Get
+       MySQL." For instructions on building from a standard
+       distribution, see Section 2.9.2, "Installing MySQL Using
+       a Standard Source Distribution."
+       Standard distributions are available as compressed tar
+       files, Zip archives, or RPM packages. Distribution files
+       have names of the form mysql-VERSION.tar.gz,
+       mysql-VERSION.zip, or mysql-VERSION.rpm, where VERSION is
+       a number like 5.5.44. File names for source distributions
+       can be distinguished from those for precompiled binary
+       distributions in that source distribution names are
+       generic and include no platform name, whereas binary
+       distribution names include a platform name indicating the
+       type of system for which the distribution is intended
+       (for example, pc-linux-i686 or winx64).
+
+     * Use a MySQL development tree. For information on building
+       from one of the development trees, see Section 2.9.3,
+       "Installing MySQL Using a Development Source Tree."
 
 Source Installation System Requirements
 
-   Installation of MySQL from source requires several development
-   tools. Some of these tools are needed no matter whether you use a
-   standard source distribution or a development source tree. Other
-   tool requirements depend on which installation method you use.
-
-   To install MySQL from source, your system must have the following
-   tools, regardless of installation method:
-
-     * CMake, which is used as the build framework on all platforms.
-       CMake can be downloaded from http://www.cmake.org.
-
-     * A good make program. Although some platforms come with their
-       own make implementations, it is highly recommended that you
-       use GNU make 3.75 or newer. It may already be available on
-       your system as gmake. GNU make is available from
-       http://www.gnu.org/software/make/.
-
-     * A working ANSI C++ compiler. GCC 4.2.1 or later, Sun Studio 10
-       or later, Visual Studio 2008 or later, and many current
-       vendor-supplied compilers are known to work.
+   Installation of MySQL from source requires several
+   development tools. Some of these tools are needed no matter
+   whether you use a standard source distribution or a
+   development source tree. Other tool requirements depend on
+   which installation method you use.
+
+   To install MySQL from source, your system must have the
+   following tools, regardless of installation method:
+
+     * CMake, which is used as the build framework on all
+       platforms. CMake can be downloaded from
+       http://www.cmake.org.
+
+     * A good make program. Although some platforms come with
+       their own make implementations, it is highly recommended
+       that you use GNU make 3.75 or newer. It may already be
+       available on your system as gmake. GNU make is available
+       from http://www.gnu.org/software/make/.
+
+     * A working ANSI C++ compiler. GCC 4.2.1 or later, Sun
+       Studio 12 or later, Visual Studio 2008 or later, and many
+       current vendor-supplied compilers are known to work.
 
      * Perl is needed if you intend to run test scripts. Most
        Unix-like systems include Perl. On Windows, you can use a
        version such as ActiveState Perl.
 
-   To install MySQL from a standard source distribution, one of the
-   following tools is required to unpack the distribution file:
+   To install MySQL from a standard source distribution, one of
+   the following tools is required to unpack the distribution
+   file:
+
+     * For a .tar.gz compressed tar file: GNU gunzip to
+       uncompress the distribution and a reasonable tar to
+       unpack it. If your tar program supports the z option, it
+       can both uncompress and unpack the file.
+       GNU tar is known to work. The standard tar provided with
+       some operating systems is not able to unpack the long
+       file names in the MySQL distribution. You should download
+       and install GNU tar, or if available, use a preinstalled
+       version of GNU tar. Usually this is available as gnutar,
+       gtar, or as tar within a GNU or Free Software directory,
+       such as /usr/sfw/bin or /usr/local/bin. GNU tar is
+       available from http://www.gnu.org/software/tar/.
+
+     * For a .zip Zip archive: WinZip or another tool that can
+       read .zip files.
+
+     * For an .rpm RPM package: The rpmbuild program used to
+       build the distribution unpacks it.
 
-     * For a .tar.gz compressed tar file: GNU gunzip to uncompress
-       the distribution and a reasonable tar to unpack it. If your
-       tar program supports the z option, it can both uncompress and
-       unpack the file.
-       GNU tar is known to work. The standard tar provided with some
-       operating systems is not able to unpack the long file names in
-       the MySQL distribution. You should download and install GNU
-       tar, or if available, use a preinstalled version of GNU tar.
-       Usually this is available as gnutar, gtar, or as tar within a
-       GNU or Free Software directory, such as /usr/sfw/bin or
-       /usr/local/bin. GNU tar is available from
-       http://www.gnu.org/software/tar/.
-
-     * For a .zip Zip archive: WinZip or another tool that can read
-       .zip files.
-
-     * For an .rpm RPM package: The rpmbuild program used to build
-       the distribution unpacks it.
-
-   To install MySQL from a development source tree, the following
-   additional tools are required:
-
-     * To obtain the source tree, you must have Bazaar installed. The
-       Bazaar VCS Web site (http://bazaar-vcs.org) has instructions
-       for downloading and installing Bazaar on different platforms.
-       Bazaar is supported on any platform that supports Python, and
-       is therefore compatible with any Linux, Unix, Windows, or Mac
-       OS X host.
-
-     * bison is needed to generate sql_yacc.cc from sql_yacc.yy You
-       should use the latest version of bison where possible.
-       Versions 1.75 and 2.1 are known to work. There have been
-       reported problems with bison 1.875. If you experience
-       problems, upgrade to a later, rather than earlier, version.
-       bison is available from http://www.gnu.org/software/bison/.
-       bison for Windows can be downloaded from
-       http://gnuwin32.sourceforge.net/packages/bison.htm. Download
-       the package labeled "Complete package, excluding sources". On
-       Windows, the default location for bison is the C:\Program
-       Files\GnuWin32 directory. Some utilities may fail to find
-       bison because of the space in the directory name. Also, Visual
-       Studio may simply hang if there are spaces in the path. You
-       can resolve these problems by installing into a directory that
-       does not contain a space; for example C:\GnuWin32.
+   To install MySQL from a development source tree, the
+   following additional tools are required:
 
-     * On OpenSolaris and Solaris Express, m4 must be installed in
-       addition to bison. m4 is available from
+     * One of the following revision control systems is required
+       to obtain the development source code:
+
+          + Git: The GitHub Help (https://help.github.com/)
+            provides instructions for downloading and installing
+            Git on different platforms. MySQL officially joined
+            GitHub in September, 2014. For more information
+            about MySQL's move to GitHub, refer to the
+            announcement on the MySQL Release Engineering blog:
+            MySQL on GitHub
+            (http://mysqlrelease.com/2014/09/mysql-on-github/)
+
+          + Bazaar: The Bazaar VCS Web site
+            (http://bazaar-vcs.org) provides instructions for
+            downloading and installing Bazaar on different
+            platforms. Bazaar is supported on any platform that
+            supports Python, and is therefore compatible with
+            any Linux, Unix, Windows, or OS X host.
+
+     * bison 2.1 or newer, available from
+       http://www.gnu.org/software/bison/. (Version 1 is no
+       longer supported.) Use the latest version of bison where
+       possible; if you experience problems, upgrade to a later
+       version, rather than revert to an earlier one.
+       bison is available from
+       http://www.gnu.org/software/bison/. bison for Windows can
+       be downloaded from
+       http://gnuwin32.sourceforge.net/packages/bison.htm.
+       Download the package labeled "Complete package, excluding
+       sources". On Windows, the default location for bison is
+       the C:\Program Files\GnuWin32 directory. Some utilities
+       may fail to find bison because of the space in the
+       directory name. Also, Visual Studio may simply hang if
+       there are spaces in the path. You can resolve these
+       problems by installing into a directory that does not
+       contain a space; for example C:\GnuWin32.
+
+     * On OpenSolaris and Solaris Express, m4 must be installed
+       in addition to bison. m4 is available from
        http://www.gnu.org/software/m4/.
 
    Note
 
-   If you have to install any programs, modify your PATH environment
-   variable to include any directories in which the programs are
-   located. See Section 4.2.4, "Setting Environment Variables."
-
-   If you run into problems and need to file a bug report, please use
-   the instructions in Section 1.7, "How to Report Bugs or Problems."
-
-2.10.1. MySQL Layout for Source Installation
-
-   By default, when you install MySQL after compiling it from source,
-   the installation step installs files under /usr/local/mysql. The
-   component locations under the installation directory are the same
-   as for binary distributions. See Section 2.2, "MySQL Installation
-   Layout for Generic Unix/Linux Binary Package," and Section 2.3.1,
-   "MySQL Installation Layout on Microsoft Windows." To configure
-   installation locations different from the defaults, use the
-   options described at Section 2.10.4, "MySQL Source-Configuration
-   Options."
+   If you have to install any programs, modify your PATH
+   environment variable to include any directories in which the
+   programs are located. See Section 4.2.10, "Setting
+   Environment Variables."
+
+   If you run into problems and need to file a bug report,
+   please use the instructions in Section 1.7, "How to Report
+   Bugs or Problems."
+
+2.9.1 MySQL Layout for Source Installation
+
+   By default, when you install MySQL after compiling it from
+   source, the installation step installs files under
+   /usr/local/mysql. The component locations under the
+   installation directory are the same as for binary
+   distributions. See Section 2.2, "MySQL Installation Layout
+   for Generic Unix/Linux Binary Package," and Section 2.3.1,
+   "MySQL Installation Layout on Microsoft Windows." To
+   configure installation locations different from the defaults,
+   use the options described at Section 2.9.4, "MySQL
+   Source-Configuration Options."
 
-2.10.2. Installing MySQL Using a Standard Source Distribution
+2.9.2 Installing MySQL Using a Standard Source Distribution
 
    To install MySQL from a standard source distribution:
 
-    1. Verify that your system satisfies the tool requirements listed
-       at Section 2.10, "Installing MySQL from Source."
+    1. Verify that your system satisfies the tool requirements
+       listed at Section 2.9, "Installing MySQL from Source."
 
-    2. Obtain a distribution file using the instructions in Section
-       2.1.3, "How to Get MySQL."
+    2. Obtain a distribution file using the instructions in
+       Section 2.1.2, "How to Get MySQL."
 
     3. Configure, build, and install the distribution using the
        instructions in this section.
 
-    4. Perform postinstallation procedures using the instructions in
-       Section 2.11, "Postinstallation Setup and Testing."
+    4. Perform postinstallation procedures using the
+       instructions in Section 2.10, "Postinstallation Setup and
+       Testing."
 
    In MySQL 5.5, CMake is used as the build framework on all
    platforms. The instructions given here should enable you to
    produce a working installation. For additional information on
-   using CMake to build MySQL, see How to Build MySQL Server with
-   CMake (http://dev.mysql.com/doc/internals/en/cmake.html).
-
-   If you start from a source RPM, use the following command to make
-   a binary RPM that you can install. If you do not have rpmbuild,
-   use rpm instead.
+   using CMake to build MySQL, see How to Build MySQL Server
+   with CMake
+   (http://dev.mysql.com/doc/internals/en/cmake.html).
+
+   If you start from a source RPM, use the following command to
+   make a binary RPM that you can install. If you do not have
+   rpmbuild, use rpm instead.
 shell> rpmbuild --rebuild --clean MySQL-VERSION.src.rpm
 
-   The result is one or more binary RPM packages that you install as
-   indicated in Section 2.5.1, "Installing MySQL on Linux Using RPM
-   Packages."
-
-   The sequence for installation from a compressed tar file or Zip
-   archive source distribution is similar to the process for
-   installing from a generic binary distribution (see Section 2.2,
-   "Installing MySQL on Unix/Linux Using Generic Binaries"), except
-   that it is used on all platforms and includes steps to configure
-   and compile the distribution. For example, with a compressed tar
-   file source distribution on Unix, the basic installation command
-   sequence looks like this:
+   The result is one or more binary RPM packages that you
+   install as indicated in Section 2.5.1, "Installing MySQL on
+   Linux Using RPM Packages."
+
+   The sequence for installation from a compressed tar file or
+   Zip archive source distribution is similar to the process for
+   installing from a generic binary distribution (see Section
+   2.2, "Installing MySQL on Unix/Linux Using Generic
+   Binaries"), except that it is used on all platforms and
+   includes steps to configure and compile the distribution. For
+   example, with a compressed tar file source distribution on
+   Unix, the basic installation command sequence looks like
+   this:
 # Preconfiguration setup
 shell> groupadd mysql
 shell> useradd -r -g mysql mysql
@@ -5442,45 +5923,49 @@
 # Next command is optional
 shell> cp support-files/mysql.server /etc/init.d/mysql.server
 
-   A more detailed version of the source-build specific instructions
-   is shown following.
+   A more detailed version of the source-build specific
+   instructions is shown following.
    Note
 
-   The procedure shown here does not set up any passwords for MySQL
-   accounts. After following the procedure, proceed to Section 2.11,
-   "Postinstallation Setup and Testing," for postinstallation setup
-   and testing.
+   The procedure shown here does not set up any passwords for
+   MySQL accounts. After following the procedure, proceed to
+   Section 2.10, "Postinstallation Setup and Testing," for
+   postinstallation setup and testing.
 
 Perform Preconfiguration Setup
 
-   On Unix, set up the mysql user and group that will be used to run
-   and execute the MySQL server and own the database directory. For
-   details, see Creating a mysql System User and Group, in Section
-   2.2, "Installing MySQL on Unix/Linux Using Generic Binaries." Then
-   perform the following steps as the mysql user, except as noted.
+   On Unix, set up the mysql user and group that will be used to
+   run and execute the MySQL server and own the database
+   directory. For details, see Creating a mysql System User and
+   Group, in Section 2.2, "Installing MySQL on Unix/Linux Using
+   Generic Binaries." Then perform the following steps as the
+   mysql user, except as noted.
 
 Obtain and Unpack the Distribution
 
-   Pick the directory under which you want to unpack the distribution
-   and change location into it.
+   Pick the directory under which you want to unpack the
+   distribution and change location into it.
 
    Obtain a distribution file using the instructions in Section
-   2.1.3, "How to Get MySQL."
+   2.1.2, "How to Get MySQL."
 
    Unpack the distribution into the current directory:
 
-     * To unpack a compressed tar file, tar can uncompress and unpack
-       the distribution if it has z option support:
+     * To unpack a compressed tar file, tar can uncompress and
+       unpack the distribution if it has z option support:
 shell> tar zxvf mysql-VERSION.tar.gz
+
        If your tar does not have z option support, use gunzip to
        unpack the distribution and tar to unpack it:
 shell> gunzip < mysql-VERSION.tar.gz | tar xvf -
+
        Alternatively, CMake can uncompress and unpack the
        distribution:
 shell> cmake -E tar zxvf mysql-VERSION.tar.gz
 
-     * To unpack a Zip archive, use WinZip or another tool that can
-       read .zip files.
+
+     * To unpack a Zip archive, use WinZip or another tool that
+       can read .zip files.
 
    Unpacking the distribution file creates a directory named
    mysql-VERSION.
@@ -5491,36 +5976,40 @@
    distribution:
 shell> cd mysql-VERSION
 
-   Configure the source directory. The minimum configuration command
-   includes no options to override configuration defaults:
+   Configure the source directory. The minimum configuration
+   command includes no options to override configuration
+   defaults:
 shell> cmake .
 
-   On Windows, specify the development environment. For example, the
-   following commands configure MySQL for 32-bit or 64-bit builds,
-   respectively:
+   On Windows, specify the development environment. For example,
+   the following commands configure MySQL for 32-bit or 64-bit
+   builds, respectively:
 shell> cmake . -G "Visual Studio 9 2008"
 shell> cmake . -G "Visual Studio 9 2008 Win64"
 
-   On Mac OS X, to use the Xcode IDE:
+   On OS X, to use the Xcode IDE:
 shell> cmake . -G Xcode
 
-   When you run cmake, you might want to add options to the command
-   line. Here are some examples:
+   When you run cmake, you might want to add options to the
+   command line. Here are some examples:
 
-     * -DBUILD_CONFIG=mysql_release: Configure the source with the
-       same build options used by Oracle to produce binary
+     * -DBUILD_CONFIG=mysql_release: Configure the source with
+       the same build options used by Oracle to produce binary
        distributions for official MySQL releases.
 
-     * -DCMAKE_INSTALL_PREFIX=dir_name: Configure the distribution
-       for installation under a particular location.
+     * -DCMAKE_INSTALL_PREFIX=dir_name: Configure the
+       distribution for installation under a particular
+       location.
 
-     * -DCPACK_MONOLITHIC_INSTALL=1: Cause make package to generate a
-       single installation file rather than multiple files.
+     * -DCPACK_MONOLITHIC_INSTALL=1: Cause make package to
+       generate a single installation file rather than multiple
+       files.
 
-     * -DWITH_DEBUG=1: Build the distribution with debugging support.
+     * -DWITH_DEBUG=1: Build the distribution with debugging
+       support.
 
-   For a more extensive list of options, see Section 2.10.4, "MySQL
-   Source-Configuration Options."
+   For a more extensive list of options, see Section 2.9.4,
+   "MySQL Source-Configuration Options."
 
    To list the configuration options, use one of the following
    commands:
@@ -5529,24 +6018,26 @@
 shell> cmake . -LAH # all params with help text
 shell> ccmake .     # interactive display
 
-   If CMake fails, you might need to reconfigure by running it again
-   with different options. If you do reconfigure, take note of the
-   following:
-
-     * If CMake is run after it has previously been run, it may use
-       information that was gathered during its previous invocation.
-       This information is stored in CMakeCache.txt. When CMake
-       starts up, it looks for that file and reads its contents if it
-       exists, on the assumption that the information is still
-       correct. That assumption is invalid when you reconfigure.
-
-     * Each time you run CMake, you must run make again to recompile.
-       However, you may want to remove old object files from previous
-       builds first because they were compiled using different
-       configuration options.
+   If CMake fails, you might need to reconfigure by running it
+   again with different options. If you do reconfigure, take
+   note of the following:
+
+     * If CMake is run after it has previously been run, it may
+       use information that was gathered during its previous
+       invocation. This information is stored in CMakeCache.txt.
+       When CMake starts up, it looks for that file and reads
+       its contents if it exists, on the assumption that the
+       information is still correct. That assumption is invalid
+       when you reconfigure.
+
+     * Each time you run CMake, you must run make again to
+       recompile. However, you may want to remove old object
+       files from previous builds first because they were
+       compiled using different configuration options.
 
    To prevent old object files or configuration information from
-   being used, run these commands on Unix before re-running CMake:
+   being used, run these commands on Unix before re-running
+   CMake:
 shell> make clean
 shell> rm CMakeCache.txt
 
@@ -5556,14 +6047,14 @@
 
    If you build out of the source tree (as described later), the
    CMakeCache.txt file and all built files are in the build
-   directory, so you can remove that directory to object files and
-   cached configuration information.
+   directory, so you can remove that directory to object files
+   and cached configuration information.
 
-   If you are going to send mail to a MySQL mailing list to ask for
-   configuration assistance, first check the files in the CMakeFiles
-   directory for useful information about the failure. To file a bug
-   report, please use the instructions in Section 1.7, "How to Report
-   Bugs or Problems."
+   If you are going to send mail to a MySQL mailing list to ask
+   for configuration assistance, first check the files in the
+   CMakeFiles directory for useful information about the
+   failure. To file a bug report, please use the instructions in
+   Section 1.7, "How to Report Bugs or Problems."
 
 Build the Distribution
 
@@ -5574,31 +6065,49 @@
    The second command sets VERBOSE to show the commands for each
    compiled source.
 
-   Use gmake instead on systems where you are using GNU make and it
-   has been installed as gmake.
+   Use gmake instead on systems where you are using GNU make and
+   it has been installed as gmake.
 
    On Windows:
 shell> devenv MySQL.sln /build RelWithDebInfo
 
-   It is possible to build out of the source tree to keep the tree
-   clean. If the top-level source directory is named mysql-src under
-   your current working directory, you can build in a directory named
-   build at the same level like this:
-shell> mkdir build
-shell> cd build
+   It is possible to build out of the source tree to keep the
+   tree clean. If the top-level source directory is named
+   mysql-src under your current working directory, you can build
+   in a directory named bld at the same level like this:
+shell> mkdir bld
+shell> cd bld
 shell> cmake ../mysql-src
 
-   If you have gotten to the compilation stage, but the distribution
-   does not build, see Section 2.10.5, "Dealing with Problems
-   Compiling MySQL," for help. If that does not solve the problem,
-   please enter it into our bugs database using the instructions
-   given in Section 1.7, "How to Report Bugs or Problems." If you
-   have installed the latest versions of the required tools, and they
-   crash trying to process our configuration files, please report
-   that also. However, if you get a command not found error or a
-   similar problem for required tools, do not report it. Instead,
-   make sure that all the required tools are installed and that your
-   PATH variable is set correctly so that your shell can find them.
+   The build directory need not actually be outside the source
+   tree. For example, to build in a directory, you can build in
+   a directory named bld under the top-level source tree, do
+   this, starting with mysql-src as your current working
+   directory:
+shell> mkdir bld
+shell> cd bld
+shell> cmake ..
+
+   If you have multiple source trees at the same level (for
+   example, to build multiple versions of MySQL), the second
+   strategy can be advantageous. The first strategy places all
+   build directories at the same level, which requires that you
+   choose a unique name for each. With the second strategy, you
+   can use the same name for the build directory within each
+   source tree.
+
+   If you have gotten to the compilation stage, but the
+   distribution does not build, see Section 2.9.5, "Dealing with
+   Problems Compiling MySQL," for help. If that does not solve
+   the problem, please enter it into our bugs database using the
+   instructions given in Section 1.7, "How to Report Bugs or
+   Problems." If you have installed the latest versions of the
+   required tools, and they crash trying to process our
+   configuration files, please report that also. However, if you
+   get a command not found error or a similar problem for
+   required tools, do not report it. Instead, make sure that all
+   the required tools are installed and that your PATH variable
+   is set correctly so that your shell can find them.
 
 Install the Distribution
 
@@ -5606,193 +6115,339 @@
 shell> make install
 
    This installs the files under the configured installation
-   directory (by default, /usr/local/mysql). You might need to run
-   the command as root.
+   directory (by default, /usr/local/mysql). You might need to
+   run the command as root.
 
-   To install in a specific directory, add a DESTDIR parameter to the
-   command line:
+   To install in a specific directory, add a DESTDIR parameter
+   to the command line:
 shell> make install DESTDIR="/opt/mysql"
 
-   Alternatively, generate installation package files that you can
-   install where you like:
+   Alternatively, generate installation package files that you
+   can install where you like:
 shell> make package
 
    This operation produces one or more .tar.gz files that can be
-   installed like generic binary distribution packages. See Section
-   2.2, "Installing MySQL on Unix/Linux Using Generic Binaries." If
-   you run CMake with -DCPACK_MONOLITHIC_INSTALL=1, the operation
-   produces a single file. Otherwise, it produces multiple files.
+   installed like generic binary distribution packages. See
+   Section 2.2, "Installing MySQL on Unix/Linux Using Generic
+   Binaries." If you run CMake with
+   -DCPACK_MONOLITHIC_INSTALL=1, the operation produces a single
+   file. Otherwise, it produces multiple files.
 
    On Windows, generate the data directory, then create a .zip
    archive installation package:
-shell> devenv MySQL.sln /build RelWithDebInfo /project initial_databa
-se
+shell> devenv MySQL.sln /build RelWithDebInfo /project initial_databas
+e
 shell> devenv MySQL.sln /build RelWithDebInfo /project package
 
-   You can install the resulting .zip archive where you like. See
-   Section 2.3.7, "Installing MySQL on Microsoft Windows Using a
-   noinstall Zip Archive."
+   You can install the resulting .zip archive where you like.
+   See Section 2.3.7, "Installing MySQL on Microsoft Windows
+   Using a noinstall Zip Archive."
 
 Perform Postinstallation Setup
 
-   The remainder of the installation process involves setting up the
-   configuration file, creating the core databases, and starting the
-   MySQL server. For instructions, see Section 2.11,
-   "Postinstallation Setup and Testing."
-   Note
-
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11,
-   "Postinstallation Setup and Testing."
-
-2.10.3. Installing MySQL Using a Development Source Tree
-
-   This section discusses how to install MySQL from the latest
-   development source code. Development trees have not necessarily
-   received the same level of testing as standard release
-   distributions, so this installation method is usually required
-   only if you need the most recent code changes. Do not use a
-   development tree for production systems. If your goal is simply to
-   get MySQL up and running on your system, you should use a standard
-   release distribution (either a binary or source distribution). See
-   Section 2.1.3, "How to Get MySQL."
-
-   MySQL development projects are hosted on Launchpad
-   (http://launchpad.net/). MySQL projects, including MySQL Server,
-   MySQL Workbench, and others are available from the Oracle/MySQL
-   Engineering (http://launchpad.net/~mysql) page. For the
-   repositories related only to MySQL Server, see the MySQL Server
-   (http://launchpad.net/mysql-server) page.
-
-   To install MySQL from a development source tree, your system must
-   satisfy the tool requirements listed at Section 2.10, "Installing
-   MySQL from Source," including the requirements for Bazaar and
-   bison.
+   The remainder of the installation process involves setting up
+   the configuration file, creating the core databases, and
+   starting the MySQL server. For instructions, see Section
+   2.10, "Postinstallation Setup and Testing."
+   Note
+
+   The accounts that are listed in the MySQL grant tables
+   initially have no passwords. After starting the server, you
+   should set up passwords for them using the instructions in
+   Section 2.10, "Postinstallation Setup and Testing."
+
+2.9.3 Installing MySQL Using a Development Source Tree
+
+   This section describes how to install MySQL from the latest
+   development source code, which is currently hosted on both
+   GitHub (https://github.com/) and Launchpad
+   (http://launchpad.net/). To obtain the MySQL Server source
+   code from one of these repository hosting services, you can
+   set up a local MySQL Git repository or a local MySQL Bazaar
+   branch.
+
+     * On GitHub (https://github.com/), MySQL Server and other
+       MySQL projects are found on the MySQL
+       (https://github.com/mysql) page. The MySQL Server project
+       is a single repository that contains branches for MySQL
+       5.5, 5.6, and 5.7.
+       MySQL officially joined GitHub in September, 2014. For
+       more information about MySQL's move to GitHub, refer to
+       the announcement on the MySQL Release Engineering blog:
+       MySQL on GitHub
+       (http://mysqlrelease.com/2014/09/mysql-on-github/)
+
+     * On Launchpad (http://launchpad.net/), MySQL projects,
+       including MySQL Server, MySQL Workbench, and others are
+       found on the Oracle/MySQL Engineering
+       (http://launchpad.net/~mysql) page. For the repositories
+       related only to MySQL Server, see the MySQL Server
+       (http://launchpad.net/mysql-server) page.
 
-   To create a local branch of the MySQL development tree on your
-   machine, use this procedure:
+Prerequisites for Installing from Development Source
 
-    1. To obtain a copy of the MySQL source code, you must create a
-       new Bazaar branch. If you do not already have a Bazaar
+   To install MySQL from a development source tree, your system
+   must satisfy the tool requirements outlined in Section 2.9,
+   "Installing MySQL from Source."
+
+Setting Up a MySQL Git Repository
+
+   To set up a MySQL Git repository on your machine, use this
+   procedure:
+
+    1. Clone the MySQL Git repository to your machine. The
+       following command clones the MySQL Git repository to a
+       directory named mysql-server. The download size is
+       approximately 437 MB. The initial download will take some
+       time to complete, depending on the speed of your
+       connection.
+~$ git clone https://github.com/mysql/mysql-server.git
+Cloning into 'mysql-server'...
+remote: Counting objects: 1035465, done.
+remote: Total 1035465 (delta 0), reused 0 (delta 0)
+Receiving objects: 100% (1035465/1035465), 437.48 MiB | 5.10 MiB/s, do
+ne.
+Resolving deltas: 100% (855607/855607), done.
+Checking connectivity... done.
+Checking out files: 100% (21902/21902), done.
+
+    2. When the clone operation completes, the contents of your
+       local MySQL Git repository appear similar to the
+       following:
+~$ cd mysql-server
+
+~/mysql-server$ ls
+BUILD            COPYING             libmysqld    regex          tests
+BUILD-CMAKE      dbug                libservices  scripts        unitt
+est
+client           Docs                man          sql            VERSI
+ON
+cmake            extra               mysql-test   sql-bench      vio
+CMakeLists.txt   include             mysys        sql-common     win
+cmd-line-utils   INSTALL-SOURCE      packaging    storage        zlib
+config.h.cmake   INSTALL-WIN-SOURCE  plugin       strings
+configure.cmake  libmysql            README       support-files
+
+    3. Use the git branch -r command to view the remote tracking
+       branches for the MySQL repository.
+~/mysql-server$ git branch -r
+  origin/5.5
+  origin/5.6
+  origin/5.7
+  origin/HEAD -> origin/5.7
+
+    4. To view the branches that are checked out in your local
+       repository, issue the git branch command. When you cloned
+       the MySQL Git repository, the MySQL 5.7 branch was
+       checked out automatically. The asterisk identifies the
+       5.7 branch as the active branch.
+~/mysql-server$ git branch
+* 5.7
+
+    5. To check out a different MySQL branch, run the git
+       checkout command, specifying the branch name. For
+       example, to checkout the MySQL 5.5 branch:
+~/mysql-server$ git checkout 5.5
+Branch 5.5 set up to track remote branch 5.5 from origin.
+Switched to a new branch '5.5'
+
+    6. Run git branch again to verify that the MySQL 5.5 branch
+       is present. MySQL 5.5, which is the last branch you
+       checked out, is marked by an asterisk indicating that it
+       is the active branch.
+~/mysql-server$ git branch
+* 5.5
+  5.7
+       The git checkout command is also used to switch branches.
+       For example, to make MySQL 5.7 the active branch again,
+       you would run git checkout 5.7.
+
+    7. To obtain changes made after your initial setup of the
+       MySQL Git repository, switch to the branch you want to
+       update and issue the git pull command:
+~/mysql-server$ git checkout 5.5
+~/mysql-server$ git pull
+
+       To examine the commit history, use the git log option:
+~/mysql-server$ git log
+
+       You can also browse commit history and source code on the
+       GitHub MySQL (https://github.com/mysql) site.
+       If you see changes or code that you have a question
+       about, send an email to the MySQL internals mailing list.
+       See Section 1.6.1, "MySQL Mailing Lists." For information
+       about contributing a patch, see Contributing to MySQL
+       Server
+       (http://mysqlserverteam.com/contributing-to-mysql-server/
+       ).
+
+    8. After you have cloned the MySQL Git repository and have
+       checked out the branch you want to build, you can build
+       MySQL Server from the source code. Instructions are
+       provided in Section 2.9.2, "Installing MySQL Using a
+       Standard Source Distribution," except that you skip the
+       part about obtaining and unpacking the distribution.
+       Be careful about installing a build from a distribution
+       source tree on a production machine. The installation
+       command may overwrite your live release installation. If
+       you already have MySQL installed and do not want to
+       overwrite it, run CMake with values for the
+       CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR
+       options different from those used by your production
+       server. For additional information about preventing
+       multiple servers from interfering with each other, see
+       Section 5.3, "Running Multiple MySQL Instances on One
+       Machine."
+       Play hard with your new installation. For example, try to
+       make new features crash. Start by running make test. See
+       Section 24.1.2, "The MySQL Test Suite."
+
+Setting Up a MySQL Bazaar Branch
+
+   To setup a MySQL Bazaar branch on your machine, use this
+   procedure:
+
+    1. To obtain a copy of the MySQL development source code
+       hosted on Launchpad (http://launchpad.net/), create a new
+       Bazaar branch. If you do not already have a Bazaar
        repository directory set up, you must initialize a new
        directory:
 shell> mkdir mysql-server
 shell> bzr init-repo --trees mysql-server
+
        This is a one-time operation.
 
-    2. Assuming that you have an initialized repository directory,
-       you can branch from the public MySQL server repositories to
-       create a local source tree. To create a branch of a specific
-       version:
+    2. Assuming that you have an initialized repository
+       directory, you can branch from the public MySQL server
+       repositories to create a local source tree. To create a
+       branch of a specific version:
 shell> cd mysql-server
 shell> bzr branch lp:mysql-server/5.5 mysql-5.5
-       This is a one-time operation per source tree. You can branch
-       the source trees for several versions of MySQL under the
-       mysql-server directory.
-
-    3. The initial download will take some time to complete,
-       depending on the speed of your connection. Please be patient.
-       Once you have downloaded the first tree, additional trees
-       should take significantly less time to download.
-
-    4. When building from the Bazaar branch, you may want to create a
-       copy of your active branch so that you can make configuration
-       and other changes without affecting the original branch
-       contents. You can achieve this by branching from the original
-       branch:
+
+       This is a one-time operation per source tree. You can
+       branch the source trees for several versions of MySQL
+       under the mysql-server directory.
+       The initial download will take some time to complete,
+       depending on the speed of your connection. Once you have
+       downloaded the first tree, additional trees should take
+       significantly less time to download.
+
+    3. When building from the Bazaar branch, you may want to
+       create a copy of your active branch so that you can make
+       configuration and other changes without affecting the
+       original branch contents. You can achieve this by
+       branching from the original branch:
 shell> bzr branch mysql-5.5 mysql-5.5-build
 
-    5. To obtain changes made after you have set up the branch
-       initially, update it using the pull option periodically. Use
-       this command in the top-level directory of the local copy:
+
+    4. To obtain changes made after you have set up the branch
+       initially, update it using the pull option periodically.
+       Use this command in the top-level directory of the local
+       copy:
 shell> bzr pull
-       To examine the changeset comments for the tree, use the log
-       option to bzr:
+
+       To examine the changeset comments for the tree, use the
+       log option to bzr:
 shell> bzr log
+
        You can also browse changesets, comments, and source code
        online at the Launchpad MySQL Server
        (http://launchpad.net/mysql-server) page.
-       If you see diffs (changes) or code that you have a question
-       about, do not hesitate to send email to the MySQL internals
-       mailing list. See Section 1.6.1, "MySQL Mailing Lists." If you
-       think you have a better idea on how to do something, send an
-       email message to the list with a patch.
-
-   After you have the local branch, you can build MySQL server from
-   the source code. For information, see Section 2.10.2, "Installing
-   MySQL Using a Standard Source Distribution," except that you skip
-   the part about obtaining and unpacking the distribution.
-
-   Be careful about installing a build from a distribution source
-   tree on a production machine. The installation command may
-   overwrite your live release installation. If you already have
-   MySQL installed and do not want to overwrite it, run CMake with
-   values for the CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and
-   MYSQL_UNIX_ADDR options different from those used by your
-   production server. For additional information about preventing
-   multiple servers from interfering with each other, see Section
-   5.3, "Running Multiple MySQL Instances on One Machine."
-
-   Play hard with your new installation. For example, try to make new
-   features crash. Start by running make test. See Section 23.1.2,
-   "The MySQL Test Suite."
-
-2.10.4. MySQL Source-Configuration Options
-
-   The CMake program provides a great deal of control over how you
-   configure a MySQL source distribution. Typically, you do this
-   using options on the CMake command line. For information about
-   options supported by CMake, run either of these commands in the
-   top-level source directory:
+       If you see diffs (changes) or code that you have a
+       question about, do not hesitate to send email to the
+       MySQL internals mailing list. See Section 1.6.1, "MySQL
+       Mailing Lists." For information about contributing at
+       patch, see Contributing to MySQL Server
+       (http://mysqlserverteam.com/contributing-to-mysql-server/
+       ).
+
+    5. After you have the local branch, you can build MySQL
+       server from the source code. Instructions are provided in
+       Section 2.9.2, "Installing MySQL Using a Standard Source
+       Distribution," except that you skip the part about
+       obtaining and unpacking the distribution.
+       Be careful about installing a build from a distribution
+       source tree on a production machine. The installation
+       command may overwrite your live release installation. If
+       you already have MySQL installed and do not want to
+       overwrite it, run CMake with values for the
+       CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR
+       options different from those used by your production
+       server. For additional information about preventing
+       multiple servers from interfering with each other, see
+       Section 5.3, "Running Multiple MySQL Instances on One
+       Machine."
+       Play hard with your new installation. For example, try to
+       make new features crash. Start by running make test. See
+       Section 24.1.2, "The MySQL Test Suite."
+
+2.9.4 MySQL Source-Configuration Options
+
+   The CMake program provides a great deal of control over how
+   you configure a MySQL source distribution. Typically, you do
+   this using options on the CMake command line. For information
+   about options supported by CMake, run either of these
+   commands in the top-level source directory:
 shell> cmake . -LH
 shell> ccmake .
 
-   You can also affect CMake using certain environment variables. See
-   Section 2.13, "Environment Variables."
+   You can also affect CMake using certain environment
+   variables. See Section 2.12, "Environment Variables."
 
    The following table shows the available CMake options. In the
    Default column, PREFIX stands for the value of the
-   CMAKE_INSTALL_PREFIX option, which specifies the installation base
-   directory. This value is used as the parent location for several
-   of the installation subdirectories.
+   CMAKE_INSTALL_PREFIX option, which specifies the installation
+   base directory. This value is used as the parent location for
+   several of the installation subdirectories.
 
-   Table 2.16. MySQL Source-Configuration Option Reference (CMake)
+   Table 2.13 MySQL Source-Configuration Option Reference
+   (CMake)
    Formats Description Default Introduced Removed
-   BUILD_CONFIG Use same build options as official releases 5.5.7
-   CMAKE_BUILD_TYPE Type of build to produce RelWithDebInfo 5.5.7
-   CMAKE_INSTALL_PREFIX Installation base directory /usr/local/mysql
-   5.5.8
-   COMPILATION_COMMENT Comment about compilation environment 5.5.7
-   CPACK_MONOLITHIC_INSTALL Whether package build produces single
-   file OFF 5.5.7
+   BUILD_CONFIG Use same build options as official releases
+   5.5.7
+   CMAKE_BUILD_TYPE Type of build to produce RelWithDebInfo
+   5.5.7
+   CMAKE_C_FLAGS Flags for C Compiler
+   CMAKE_CXX_FLAGS Flags for C++ Compiler
+   CMAKE_INSTALL_PREFIX Installation base directory
+   /usr/local/mysql 5.5.8
+   COMPILATION_COMMENT Comment about compilation environment
+   5.5.7
+   CPACK_MONOLITHIC_INSTALL Whether package build produces
+   single file OFF 5.5.7
    DEFAULT_CHARSET The default server character set latin1 5.5.7
-   DEFAULT_COLLATION The default server collation latin1_swedish_ci
+
+   DEFAULT_COLLATION The default server collation
+   latin1_swedish_ci 5.5.7
+   ENABLE_DEBUG_SYNC Whether to enable Debug Sync support ON
    5.5.7
-   ENABLE_DEBUG_SYNC Whether to enable Debug Sync support ON 5.5.7
    ENABLE_DOWNLOADS Whether to download optional files OFF 5.5.7
+
    ENABLE_DTRACE Whether to include DTrace support 5.5.7
    ENABLE_GCOV Whether to include gcov support 5.5.14
-   ENABLED_LOCAL_INFILE Whether to enable LOCAL for LOAD DATA INFILE
-   OFF 5.5.7
-   ENABLED_PROFILING Whether to enable query profiling code ON 5.5.7
-
-   IGNORE_AIO_CHECK With -DBUILD_CONFIG=mysql_release, ignore libaio
-   check OFF 5.5.9
+   ENABLED_LOCAL_INFILE Whether to enable LOCAL for LOAD DATA
+   INFILE OFF 5.5.7
+   ENABLED_PROFILING Whether to enable query profiling code ON
+   5.5.7
+   IGNORE_AIO_CHECK With -DBUILD_CONFIG=mysql_release, ignore
+   libaio check OFF 5.5.9
    INSTALL_BINDIR User executables directory PREFIX/bin 5.5.7
    INSTALL_DOCDIR Documentation directory PREFIX/docs 5.5.7
    INSTALL_DOCREADMEDIR README file directory PREFIX 5.5.7
    INSTALL_INCLUDEDIR Header file directory PREFIX/include 5.5.7
+
    INSTALL_INFODIR Info file directory PREFIX/docs 5.5.7
-   INSTALL_LAYOUT Select predefined installation layout STANDALONE
-   5.5.7
+   INSTALL_LAYOUT Select predefined installation layout
+   STANDALONE 5.5.7
    INSTALL_LIBDIR Library file directory PREFIX/lib 5.5.7
    INSTALL_MANDIR Manual page directory PREFIX/man 5.5.7
-   INSTALL_MYSQLSHAREDIR Shared data directory PREFIX/share 5.5.7
-   INSTALL_MYSQLTESTDIR mysql-test directory PREFIX/mysql-test 5.5.7
-
+   INSTALL_MYSQLSHAREDIR Shared data directory PREFIX/share
+   5.5.7
+   INSTALL_MYSQLTESTDIR mysql-test directory PREFIX/mysql-test
+   5.5.7
    INSTALL_PLUGINDIR Plugin directory PREFIX/lib/plugin 5.5.7
    INSTALL_SBINDIR Server executable directory PREFIX/bin 5.5.7
+
    INSTALL_SCRIPTDIR Scripts directory PREFIX/scripts 5.5.7
    INSTALL_SHAREDIR aclocal/mysql.m4 installation directory
    PREFIX/share 5.5.7
@@ -5801,15 +6456,16 @@
    PREFIX/support-files 5.5.7
    MEMCACHED_HOME Path to memcached [none] 5.5.16-ndb-7.2.2
    MYSQL_DATADIR Data directory 5.5.7
-   MYSQL_MAINTAINER_MODE Whether to enable MySQL maintainer-specific
-   development environment OFF 5.5.7
-   MYSQL_PROJECT_NAME Windows/Mac OS X project name 3306 5.5.21
+   MYSQL_MAINTAINER_MODE Whether to enable MySQL
+   maintainer-specific development environment OFF 5.5.7
+   MYSQL_PROJECT_NAME Windows/OS X project name 3306 5.5.21
    MYSQL_TCP_PORT TCP/IP port number 3306 5.5.7
    MYSQL_UNIX_ADDR Unix socket file /tmp/mysql.sock 5.5.7
    ODBC_INCLUDES ODBC includes directory
    ODBC_LIB_DIR ODBC library directory
    SYSCONFDIR Option file directory 5.5.7
-   WITH_ASAN Enable address sanitizer OFF 5.5.35
+   TMPDIR tmpdir default value 5.5.36
+   WITH_ASAN Enable AddressSanitizer OFF 5.5.35
    WITH_BUNDLED_LIBEVENT Use bundled libevent when building
    ndbmemcache ON 5.5.16-ndb-7.2.2
    WITH_BUNDLED_MEMCACHED Use bundled memcached when building
@@ -5817,102 +6473,112 @@
    WITH_CLASSPATH Classpath to use when building MySQL Cluster
    Connector for Java. Default is an empty string.
    WITH_DEBUG Whether to include debugging support OFF 5.5.7
-   WITH_EMBEDDED_SERVER Whether to build embedded server OFF 5.5.7
-   WITH_xxx_STORAGE_ENGINE Compile storage engine xxx statically into
-   server 5.5.7
+   WITH_EMBEDDED_SERVER Whether to build embedded server OFF
+   5.5.7
+   WITH_EMBEDDED_SHARED_LIBRARY Whether to build a shared
+   embedded server library OFF 5.5.37
+   WITH_xxx_STORAGE_ENGINE Compile storage engine xxx statically
+   into server 5.5.7
    WITH_ERROR_INSERT Enable error injection in the NDB storage
    engine. Should not be used for building binaries intended for
    production. OFF
    WITH_EXTRA_CHARSETS Which extra character sets to include all
    5.5.7
    WITH_LIBEDIT Use bundled libedit library ON 5.5.7
-   WITH_LIBWRAP Whether to include libwrap (TCP wrappers) support OFF
-   5.5.7
-   WITH_NDB_BINLOG Enable binary logging by default by mysqld. ON
+   WITH_LIBWRAP Whether to include libwrap (TCP wrappers)
+   support OFF 5.5.7
+   WITH_NDB_BINLOG Enable binary logging by default by mysqld.
+   ON
    WITH_NDB_DEBUG Produce a debug build for testing or
    troubleshooting. OFF
    WITH_NDB_JAVA Enable building of Java and ClusterJ support.
    Enabled by default. Supported in MySQL Cluster only. ON
    5.5.27-ndb-7.2.9
-   WITH_NDB_PORT Default port used by a management server built with
-   this option. If this option was not used to build it, the
-   management server's default port is 1186. [none]
+   WITH_NDB_PORT Default port used by a management server built
+   with this option. If this option was not used to build it,
+   the management server's default port is 1186. [none]
    WITH_NDB_TEST Include NDB API test programs. OFF
-   WITH_NDBCLUSTER_STORAGE_ENGINE Build the NDB storage engine ON
+   WITH_NDBCLUSTER_STORAGE_ENGINE Build the NDB storage engine
+   ON
    WITH_NDBMTD Build multi-threaded data node. ON
    WITH_READLINE Use bundled readline library OFF 5.5.7
    WITH_SSL Type of SSL support no 5.5.7
    WITH_UNIXODBC Enable unixODBC support OFF
+   WITH_VALGRIND Whether to compile in Valgrind header files OFF
+   5.5.6
    WITH_ZLIB Type of zlib support system 5.5.7
-   WITHOUT_xxx_STORAGE_ENGINE Exclude storage engine xxx from build
-   5.5.7
+   WITHOUT_xxx_STORAGE_ENGINE Exclude storage engine xxx from
+   build 5.5.7
    WITHOUT_SERVER Do not build the server OFF
 
    The following sections provide more information about CMake
    options.
 
-     * General Options
+     * Section 2.9.4, ""
 
-     * Installation Layout Options
+     * Section 2.9.4, ""
 
-     * Feature Options
+     * Section 2.9.4, ""
 
-     * Options for Compiling MySQL Cluster
+     * Section 2.9.4, ""
 
-     * Compiler Flags
+     * Section 2.9.4, ""
 
    For boolean options, the value may be specified as 1 or ON to
    enable the option, or as 0 or OFF to disable the option.
 
    Many options configure compile-time defaults that can be
    overridden at server startup. For example, the
-   CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR options
-   that configure the default installation base directory location,
-   TCP/IP port number, and Unix socket file can be changed at server
-   startup with the --basedir, --port, and --socket options for
-   mysqld. Where applicable, configuration option descriptions
-   indicate the corresponding mysqld startup option.
+   CMAKE_INSTALL_PREFIX, MYSQL_TCP_PORT, and MYSQL_UNIX_ADDR
+   options that configure the default installation base
+   directory location, TCP/IP port number, and Unix socket file
+   can be changed at server startup with the --basedir, --port,
+   and --socket options for mysqld. Where applicable,
+   configuration option descriptions indicate the corresponding
+   mysqld startup option.
 
 General Options
 
 
      * -DBUILD_CONFIG=mysql_release
-       This option configures a source distribution with the same
-       build options used by Oracle to produce binary distributions
-       for official MySQL releases.
+       This option configures a source distribution with the
+       same build options used by Oracle to produce binary
+       distributions for official MySQL releases.
 
      * -DCMAKE_BUILD_TYPE=type
        The type of build to produce:
 
           + RelWithDebInfo: Enable optimizations and generate
-            debugging information. This is the default MySQL build
-            type.
+            debugging information. This is the default MySQL
+            build type.
 
           + Debug: Disable optimizations and generate debugging
             information. This build type is also used if the
-            WITH_DEBUG option is enabled. That is, -DWITH_DEBUG=1 has
-            the same effect as -DCMAKE_BUILD_TYPE=Debug.
+            WITH_DEBUG option is enabled. That is,
+            -DWITH_DEBUG=1 has the same effect as
+            -DCMAKE_BUILD_TYPE=Debug.
 
      * -DCPACK_MONOLITHIC_INSTALL=bool
        This option affects whether the make package operation
-       produces multiple installation package files or a single file.
-       If disabled, the operation produces multiple installation
-       package files, which may be useful if you want to install only
-       a subset of a full MySQL installation. If enabled, it produces
-       a single file for installing everything.
+       produces multiple installation package files or a single
+       file. If disabled, the operation produces multiple
+       installation package files, which may be useful if you
+       want to install only a subset of a full MySQL
+       installation. If enabled, it produces a single file for
+       installing everything.
 
 Installation Layout Options
 
-   The CMAKE_INSTALL_PREFIX option indicates the base installation
-   directory. Other options with names of the form INSTALL_xxx that
-   indicate component locations are interpreted relative to the
-   prefix and their values are relative pathnames. Their values
-   should not include the prefix.
+   The CMAKE_INSTALL_PREFIX option indicates the base
+   installation directory. Other options with names of the form
+   INSTALL_xxx that indicate component locations are interpreted
+   relative to the prefix and their values are relative
+   pathnames. Their values should not include the prefix.
 
      * -DCMAKE_INSTALL_PREFIX=dir_name
        The installation base directory.
-       This value can be set at server startup with the --basedir
-       option.
+       This value can be set at server startup with the
+       --basedir option.
 
      * -DINSTALL_BINDIR=dir_name
        Where to install user programs.
@@ -5941,10 +6607,11 @@
 
           + DEB: DEB package layout (experimental).
        You can select a predefined layout but modify individual
-       component installation locations by specifying other options.
-       For example:
+       component installation locations by specifying other
+       options. For example:
 shell> cmake . -DINSTALL_LAYOUT=SVR4 -DMYSQL_DATADIR=/var/mysql/data
 
+
      * -DINSTALL_LIBDIR=dir_name
        Where to install library files.
 
@@ -5955,14 +6622,15 @@
        Where to install shared data files.
 
      * -DINSTALL_MYSQLTESTDIR=dir_name
-       Where to install the mysql-test directory. As of MySQL 5.5.32,
-       to suppress installation of this directory, explicitly set the
-       option to the empty value (-DINSTALL_MYSQLTESTDIR=).
+       Where to install the mysql-test directory. As of MySQL
+       5.5.32, to suppress installation of this directory,
+       explicitly set the option to the empty value
+       (-DINSTALL_MYSQLTESTDIR=).
 
      * -DINSTALL_PLUGINDIR=dir_name
        The location of the plugin directory.
-       This value can be set at server startup with the --plugin_dir
-       option.
+       This value can be set at server startup with the
+       --plugin_dir option.
 
      * -DINSTALL_SBINDIR=dir_name
        Where to install the mysqld server.
@@ -5975,52 +6643,55 @@
 
      * -DINSTALL_SQLBENCHDIR=dir_name
        Where to install the sql-bench directory. To suppress
-       installation of this directory, explicitly set the option to
-       the empty value (-DINSTALL_SQLBENCHDIR=).
+       installation of this directory, explicitly set the option
+       to the empty value (-DINSTALL_SQLBENCHDIR=).
 
      * -DINSTALL_SUPPORTFILESDIR=dir_name
        Where to install extra support files.
 
      * -DMYSQL_DATADIR=dir_name
        The location of the MySQL data directory.
-       This value can be set at server startup with the --datadir
-       option.
+       This value can be set at server startup with the
+       --datadir option.
 
      * -DODBC_INCLUDES=dir_name
-       The location of the ODBC includes directory, and may be used
-       while configuring Connector/ODBC.
+       The location of the ODBC includes directory, and may be
+       used while configuring Connector/ODBC.
 
      * -DODBC_LIB_DIR=dir_name
-       The location of the ODBC library directory, and may be used
-       while configuring Connector/ODBC.
+       The location of the ODBC library directory, and may be
+       used while configuring Connector/ODBC.
 
      * -DSYSCONFDIR=dir_name
        The default my.cnf option file directory.
-       This location cannot be set at server startup, but you can
-       start the server with a given option file using the
-       --defaults-file=file_name option, where file_name is the full
-       path name to the file.
-
-     * -DWITH_UNIXODBC=1
-       Enables unixODBC support, for Connector/ODBC.
+       This location cannot be set at server startup, but you
+       can start the server with a given option file using the
+       --defaults-file=file_name option, where file_name is the
+       full path name to the file.
+
+     * -DTMPDIR=dir_name
+       The default location to use for the tmpdir system
+       variable. If unspecified, the value defaults to P_tmpdir
+       in <stdio.h>. This option was added in MySQL 5.6.16.
 
 Storage Engine Options
 
-   Storage engines are built as plugins. You can build a plugin as a
-   static module (compiled into the server) or a dynamic module
-   (built as a dynamic library that must be installed into the server
-   using the INSTALL PLUGIN statement or the --plugin-load option
-   before it can be used). Some plugins might not support static or
-   dynamic building.
-
-   The MyISAM, MERGE, MEMORY, and CSV engines are mandatory (always
-   compiled into the server) and need not be installed explicitly.
+   Storage engines are built as plugins. You can build a plugin
+   as a static module (compiled into the server) or a dynamic
+   module (built as a dynamic library that must be installed
+   into the server using the INSTALL PLUGIN statement or the
+   --plugin-load option before it can be used). Some plugins
+   might not support static or dynamic building.
+
+   The MyISAM, MERGE, MEMORY, and CSV engines are mandatory
+   (always compiled into the server) and need not be installed
+   explicitly.
 
    To compile a storage engine statically into the server, use
-   -DWITH_engine_STORAGE_ENGINE=1. Some permissible engine values are
-   ARCHIVE, BLACKHOLE, EXAMPLE, FEDERATED, INNOBASE (InnoDB),
-   NDBCLUSTER (NDB), PARTITION (partitioning support), and PERFSCHEMA
-   (Performance Schema). Examples:
+   -DWITH_engine_STORAGE_ENGINE=1. Some permissible engine
+   values are ARCHIVE, BLACKHOLE, EXAMPLE, FEDERATED, INNOBASE
+   (InnoDB), NDBCLUSTER (NDB), PARTITION (partitioning support),
+   and PERFSCHEMA (Performance Schema). Examples:
 -DWITH_INNOBASE_STORAGE_ENGINE=1
 -DWITH_ARCHIVE_STORAGE_ENGINE=1
 -DWITH_BLACKHOLE_STORAGE_ENGINE=1
@@ -6028,14 +6699,14 @@
 
    Note
 
-   WITH_NDBCLUSTER_STORAGE_ENGINE is supported only when building
-   MySQL Cluster using the MySQL Cluster sources. It cannot be used
-   to enable clustering support in other MySQL source trees or
-   distributions. In MySQL Cluster NDB 7.2 source distributions, it
-   is enabled by default. See Section 17.2.1.3, "Building MySQL
-   Cluster from Source on Linux," and Section 17.2.2.2, "Compiling
-   and Installing MySQL Cluster from Source on Windows," for more
-   information.
+   WITH_NDBCLUSTER_STORAGE_ENGINE is supported only when
+   building MySQL Cluster using the MySQL Cluster sources. It
+   cannot be used to enable clustering support in other MySQL
+   source trees or distributions. In MySQL Cluster NDB 7.2
+   source distributions, it is enabled by default. See Section
+   18.2.1.3, "Building MySQL Cluster from Source on Linux," and
+   Section 18.2.2.2, "Compiling and Installing MySQL Cluster
+   from Source on Windows," for more information.
 
    To exclude a storage engine from the build, use
    -DWITHOUT_engine_STORAGE_ENGINE=1. Examples:
@@ -6044,9 +6715,9 @@
 -DWITHOUT_PARTITION_STORAGE_ENGINE=1
 
    If neither -DWITH_engine_STORAGE_ENGINE nor
-   -DWITHOUT_engine_STORAGE_ENGINE are specified for a given storage
-   engine, the engine is built as a shared module, or excluded if it
-   cannot be built as a shared module.
+   -DWITHOUT_engine_STORAGE_ENGINE are specified for a given
+   storage engine, the engine is built as a shared module, or
+   excluded if it cannot be built as a shared module.
 
 Feature Options
 
@@ -6055,15 +6726,16 @@
        A descriptive comment about the compilation environment.
 
      * -DDEFAULT_CHARSET=charset_name
-       The server character set. By default, MySQL uses the latin1
-       (cp1252 West European) character set.
+       The server character set. By default, MySQL uses the
+       latin1 (cp1252 West European) character set.
        charset_name may be one of binary, armscii8, ascii, big5,
-       cp1250, cp1251, cp1256, cp1257, cp850, cp852, cp866, cp932,
-       dec8, eucjpms, euckr, gb2312, gbk, geostd8, greek, hebrew,
-       hp8, keybcs2, koi8r, koi8u, latin1, latin2, latin5, latin7,
-       macce, macroman, sjis, swe7, tis620, ucs2, ujis, utf8,
-       utf8mb4, utf16, utf32. The permissible character sets are
-       listed in the cmake/character_sets.cmake file as the value of
+       cp1250, cp1251, cp1256, cp1257, cp850, cp852, cp866,
+       cp932, dec8, eucjpms, euckr, gb2312, gbk, geostd8, greek,
+       hebrew, hp8, keybcs2, koi8r, koi8u, latin1, latin2,
+       latin5, latin7, macce, macroman, sjis, swe7, tis620,
+       ucs2, ujis, utf8, utf8mb4, utf16, utf32. The permissible
+       character sets are listed in the
+       cmake/character_sets.cmake file as the value of
        CHARSETS_AVAILABLE.
        This value can be set at server startup with the
        --character_set_server option.
@@ -6071,99 +6743,108 @@
      * -DDEFAULT_COLLATION=collation_name
        The server collation. By default, MySQL uses
        latin1_swedish_ci. Use the SHOW COLLATION statement to
-       determine which collations are available for each character
-       set.
+       determine which collations are available for each
+       character set.
        This value can be set at server startup with the
        --collation_server option.
 
      * -DENABLE_DEBUG_SYNC=bool
-       Whether to compile the Debug Sync facility into the server.
-       This facility is used for testing and debugging. This option
-       is enabled by default, but has no effect unless MySQL is
-       configured with debugging enabled. If debugging is enabled and
-       you want to disable Debug Sync, use -DENABLE_DEBUG_SYNC=0.
+       Whether to compile the Debug Sync facility into the
+       server. This facility is used for testing and debugging.
+       This option is enabled by default, but has no effect
+       unless MySQL is configured with debugging enabled. If
+       debugging is enabled and you want to disable Debug Sync,
+       use -DENABLE_DEBUG_SYNC=0.
        When compiled in, Debug Sync is disabled by default at
        runtime. To enable it, start mysqld with the
        --debug-sync-timeout=N option, where N is a timeout value
-       greater than 0. (The default value is 0, which disables Debug
-       Sync.) N becomes the default timeout for individual
+       greater than 0. (The default value is 0, which disables
+       Debug Sync.) N becomes the default timeout for individual
        synchronization points.
-       For a description of the Debug Sync facility and how to use
-       synchronization points, see MySQL Internals: Test
+       For a description of the Debug Sync facility and how to
+       use synchronization points, see MySQL Internals: Test
        Synchronization
-       (http://dev.mysql.com/doc/internals/en/test-synchronization.ht
-       ml).
+       (http://dev.mysql.com/doc/internals/en/test-synchronizati
+       on.html).
 
      * -DENABLE_DOWNLOADS=bool
-       Whether to download optional files. For example, with this
-       option enabled, CMake downloads the Google Test distribution
-       that is used by the test suite to run unit tests.
+       Whether to download optional files. For example, with
+       this option enabled, CMake downloads the Google Test
+       distribution that is used by the test suite to run unit
+       tests.
 
      * -DENABLE_DTRACE=bool
-       Whether to include support for DTrace probes. For information
-       about DTrace, wee Section 5.4, "Tracing mysqld Using DTrace"
+       Whether to include support for DTrace probes. For
+       information about DTrace, wee Section 5.4, "Tracing
+       mysqld Using DTrace"
 
      * -DENABLE_GCOV=bool
        Whether to include gcov support (Linux only).
 
      * -DENABLED_LOCAL_INFILE=bool
-       Whether to enable LOCAL capability in the client library for
-       LOAD DATA INFILE.
-       This option controls client-side LOCAL capability, but the
-       capability can be set on the server side at server startup
-       with the --local-infile option. See Section 6.1.6, "Security
-       Issues with LOAD DATA LOCAL."
+       Whether to enable LOCAL capability in the client library
+       for LOAD DATA INFILE.
+       This option controls client-side LOCAL capability, but
+       the capability can be set on the server side at server
+       startup with the --local-infile option. See Section
+       6.1.6, "Security Issues with LOAD DATA LOCAL."
 
      * -DENABLED_PROFILING=bool
-       Whether to enable query profiling code (for the SHOW PROFILE
-       and SHOW PROFILES statements).
+       Whether to enable query profiling code (for the SHOW
+       PROFILE and SHOW PROFILES statements).
 
      * -DIGNORE_AIO_CHECK=bool
-       If the -DBUILD_CONFIG=mysql_release option is given on Linux,
-       the libaio library must be linked in by default. If you do not
-       have libaio or do not want to install it, you can suppress the
-       check for it by specifying -DIGNORE_AIO_CHECK=1. This option
-       was added in MySQL 5.5.9.
+       If the -DBUILD_CONFIG=mysql_release option is given on
+       Linux, the libaio library must be linked in by default.
+       If you do not have libaio or do not want to install it,
+       you can suppress the check for it by specifying
+       -DIGNORE_AIO_CHECK=1. This option was added in MySQL
+       5.5.9.
 
      * -DMYSQL_MAINTAINER_MODE=bool
        Whether to enable a MySQL maintainer-specific development
-       environment. If enabled, this option causes compiler warnings
-       to become errors.
+       environment. If enabled, this option causes compiler
+       warnings to become errors.
 
      * -DMYSQL_PROJECT_NAME=name
-       For Windows or Mac OS X, the project name to incorporate into
-       the project file name. This option was added in MySQL 5.5.21.
+       For Windows or OS X, the project name to incorporate into
+       the project file name. This option was added in MySQL
+       5.5.21.
 
      * -DMYSQL_TCP_PORT=port_num
-       The port number on on which the server listens for TCP/IP
+       The port number on which the server listens for TCP/IP
        connections. The default is 3306.
        This value can be set at server startup with the --port
        option.
 
      * -DMYSQL_UNIX_ADDR=file_name
        The Unix socket file path on which the server listens for
-       socket connections. This must be an absolute path name. The
-       default is /tmp/mysql.sock.
+       socket connections. This must be an absolute path name.
+       The default is /tmp/mysql.sock.
        This value can be set at server startup with the --socket
        option.
 
      * -DWITH_ASAN=bool
-       Whether to enable address sanitization, for compilers that
-       support it. The default is off. This option was added in MySQL
-       5.5.35.
+       Whether to enable AddressSanitizer, for compilers that
+       support it. The default is off. This option was added in
+       MySQL 5.5.35.
 
      * -DWITH_DEBUG=bool
        Whether to include debugging support.
-       Configuring MySQL with debugging support enables you to use
-       the --debug="d,parser_debug" option when you start the server.
-       This causes the Bison parser that is used to process SQL
-       statements to dump a parser trace to the server's standard
-       error output. Typically, this output is written to the error
-       log.
+       Configuring MySQL with debugging support enables you to
+       use the --debug="d,parser_debug" option when you start
+       the server. This causes the Bison parser that is used to
+       process SQL statements to dump a parser trace to the
+       server's standard error output. Typically, this output is
+       written to the error log.
 
      * -DWITH_EMBEDDED_SERVER=bool
        Whether to build the libmysqld embedded server library.
 
+     * -DWITH_EMBEDDED_SHARED_LIBRARY=bool
+       Whether to build a shared libmysqld embedded server
+       library. This option was added in MySQL 5.5.37.
+
      * -DWITH_EXTRA_CHARSETS=name
        Which extra character sets to include:
 
@@ -6196,462 +6877,535 @@
             distribution.
 
           + system: Use the system SSL library.
-       For information about using SSL support, see Section 6.3.8,
-       "Using SSL for Secure Connections."
+       For information about using SSL support, see Section
+       6.3.9, "Using SSL for Secure Connections."
+
+     * -DWITH_UNIXODBC=1
+       Enables unixODBC support, for Connector/ODBC.
+
+     * -DWITH_VALGRIND=bool
+       Whether to compile in the Valgrind header files, which
+       exposes the Valgrind API to MySQL code. The default is
+       OFF.
+       To generate a Valgrind-aware debug build,
+       -DWITH_VALGRIND=1 normally is combined with
+       -DWITH_DEBUG=1. See Building Debug Configurations
+       (http://dev.mysql.com/doc/internals/en/debug-configuratio
+       ns.html).
 
      * -DWITH_ZLIB=zlib_type
        Some features require that the server be built with
        compression library support, such as the COMPRESS() and
-       UNCOMPRESS() functions, and compression of the client/server
-       protocol. The WITH_ZLIB indicates the source of zlib support:
+       UNCOMPRESS() functions, and compression of the
+       client/server protocol. The WITH_ZLIB indicates the
+       source of zlib support:
 
           + bundled: Use the zlib library bundled with the
             distribution.
 
-          + system: Use the system zlib library. This is the default.
+          + system: Use the system zlib library. This is the
+            default.
 
      * -DWITHOUT_SERVER=bool
-       Whether to build without the MySQL server. The default is OFF,
-       which does build the server.
+       Whether to build without the MySQL server. The default is
+       OFF, which does build the server.
 
 Compiler Flags
 
-   To specify compiler flags, set the CFLAGS and CXXFLAGS environment
-   variables before running CMake. Example:
-shell> CFLAGS=-DHAVE_EMBEDDED_PRIVILEGE_CONTROL
-shell> CXXFLAGS=-DHAVE_EMBEDDED_PRIVILEGE_CONTROL
-shell> export CFLAGS CXXFLAGS
-shell> cmake [options]
-
-   The following flags control configuration features:
-
-     * HAVE_EMBEDDED_PRIVILEGE_CONTROL
-       By default, authentication for connections to the embedded
-       server is disabled. To enable connection authentication,
-       define this flag.
+
+     * -DCMAKE_C_FLAGS="flags"
+       Flags for the C Compiler.
+
+     * -DCMAKE_CXX_FLAGS="flags"
+       Flags for the C++ Compiler.
+
+   To specify your own C and C++ compiler flags, for flags that
+   do not affect optimization, use the CMAKE_C_FLAGS and
+   CMAKE_CXX_FLAGS CMake options.
+
+   When providing your own compiler flags, you might want to
+   specify CMAKE_BUILD_TYPE as well.
+
+   For example, to create a 32-bit release build on a 64-bit
+   Linux machine, do this:
+shell> mkdir bld
+shell> cd bld
+shell> cmake .. -DCMAKE_C_FLAGS=-m32 \
+         -DCMAKE_CXX_FLAGS=-m32 \
+         -DCMAKE_BUILD_TYPE=RelWithDebInfo
+
+   If you set flags that affect optimization (-Onumber), you
+   must set the CMAKE_C_FLAGS_build_type and/or
+   CMAKE_CXX_FLAGS_build_type options, where build_type
+   corresponds to the CMAKE_BUILD_TYPE value. To specify a
+   different optimization for the default build type
+   (RelWithDebInfo) set the CMAKE_C_FLAGS_RELWITHDEBINFO and
+   CMAKE_CXX_FLAGS_RELWITHDEBINFO options. For example, to
+   compile on Linux with -O3 and with debug symbols, do this:
+shell> cmake .. -DCMAKE_C_FLAGS_RELWITHDEBINFO="-O3 -g" \
+         -DCMAKE_CXX_FLAGS_RELWITHDEBINFO="-O3 -g"
 
 CMake Options for Compiling MySQL Cluster
 
-   The following options are for use when building MySQL Cluster NDB
-   7.2 or later. These options are supported only with the MySQL
-   Cluster NDB 7.2 and later MySQL Cluster sources; they are not
-   supported when using sources from the MySQL 5.5 Server tree.
+   The following options are for use when building MySQL Cluster
+   NDB 7.2 or later. These options are supported only with the
+   MySQL Cluster NDB 7.2 and later MySQL Cluster sources; they
+   are not supported when using sources from the MySQL 5.5
+   Server tree.
 
      * -DMEMCACHED_HOME=path
-       Perform the build using the memcached (version 1.6 or later)
-       installed in the system directory indicated by path. Files
-       from this installation that are used in the build include the
-       memcached binary, header files, and libraries, as well as the
-       memcached_utilities library and the header file
-       engine_testapp.h.
-       You must leave this option unset when building ndbmemcache
-       using the bundled memcached sources (WITH_BUNDLED_MEMCACHED
-       option); in other words, the bundled sources are used by
-       default).
+       Perform the build using the memcached (version 1.6 or
+       later) installed in the system directory indicated by
+       path. Files from this installation that are used in the
+       build include the memcached binary, header files, and
+       libraries, as well as the memcached_utilities library and
+       the header file engine_testapp.h.
+       You must leave this option unset when building
+       ndbmemcache using the bundled memcached sources
+       (WITH_BUNDLED_MEMCACHED option); in other words, the
+       bundled sources are used by default).
        This option was added in MySQL Cluster NDB 7.2.2.
        While additional CMake options---such as for SASL
-       authorization and for providing dtrace support---are available
-       for use when compiling memcached from external sources, these
-       options are currently not enabled for the memcached sources
-       bundled with MySQL Cluster.
+       authorization and for providing dtrace support---are
+       available for use when compiling memcached from external
+       sources, these options are currently not enabled for the
+       memcached sources bundled with MySQL Cluster.
 
      * -DWITH_BUNDLED_LIBEVENT={ON|OFF}
-       Use the libevent included in the MySQL Cluster sources when
-       building MySQL Cluster with ndbmemcached support (MySQL
-       Cluster NDB 7.2.2 and later). Enabled by default. OFF causes
-       the system's libevent to be used instead.
+       Use the libevent included in the MySQL Cluster sources
+       when building MySQL Cluster with ndbmemcached support
+       (MySQL Cluster NDB 7.2.2 and later). Enabled by default.
+       OFF causes the system's libevent to be used instead.
 
      * -DWITH_BUNDLED_MEMCACHED={ON|OFF}
        Build the memcached sources included in the MySQL Cluster
-       source tree (MySQL Cluster NDB 7.2.3 and later), then use the
-       resulting memcached server when building the ndbmemcache
-       engine. In this case, make install places the memcached binary
-       in the installation bin directory, and the ndbmemcache engine
-       shared object file ndb_engine.so in the installation lib
-       directory.
+       source tree (MySQL Cluster NDB 7.2.3 and later), then use
+       the resulting memcached server when building the
+       ndbmemcache engine. In this case, make install places the
+       memcached binary in the installation bin directory, and
+       the ndbmemcache engine shared object file ndb_engine.so
+       in the installation lib directory.
        This option is ON by default.
 
      * -DWITH_CLASSPATH=path
-       Sets the classpath for building MySQL Cluster Connector for
-       Java. Default is empty. In MySQL Cluster NDB 7.2.9 and later,
-       this option is ignored if -DWITH_NDB_JAVA=OFF is used.
+       Sets the classpath for building MySQL Cluster Connector
+       for Java. The default is empty. In MySQL Cluster NDB
+       7.2.9 and later, this option is ignored if
+       -DWITH_NDB_JAVA=OFF is used.
 
      * -DWITH_ERROR_INSERT={ON|OFF}
-       Enables error injection in the NDB kernel. For testing only;
-       not intended for use in building production binaries. Default
-       is OFF.
+       Enables error injection in the NDB kernel. For testing
+       only; not intended for use in building production
+       binaries. The default is OFF.
 
      * -DWITH_NDBCLUSTER_STORAGE_ENGINE={ON|OFF}
-       Build and link in support for the NDB (NDBCLUSTER) storage
-       engine in mysqld. Default is ON.
+       Build and link in support for the NDB (NDBCLUSTER)
+       storage engine in mysqld. The default is ON.
 
      * -DWITH_NDBCLUSTER={ON|OFF}
        This is an alias for WITH_NDBCLUSTER_STORAGE_ENGINE.
 
      * -DWITH_NDBMTD={ON|OFF}
-       Build the multi-threaded data node executable ndbmtd. Default
-       is ON.
+       Build the multi-threaded data node executable ndbmtd. The
+       default is ON.
 
      * -DWITH_NDB_BINLOG={ON|OFF}
-       Enable binary logging by default in the mysqld built using
-       this option. ON by default.
+       Enable binary logging by default in the mysqld built
+       using this option. ON by default.
 
      * -DWITH_NDB_DEBUG={ON|OFF}
        Enable building the debug versions of the MySQL Cluster
        binaries. OFF by default.
 
      * -DWITH_NDB_JAVA={ON|OFF}
-       Enable building MySQL Cluster with Java support, including
-       ClusterJ.
-       This option was added in MySQL Cluster NDB 7.2.9, and is ON by
-       default. If you do not wish to compile MySQL Cluster with Java
-       support, you must disable it explicitly by specifying
-       -DWITH_NDB_JAVA=OFF when running CMake. Otherwise, if Java
-       cannot be found, configuration of the build fails.
+       Enable building MySQL Cluster with Java support,
+       including ClusterJ.
+       This option was added in MySQL Cluster NDB 7.2.9, and is
+       ON by default. If you do not wish to compile MySQL
+       Cluster with Java support, you must disable it explicitly
+       by specifying -DWITH_NDB_JAVA=OFF when running CMake.
+       Otherwise, if Java cannot be found, configuration of the
+       build fails.
 
      * -DWITH_NDB_PORT=port
-       Causes the MySQL Cluster management server (ndb_mgmd) that is
-       built to use this port by default. If this option is unset,
-       the resulting management server tries to use port 1186 by
-       default.
+       Causes the MySQL Cluster management server (ndb_mgmd)
+       that is built to use this port by default. If this option
+       is unset, the resulting management server tries to use
+       port 1186 by default.
 
      * -DWITH_NDB_TEST={ON|OFF}
        If enabled, include a set of NDB API test programs. The
        default is OFF.
 
-2.10.5. Dealing with Problems Compiling MySQL
+2.9.5 Dealing with Problems Compiling MySQL
 
-   The solution to many problems involves reconfiguring. If you do
-   reconfigure, take note of the following:
+   The solution to many problems involves reconfiguring. If you
+   do reconfigure, take note of the following:
 
-     * If CMake is run after it has previously been run, it may use
-       information that was gathered during its previous invocation.
-       This information is stored in CMakeCache.txt. When CMake
-       starts up, it looks for that file and reads its contents if it
-       exists, on the assumption that the information is still
-       correct. That assumption is invalid when you reconfigure.
-
-     * Each time you run CMake, you must run make again to recompile.
-       However, you may want to remove old object files from previous
-       builds first because they were compiled using different
-       configuration options.
+     * If CMake is run after it has previously been run, it may
+       use information that was gathered during its previous
+       invocation. This information is stored in CMakeCache.txt.
+       When CMake starts up, it looks for that file and reads
+       its contents if it exists, on the assumption that the
+       information is still correct. That assumption is invalid
+       when you reconfigure.
+
+     * Each time you run CMake, you must run make again to
+       recompile. However, you may want to remove old object
+       files from previous builds first because they were
+       compiled using different configuration options.
 
    To prevent old object files or configuration information from
-   being used, run these commands on Unix before re-running CMake:
+   being used, run the following commands before re-running
+   CMake:
+
+   On Unix:
 shell> make clean
 shell> rm CMakeCache.txt
 
-   Or, on Windows:
+   On Windows:
 shell> devenv MySQL.sln /clean
 shell> del CMakeCache.txt
 
-   If you build out of the source tree, remove and recreate your
-   build directory before re-running CMake. For instructions on
-   building outside of the source tree, see How to Build MySQL Server
-   with CMake (http://dev.mysql.com/doc/internals/en/cmake.html).
-
-   On some systems, warnings may occur due to differences in system
-   include files. The following list describes other problems that
-   have been found to occur most often when compiling MySQL:
-
-     * To define flags to be used by your C or C++ compilers, specify
-       them using the CFLAGS and CXXFLAGS environment variables. You
-       can also specify the compiler names this way using CC and CXX.
-       For example:
+   If you build outside of the source tree, remove and recreate
+   your build directory before re-running CMake. For
+   instructions on building outside of the source tree, see How
+   to Build MySQL Server with CMake
+   (http://dev.mysql.com/doc/internals/en/cmake.html).
+
+   On some systems, warnings may occur due to differences in
+   system include files. The following list describes other
+   problems that have been found to occur most often when
+   compiling MySQL:
+
+     * To define which C and C++ compilers to use, you can
+       define the CC and CXX environment variables. For example:
 shell> CC=gcc
-shell> CFLAGS=-O3
-shell> CXX=gcc
-shell> CXXFLAGS=-O3
-shell> export CC CFLAGS CXX CXXFLAGS
+shell> CXX=g++
+shell> export CC CXX
+
+       To specify your own C and C++ compiler flags, use the
+       CMAKE_C_FLAGS and CMAKE_CXX_FLAGS CMake options. See
+       Section 2.9.4, "."
        To see what flags you might need to specify, invoke
        mysql_config with the --cflags option.
 
-     * If compilation fails, check whether the MYSQL_MAINTAINER_MODE
-       option is enabled. This mode causes compiler warnings to
-       become errors, so disabling it may enable compilation to
-       proceed.
+     * To see what commands are executed during the compile
+       stage, after using CMake to configure MySQL, run make
+       VERBOSE=1 rather than just make.
+
+     * If compilation fails, check whether the
+       MYSQL_MAINTAINER_MODE option is enabled. This mode causes
+       compiler warnings to become errors, so disabling it may
+       enable compilation to proceed.
 
      * If your compile fails with errors such as any of the
-       following, you must upgrade your version of make to GNU make:
+       following, you must upgrade your version of make to GNU
+       make:
 make: Fatal error in reader: Makefile, line 18:
 Badly formed macro assignment
+
        Or:
 make: file `Makefile' line 18: Must be a separator (:
+
        Or:
 pthread.h: No such file or directory
+
        Solaris and FreeBSD are known to have troublesome make
        programs.
        GNU make 3.75 is known to work.
 
-     * The sql_yacc.cc file is generated from sql_yacc.yy. Normally,
-       the build process does not need to create sql_yacc.cc because
-       MySQL comes with a pregenerated copy. However, if you do need
-       to re-create it, you might encounter this error:
+     * The sql_yacc.cc file is generated from sql_yacc.yy.
+       Normally, the build process does not need to create
+       sql_yacc.cc because MySQL comes with a pregenerated copy.
+       However, if you do need to re-create it, you might
+       encounter this error:
 "sql_yacc.yy", line xxx fatal: default action causes potential...
-       This is a sign that your version of yacc is deficient. You
-       probably need to install bison (the GNU version of yacc) and
-       use that instead.
+
+       This is a sign that your version of yacc is deficient.
+       You probably need to install a recent version of bison
+       (the GNU version of yacc) and use that instead.
        Versions of bison older than 1.75 may report this error:
 sql_yacc.yy:#####: fatal error: maximum table size (32767) exceeded
-       The maximum table size is not actually exceeded; the error is
-       caused by bugs in older versions of bison.
-
-   For information about acquiring or updating tools, see the system
-   requirements in Section 2.10, "Installing MySQL from Source."
 
-2.10.6. MySQL Configuration and Third-Party Tools
+       The maximum table size is not actually exceeded; the
+       error is caused by bugs in older versions of bison.
 
-   Third-party tools that need to determine the MySQL version from
-   the MySQL source can read the VERSION file in the top-level source
-   directory. The file lists the pieces of the version separately.
-   For example, if the version is 5.5.8, the file looks like this:
+   For information about acquiring or updating tools, see the
+   system requirements in Section 2.9, "Installing MySQL from
+   Source."
+
+2.9.6 MySQL Configuration and Third-Party Tools
+
+   Third-party tools that need to determine the MySQL version
+   from the MySQL source can read the VERSION file in the
+   top-level source directory. The file lists the pieces of the
+   version separately. For example, if the version is MySQL
+   5.7.4-m14, the file looks like this:
 MYSQL_VERSION_MAJOR=5
-MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=8
-MYSQL_VERSION_EXTRA=
-
-   If the source is not for a General Availability (GA) release, the
-   MYSQL_VERSION_EXTRA value will be nonempty. For example, the value
-   for a Release Candidate release would look like this:
-MYSQL_VERSION_EXTRA=rc
-
-   To construct a five-digit number from the version components, use
-   this formula:
-MYSQL_VERSION_MAJOR*10000 + MYSQL_VERSION_MINOR*100 + MYSQL_VERSION_P
-ATCH
-
-2.11. Postinstallation Setup and Testing
-
-   This section discusses post-installation items for Unix-like
-   systems. If you are using Windows, see Section 2.3.10, "Windows
-   Postinstallation Procedures."
-
-   After installing MySQL, there are some items that you should
-   address. For example:
-
-     * You should initialize the data directory and create the MySQL
-       grant tables, as describe in Section 2.11.1, "Postinstallation
-       Procedures for Unix-like Systems."
-
-     * An important security concern is that the initial accounts in
-       the grant tables have no passwords. You should assign
-       passwords to prevent unauthorized access to the MySQL server.
-       For instructions, see Section 2.11.2, "Securing the Initial
+MYSQL_VERSION_MINOR=7
+MYSQL_VERSION_PATCH=4
+MYSQL_VERSION_EXTRA=-m14
+
+   If the source is not for a General Availablility (GA)
+   release, the MYSQL_VERSION_EXTRA value will be nonempty. For
+   the example, the value corresponds to Milestone 14.
+
+   To construct a five-digit number from the version components,
+   use this formula:
+MYSQL_VERSION_MAJOR*10000 + MYSQL_VERSION_MINOR*100 + MYSQL_VERSION_PA
+TCH
+
+2.10 Postinstallation Setup and Testing
+
+   This section discusses postinstallation tasks for Unix-like
+   systems.
+
+   After installing MySQL, there are some tasks that you should
+   perform:
+
+     * You should initialize the data directory and create the
+       MySQL grant tables. If you are using Windows, see Section
+       2.3.10, "Windows Postinstallation Procedures." For Unix
+       systems, see Section 2.10.1, "Postinstallation Procedures
+       for Unix-like Systems."
+
+     * After you complete the procedure and have the server
+       running, any initial accounts in the grant tables should
+       be assigned passwords, if that was not already done
+       during data directory initialization. Passwords prevent
+       unauthorized access to the MySQL server. You may also
+       wish to restrict access to test databases. For
+       instructions, see Section 2.10.2, "Securing the Initial
        MySQL Accounts."
 
-     * Optionally, you can create time zone tables to enable
-       recognition of named time zones. For instructions, see Section
-       4.4.6, "mysql_tzinfo_to_sql --- Load the Time Zone Tables."
-
-     * If you have trouble getting the server to start, see Section
-       2.11.1.3, "Starting and Troubleshooting the MySQL Server."
-
-     * When you are ready to create additional user accounts, you can
-       find information on the MySQL access control system and
-       account management in Section 6.2, "The MySQL Access Privilege
-       System," and Section 6.3, "MySQL User Account Management."
-
-2.11.1. Postinstallation Procedures for Unix-like Systems
-
-   After installing MySQL on a Unix-like system, you must initialize
-   the grant tables, start the server, and make sure that the server
-   works satisfactorily. You may also wish to arrange for the server
-   to be started and stopped automatically when your system starts
-   and stops. You should also assign passwords to the accounts in the
-   grant tables.
-
-   On a Unix-like system, the grant tables are set up by the
-   mysql_install_db program. For some installation methods, this
-   program is run for you automatically if an existing database
-   cannot be found.
-
-     * If you install MySQL on Linux using RPM distributions, the
-       server RPM runs mysql_install_db.
-
-     * Using the native packaging system on many platforms, including
-       Debian Linux, Ubuntu Linux, Gentoo Linux and others, the
-       mysql_install_db command is run for you.
-
-     * If you install MySQL on Mac OS X using a DMG distribution, the
-       installer runs mysql_install_db.
-
-   For other platforms and installation types, including generic
-   binary and source installs, you will need to run mysql_install_db
-   yourself.
-
-   The following procedure describes how to initialize the grant
-   tables (if that has not previously been done) and start the
-   server. It also suggests some commands that you can use to test
-   whether the server is accessible and working properly. For
-   information about starting and stopping the server automatically,
-   see Section 2.11.1.2, "Starting and Stopping MySQL Automatically."
-
-   After you complete the procedure and have the server running, you
-   should assign passwords to the accounts created by
-   mysql_install_db and perhaps restrict access to test databases.
-   For instructions, see Section 2.11.2, "Securing the Initial MySQL
-   Accounts."
+     * You may wish to arrange for the server to start and stop
+       automatically when your system starts and stops. For
+       instructions, see Section 2.10.3, "Starting and Stopping
+       MySQL Automatically."
 
-   In the examples shown here, the server runs under the user ID of
-   the mysql login account. This assumes that such an account exists.
-   Either create the account if it does not exist, or substitute the
-   name of a different existing login account that you plan to use
-   for running the server. For information about creating the
-   account, see Creating a mysql System User and Group, in Section
-   2.2, "Installing MySQL on Unix/Linux Using Generic Binaries."
+     * Optionally, you can create time zone tables to enable
+       recognition of named time zones. For instructions, see
+       Section 4.4.6, "mysql_tzinfo_to_sql --- Load the Time
+       Zone Tables."
+
+   If you have trouble starting the server, see Section 2.10.4,
+   "Troubleshooting Problems Starting the MySQL Server."
+
+   When you are ready to create additional user accounts, you
+   can find information on the MySQL access control system and
+   account management in Section 6.2, "The MySQL Access
+   Privilege System," and Section 6.3, "MySQL User Account
+   Management."
+
+2.10.1 Postinstallation Procedures for Unix-like Systems
+
+   After installing MySQL on a Unix-like system, you must
+   initialize the data directory (including the tables in the
+   mysql system database), start the server, and make sure that
+   the server works satisfactorily. You should also assign
+   passwords to any accounts listed in the mysql.user grant
+   table
+
+   On a Unix-like system, the grant tables in the mysql database
+   are set up by the mysql_install_db program. For some
+   installation methods, this program is run for you
+   automatically if an existing mysql database cannot be found:
+
+     * If you install MySQL on Linux using server RPM
+       distributions.
+
+     * Using the native packaging system on many platforms,
+       including Debian Linux, Ubuntu Linux, Gentoo Linux, and
+       others.
+
+     * If you install MySQL on OS X using a DMG distribution.
+
+   For other platforms and installation types, including
+   installation from generic binary and source distributions,
+   you must initialize the data directory yourself.
+
+   The following procedure describes how to initialize the data
+   directory (if that has not previously been done) and start
+   the server. It also suggests some commands that you can use
+   to test whether the server is accessible and working
+   properly.
+
+   In the examples shown here, the server runs under the user ID
+   of the mysql login account. This assumes that such an account
+   exists. Either create the account if it does not exist, or
+   substitute the name of a different existing login account
+   that you plan to use for running the server. For information
+   about creating the account, see Creating a mysql System User
+   and Group, in Section 2.2, "Installing MySQL on Unix/Linux
+   Using Generic Binaries."
 
-    1. Change location into the top-level directory of your MySQL
-       installation, represented here by BASEDIR:
+    1. Change location into the top-level directory of your
+       MySQL installation, represented here by BASEDIR:
 shell> cd BASEDIR
-       BASEDIR is the installation directory for your MySQL instance.
-       It is likely to be something like /usr/local/mysql or
-       /usr/local. The following steps assume that you have changed
-       location to this directory.
-       You will find several files and subdirectories in the BASEDIR
-       directory. The most important for installation purposes are
-       the bin and scripts subdirectories:
+
+       BASEDIR is the installation directory for your MySQL
+       instance. It is likely to be something like
+       /usr/local/mysql or /usr/local. The following steps
+       assume that you have changed location to this directory.
+       You will find several files and subdirectories in the
+       BASEDIR directory. The most important for installation
+       purposes are the bin and scripts subdirectories:
 
           + The bin directory contains client programs and the
-            server. You should add the full path name of this
-            directory to your PATH environment variable so that your
-            shell finds the MySQL programs properly. See Section
-            2.13, "Environment Variables."
+            server. To make it more convenient to invoke
+            programs installed in the bin directory under the
+            installation directory, you can add that directory
+            to your PATH environment variable setting. That
+            enables your shell to find MySQL programs properly,
+            so that you can run a program by typing only its
+            name, not its entire path name. See Section 4.2.10,
+            "Setting Environment Variables."
 
           + The scripts directory contains the mysql_install_db
-            script used to initialize the mysql database containing
-            the grant tables that store the server access
-            permissions.
+            program used to initialize the mysql database
+            containing the grant tables that store the server
+            access permissions.
 
     2. If necessary, ensure that the distribution contents are
        accessible to mysql. If you installed the distribution as
-       mysql, no further action is required. If you installed the
-       distribution as root, its contents will be owned by root.
-       Change its ownership to mysql by executing the following
-       commands as root in the installation directory. The first
-       command changes the owner attribute of the files to the mysql
-       user. The second changes the group attribute to the mysql
-       group.
-shell> chown -R mysql .
+       mysql, no further action is required. If you installed
+       the distribution as root, its contents will be owned by
+       root. This is suitable for most of the installation, with
+       the exception that the data directory must be owned by
+       mysql. To accomplish this, run the following commands as
+       root in the installation directory. For some distribution
+       types, the data directory might be named var rather than
+       data; adjust the second command accordingly.
+shell> chown -R root .
+shell> chown -R mysql data
 shell> chgrp -R mysql .
 
-    3. If necessary, run the mysql_install_db program to set up the
-       initial MySQL grant tables containing the privileges that
-       determine how users are permitted to connect to the server.
-       You will need to do this if you used a distribution type for
-       which the installation procedure does not run the program for
-       you.
+
+    3. If necessary, run the mysql_install_db program to set up
+       the initial MySQL grant tables containing the privileges
+       that determine how users are permitted to connect to the
+       server. You must do this if you used a distribution type
+       for which the installation procedure does not run the
+       program for you.
 shell> scripts/mysql_install_db --user=mysql
-       Typically, mysql_install_db needs to be run only the first
-       time you install MySQL, so you can skip this step if you are
-       upgrading an existing installation, However, mysql_install_db
-       does not overwrite any existing privilege tables, so it should
-       be safe to run in any circumstances.
+
+       Typically, mysql_install_db needs to be run only the
+       first time you install MySQL, so you can skip this step
+       if you are upgrading an existing installation, However,
+       mysql_install_db does not overwrite any existing
+       privilege tables, so it should be safe to run in any
+       circumstances.
        It might be necessary to specify other options such as
-       --basedir or --datadir if mysql_install_db does not identify
-       the correct locations for the installation directory or data
-       directory. For example:
+       --basedir or --datadir if mysql_install_db does not
+       identify the correct locations for the installation
+       directory or data directory. For example:
 shell> scripts/mysql_install_db --user=mysql \
          --basedir=/opt/mysql/mysql \
          --datadir=/opt/mysql/mysql/data
-       The mysql_install_db script creates the server's data
-       directory with mysql as the owner. Under the data directory,
-       it creates directories for the mysql database that holds the
-       grant tables and the test database that you can use to test
-       MySQL. The script also creates privilege table entries for
-       root and anonymous-user accounts. The accounts have no
-       passwords initially. Section 2.11.2, "Securing the Initial
-       MySQL Accounts," describes the initial privileges. Briefly,
-       these privileges permit the MySQL root user to do anything,
-       and permit anybody to create or use databases with a name of
+
+       The mysql_install_db program creates the server's data
+       directory with mysql as the owner. Under the data
+       directory, it creates directories for the mysql database
+       that holds the grant tables and the test database that
+       you can use to test MySQL. The script also creates
+       privilege table entries for root and anonymous-user
+       accounts. The accounts have no passwords initially.
+       Section 2.10.2, "Securing the Initial MySQL Accounts,"
+       describes the initial privileges. Briefly, these
+       privileges permit the MySQL root user to do anything, and
+       permit anybody to create or use databases with a name of
        test or starting with test_. See Section 6.2, "The MySQL
        Access Privilege System," for a complete listing and
        description of the grant tables.
-       It is important to make sure that the database directories and
-       files are owned by the mysql login account so that the server
-       has read and write access to them when you run it later. To
-       ensure this if you run mysql_install_db as root, include the
-       --user option as shown. Otherwise, you should execute the
-       script while logged in as mysql, in which case you can omit
-       the --user option from the command.
-       If you do not want to have the test database, you can remove
-       it after starting the server, using the instructions in
-       Section 2.11.2, "Securing the Initial MySQL Accounts."
-       If you have trouble with mysql_install_db at this point, see
-       Section 2.11.1.1, "Problems Running mysql_install_db."
-
-    4. Most of the MySQL installation can be owned by root if you
-       like. The exception is that the data directory must be owned
-       by mysql. To accomplish this, run the following commands as
-       root in the installation directory:
-shell> chown -R root .
-shell> chown -R mysql data
-
-    5. If the plugin directory (the directory named by the plugin_dir
-       system variable) is writable by the server, it may be possible
-       for a user to write executable code to a file in the directory
-       using SELECT ... INTO DUMPFILE. This can be prevented by
-       making plugin_dir read only to the server or by setting
-       --secure-file-priv to a directory where SELECT writes can be
-       made safely.
-
-    6. If you installed MySQL using a source distribution, you may
-       want to optionally copy one of the provided configuration
-       files from the support-files directory into your /etc
-       directory. There are different sample configuration files for
-       different use cases, server types, and CPU and RAM
-       configurations. If you want to use one of these standard
-       files, you should copy it to /etc/my.cnf, or /etc/mysql/my.cnf
-       and edit and check the configuration before starting your
-       MySQL server for the first time.
-       If you do not copy one of the standard configuration files,
-       the MySQL server will be started with the default settings.
-       If you want MySQL to start automatically when you boot your
-       machine, you can copy support-files/mysql.server to the
-       location where your system has its startup files. More
-       information can be found in the mysql.server script itself,
-       and in Section 2.11.1.2, "Starting and Stopping MySQL
-       Automatically."
+       It is important to make sure that the database
+       directories and files are owned by the mysql login
+       account so that the server has read and write access to
+       them when you run it later. To ensure this if you run
+       mysql_install_db as root, include the --user option as
+       shown. Otherwise, you should execute the program while
+       logged in as mysql, in which case you can omit the --user
+       option from the command.
+       If you do not want to have the test database, you can
+       remove it after starting the server, using the
+       instructions in Section 2.10.2, "Securing the Initial
+       MySQL Accounts."
+       If you have trouble with mysql_install_db at this point,
+       see Section 2.10.1.1, "Problems Running
+       mysql_install_db."
+
+    4. If the plugin directory (the directory named by the
+       plugin_dir system variable) is writable by the server, it
+       may be possible for a user to write executable code to a
+       file in the directory using SELECT ... INTO DUMPFILE.
+       This can be prevented by making plugin_dir read only to
+       the server or by setting --secure-file-priv to a
+       directory where SELECT writes can be made safely.
+
+    5. If you installed MySQL using a source distribution, you
+       may want to optionally copy one of the provided
+       configuration files from the support-files directory into
+       your /etc directory. There are different sample
+       configuration files for different use cases, server
+       types, and CPU and RAM configurations. If you want to use
+       one of these standard files, you should copy it to
+       /etc/my.cnf, or /etc/mysql/my.cnf and edit and check the
+       configuration before starting your MySQL server for the
+       first time.
+       If you do not copy one of the standard configuration
+       files, the MySQL server will be started with the default
+       settings.
+       If you want MySQL to start automatically when you boot
+       your machine, you can copy support-files/mysql.server to
+       the location where your system has its startup files.
+       More information can be found in the mysql.server script
+       itself, and in Section 2.10.3, "Starting and Stopping
+       MySQL Automatically."
 
-    7. Start the MySQL server:
+    6. Start the MySQL server:
 shell> bin/mysqld_safe --user=mysql &
+
        It is important that the MySQL server be run using an
-       unprivileged (non-root) login account. To ensure this if you
-       run mysqld_safe as root, include the --user option as shown.
-       Otherwise, you should execute the script while logged in as
-       mysql, in which case you can omit the --user option from the
-       command.
-       For further instructions for running MySQL as an unprivileged
-       user, see Section 6.1.5, "How to Run MySQL as a Normal User."
-       If the command fails immediately and prints mysqld ended, look
-       for information in the error log (which by default is the
-       host_name.err file in the data directory).
-       If you neglected to create the grant tables by running
-       mysql_install_db before proceeding to this step, the following
-       message appears in the error log file when you start the
-       server:
-mysqld: Can't find file: 'host.frm'
-       This error also occurs if you run mysql_install_db as root
-       without the --user option. Remove the data directory and run
-       mysql_install_db with the --user option as described
-       previously.
-       If you have other problems starting the server, see Section
-       2.11.1.3, "Starting and Troubleshooting the MySQL Server." For
-       more information about mysqld_safe, see Section 4.3.2,
-       "mysqld_safe --- MySQL Server Startup Script."
-
-    8. Use mysqladmin to verify that the server is running. The
-       following commands provide simple tests to check whether the
-       server is up and responding to connections:
+       unprivileged (non-root) login account. To ensure this if
+       you run mysqld_safe as root, include the --user option as
+       shown. Otherwise, you should execute the program while
+       logged in as mysql, in which case you can omit the --user
+       option from the command.
+       For further instructions for running MySQL as an
+       unprivileged user, see Section 6.1.5, "How to Run MySQL
+       as a Normal User."
+       If the command fails immediately and prints mysqld ended,
+       look for information in the error log (which by default
+       is the host_name.err file in the data directory).
+       If the server is unable to access the data directory it
+       starts or read the grant tables in the mysql database, it
+       writes a message to its error log. Such problems can
+       occur if you neglected to create the grant tables by
+       initializing the data directory before proceeding to this
+       step, or if you ran the command that initializes the data
+       directory without the --user option. Remove the data
+       directory and run the command with the --user option as
+       described previously.
+       If you have other problems starting the server, see
+       Section 2.10.4, "Troubleshooting Problems Starting the
+       MySQL Server." For more information about mysqld_safe,
+       see Section 4.3.2, "mysqld_safe --- MySQL Server Startup
+       Script."
+
+    7. Use mysqladmin to verify that the server is running. The
+       following commands provide simple tests to check whether
+       the server is up and responding to connections:
 shell> bin/mysqladmin version
 shell> bin/mysqladmin variables
-       The output from mysqladmin version varies slightly depending
-       on your platform and version of MySQL, but should be similar
-       to that shown here:
+
+       The output from mysqladmin version varies slightly
+       depending on your platform and version of MySQL, but
+       should be similar to that shown here:
 shell> bin/mysqladmin version
-mysqladmin  Ver 14.12 Distrib 5.5.36, for pc-linux-gnu on i686
+mysqladmin  Ver 14.12 Distrib 5.5.44, for pc-linux-gnu on i686
 ...
 
-Server version          5.5.36
+Server version          5.5.44
 Protocol version        10
 Connection              Localhost via UNIX socket
 UNIX socket             /var/lib/mysql/mysql.sock
@@ -6660,19 +7414,24 @@
 Threads: 1  Questions: 366  Slow queries: 0
 Opens: 0  Flush tables: 1  Open tables: 19
 Queries per second avg: 0.000
-       To see what else you can do with mysqladmin, invoke it with
-       the --help option.
 
-    9. Verify that you can shut down the server:
+       To see what else you can do with mysqladmin, invoke it
+       with the --help option.
+
+    8. Verify that you can shut down the server:
 shell> bin/mysqladmin -u root shutdown
-   10. Verify that you can start the server again. Do this by using
-       mysqld_safe or by invoking mysqld directly. For example:
+
+
+    9. Verify that you can start the server again. Do this by
+       using mysqld_safe or by invoking mysqld directly. For
+       example:
 shell> bin/mysqld_safe --user=mysql &
-       If mysqld_safe fails, see Section 2.11.1.3, "Starting and
-       Troubleshooting the MySQL Server."
-   11. Run some simple tests to verify that you can retrieve
-       information from the server. The output should be similar to
-       what is shown here:
+
+       If mysqld_safe fails, see Section 2.10.4,
+       "Troubleshooting Problems Starting the MySQL Server."
+   10. Run some simple tests to verify that you can retrieve
+       information from the server. The output should be similar
+       to what is shown here:
 shell> bin/mysqlshow
 +--------------------+
 |     Databases      |
@@ -6716,287 +7475,525 @@
 | %    | test   |      |
 | %    | test_% |      |
 +------+--------+------+
-   12. There is a benchmark suite in the sql-bench directory (under
-       the MySQL installation directory) that you can use to compare
-       how MySQL performs on different platforms. The benchmark suite
-       is written in Perl. It requires the Perl DBI module that
-       provides a database-independent interface to the various
-       databases, and some other additional Perl modules:
-DBI
-DBD::mysql
-Data::Dumper
-Data::ShowTable
-       These modules can be obtained from CPAN
-       (http://www.cpan.org/). See also Section 2.14.1, "Installing
-       Perl on Unix."
-       The sql-bench/Results directory contains the results from many
-       runs against different databases and platforms. To run all
-       tests, execute these commands:
-shell> cd sql-bench
-shell> perl run-all-tests
-       If you do not have the sql-bench directory, you probably
-       installed MySQL using RPM files other than the source RPM.
-       (The source RPM includes the sql-bench benchmark directory.)
-       In this case, you must first install the benchmark suite
-       before you can use it. There are separate benchmark RPM files
-       named mysql-bench-VERSION.i386.rpm that contain benchmark code
-       and data.
-       If you have a source distribution, there are also tests in its
-       tests subdirectory that you can run. For example, to run
-       auto_increment.tst, execute this command from the top-level
-       directory of your source distribution:
-shell> mysql -vvf test < ./tests/auto_increment.tst
-       The expected result of the test can be found in the
-       ./tests/auto_increment.res file.
-   13. At this point, you should have the server running. However,
-       none of the initial MySQL accounts have a password, and the
-       server permits permissive access to test databases. To tighten
-       security, follow the instructions in Section 2.11.2, "Securing
-       the Initial MySQL Accounts."
-
-   The MySQL 5.5 installation procedure creates time zone tables in
-   the mysql database but does not populate them. To do so, use the
-   instructions in Section 10.6, "MySQL Server Time Zone Support."
-
-   To make it more convenient to invoke programs installed in the bin
-   directory under the installation directory, you can add that
-   directory to your PATH environment variable setting. That enables
-   you to run a program by typing only its name, not its entire path
-   name. See Section 4.2.4, "Setting Environment Variables."
+
+   11. At this point, you should have the server running.
+       However, none of the initial MySQL accounts have a
+       password, and the server permits permissive access to
+       test databases. To tighten security, follow the
+       instructions in Section 2.10.2, "Securing the Initial
+       MySQL Accounts."
+
+   The MySQL 5.5 installation procedure creates time zone tables
+   in the mysql database but does not populate them. To do so,
+   use the instructions in Section 10.6, "MySQL Server Time Zone
+   Support."
 
    You can set up new accounts using the bin/mysql_setpermission
-   script if you install the DBI and DBD::mysql Perl modules. See
-   Section 4.6.13, "mysql_setpermission --- Interactively Set
-   Permissions in Grant Tables." For Perl module installation
-   instructions, see Section 2.14, "Perl Installation Notes."
+   script if you install the DBI and DBD::mysql Perl modules.
+   See Section 4.6.13, "mysql_setpermission --- Interactively
+   Set Permissions in Grant Tables." For Perl module
+   installation instructions, see Section 2.13, "Perl
+   Installation Notes."
 
    If you would like to use mysqlaccess and have the MySQL
-   distribution in some nonstandard location, you must change the
-   location where mysqlaccess expects to find the mysql client. Edit
-   the bin/mysqlaccess script at approximately line 18. Search for a
-   line that looks like this:
+   distribution in some nonstandard location, you must change
+   the location where mysqlaccess expects to find the mysql
+   client. Edit the bin/mysqlaccess script at approximately line
+   18. Search for a line that looks like this:
 $MYSQL     = '/usr/local/bin/mysql';    # path to mysql executable
 
-   Change the path to reflect the location where mysql actually is
-   stored on your system. If you do not do this, a Broken pipe error
-   will occur when you run mysqlaccess.
-
-2.11.1.1. Problems Running mysql_install_db
-
-   The purpose of the mysql_install_db script is to generate new
-   MySQL privilege tables. It does not overwrite existing MySQL
-   privilege tables, and it does not affect any other data.
-
-   If you want to re-create your privilege tables, first stop the
-   mysqld server if it is running. Then rename the mysql directory
-   under the data directory to save it, and then run
-   mysql_install_db. Suppose that your current directory is the MySQL
-   installation directory and that mysql_install_db is located in the
-   bin directory and the data directory is named data. To rename the
-   mysql database and re-run mysql_install_db, use these commands.
+   Change the path to reflect the location where mysql actually
+   is stored on your system. If you do not do this, a Broken
+   pipe error will occur when you run mysqlaccess.
+
+2.10.1.1 Problems Running mysql_install_db
+
+   The purpose of the mysql_install_db program is to initialize
+   the data directory, including the tables in the mysql system
+   database. It does not overwrite existing MySQL privilege
+   tables, and it does not affect any other data.
+
+   To re-create your privilege tables, first stop the mysqld
+   server if it is running. Then rename the mysql directory
+   under the data directory to save it, and run
+   mysql_install_db. Suppose that your current directory is the
+   MySQL installation directory and that mysql_install_db is
+   located in the bin directory and the data directory is named
+   data. To rename the mysql database and re-run
+   mysql_install_db, use these commands.
 shell> mv data/mysql data/mysql.old
 shell> scripts/mysql_install_db --user=mysql
 
-   When you run mysql_install_db, you might encounter the following
-   problems:
+   When you run mysql_install_db, you might encounter the
+   following problems:
 
      * mysql_install_db fails to install the grant tables
-       You may find that mysql_install_db fails to install the grant
-       tables and terminates after displaying the following messages:
+       You may find that mysql_install_db fails to install the
+       grant tables and terminates after displaying the
+       following messages:
 Starting mysqld daemon with databases from XXXXXX
 mysqld ended
+
        In this case, you should examine the error log file very
-       carefully. The log should be located in the directory XXXXXX
-       named by the error message and should indicate why mysqld did
-       not start. If you do not understand what happened, include the
-       log when you post a bug report. See Section 1.7, "How to
-       Report Bugs or Problems."
+       carefully. The log should be located in the directory
+       XXXXXX named by the error message and should indicate why
+       mysqld did not start. If you do not understand what
+       happened, include the log when you post a bug report. See
+       Section 1.7, "How to Report Bugs or Problems."
 
      * There is a mysqld process running
-       This indicates that the server is running, in which case the
-       grant tables have probably been created already. If so, there
-       is no need to run mysql_install_db at all because it needs to
-       be run only once (when you install MySQL the first time).
+       This indicates that the server is running, in which case
+       the grant tables have probably been created already. If
+       so, there is no need to run mysql_install_db at all
+       because it needs to be run only once, when you first
+       install MySQL.
 
      * Installing a second mysqld server does not work when one
        server is running
-       This can happen when you have an existing MySQL installation,
-       but want to put a new installation in a different location.
-       For example, you might have a production installation, but you
-       want to create a second installation for testing purposes.
-       Generally the problem that occurs when you try to run a second
-       server is that it tries to use a network interface that is in
-       use by the first server. In this case, you should see one of
-       the following error messages:
+       This can happen when you have an existing MySQL
+       installation, but want to put a new installation in a
+       different location. For example, you might have a
+       production installation, but you want to create a second
+       installation for testing purposes. Generally the problem
+       that occurs when you try to run a second server is that
+       it tries to use a network interface that is in use by the
+       first server. In this case, you should see one of the
+       following error messages:
 Can't start server: Bind on TCP/IP port:
 Address already in use
 Can't start server: Bind on unix socket...
-       For instructions on setting up multiple servers, see Section
-       5.3, "Running Multiple MySQL Instances on One Machine."
+
+       For instructions on setting up multiple servers, see
+       Section 5.3, "Running Multiple MySQL Instances on One
+       Machine."
 
      * You do not have write access to the /tmp directory
-       If you do not have write access to create temporary files or a
-       Unix socket file in the default location (the /tmp directory)
-       or the TMP_DIR environment variable, if it has been set, an
-       error occurs when you run mysql_install_db or the mysqld
-       server.
+       If you do not have write access to create temporary files
+       or a Unix socket file in the default location (the /tmp
+       directory) or the TMPDIR environment variable, if it has
+       been set, an error occurs when you run mysql_install_db
+       or the mysqld server.
        You can specify different locations for the temporary
-       directory and Unix socket file by executing these commands
-       prior to starting mysql_install_db or mysqld, where
-       some_tmp_dir is the full path name to some directory for which
-       you have write permission:
+       directory and Unix socket file by executing these
+       commands prior to starting mysql_install_db or mysqld,
+       where some_tmp_dir is the full path name to some
+       directory for which you have write permission:
 shell> TMPDIR=/some_tmp_dir/
 shell> MYSQL_UNIX_PORT=/some_tmp_dir/mysql.sock
 shell> export TMPDIR MYSQL_UNIX_PORT
-       Then you should be able to run mysql_install_db and start the
-       server with these commands:
+
+       Then you should be able to run mysql_install_db and start
+       the server with these commands:
 shell> scripts/mysql_install_db --user=mysql
 shell> bin/mysqld_safe --user=mysql &
+
        If mysql_install_db is located in the scripts directory,
        modify the first command to scripts/mysql_install_db.
-       See Section C.5.4.5, "How to Protect or Change the MySQL Unix
-       Socket File," and Section 2.13, "Environment Variables."
+       See Section B.5.4.5, "How to Protect or Change the MySQL
+       Unix Socket File," and Section 2.12, "Environment
+       Variables."
 
-   There are some alternatives to running the mysql_install_db script
-   provided in the MySQL distribution:
+   There are some alternatives to running the mysql_install_db
+   program provided in the MySQL distribution:
 
-     * If you want the initial privileges to be different from the
-       standard defaults, you can modify mysql_install_db before you
-       run it. However, it is preferable to use GRANT and REVOKE to
-       change the privileges after the grant tables have been set up.
-       In other words, you can run mysql_install_db, and then use
-       mysql -u root mysql to connect to the server as the MySQL root
-       user so that you can issue the necessary GRANT and REVOKE
-       statements.
-       If you want to install MySQL on several machines with the same
-       privileges, you can put the GRANT and REVOKE statements in a
-       file and execute the file as a script using mysql after
+     * If you want the initial privileges to be different from
+       the standard defaults, use account-management statements
+       such as CREATE USER, GRANT, and REVOKE to change the
+       privileges after the grant tables have been set up. In
+       other words, run mysql_install_db, and then use mysql -u
+       root mysql to connect to the server as the MySQL root
+       user so that you can issue the necessary statements. (See
+       xref linkend="account-management-sql"/>.)
+       To install MySQL on several machines with the same
+       privileges, put the GRANT and REVOKE statements in a file
+       and execute the file as a script using mysql after
        running mysql_install_db. For example:
 shell> scripts/mysql_install_db --user=mysql
 shell> bin/mysql -u root < your_script_file
-       By doing this, you can avoid having to issue the statements
-       manually on each machine.
 
-     * It is possible to re-create the grant tables completely after
-       they have previously been created. You might want to do this
-       if you are just learning how to use GRANT and REVOKE and have
-       made so many modifications after running mysql_install_db that
-       you want to wipe out the tables and start over.
-       To re-create the grant tables, remove all the .frm, .MYI, and
-       .MYD files in the mysql database directory. Then run the
-       mysql_install_db script again.
-
-     * You can start mysqld manually using the --skip-grant-tables
-       option and add the privilege information yourself using mysql:
-shell> bin/mysqld_safe --user=mysql --skip-grant-tables &
-shell> bin/mysql mysql
-       From mysql, manually execute the SQL commands contained in
-       mysql_install_db. Make sure that you run mysqladmin
-       flush-privileges or mysqladmin reload afterward to tell the
-       server to reload the grant tables.
-       Note that by not using mysql_install_db, you not only have to
-       populate the grant tables manually, you also have to create
-       them first.
+       This enables you to avoid issuing the statements manually
+       on each machine.
 
-2.11.1.2. Starting and Stopping MySQL Automatically
+     * It is possible to re-create the grant tables completely
+       after they have previously been created. You might want
+       to do this if you are just learning how to use GRANT and
+       REVOKE and have made so many modifications after running
+       mysql_install_db that you want to wipe out the tables and
+       start over.
+       To re-create the grant tables, stop the server if it is
+       running and remove the mysql database directory. Then run
+       mysql_install_db again.
+
+2.10.2 Securing the Initial MySQL Accounts
+
+   Part of the MySQL installation process is to set up, in the
+   data directory, the mysql database that contains the grant
+   tables:
 
-   Generally, you start the mysqld server in one of these ways:
+     * Windows distributions contain preinitialized grant
+       tables.
 
-     * Invoke mysqld directly. This works on any platform.
+     * On Unix, the mysql_install_db program populates the grant
+       tables. Some installation methods run this program for
+       you. Others require that you execute it manually. For
+       details, see Section 2.10.1, "Postinstallation Procedures
+       for Unix-like Systems."
+
+   The mysql.user grant table defines the initial MySQL user
+   accounts and their access privileges:
+
+     * Some accounts have the user name root. These are
+       superuser accounts that have all privileges and can do
+       anything. The initial root account passwords are empty,
+       so anyone can connect to the MySQL server as root without
+       a password and be granted all privileges.
 
-     * Invoke mysqld_safe, which tries to determine the proper
-       options for mysqld and then runs it with those options. This
-       script is used on Unix and Unix-like systems. See Section
-       4.3.2, "mysqld_safe --- MySQL Server Startup Script."
-
-     * Invoke mysql.server. This script is used primarily at system
-       startup and shutdown on systems that use System V-style run
-       directories (that is, /etc/init.d and run-level specific
-       directories), where it usually is installed under the name
-       mysql. The mysql.server script starts the server by invoking
-       mysqld_safe. See Section 4.3.3, "mysql.server --- MySQL Server
-       Startup Script."
-
-     * On Mac OS X, install a separate MySQL Startup Item package to
-       enable the automatic startup of MySQL on system startup. The
-       Startup Item starts the server by invoking mysql.server. See
-       Section 2.4.3, "Installing the MySQL Startup Item," for
-       details. A MySQL Preference Pane also provides control for
-       starting and stopping MySQL through the System Preferences,
-       see Section 2.4.4, "Installing and Using the MySQL Preference
-       Pane."
-
-     * Use the Solaris/OpenSolaris service management framework (SMF)
-       system to initiate and control MySQL startup. For more
-       information, see Section 2.7.2, "Installing MySQL on
-       OpenSolaris Using IPS."
+          + On Windows, root accounts are created that permit
+            connections from the local host only. Connections
+            can be made by specifying the host name localhost,
+            the IP address 127.0.0.1, or the IPv6 address ::1.
+            If the user selects the Enable root access from
+            remote machines option during installation, the
+            Windows installer creates another root account that
+            permits connections from any host.
+
+          + On Unix, each root account permits connections from
+            the local host. Connections can be made by
+            specifying the host name localhost, the IP address
+            127.0.0.1, the IPv6 address ::1, or the actual host
+            name or IP address.
+       An attempt to connect to the host 127.0.0.1 normally
+       resolves to the localhost account. However, this fails if
+       the server is run with the --skip-name-resolve option, so
+       the 127.0.0.1 account is useful in that case. The ::1
+       account is used for IPv6 connections.
+
+     * If accounts for anonymous users were created, these have
+       an empty user name. The anonymous accounts have no
+       password, so anyone can use them to connect to the MySQL
+       server.
 
-   The mysqld_safe and mysql.server scripts, Solaris/OpenSolaris SMF,
-   and the Mac OS X Startup Item (or MySQL Preference Pane) can be
-   used to start the server manually, or automatically at system
-   startup time. mysql.server and the Startup Item also can be used
-   to stop the server.
+          + On Windows, there is one anonymous account that
+            permits connections from the local host. Connections
+            can be made by specifying a host name of localhost.
+
+          + On Unix, each anonymous account permits connections
+            from the local host. Connections can be made by
+            specifying a host name of localhost for one of the
+            accounts, or the actual host name or IP address for
+            the other.
+
+   To display which accounts exist in the mysql.user table and
+   check whether their passwords are empty, use the following
+   statement:
+mysql> SELECT User, Host, Password FROM mysql.user;
++------+--------------------+----------+
+| User | Host               | Password |
++------+--------------------+----------+
+| root | localhost          |          |
+| root | myhost.example.com |          |
+| root | 127.0.0.1          |          |
+| root | ::1                |          |
+|      | localhost          |          |
+|      | myhost.example.com |          |
++------+--------------------+----------+
 
-   To start or stop the server manually using the mysql.server
-   script, invoke it with start or stop arguments:
-shell> mysql.server start
-shell> mysql.server stop
+   This output indicates that there are several root and
+   anonymous-user accounts, none of which have passwords. The
+   output might differ on your system, but the presence of
+   accounts with empty passwords means that your MySQL
+   installation is unprotected until you do something about it:
+
+     * You should assign a password to each MySQL root account
+       that does not have one.
+
+     * If you want to prevent clients from connecting as
+       anonymous users without a password, you should either
+       assign a password to each anonymous account or else
+       remove the accounts.
 
-   Before mysql.server starts the server, it changes location to the
-   MySQL installation directory, and then invokes mysqld_safe. If you
-   want the server to run as some specific user, add an appropriate
-   user option to the [mysqld] group of the /etc/my.cnf option file,
-   as shown later in this section. (It is possible that you will need
-   to edit mysql.server if you've installed a binary distribution of
-   MySQL in a nonstandard location. Modify it to change location into
-   the proper directory before it runs mysqld_safe. If you do this,
-   your modified version of mysql.server may be overwritten if you
-   upgrade MySQL in the future, so you should make a copy of your
-   edited version that you can reinstall.)
+   In addition, the mysql.db table contains rows that permit all
+   accounts to access the test database and other databases with
+   names that start with test_. This is true even for accounts
+   that otherwise have no special privileges such as the default
+   anonymous accounts. This is convenient for testing but
+   inadvisable on production servers. Administrators who want
+   database access restricted only to accounts that have
+   permissions granted explicitly for that purpose should remove
+   these mysql.db table rows.
+
+   The following instructions describe how to set up passwords
+   for the initial MySQL accounts, first for the root accounts,
+   then for the anonymous accounts. The instructions also cover
+   how to remove the anonymous accounts, should you prefer not
+   to permit anonymous access at all, and describe how to remove
+   permissive access to test databases. Replace newpwd in the
+   examples with the password that you want to use. Replace
+   host_name with the name of the server host. You can determine
+   this name from the output of the preceding SELECT statement.
+   For the output shown, host_name is myhost.example.com.
+   Note
+
+   For additional information about setting passwords, see
+   Section 6.3.5, "Assigning Account Passwords." If you forget
+   your root password after setting it, see Section B.5.4.1,
+   "How to Reset the Root Password."
 
-   mysql.server stop stops the server by sending a signal to it. You
-   can also stop the server manually by executing mysqladmin
-   shutdown.
+   You might want to defer setting the passwords until later, to
+   avoid the need to specify them while you perform additional
+   setup or testing. However, be sure to set them before using
+   your installation for production purposes.
+
+   To set up additional accounts, see Section 6.3.2, "Adding
+   User Accounts."
+   Note
 
-   To start and stop MySQL automatically on your server, you need to
-   add start and stop commands to the appropriate places in your
-   /etc/rc* files.
+   On Windows, you can also perform the process described in
+   this section using the Configuration Wizard (see Section
+   2.3.6.11, "The Security Options Dialog"). On all platforms,
+   the MySQL distribution includes mysql_secure_installation, a
+   command-line utility that automates much of the process of
+   securing a MySQL installation.
 
-   If you use the Linux server RPM package
-   (MySQL-server-VERSION.rpm), or a native Linux package
-   installation, the mysql.server script may be installed in the
-   /etc/init.d directory with the name mysql. See Section 2.5.1,
-   "Installing MySQL on Linux Using RPM Packages," for more
-   information on the Linux RPM packages.
+Assigning root Account Passwords
+
+   A root account password can be set several ways. The
+   following discussion demonstrates three methods:
+
+     * Use the SET PASSWORD statement
+
+     * Use the UPDATE statement
+
+     * Use the mysqladmin command-line client program
+
+   To assign passwords using SET PASSWORD, connect to the server
+   as root and issue a SET PASSWORD statement for each root
+   account listed in the mysql.user table. Be sure to encrypt
+   the password using the PASSWORD() function.
+
+   For Windows, do this:
+shell> mysql -u root
+mysql> SET PASSWORD FOR 'root'@'localhost' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR 'root'@'::1' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR 'root'@'%' = PASSWORD('newpwd');
+
+   The last statement is unnecessary if the mysql.user table has
+   no root account with a host value of %.
+
+   For Unix, do this:
+shell> mysql -u root
+mysql> SET PASSWORD FOR 'root'@'localhost' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR 'root'@'::1' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR 'root'@'host_name' = PASSWORD('newpwd');
+
+   You can also use a single statement that assigns a password
+   to all root accounts by using UPDATE to modify the mysql.user
+   table directly. This method works on any platform:
+shell> mysql -u root
+mysql> UPDATE mysql.user SET Password = PASSWORD('newpwd')
+    ->     WHERE User = 'root';
+mysql> FLUSH PRIVILEGES;
+
+   The FLUSH statement causes the server to reread the grant
+   tables. Without it, the password change remains unnoticed by
+   the server until you restart it.
+
+   To assign passwords to the root accounts using mysqladmin,
+   execute the following commands:
+shell> mysqladmin -u root password "newpwd"
+shell> mysqladmin -u root -h host_name password "newpwd"
+
+   Those commands apply both to Windows and to Unix. The double
+   quotation marks around the password are not always necessary,
+   but you should use them if the password contains spaces or
+   other characters that are special to your command
+   interpreter.
+
+   The mysqladmin method of setting the root account passwords
+   does not work for the 'root'@'127.0.0.1' or 'root'@'::1'
+   account. Use the SET PASSWORD method shown earlier.
+
+   After the root passwords have been set, you must supply the
+   appropriate password whenever you connect as root to the
+   server. For example, to shut down the server with mysqladmin,
+   use this command:
+shell> mysqladmin -u root -p shutdown
+Enter password: (enter root password here)
+
+Assigning Anonymous Account Passwords
+
+   The mysql commands in the following instructions include a -p
+   option based on the assumption that you have set the root
+   account passwords using the preceding instructions and must
+   specify that password when connecting to the server.
+
+   To assign passwords to the anonymous accounts, connect to the
+   server as root, then use either SET PASSWORD or UPDATE. Be
+   sure to encrypt the password using the PASSWORD() function.
+
+   To use SET PASSWORD on Windows, do this:
+shell> mysql -u root -p
+Enter password: (enter root password here)
+mysql> SET PASSWORD FOR ''@'localhost' = PASSWORD('newpwd');
+
+   To use SET PASSWORD on Unix, do this:
+shell> mysql -u root -p
+Enter password: (enter root password here)
+mysql> SET PASSWORD FOR ''@'localhost' = PASSWORD('newpwd');
+mysql> SET PASSWORD FOR ''@'host_name' = PASSWORD('newpwd');
+
+   To set the anonymous-user account passwords with a single
+   UPDATE statement, do this (on any platform):
+shell> mysql -u root -p
+Enter password: (enter root password here)
+mysql> UPDATE mysql.user SET Password = PASSWORD('newpwd')
+    ->     WHERE User = '';
+mysql> FLUSH PRIVILEGES;
+
+   The FLUSH statement causes the server to reread the grant
+   tables. Without it, the password change remains unnoticed by
+   the server until you restart it.
+
+Removing Anonymous Accounts
+
+   If you prefer to remove any anonymous accounts rather than
+   assigning them passwords, do so as follows on Windows:
+shell> mysql -u root -p
+Enter password: (enter root password here)
+mysql> DROP USER ''@'localhost';
+
+   On Unix, remove the anonymous accounts like this:
+shell> mysql -u root -p
+Enter password: (enter root password here)
+mysql> DROP USER ''@'localhost';
+mysql> DROP USER ''@'host_name';
+
+Securing Test Databases
+
+   By default, the mysql.db table contains rows that permit
+   access by any user to the test database and other databases
+   with names that start with test_. (These rows have an empty
+   User column value, which for access-checking purposes matches
+   any user name.) This means that such databases can be used
+   even by accounts that otherwise possess no privileges. If you
+   want to remove any-user access to test databases, do so as
+   follows:
+shell> mysql -u root -p
+Enter password: (enter root password here)
+mysql> DELETE FROM mysql.db WHERE Db LIKE 'test%';
+mysql> FLUSH PRIVILEGES;
+
+   The FLUSH statement causes the server to reread the grant
+   tables. Without it, the privilege change remains unnoticed by
+   the server until you restart it.
+
+   With the preceding change, only users who have global
+   database privileges or privileges granted explicitly for the
+   test database can use it. However, if you do not want the
+   database to exist at all, drop it:
+mysql> DROP DATABASE test;
+
+2.10.3 Starting and Stopping MySQL Automatically
+
+   Generally, you start the mysqld server in one of these ways:
+
+     * Invoke mysqld directly. This works on any platform.
+
+     * Invoke mysqld_safe, which tries to determine the proper
+       options for mysqld and then runs it with those options.
+       This script is used on Unix and Unix-like systems. See
+       Section 4.3.2, "mysqld_safe --- MySQL Server Startup
+       Script."
+
+     * Invoke mysql.server. This script is used primarily at
+       system startup and shutdown on systems that use System
+       V-style run directories (that is, /etc/init.d and
+       run-level specific directories), where it usually is
+       installed under the name mysql. The mysql.server script
+       starts the server by invoking mysqld_safe. See Section
+       4.3.3, "mysql.server --- MySQL Server Startup Script."
+
+     * On OS X, install a separate MySQL Startup Item package to
+       enable the automatic startup of MySQL on system startup.
+       The Startup Item starts the server by invoking
+       mysql.server. See Section 2.4.4, "Installing the MySQL
+       Startup Item," for details. A MySQL Preference Pane also
+       provides control for starting and stopping MySQL through
+       the System Preferences, see Section 2.4.5, "Installing
+       and Using the MySQL Preference Pane."
+
+     * Use the Solaris/OpenSolaris service management framework
+       (SMF) system to initiate and control MySQL startup. For
+       more information, see Section 2.7.2, "Installing MySQL on
+       OpenSolaris Using IPS."
+
+   The mysqld_safe and mysql.server scripts, Solaris/OpenSolaris
+   SMF, and the OS X Startup Item (or MySQL Preference Pane) can
+   be used to start the server manually, or automatically at
+   system startup time. mysql.server and the Startup Item also
+   can be used to stop the server.
+
+   To start or stop the server manually using the mysql.server
+   script, invoke it with start or stop arguments:
+shell> mysql.server start
+shell> mysql.server stop
+
+   Before mysql.server starts the server, it changes location to
+   the MySQL installation directory, and then invokes
+   mysqld_safe. If you want the server to run as some specific
+   user, add an appropriate user option to the [mysqld] group of
+   the /etc/my.cnf option file, as shown later in this section.
+   (It is possible that you must edit mysql.server if you've
+   installed a binary distribution of MySQL in a nonstandard
+   location. Modify it to change location into the proper
+   directory before it runs mysqld_safe. If you do this, your
+   modified version of mysql.server may be overwritten if you
+   upgrade MySQL in the future, so you should make a copy of
+   your edited version that you can reinstall.)
+
+   mysql.server stop stops the server by sending a signal to it.
+   You can also stop the server manually by executing mysqladmin
+   shutdown.
+
+   To start and stop MySQL automatically on your server, you
+   must add start and stop commands to the appropriate places in
+   your /etc/rc* files.
+
+   If you use the Linux server RPM package
+   (MySQL-server-VERSION.rpm), or a native Linux package
+   installation, the mysql.server script may be installed in the
+   /etc/init.d directory with the name mysql. See Section 2.5.1,
+   "Installing MySQL on Linux Using RPM Packages," for more
+   information on the Linux RPM packages.
 
-   Some vendors provide RPM packages that install a startup script
-   under a different name such as mysqld.
+   Some vendors provide RPM packages that install a startup
+   script under a different name such as mysqld.
 
-   If you install MySQL from a source distribution or using a binary
-   distribution format that does not install mysql.server
+   If you install MySQL from a source distribution or using a
+   binary distribution format that does not install mysql.server
    automatically, you can install it manually. The script can be
-   found in the support-files directory under the MySQL installation
-   directory or in a MySQL source tree.
+   found in the support-files directory under the MySQL
+   installation directory or in a MySQL source tree.
 
    To install mysql.server manually, copy it to the /etc/init.d
-   directory with the name mysql, and then make it executable. Do
-   this by changing location into the appropriate directory where
-   mysql.server is located and executing these commands:
+   directory with the name mysql, and then make it executable:
 shell> cp mysql.server /etc/init.d/mysql
 shell> chmod +x /etc/init.d/mysql
 
    Note
 
-   Older Red Hat systems use the /etc/rc.d/init.d directory rather
-   than /etc/init.d. Adjust the preceding commands accordingly.
-   Alternatively, first create /etc/init.d as a symbolic link that
-   points to /etc/rc.d/init.d:
+   Older Red Hat systems use the /etc/rc.d/init.d directory
+   rather than /etc/init.d. Adjust the preceding commands
+   accordingly. Alternatively, first create /etc/init.d as a
+   symbolic link that points to /etc/rc.d/init.d:
 shell> cd /etc
 shell> ln -s rc.d/init.d .
 
-   After installing the script, the commands needed to activate it to
-   run at system startup depend on your operating system. On Linux,
-   you can use chkconfig:
+   After installing the script, the commands needed to activate
+   it to run at system startup depend on your operating system.
+   On Linux, you can use chkconfig:
 shell> chkconfig --add mysql
 
    On some Linux systems, the following command also seems to be
@@ -7004,25 +8001,26 @@
 shell> chkconfig --level 345 mysql on
 
    On FreeBSD, startup scripts generally should go in
-   /usr/local/etc/rc.d/. The rc(8) manual page states that scripts in
-   this directory are executed only if their basename matches the
-   *.sh shell file name pattern. Any other files or directories
-   present within the directory are silently ignored. In other words,
-   on FreeBSD, you should install the mysql.server script as
-   /usr/local/etc/rc.d/mysql.server.sh to enable automatic startup.
-
-   As an alternative to the preceding setup, some operating systems
-   also use /etc/rc.local or /etc/init.d/boot.local to start
-   additional services on startup. To start up MySQL using this
-   method, you could append a command like the one following to the
+   /usr/local/etc/rc.d/. The rc(8) manual page states that
+   scripts in this directory are executed only if their basename
+   matches the *.sh shell file name pattern. Any other files or
+   directories present within the directory are silently
+   ignored. In other words, on FreeBSD, you should install the
+   mysql.server script as /usr/local/etc/rc.d/mysql.server.sh to
+   enable automatic startup.
+
+   As an alternative to the preceding setup, some operating
+   systems also use /etc/rc.local or /etc/init.d/boot.local to
+   start additional services on startup. To start up MySQL using
+   this method, append a command like the one following to the
    appropriate startup file:
 /bin/sh -c 'cd /usr/local/mysql; ./bin/mysqld_safe --user=mysql &'
 
-   For other systems, consult your operating system documentation to
-   see how to install startup scripts.
+   For other systems, consult your operating system
+   documentation to see how to install startup scripts.
 
-   You can add options for mysql.server in a global /etc/my.cnf file.
-   A typical /etc/my.cnf file might look like this:
+   You can add options for mysql.server in a global /etc/my.cnf
+   file. A typical /etc/my.cnf file might look like this:
 [mysqld]
 datadir=/usr/local/mysql/var
 socket=/var/tmp/mysql.sock
@@ -7032,15 +8030,16 @@
 [mysql.server]
 basedir=/usr/local/mysql
 
-   The mysql.server script supports the following options: basedir,
-   datadir, and pid-file. If specified, they must be placed in an
-   option file, not on the command line. mysql.server supports only
-   start and stop as command-line arguments.
+   The mysql.server script supports the following options:
+   basedir, datadir, and pid-file. If specified, they must be
+   placed in an option file, not on the command line.
+   mysql.server supports only start and stop as command-line
+   arguments.
 
-   The following table shows which option groups the server and each
-   startup script read from option files.
+   The following table shows which option groups the server and
+   each startup script read from option files.
 
-   Table 2.17. MySQL Startup scripts and supported server option
+   Table 2.14 MySQL Startup scripts and supported server option
    groups
       Script                  Option Groups
    mysqld       [mysqld], [server], [mysqld-major_version]
@@ -7048,95 +8047,98 @@
    mysql.server [mysqld], [mysql.server], [server]
 
    [mysqld-major_version] means that groups with names like
-   [mysqld-5.1] and [mysqld-5.5] are read by servers having versions
-   5.1.x, 5.5.x, and so forth. This feature can be used to specify
-   options that can be read only by servers within a given release
-   series.
+   [mysqld-5.1] and [mysqld-5.5] are read by servers having
+   versions 5.1.x, 5.5.x, and so forth. This feature can be used
+   to specify options that can be read only by servers within a
+   given release series.
 
    For backward compatibility, mysql.server also reads the
-   [mysql_server] group and mysqld_safe also reads the [safe_mysqld]
-   group. However, you should update your option files to use the
-   [mysql.server] and [mysqld_safe] groups instead when using MySQL
-   5.5.
+   [mysql_server] group and mysqld_safe also reads the
+   [safe_mysqld] group. However, you should update your option
+   files to use the [mysql.server] and [mysqld_safe] groups
+   instead.
 
    For more information on MySQL configuration files and their
-   structure and contents, see Section 4.2.3.3, "Using Option Files."
+   structure and contents, see Section 4.2.6, "Using Option
+   Files."
 
-2.11.1.3. Starting and Troubleshooting the MySQL Server
+2.10.4 Troubleshooting Problems Starting the MySQL Server
 
-   This section provides troubleshooting suggestions for problems
-   starting the server on a Unix-like system. If you are using
-   Windows, see Section 2.3.8, "Troubleshooting a Microsoft Windows
-   MySQL Server Installation."
+   This section provides troubleshooting suggestions for
+   problems starting the server. For additional suggestions for
+   Windows systems, see Section 2.3.8, "Troubleshooting a
+   Microsoft Windows MySQL Server Installation."
 
-   If you have problems starting the server, here are some things to
-   try:
+   If you have problems starting the server, here are some
+   things to try:
 
      * Check the error log to see why the server does not start.
 
-     * Specify any special options needed by the storage engines you
-       are using.
+     * Specify any special options needed by the storage engines
+       you are using.
 
      * Make sure that the server knows where to find the data
        directory.
 
-     * Make sure that the server can access the data directory. The
-       ownership and permissions of the data directory and its
-       contents must be set such that the server can read and modify
-       them.
-
-     * Verify that the network interfaces the server wants to use are
-       available.
-
-   Some storage engines have options that control their behavior. You
-   can create a my.cnf file and specify startup options for the
-   engines that you plan to use. If you are going to use storage
-   engines that support transactional tables (InnoDB, NDB), be sure
-   that you have them configured the way you want before starting the
-   server:
+     * Make sure that the server can access the data directory.
+       The ownership and permissions of the data directory and
+       its contents must be set such that the server can read
+       and modify them.
+
+     * Verify that the network interfaces the server wants to
+       use are available.
+
+   Some storage engines have options that control their
+   behavior. You can create a my.cnf file and specify startup
+   options for the engines that you plan to use. If you are
+   going to use storage engines that support transactional
+   tables (InnoDB, NDB), be sure that you have them configured
+   the way you want before starting the server:
 
-   If you are using InnoDB tables, see Section 14.3.7, "InnoDB
+   If you are using InnoDB tables, see Section 14.6, "InnoDB
    Configuration."
 
    Storage engines will use default option values if you specify
-   none, but it is recommended that you review the available options
-   and specify explicit values for those for which the defaults are
-   not appropriate for your installation.
-
-   When the mysqld server starts, it changes location to the data
-   directory. This is where it expects to find databases and where it
-   expects to write log files. The server also writes the pid
-   (process ID) file in the data directory.
-
-   The data directory location is hardwired in when the server is
-   compiled. This is where the server looks for the data directory by
-   default. If the data directory is located somewhere else on your
-   system, the server will not work properly. You can determine what
-   the default path settings are by invoking mysqld with the
-   --verbose and --help options.
+   none, but it is recommended that you review the available
+   options and specify explicit values for those for which the
+   defaults are not appropriate for your installation.
+
+   When the mysqld server starts, it changes location to the
+   data directory. This is where it expects to find databases
+   and where it expects to write log files. The server also
+   writes the pid (process ID) file in the data directory.
+
+   The data directory location is hardwired in when the server
+   is compiled. This is where the server looks for the data
+   directory by default. If the data directory is located
+   somewhere else on your system, the server will not work
+   properly. You can determine what the default path settings
+   are by invoking mysqld with the --verbose and --help options.
 
    If the default locations do not match the MySQL installation
-   layout on your system, you can override them by specifying options
-   to mysqld or mysqld_safe on the command line or in an option file.
-
-   To specify the location of the data directory explicitly, use the
-   --datadir option. However, normally you can tell mysqld the
-   location of the base directory under which MySQL is installed and
-   it looks for the data directory there. You can do this with the
-   --basedir option.
-
-   To check the effect of specifying path options, invoke mysqld with
-   those options followed by the --verbose and --help options. For
-   example, if you change location into the directory where mysqld is
-   installed and then run the following command, it shows the effect
-   of starting the server with a base directory of /usr/local:
+   layout on your system, you can override them by specifying
+   options to mysqld or mysqld_safe on the command line or in an
+   option file.
+
+   To specify the location of the data directory explicitly, use
+   the --datadir option. However, normally you can tell mysqld
+   the location of the base directory under which MySQL is
+   installed and it looks for the data directory there. You can
+   do this with the --basedir option.
+
+   To check the effect of specifying path options, invoke mysqld
+   with those options followed by the --verbose and --help
+   options. For example, if you change location into the
+   directory where mysqld is installed and then run the
+   following command, it shows the effect of starting the server
+   with a base directory of /usr/local:
 shell> ./mysqld --basedir=/usr/local --verbose --help
 
    You can specify other options such as --datadir as well, but
    --verbose and --help must be the last options.
 
-   Once you determine the path settings you want, start the server
-   without --verbose and --help.
+   Once you determine the path settings you want, start the
+   server without --verbose and --help.
 
    If mysqld is currently running, you can find out what path
    settings it is using by executing this command:
@@ -7149,393 +8151,138 @@
 
    If you get Errcode 13 (which means Permission denied) when
    starting mysqld, this means that the privileges of the data
-   directory or its contents do not permit server access. In this
-   case, you change the permissions for the involved files and
-   directories so that the server has the right to use them. You can
-   also start the server as root, but this raises security issues and
-   should be avoided.
-
-   Change location into the data directory and check the ownership of
-   the data directory and its contents to make sure the server has
-   access. For example, if the data directory is
+   directory or its contents do not permit server access. In
+   this case, you change the permissions for the involved files
+   and directories so that the server has the right to use them.
+   You can also start the server as root, but this raises
+   security issues and should be avoided.
+
+   Change location into the data directory and check the
+   ownership of the data directory and its contents to make sure
+   the server has access. For example, if the data directory is
    /usr/local/mysql/var, use this command:
 shell> ls -la /usr/local/mysql/var
 
-   If the data directory or its files or subdirectories are not owned
-   by the login account that you use for running the server, change
-   their ownership to that account. If the account is named mysql,
-   use these commands:
+   If the data directory or its files or subdirectories are not
+   owned by the login account that you use for running the
+   server, change their ownership to that account. If the
+   account is named mysql, use these commands:
 shell> chown -R mysql /usr/local/mysql/var
 shell> chgrp -R mysql /usr/local/mysql/var
 
-   If it possible that even with correct ownership, MySQL may fail to
-   start up if there is other security software running on your
-   system that manages application access to various parts of the
-   file system. In this case, you may need to reconfigure that
-   software to enable mysqld to access the directories it uses during
-   normal operation.
-
-   If the server fails to start up correctly, check the error log.
-   Log files are located in the data directory (typically C:\Program
-   Files\MySQL\MySQL Server 5.5\data on Windows,
-   /usr/local/mysql/data for a Unix/Linux binary distribution, and
-   /usr/local/var for a Unix/Linux source distribution). Look in the
-   data directory for files with names of the form host_name.err and
-   host_name.log, where host_name is the name of your server host.
-   Then examine the last few lines of these files. You can use tail
-   to display them:
+   If it possible that even with correct ownership, MySQL may
+   fail to start up if there is other security software running
+   on your system that manages application access to various
+   parts of the file system. In this case, you may need to
+   reconfigure that software to enable mysqld to access the
+   directories it uses during normal operation.
+
+   If the server fails to start up correctly, check the error
+   log. Log files are located in the data directory (typically
+   C:\Program Files\MySQL\MySQL Server 5.5\data on Windows,
+   /usr/local/mysql/data for a Unix/Linux binary distribution,
+   and /usr/local/var for a Unix/Linux source distribution).
+   Look in the data directory for files with names of the form
+   host_name.err and host_name.log, where host_name is the name
+   of your server host. Then examine the last few lines of these
+   files. You can use tail to display them:
 shell> tail host_name.err
 shell> tail host_name.log
 
-   The error log should contain information that indicates why the
-   server could not start.
+   The error log should contain information that indicates why
+   the server could not start.
 
-   If either of the following errors occur, it means that some other
-   program (perhaps another mysqld server) is using the TCP/IP port
-   or Unix socket file that mysqld is trying to use:
+   If either of the following errors occur, it means that some
+   other program (perhaps another mysqld server) is using the
+   TCP/IP port or Unix socket file that mysqld is trying to use:
 Can't start server: Bind on TCP/IP port: Address already in use
 Can't start server: Bind on unix socket...
 
    Use ps to determine whether you have another mysqld server
-   running. If so, shut down the server before starting mysqld again.
-   (If another server is running, and you really want to run multiple
-   servers, you can find information about how to do so in Section
-   5.3, "Running Multiple MySQL Instances on One Machine.")
-
-   If no other server is running, try to execute the command telnet
-   your_host_name tcp_ip_port_number. (The default MySQL port number
-   is 3306.) Then press Enter a couple of times. If you do not get an
-   error message like telnet: Unable to connect to remote host:
-   Connection refused, some other program is using the TCP/IP port
-   that mysqld is trying to use. You will need to track down what
-   program this is and disable it, or else tell mysqld to listen to a
-   different port with the --port option. In this case, you will also
-   need to specify the port number for client programs when
-   connecting to the server using TCP/IP.
-
-   Another reason the port might be inaccessible is that you have a
-   firewall running that blocks connections to it. If so, modify the
-   firewall settings to permit access to the port.
-
-   If the server starts but you cannot connect to it, you should make
-   sure that you have an entry in /etc/hosts that looks like this:
+   running. If so, shut down the server before starting mysqld
+   again. (If another server is running, and you really want to
+   run multiple servers, you can find information about how to
+   do so in Section 5.3, "Running Multiple MySQL Instances on
+   One Machine.")
+
+   If no other server is running, try to execute the command
+   telnet your_host_name tcp_ip_port_number. (The default MySQL
+   port number is 3306.) Then press Enter a couple of times. If
+   you do not get an error message like telnet: Unable to
+   connect to remote host: Connection refused, some other
+   program is using the TCP/IP port that mysqld is trying to
+   use. You will need to track down what program this is and
+   disable it, or else tell mysqld to listen to a different port
+   with the --port option. In this case, you will also need to
+   specify the port number for client programs when connecting
+   to the server using TCP/IP.
+
+   Another reason the port might be inaccessible is that you
+   have a firewall running that blocks connections to it. If so,
+   modify the firewall settings to permit access to the port.
+
+   If the server starts but you cannot connect to it, you should
+   make sure that you have an entry in /etc/hosts that looks
+   like this:
 127.0.0.1       localhost
 
-   If you cannot get mysqld to start, you can try to make a trace
-   file to find the problem by using the --debug option. See Section
-   23.4.3, "The DBUG Package."
-
-2.11.2. Securing the Initial MySQL Accounts
-
-   Part of the MySQL installation process is to set up the mysql
-   database that contains the grant tables:
-
-     * Windows distributions contain preinitialized grant tables.
-
-     * On Unix, the mysql_install_db program populates the grant
-       tables. Some installation methods run this program for you.
-       Others require that you execute it manually. For details, see
-       Section 2.11.1, "Postinstallation Procedures for Unix-like
-       Systems."
-
-   The mysql.user grant table defines the initial MySQL user accounts
-   and their access privileges:
-
-     * Some accounts have the user name root. These are superuser
-       accounts that have all privileges and can do anything. The
-       initial root account passwords are empty, so anyone can
-       connect to the MySQL server as root without a password and be
-       granted all privileges.
-
-          + On Windows, root accounts are created that permit
-            connections from the local host only. Connections can be
-            made by specifying the host name localhost, the IP
-            address 127.0.0.1, or the IPv6 address ::1. If the user
-            selects the Enable root access from remote machines
-            option during installation, the Windows installer creates
-            another root account that permits connections from any
-            host.
-
-          + On Unix, each root account permits connections from the
-            local host. Connections can be made by specifying the
-            host name localhost, the IP address 127.0.0.1, the IPv6
-            address ::1, or the actual host name or IP address.
-       An attempt to connect to the host 127.0.0.1 normally resolves
-       to the localhost account. However, this fails if the server is
-       run with the --skip-name-resolve option, so the 127.0.0.1
-       account is useful in that case. The ::1 account is used for
-       IPv6 connections.
-
-     * Some accounts are for anonymous users. These have an empty
-       user name. The anonymous accounts have no password, so anyone
-       can use them to connect to the MySQL server.
-
-          + On Windows, there is one anonymous account that permits
-            connections from the local host. Connections can be made
-            by specifying a host name of localhost.
-
-          + On Unix, each anonymous account permits connections from
-            the local host. Connections can be made by specifying a
-            host name of localhost for one of the accounts, or the
-            actual host name or IP address for the other.
-
-   To display which accounts exist in the mysql.user table and check
-   whether their passwords are empty, use the following statement:
-mysql> SELECT User, Host, Password FROM mysql.user;
-+------+--------------------+----------+
-| User | Host               | Password |
-+------+--------------------+----------+
-| root | localhost          |          |
-| root | myhost.example.com |          |
-| root | 127.0.0.1          |          |
-| root | ::1                |          |
-|      | localhost          |          |
-|      | myhost.example.com |          |
-+------+--------------------+----------+
-
-   This output indicates that there are several root and
-   anonymous-user accounts, none of which have passwords. The output
-   might differ on your system, but the presence of accounts with
-   empty passwords means that your MySQL installation is unprotected
-   until you do something about it:
-
-     * You should assign a password to each MySQL root account.
-
-     * If you want to prevent clients from connecting as anonymous
-       users without a password, you should either assign a password
-       to each anonymous account or else remove the accounts.
-
-   In addition, the mysql.db table contains rows that permit all
-   accounts to access the test database and other databases with
-   names that start with test_. This is true even for accounts that
-   otherwise have no special privileges such as the default anonymous
-   accounts. This is convenient for testing but inadvisable on
-   production servers. Administrators who want database access
-   restricted only to accounts that have permissions granted
-   explicitly for that purpose should remove these mysql.db table
-   rows.
-
-   The following instructions describe how to set up passwords for
-   the initial MySQL accounts, first for the root accounts, then for
-   the anonymous accounts. The instructions also cover how to remove
-   the anonymous accounts, should you prefer not to permit anonymous
-   access at all, and describe how to remove permissive access to
-   test databases. Replace newpwd in the examples with the password
-   that you want to use. Replace host_name with the name of the
-   server host. You can determine this name from the output of the
-   preceding SELECT statement. For the output shown, host_name is
-   myhost.example.com.
-   Note
-
-   For additional information about setting passwords, see Section
-   6.3.5, "Assigning Account Passwords." If you forget your root
-   password after setting it, see Section C.5.4.1, "How to Reset the
-   Root Password."
-
-   You might want to defer setting the passwords until later, to
-   avoid the need to specify them while you perform additional setup
-   or testing. However, be sure to set them before using your
-   installation for production purposes.
-
-   To set up additional accounts, see Section 6.3.2, "Adding User
-   Accounts."
-
-Assigning root Account Passwords
-
-   The root account passwords can be set several ways. The following
-   discussion demonstrates three methods:
-
-     * Use the SET PASSWORD statement
-
-     * Use the UPDATE statement
-
-     * Use the mysqladmin command-line client program
-
-   To assign passwords using SET PASSWORD, connect to the server as
-   root and issue a SET PASSWORD statement for each root account
-   listed in the mysql.user table. Be sure to encrypt the password
-   using the PASSWORD() function.
-
-   For Windows, do this:
-shell> mysql -u root
-mysql> SET PASSWORD FOR 'root'@'localhost' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR 'root'@'::1' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR 'root'@'%' = PASSWORD('newpwd');
-
-   The last statement is unnecessary if the mysql.user table has no
-   root account with a host value of %.
-
-   For Unix, do this:
-shell> mysql -u root
-mysql> SET PASSWORD FOR 'root'@'localhost' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR 'root'@'127.0.0.1' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR 'root'@'::1' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR 'root'@'host_name' = PASSWORD('newpwd');
-
-   You can also use a single statement that assigns a password to all
-   root accounts by using UPDATE to modify the mysql.user table
-   directly. This method works on any platform:
-shell> mysql -u root
-mysql> UPDATE mysql.user SET Password = PASSWORD('newpwd')
-    ->     WHERE User = 'root';
-mysql> FLUSH PRIVILEGES;
-
-   The FLUSH statement causes the server to reread the grant tables.
-   Without it, the password change remains unnoticed by the server
-   until you restart it.
-
-   To assign passwords to the root accounts using mysqladmin, execute
-   the following commands:
-shell> mysqladmin -u root password "newpwd"
-shell> mysqladmin -u root -h host_name password "newpwd"
-
-   Those commands apply both to Windows and to Unix. The double
-   quotation marks around the password are not always necessary, but
-   you should use them if the password contains spaces or other
-   characters that are special to your command interpreter.
-
-   The mysqladmin method of setting the root account passwords does
-   not work for the 'root'@'127.0.0.1' or 'root'@'::1' account. Use
-   the SET PASSWORD method shown earlier.
-
-   After the root passwords have been set, you must supply the
-   appropriate password whenever you connect as root to the server.
-   For example, to shut down the server with mysqladmin, use this
-   command:
-shell> mysqladmin -u root -p shutdown
-Enter password: (enter root password here)
-
-Assigning Anonymous Account Passwords
-
-   The mysql commands in the following instructions include a -p
-   option based on the assumption that you have set the root account
-   passwords using the preceding instructions and must specify that
-   password when connecting to the server.
-
-   To assign passwords to the anonymous accounts, connect to the
-   server as root, then use either SET PASSWORD or UPDATE. Be sure to
-   encrypt the password using the PASSWORD() function.
-
-   To use SET PASSWORD on Windows, do this:
-shell> mysql -u root -p
-Enter password: (enter root password here)
-mysql> SET PASSWORD FOR ''@'localhost' = PASSWORD('newpwd');
-
-   To use SET PASSWORD on Unix, do this:
-shell> mysql -u root -p
-Enter password: (enter root password here)
-mysql> SET PASSWORD FOR ''@'localhost' = PASSWORD('newpwd');
-mysql> SET PASSWORD FOR ''@'host_name' = PASSWORD('newpwd');
-
-   To set the anonymous-user account passwords with a single UPDATE
-   statement, do this (on any platform):
-shell> mysql -u root -p
-Enter password: (enter root password here)
-mysql> UPDATE mysql.user SET Password = PASSWORD('newpwd')
-    ->     WHERE User = '';
-mysql> FLUSH PRIVILEGES;
-
-   The FLUSH statement causes the server to reread the grant tables.
-   Without it, the password change remains unnoticed by the server
-   until you restart it.
-
-Removing Anonymous Accounts
-
-   If you prefer to remove any anonymous accounts rather than
-   assigning them passwords, do so as follows on Windows:
-shell> mysql -u root -p
-Enter password: (enter root password here)
-mysql> DROP USER ''@'localhost';
-
-   On Unix, remove the anonymous accounts like this:
-shell> mysql -u root -p
-Enter password: (enter root password here)
-mysql> DROP USER ''@'localhost';
-mysql> DROP USER ''@'host_name';
-
-Securing Test Databases
-
-   By default, the mysql.db table contains rows that permit access by
-   any user to the test database and other databases with names that
-   start with test_. (These rows have an empty User column value,
-   which for access-checking purposes matches any user name.) This
-   means that such databases can be used even by accounts that
-   otherwise possess no privileges. If you want to remove any-user
-   access to test databases, do so as follows:
-shell> mysql -u root -p
-Enter password: (enter root password here)
-mysql> DELETE FROM mysql.db WHERE Db LIKE 'test%';
-mysql> FLUSH PRIVILEGES;
-
-   The FLUSH statement causes the server to reread the grant tables.
-   Without it, the privilege change remains unnoticed by the server
-   until you restart it.
-
-   With the preceding change, only users who have global database
-   privileges or privileges granted explicitly for the test database
-   can use it. However, if you do not want the database to exist at
-   all, drop it:
-mysql> DROP DATABASE test;
+   If you cannot get mysqld to start, you can try to make a
+   trace file to find the problem by using the --debug option.
+   See Section 24.4.3, "The DBUG Package."
+
+2.11 Upgrading or Downgrading MySQL
+
+2.11.1 Upgrading MySQL
+
+   As a general rule, to upgrade from one release series to
+   another, go to the next series rather than skipping a series.
+   To upgrade from a release series previous to MySQL 5.1,
+   upgrade to each successive release series in turn until you
+   have reached MySQL 5.1, and then proceed with the upgrade to
+   MySQL 5.5. For example, if you currently are running MySQL
+   5.0 and wish to upgrade to a newer series, upgrade to MySQL
+   5.1 first before upgrading to 5.5, and so forth. For
+   information on upgrading to MySQL 5.1, see the MySQL 5.1
+   Reference Manual.
+
+   There is a special case for upgrading to MySQL 5.5, which is
+   that there was a short-lived MySQL 5.4 development series.
+   This series is no longer being worked on, but to accommodate
+   users of both series, this section includes one subsection
+   for users upgrading from MySQL 5.1 to 5.5 and another for
+   users upgrading from MySQL 5.4 to 5.5.
 
-   Note
-
-   On Windows, you can also perform the process described in this
-   section using the Configuration Wizard (see Section 2.3.6.11, "The
-   Security Options Dialog"). On all platforms, the MySQL
-   distribution includes mysql_secure_installation, a command-line
-   utility that automates much of the process of securing a MySQL
-   installation.
-
-2.12. Upgrading or Downgrading MySQL
-
-2.12.1. Upgrading MySQL
-
-   As a general rule, to upgrade from one release series to another,
-   go to the next series rather than skipping a series. To upgrade
-   from a release series previous to MySQL 5.1, upgrade to each
-   successive release series in turn until you have reached MySQL
-   5.1, and then proceed with the upgrade to MySQL 5.5. For example,
-   if you currently are running MySQL 5.0 and wish to upgrade to a
-   newer series, upgrade to MySQL 5.1 first before upgrading to 5.5,
-   and so forth. For information on upgrading to MySQL 5.1, see the
-   MySQL 5.1 Reference Manual.
-
-   There is a special case for upgrading to MySQL 5.5, which is that
-   there was a short-lived MySQL 5.4 development series. This series
-   is no longer being worked on, but to accommodate users of both
-   series, this section includes one subsection for users upgrading
-   from MySQL 5.1 to 5.5 and another for users upgrading from MySQL
-   5.4 to 5.5.
-
-   To upgrade to MySQL 5.5, use the items in the following checklist
-   as a guide:
+   To upgrade to MySQL 5.5, use the items in the following
+   checklist as a guide:
 
      * Before any upgrade, back up your databases, including the
-       mysql database that contains the grant tables. See Section
-       7.2, "Database Backup Methods."
+       mysql database that contains the grant tables. See
+       Section 7.2, "Database Backup Methods."
 
-     * Read all the notes in Section 2.12.1.1, "Upgrading from MySQL
-       5.1 to 5.5," or Section 2.12.1.2, "Upgrading from MySQL 5.4 to
-       5.5," depending on whether you currently use MySQL 5.1 or 5.4.
-       These notes enable you to identify upgrade issues that apply
-       to your current MySQL installation. Some incompatibilities
-       discussed in that section require your attention before
-       upgrading. Others should be dealt with after upgrading.
+     * Read all the notes in Section 2.11.1.1, "Upgrading from
+       MySQL 5.1 to 5.5," or Section 2.11.1.2, "Upgrading from
+       MySQL 5.4 to 5.5," depending on whether you currently use
+       MySQL 5.1 or 5.4. These notes enable you to identify
+       upgrade issues that apply to your current MySQL
+       installation. Some incompatibilities discussed in that
+       section require your attention before upgrading. Others
+       should be dealt with after upgrading.
 
      * Read the Release Notes
-       (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) as well,
-       which provide information about features that are new in MySQL
-       5.5 or differ from those found in earlier MySQL releases.
-
-     * After upgrading to a new version of MySQL, run mysql_upgrade
-       (see Section 4.4.7, "mysql_upgrade --- Check and Upgrade MySQL
-       Tables"). This program checks your tables, and attempts to
-       repair them if necessary. It also updates your grant tables to
-       make sure that they have the current structure so that you can
-       take advantage of any new capabilities. (Some releases of
-       MySQL introduce changes to the structure of the grant tables
-       to add new privileges or features.)
+       (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) as
+       well, which provide information about features that are
+       new in MySQL 5.5 or differ from those found in earlier
+       MySQL releases.
+
+     * After upgrading to a new version of MySQL, run
+       mysql_upgrade (see Section 4.4.7, "mysql_upgrade ---
+       Check and Upgrade MySQL Tables"). This program checks
+       your tables, and attempts to repair them if necessary. It
+       also updates your grant tables to make sure that they
+       have the current structure so that you can take advantage
+       of any new capabilities. (Some releases of MySQL
+       introduce changes to the structure of the grant tables to
+       add new privileges or features.)
        mysql_upgrade does not upgrade the contents of the help
        tables. For upgrade instructions, see Section 5.1.10,
        "Server-Side Help."
@@ -7543,157 +8290,170 @@
      * If you run MySQL Server on Windows, see Section 2.3.9,
        "Upgrading MySQL on Windows."
 
-     * If you use replication, see Section 16.4.3, "Upgrading a
+     * If you use replication, see Section 17.4.3, "Upgrading a
        Replication Setup," for information on upgrading your
        replication setup.
 
-     * If you use InnoDB, consider setting innodb_fast_shutdown to 0
-       before shutting down and upgrading your server. When you set
-       innodb_fast_shutdown to 0, InnoDB does a slow shutdown, a full
-       purge and an insert buffer merge before shutting down, which
-       ensures that all data files are fully prepared in case the
-       upgrade process modifies the file format.
+     * If you use InnoDB, consider setting innodb_fast_shutdown
+       to 0 before shutting down and upgrading your server. When
+       you set innodb_fast_shutdown to 0, InnoDB does a slow
+       shutdown, a full purge and an insert buffer merge before
+       shutting down, which ensures that all data files are
+       fully prepared in case the upgrade process modifies the
+       file format.
 
      * If you upgrade an installation originally produced by
-       installing multiple RPM packages, it is best to upgrade all
-       the packages, not just some. For example, if you previously
-       installed the server and client RPMs, do not upgrade just the
-       server RPM.
-
-     * If you have created a user-defined function (UDF) with a given
-       name and upgrade MySQL to a version that implements a new
-       built-in function with the same name, the UDF becomes
-       inaccessible. To correct this, use DROP FUNCTION to drop the
-       UDF, and then use CREATE FUNCTION to re-create the UDF with a
-       different nonconflicting name. The same is true if the new
-       version of MySQL implements a built-in function with the same
-       name as an existing stored function. See Section 9.2.4,
-       "Function Name Parsing and Resolution," for the rules
-       describing how the server interprets references to different
-       kinds of functions.
-
-   For upgrades between versions of a MySQL release series that has
-   reached General Availability status, you can move the MySQL format
-   files and data files between different versions on systems with
-   the same architecture. For upgrades to a version of a MySQL
-   release series that is in development status, that is not
-   necessarily true. Use of development releases is at your own risk.
+       installing multiple RPM packages, it is best to upgrade
+       all the packages, not just some. For example, if you
+       previously installed the server and client RPMs, do not
+       upgrade just the server RPM.
+
+     * If you have created a user-defined function (UDF) with a
+       given name and upgrade MySQL to a version that implements
+       a new built-in function with the same name, the UDF
+       becomes inaccessible. To correct this, use DROP FUNCTION
+       to drop the UDF, and then use CREATE FUNCTION to
+       re-create the UDF with a different nonconflicting name.
+       The same is true if the new version of MySQL implements a
+       built-in function with the same name as an existing
+       stored function. See Section 9.2.4, "Function Name
+       Parsing and Resolution," for the rules describing how the
+       server interprets references to different kinds of
+       functions.
+
+   For upgrades between versions of a MySQL release series that
+   has reached General Availability status, you can move the
+   MySQL format files and data files between different versions
+   on systems with the same architecture. For upgrades to a
+   version of a MySQL release series that is in development
+   status, that is not necessarily true. Use of development
+   releases is at your own risk.
 
    If you are cautious about using new versions, you can always
-   rename your old mysqld before installing a newer one. For example,
-   if you are using a version of MySQL 5.1 and want to upgrade to
-   5.5, rename your current server from mysqld to mysqld-5.1. If your
-   new mysqld then does something unexpected, you can simply shut it
-   down and restart with your old mysqld.
-
-   If problems occur, such as that the new mysqld server does not
-   start or that you cannot connect without a password, verify that
-   you do not have an old my.cnf file from your previous
-   installation. You can check this with the --print-defaults option
-   (for example, mysqld --print-defaults). If this command displays
-   anything other than the program name, you have an active my.cnf
-   file that affects server or client operation.
-
-   If, after an upgrade, you experience problems with compiled client
-   programs, such as Commands out of sync or unexpected core dumps,
-   you probably have used old header or library files when compiling
-   your programs. In this case, you should check the date for your
-   mysql.h file and libmysqlclient.a library to verify that they are
-   from the new MySQL distribution. If not, recompile your programs
-   with the new headers and libraries. Recompilation might also be
-   necessary for programs compiled against the shared client library
-   if the library major version number has changed (for example from
-   libmysqlclient.so.15 to libmysqlclient.so.16.
-
-   If your MySQL installation contains a large amount of data that
-   might take a long time to convert after an in-place upgrade, you
-   might find it useful to create a "dummy" database instance for
-   assessing what conversions might be needed and the work involved
-   to perform them. Make a copy of your MySQL instance that contains
-   a full copy of the mysql database, plus all other databases
-   without data. Run your upgrade procedure on this dummy instance to
-   see what actions might be needed so that you can better evaluate
-   the work involved when performing actual data conversion on your
+   rename your old mysqld before installing a newer one. For
+   example, if you are using a version of MySQL 5.1 and want to
+   upgrade to 5.5, rename your current server from mysqld to
+   mysqld-5.1. If your new mysqld then does something
+   unexpected, you can simply shut it down and restart with your
+   old mysqld.
+
+   If problems occur, such as that the new mysqld server does
+   not start or that you cannot connect without a password,
+   verify that you do not have an old my.cnf file from your
+   previous installation. You can check this with the
+   --print-defaults option (for example, mysqld
+   --print-defaults). If this command displays anything other
+   than the program name, you have an active my.cnf file that
+   affects server or client operation.
+
+   If, after an upgrade, you experience problems with compiled
+   client programs, such as Commands out of sync or unexpected
+   core dumps, you probably have used old header or library
+   files when compiling your programs. In this case, you should
+   check the date for your mysql.h file and libmysqlclient.a
+   library to verify that they are from the new MySQL
+   distribution. If not, recompile your programs with the new
+   headers and libraries. Recompilation might also be necessary
+   for programs compiled against the shared client library if
+   the library major version number has changed (for example
+   from libmysqlclient.so.15 to libmysqlclient.so.16.
+
+   If your MySQL installation contains a large amount of data
+   that might take a long time to convert after an in-place
+   upgrade, you might find it useful to create a "dummy"
+   database instance for assessing what conversions might be
+   needed and the work involved to perform them. Make a copy of
+   your MySQL instance that contains a full copy of the mysql
+   database, plus all other databases without data. Run your
+   upgrade procedure on this dummy instance to see what actions
+   might be needed so that you can better evaluate the work
+   involved when performing actual data conversion on your
    original database instance.
 
-   It is a good idea to rebuild and reinstall the Perl DBD::mysql
-   module whenever you install a new release of MySQL. The same
-   applies to other MySQL interfaces as well, such as PHP mysql
-   extensions and the Python MySQLdb module.
+   It is a good idea to rebuild and reinstall the Perl
+   DBD::mysql module whenever you install a new release of
+   MySQL. The same applies to other MySQL interfaces as well,
+   such as PHP mysql extensions and the Python MySQLdb module.
 
-2.12.1.1. Upgrading from MySQL 5.1 to 5.5
+2.11.1.1 Upgrading from MySQL 5.1 to 5.5
 
    Note
 
-   It is good practice to back up your data before installing any new
-   version of software. Although MySQL works very hard to ensure a
-   high level of quality, you should protect your data by making a
-   backup.
+   It is good practice to back up your data before installing
+   any new version of software. Although MySQL works very hard
+   to ensure a high level of quality, you should protect your
+   data by making a backup.
 
-   To upgrade to 5.5 from any previous version, MySQL recommends that
-   you dump your tables with mysqldump before upgrading and reload
-   the dump file after upgrading. Use the --all-databases option to
-   include all databases in the dump. If your databases include
-   stored programs, use the --routines and --events options as well.
+   To upgrade to 5.5 from any previous version, MySQL recommends
+   that you dump your tables with mysqldump before upgrading and
+   reload the dump file after upgrading. Use the --all-databases
+   option to include all databases in the dump. If your
+   databases include stored programs, use the --routines and
+   --events options as well.
 
-   In general, you should do the following when upgrading from MySQL
-   5.1 to 5.5:
+   In general, you should do the following when upgrading from
+   MySQL 5.1 to 5.5:
 
-     * Read all the items in these sections to see whether any of
-       them might affect your applications:
+     * Read all the items in these sections to see whether any
+       of them might affect your applications:
 
-          + Section 2.12.1, "Upgrading MySQL," has general update
-            information.
+          + Section 2.11.1, "Upgrading MySQL," has general
+            update information.
 
           + The items in the change lists provided later in this
-            section enable you to identify upgrade issues that apply
-            to your current MySQL installation. Some
-            incompatibilities discussed there require your attention
-            before upgrading. Others should be dealt with after
-            upgrading.
+            section enable you to identify upgrade issues that
+            apply to your current MySQL installation. Some
+            incompatibilities discussed there require your
+            attention before upgrading. Others should be dealt
+            with after upgrading.
 
           + The MySQL 5.5 Release Notes
             (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/)
-            describe significant new features you can use in 5.5 or
-            that differ from those found in earlier MySQL releases.
-            Some of these changes may result in incompatibilities.
-       Note particularly any changes that are marked Known issue or
-       Incompatible change. These incompatibilities with earlier
-       versions of MySQL may require your attention before you
-       upgrade. Our aim is to avoid these changes, but occasionally
-       they are necessary to correct problems that would be worse
-       than an incompatibility between releases. If any upgrade issue
-       applicable to your installation involves an incompatibility
-       that requires special handling, follow the instructions given
-       in the incompatibility description. Sometimes this involves
-       dumping and reloading tables, or use of a statement such as
-       CHECK TABLE or REPAIR TABLE.
-       For dump and reload instructions, see Section 2.12.4,
-       "Rebuilding or Repairing Tables or Indexes." Any procedure
-       that involves REPAIR TABLE with the USE_FRM option must be
-       done before upgrading. Use of this statement with a version of
-       MySQL different from the one used to create the table (that
-       is, using it after upgrading) may damage the table. See
-       Section 13.7.2.5, "REPAIR TABLE Syntax."
-
-     * Before upgrading to a new version of MySQL, Section 2.12.3,
-       "Checking Whether Tables or Indexes Must Be Rebuilt," to see
-       whether changes to table formats or to character sets or
-       collations were made between your current version of MySQL and
-       the version to which you are upgrading. If so and these
-       changes result in an incompatibility between MySQL versions,
-       you will need to upgrade the affected tables using the
-       instructions in Section 2.12.4, "Rebuilding or Repairing
-       Tables or Indexes."
-
-     * After upgrading to a new version of MySQL, run mysql_upgrade
-       (see Section 4.4.7, "mysql_upgrade --- Check and Upgrade MySQL
-       Tables"). This program checks your tables, and attempts to
-       repair them if necessary. It also updates your grant tables to
-       make sure that they have the current structure so that you can
-       take advantage of any new capabilities. (Some releases of
-       MySQL introduce changes to the structure of the grant tables
-       to add new privileges or features.)
+            describe significant new features you can use in 5.5
+            or that differ from those found in earlier MySQL
+            releases. Some of these changes may result in
+            incompatibilities.
+       Changes marked as either Known issue or Incompatible
+       change are incompatibilities with earlier versions of
+       MySQL, and may require your attention before you upgrade.
+       Our aim is to avoid these changes, but occasionally they
+       are necessary to correct problems that would be worse
+       than an incompatibility between releases. If any upgrade
+       issue applicable to your installation involves an
+       incompatibility that requires special handling, follow
+       the instructions given in the incompatibility
+       description. Sometimes this involves dumping and
+       reloading tables, or use of a statement such as CHECK
+       TABLE or REPAIR TABLE.
+       For dump and reload instructions, see Section 2.11.4,
+       "Rebuilding or Repairing Tables or Indexes." Any
+       procedure that involves REPAIR TABLE with the USE_FRM
+       option must be done before upgrading. Use of this
+       statement with a version of MySQL different from the one
+       used to create the table (that is, using it after
+       upgrading) may damage the table. See Section 13.7.2.5,
+       "REPAIR TABLE Syntax."
+
+     * Before upgrading to a new version of MySQL, Section
+       2.11.3, "Checking Whether Tables or Indexes Must Be
+       Rebuilt," to see whether changes to table formats or to
+       character sets or collations were made between your
+       current version of MySQL and the version to which you are
+       upgrading. If so and these changes result in an
+       incompatibility between MySQL versions, you will need to
+       upgrade the affected tables using the instructions in
+       Section 2.11.4, "Rebuilding or Repairing Tables or
+       Indexes."
+
+     * After upgrading to a new version of MySQL, run
+       mysql_upgrade (see Section 4.4.7, "mysql_upgrade ---
+       Check and Upgrade MySQL Tables"). This program checks
+       your tables, and attempts to repair them if necessary. It
+       also updates your grant tables to make sure that they
+       have the current structure so that you can take advantage
+       of any new capabilities. (Some releases of MySQL
+       introduce changes to the structure of the grant tables to
+       add new privileges or features.)
        mysql_upgrade does not upgrade the contents of the help
        tables. For upgrade instructions, see Section 5.1.10,
        "Server-Side Help."
@@ -7701,487 +8461,538 @@
      * If you run MySQL Server on Windows, see Section 2.3.9,
        "Upgrading MySQL on Windows."
 
-     * If you use replication, see Section 16.4.3, "Upgrading a
+     * If you use replication, see Section 17.4.3, "Upgrading a
        Replication Setup," for information on upgrading your
        replication setup.
 
-   If your MySQL installation contains a large amount of data that
-   might take a long time to convert after an in-place upgrade, you
-   might find it useful to create a "dummy" database instance for
-   assessing what conversions might be needed and the work involved
-   to perform them. Make a copy of your MySQL instance that contains
-   a full copy of the mysql database, plus all other databases
-   without data. Run your upgrade procedure on this dummy instance to
-   see what actions might be needed so that you can better evaluate
-   the work involved when performing actual data conversion on your
+   If your MySQL installation contains a large amount of data
+   that might take a long time to convert after an in-place
+   upgrade, you might find it useful to create a "dummy"
+   database instance for assessing what conversions might be
+   needed and the work involved to perform them. Make a copy of
+   your MySQL instance that contains a full copy of the mysql
+   database, plus all other databases without data. Run your
+   upgrade procedure on this dummy instance to see what actions
+   might be needed so that you can better evaluate the work
+   involved when performing actual data conversion on your
    original database instance.
 
-   The following lists describe changes that may affect applications
-   and that you should watch out for when upgrading from MySQL 5.1 to
-   5.5.
+   The following lists describe changes that may affect
+   applications and that you should watch out for when upgrading
+   from MySQL 5.1 to 5.5.
 
 Configuration Changes
 
 
-     * Incompatible change: The InnoDB Plugin is included in MySQL
-       5.5 releases. It becomes the built-in version of InnoDB in
-       MySQL Server, replacing the version previously included as the
-       built-in InnoDB engine. InnoDB Plugin is also available in
-       MySQL 5.1 as of 5.1.38, but it is an optional storage engine
-       that must be enabled explicitly using two server options:
+     * Incompatible change: The InnoDB Plugin is included in
+       MySQL 5.5 releases. It becomes the built-in version of
+       InnoDB in MySQL Server, replacing the version previously
+       included as the built-in InnoDB engine. InnoDB Plugin is
+       also available in MySQL 5.1 as of 5.1.38, but it is an
+       optional storage engine that must be enabled explicitly
+       using two server options:
 [mysqld]
 ignore-builtin-innodb
 plugin-load=innodb=ha_innodb_plugin.so
-       If you were using InnoDB Plugin in MySQL 5.1 by means of those
-       options, you must remove them after an upgrade to 5.5 or the
-       server will fail to start.
+
+       If you were using InnoDB Plugin in MySQL 5.1 by means of
+       those options, you must remove them after an upgrade to
+       5.5 or the server will fail to start.
        In addition, in InnoDB Plugin, the innodb_file_io_threads
        system variable has been removed and replaced with
-       innodb_read_io_threads and innodb_write_io_threads. If you
-       upgrade from MySQL 5.1 to MySQL 5.5 and previously explicitly
-       set innodb_file_io_threads at server startup, you must change
-       your configuration. Either remove any reference to
-       innodb_file_io_threads or replace it with references to
-       innodb_read_io_threads and innodb_write_io_threads.
+       innodb_read_io_threads and innodb_write_io_threads. If
+       you upgrade from MySQL 5.1 to MySQL 5.5 and previously
+       explicitly set innodb_file_io_threads at server startup,
+       you must change your configuration. Either remove any
+       reference to innodb_file_io_threads or replace it with
+       references to innodb_read_io_threads and
+       innodb_write_io_threads.
 
      * Incompatible change: In MySQL 5.5, the server includes a
-       plugin services interface that complements the plugin API. The
-       services interface enables server functionality to be exposed
-       as a "service" that plugins can access through a function-call
-       interface. The libmysqlservices library provides access to the
-       available services and dynamic plugins now must be linked
-       against this library (use the -lmysqlservices flag). For an
-       example showing how to configure for CMake, see Section
-       23.2.5, "MySQL Services for Plugins."
+       plugin services interface that complements the plugin
+       API. The services interface enables server functionality
+       to be exposed as a "service" that plugins can access
+       through a function-call interface. The libmysqlservices
+       library provides access to the available services and
+       dynamic plugins now must be linked against this library
+       (use the -lmysqlservices flag). For an example showing
+       how to configure for CMake, see Section 24.2.5, "MySQL
+       Services for Plugins."
 
 Server Changes
 
 
-     * Known issue: As of MySQL 5.5.32, for new installations, the
-       url columns in the mysql database help tables are now created
-       as type TEXT to accommodate longer URLs. For upgrades,
-       mysql_upgrade does not update the columns. Modify them
-       manually using these statements:
+     * On Linux systems, the libaio library may be needed.
+       Install it first, if it is not already present on your
+       system.
+
+     * Known issue: As of MySQL 5.5.32, for new installations,
+       the url columns in the mysql database help tables are now
+       created as type TEXT to accommodate longer URLs. For
+       upgrades, mysql_upgrade does not update the columns.
+       Modify them manually using these statements:
 ALTER TABLE mysql.help_category MODIFY url TEXT NOT NULL;
 ALTER TABLE mysql.help_topic MODIFY url TEXT NOT NULL;
 
-     * Incompatible change: As of MySQL 5.5.3, due to work done for
-       Bug #989, FLUSH TABLES is not permitted when there is an
-       active LOCK TABLES ... READ. To provide a workaround for this
-       restriction, FLUSH TABLES has a new variant, FLUSH TABLES
-       tbl_list WITH READ LOCK, that enables tables to be flushed and
-       locked in a single operation. As a result of this change,
-       applications that previously used this statement sequence to
-       lock and flush tables will fail:
+
+     * Incompatible change: As of MySQL 5.5.3, due to work done
+       for Bug #989, FLUSH TABLES is not permitted when there is
+       an active LOCK TABLES ... READ. To provide a workaround
+       for this restriction, FLUSH TABLES has a new variant,
+       FLUSH TABLES tbl_list WITH READ LOCK, that enables tables
+       to be flushed and locked in a single operation. As a
+       result of this change, applications that previously used
+       this statement sequence to lock and flush tables will
+       fail:
 LOCK TABLES tbl_list READ;
 FLUSH TABLES tbl_list;
+
        Such applications should now use this statement instead:
 FLUSH TABLES tbl_list WITH READ LOCK;
 
-     * Incompatible change: As of MySQL 5.5.7, the server requires
-       that a new grant table, proxies_priv, be present in the mysql
-       database. If you are upgrading to 5.5.7 from a previous MySQL
-       release rather than performing a new installation, the server
-       will find that this table is missing and exit during startup
-       with the following message:
+
+     * Incompatible change: As of MySQL 5.5.7, the server
+       requires that a new grant table, proxies_priv, be present
+       in the mysql database. If you are upgrading to 5.5.7 from
+       a previous MySQL release rather than performing a new
+       installation, the server will find that this table is
+       missing and exit during startup with the following
+       message:
 Table 'mysql.proxies_priv' doesn't exist
-       To create the proxies_priv table, start the server with the
-       --skip-grant-tables option to cause it to skip the normal
-       grant table checks, then run mysql_upgrade. For example:
+
+       To create the proxies_priv table, start the server with
+       the --skip-grant-tables option to cause it to skip the
+       normal grant table checks, then run mysql_upgrade. For
+       example:
 shell> mysqld --skip-grant-tables &
 shell> mysql_upgrade
+
        Then stop the server and restart it normally.
-       You can specify other options on the mysqld command line if
-       necessary. Alternatively, if your installation is configured
-       so that the server normally reads options from an option file,
-       use the --defaults-file option to specify the file (enter each
-       command on a single line):
+       You can specify other options on the mysqld command line
+       if necessary. Alternatively, if your installation is
+       configured so that the server normally reads options from
+       an option file, use the --defaults-file option to specify
+       the file (enter each command on a single line):
 shell> mysqld --defaults-file=/usr/local/mysql/etc/my.cnf
          --skip-grant-tables &
 shell> mysql_upgrade
+
        With the --skip-grant-tables option, the server does no
-       password or privilege checking, so any client can connect and
-       effectively have all privileges. For additional security, use
-       the --skip-networking option as well to prevent remote clients
-       from connecting.
+       password or privilege checking, so any client can connect
+       and effectively have all privileges. For additional
+       security, use the --skip-networking option as well to
+       prevent remote clients from connecting.
        Note
        This problem is fixed in MySQL 5.5.8; the server treats a
-       missing proxies_priv table as equivalent to an empty table.
-       However, after starting the server, you should still run
-       mysql_upgrade to create the table.
-
-     * Incompatible change: As of MySQL 5.5.7, InnoDB always uses the
-       fast truncation technique, equivalent to DROP TABLE and CREATE
-       TABLE. It no longer performs a row-by-row delete for tables
-       with parent-child foreign key relationships. TRUNCATE TABLE
-       returns an error for such tables. Modify your SQL to issue
-       DELETE FROM table_name for such tables instead.
-
-     * Incompatible change: Prior to MySQL 5.5.7, if you flushed the
-       logs using FLUSH LOGS or mysqladmin flush-logs and mysqld was
-       writing the error log to a file (for example, if it was
-       started with the --log-error option), it renames the current
-       log file with the suffix -old, then created a new empty log
-       file. This had the problem that a second log-flushing
-       operation thus caused the original error log file to be lost
-       unless you saved it under a different name. For example, you
-       could use the following commands to save the file:
+       missing proxies_priv table as equivalent to an empty
+       table. However, after starting the server, you should
+       still run mysql_upgrade to create the table.
+
+     * Incompatible change: As of MySQL 5.5.7, InnoDB always
+       uses the fast truncation technique, equivalent to DROP
+       TABLE and CREATE TABLE. It no longer performs a
+       row-by-row delete for tables with parent-child foreign
+       key relationships. TRUNCATE TABLE returns an error for
+       such tables. Modify your SQL to issue DELETE FROM
+       table_name for such tables instead.
+
+     * Incompatible change: Prior to MySQL 5.5.7, if you flushed
+       the logs using FLUSH LOGS or mysqladmin flush-logs and
+       mysqld was writing the error log to a file (for example,
+       if it was started with the --log-error option), it
+       renames the current log file with the suffix -old, then
+       created a new empty log file. This had the problem that a
+       second log-flushing operation thus caused the original
+       error log file to be lost unless you saved it under a
+       different name. For example, you could use the following
+       commands to save the file:
 shell> mysqladmin flush-logs
 shell> mv host_name.err-old backup-directory
-       To avoid the preceding file-loss problem, no renaming occurs
-       as of MySQL 5.5.7; the server merely closes and reopens the
-       log file. To rename the file, you can do so manually before
-       flushing. Then flushing the logs reopens a new file with the
-       original file name. For example, you can rename the file and
-       create a new one using the following commands:
+
+       To avoid the preceding file-loss problem, no renaming
+       occurs as of MySQL 5.5.7; the server merely closes and
+       reopens the log file. To rename the file, you can do so
+       manually before flushing. Then flushing the logs reopens
+       a new file with the original file name. For example, you
+       can rename the file and create a new one using the
+       following commands:
 shell> mv host_name.err host_name.err-old
 shell> mysqladmin flush-logs
 shell> mv host_name.err-old backup-directory
 
-     * Incompatible change: As of MySQL 5.5.6, handling of CREATE
-       TABLE IF NOT EXISTS ... SELECT statements has been changed for
-       the case that the destination table already exists:
-
-          + Previously, for CREATE TABLE IF NOT EXISTS ... SELECT,
-            MySQL produced a warning that the table exists, but
-            inserted the rows and wrote the statement to the binary
-            log anyway. By contrast, CREATE TABLE ... SELECT (without
-            IF NOT EXISTS) failed with an error, but MySQL inserted
-            no rows and did not write the statement to the binary
-            log.
-
-          + MySQL now handles both statements the same way when the
-            destination table exists, in that neither statement
-            inserts rows or is written to the binary log. The
-            difference between them is that MySQL produces a warning
-            when IF NOT EXISTS is present and an error when it is
-            not.
+
+     * Incompatible change: As of MySQL 5.5.6, handling of
+       CREATE TABLE IF NOT EXISTS ... SELECT statements has been
+       changed for the case that the destination table already
+       exists:
+
+          + Previously, for CREATE TABLE IF NOT EXISTS ...
+            SELECT, MySQL produced a warning that the table
+            exists, but inserted the rows and wrote the
+            statement to the binary log anyway. By contrast,
+            CREATE TABLE ... SELECT (without IF NOT EXISTS)
+            failed with an error, but MySQL inserted no rows and
+            did not write the statement to the binary log.
+
+          + MySQL now handles both statements the same way when
+            the destination table exists, in that neither
+            statement inserts rows or is written to the binary
+            log. The difference between them is that MySQL
+            produces a warning when IF NOT EXISTS is present and
+            an error when it is not.
        This change in handling of IF NOT EXISTS results in an
-       incompatibility for statement-based replication from a MySQL
-       5.1 master with the original behavior and a MySQL 5.5 slave
-       with the new behavior. Suppose that CREATE TABLE IF NOT EXISTS
-       ... SELECT is executed on the master and the destination table
-       exists. The result is that rows are inserted on the master but
-       not on the slave. (Row-based replication does not have this
-       problem.)
+       incompatibility for statement-based replication from a
+       MySQL 5.1 master with the original behavior and a MySQL
+       5.5 slave with the new behavior. Suppose that CREATE
+       TABLE IF NOT EXISTS ... SELECT is executed on the master
+       and the destination table exists. The result is that rows
+       are inserted on the master but not on the slave.
+       (Row-based replication does not have this problem.)
        To address this issue, statement-based binary logging for
-       CREATE TABLE IF NOT EXISTS ... SELECT is changed in MySQL 5.1
-       as of 5.1.51:
+       CREATE TABLE IF NOT EXISTS ... SELECT is changed in MySQL
+       5.1 as of 5.1.51:
 
           + If the destination table does not exist, there is no
             change: The statement is logged as is.
 
-          + If the destination table does exist, the statement is
-            logged as the equivalent pair of CREATE TABLE IF NOT
-            EXISTS and INSERT ... SELECT statements. (If the SELECT
-            in the original statement is preceded by IGNORE or
-            REPLACE, the INSERT becomes INSERT IGNORE or REPLACE,
-            respectively.)
-       This change provides forward compatibility for statement-based
-       replication from MySQL 5.1 to 5.5 because when the destination
-       table exists, the rows will be inserted on both the master and
-       slave. To take advantage of this compatibility measure, the
-       5.1 server must be at least 5.1.51 and the 5.5 server must be
-       at least 5.5.6.
+          + If the destination table does exist, the statement
+            is logged as the equivalent pair of CREATE TABLE IF
+            NOT EXISTS and INSERT ... SELECT statements. (If the
+            SELECT in the original statement is preceded by
+            IGNORE or REPLACE, the INSERT becomes INSERT IGNORE
+            or REPLACE, respectively.)
+       This change provides forward compatibility for
+       statement-based replication from MySQL 5.1 to 5.5 because
+       when the destination table exists, the rows will be
+       inserted on both the master and slave. To take advantage
+       of this compatibility measure, the 5.1 server must be at
+       least 5.1.51 and the 5.5 server must be at least 5.5.6.
        To upgrade an existing 5.1-to-5.5 replication scenario,
-       upgrade the master first to 5.1.51 or higher. Note that this
-       differs from the usual replication upgrade advice of upgrading
-       the slave first.
+       upgrade the master first to 5.1.51 or higher. Note that
+       this differs from the usual replication upgrade advice of
+       upgrading the slave first.
        A workaround for applications that wish to achieve the
        original effect (rows inserted regardless of whether the
-       destination table exists) is to use CREATE TABLE IF NOT EXISTS
-       and INSERT ... SELECT statements rather than CREATE TABLE IF
-       NOT EXISTS ... SELECT statements.
-       Along with the change just described, the following related
-       change was made: Previously, if an existing view was named as
-       the destination table for CREATE TABLE IF NOT EXISTS ...
-       SELECT, rows were inserted into the underlying base table and
-       the statement was written to the binary log. As of MySQL
-       5.1.51 and 5.5.6, nothing is inserted or logged.
-
-     * Incompatible change: Prior to MySQL 5.5.6, if the server was
-       started with character_set_server set to utf16, it crashed
-       during full-text stopword initialization. Now the stopword
-       file is loaded and searched using latin1 if
-       character_set_server is ucs2, utf16, or utf32. If any table
-       was created with FULLTEXT indexes while the server character
-       set was ucs2, utf16, or utf32, it should be repaired using
-       this statement:
+       destination table exists) is to use CREATE TABLE IF NOT
+       EXISTS and INSERT ... SELECT statements rather than
+       CREATE TABLE IF NOT EXISTS ... SELECT statements.
+       Along with the change just described, the following
+       related change was made: Previously, if an existing view
+       was named as the destination table for CREATE TABLE IF
+       NOT EXISTS ... SELECT, rows were inserted into the
+       underlying base table and the statement was written to
+       the binary log. As of MySQL 5.1.51 and 5.5.6, nothing is
+       inserted or logged.
+
+     * Incompatible change: Prior to MySQL 5.5.6, if the server
+       was started with character_set_server set to utf16, it
+       crashed during full-text stopword initialization. Now the
+       stopword file is loaded and searched using latin1 if
+       character_set_server is ucs2, utf16, or utf32. If any
+       table was created with FULLTEXT indexes while the server
+       character set was ucs2, utf16, or utf32, it should be
+       repaired using this statement:
 REPAIR TABLE tbl_name QUICK;
 
-     * Incompatible change: As of MySQL 5.5.5, all numeric operators
-       and functions on integer, floating-point and DECIMAL values
-       throw an "out of range" error (ER_DATA_OUT_OF_RANGE) rather
-       than returning an incorrect value or NULL, when the result is
-       out of the supported range for the corresponding data type.
-       See Section 11.2.6, "Out-of-Range and Overflow Handling."
-
-     * Incompatible change: In very old versions of MySQL (prior to
-       4.1), the TIMESTAMP data type supported a display width, which
-       was silently ignored beginning with MySQL 4.1. This is
-       deprecated in MySQL 5.1, and removed altogether in MySQL 5.5.
-       These changes in behavior can lead to two problem scenarios
-       when trying to use TIMESTAMP(N) columns with a MySQL 5.5 or
-       later server:
+
+     * Incompatible change: As of MySQL 5.5.5, all numeric
+       operators and functions on integer, floating-point and
+       DECIMAL values throw an "out of range" error
+       (ER_DATA_OUT_OF_RANGE) rather than returning an incorrect
+       value or NULL, when the result is out of the supported
+       range for the corresponding data type. See Section
+       11.2.6, "Out-of-Range and Overflow Handling."
+
+     * Incompatible change: In very old versions of MySQL (prior
+       to 4.1), the TIMESTAMP data type supported a display
+       width, which was silently ignored beginning with MySQL
+       4.1. This is deprecated in MySQL 5.1, and removed
+       altogether in MySQL 5.5. These changes in behavior can
+       lead to two problem scenarios when trying to use
+       TIMESTAMP(N) columns with a MySQL 5.5 or later server:
 
           + When importing a dump file (for example, one created
-            using mysqldump) created in a MySQL 5.0 or earlier server
-            into a server from a newer release series, a CREATE TABLE
-            or ALTER TABLE statement containing TIMESTAMP(N) causes
-            the import to fail with a syntax error.
-            To fix this problem, edit the dump file in a text editor
-            to replace any instances of TIMESTAMP(N) with TIMESTAMP
-            prior to importing the file. Be sure to use a plain text
-            editor for this, and not a word processor; otherwise, the
-            result is almost certain to be unusable for importing
-            into the MySQL server.
-
-          + When trying replicate any CREATE TABLE or ALTER TABLE
-            statement containing TIMESTAMP(N) from a master MySQL
-            server that supports the TIMESTAMP(N) syntax to a MySQL
-            5.5.3 or newer slave, the statement causes replication to
-            fail. Similarly, when you try to restore from a binary
-            log written by a server that supports TIMESTAMP(N) to a
-            MySQL 5.5.3 or newer server, any CREATE TABLE or ALTER
-            TABLE statement containing TIMESTAMP(N) causes the backup
+            using mysqldump) created in a MySQL 5.0 or earlier
+            server into a server from a newer release series, a
+            CREATE TABLE or ALTER TABLE statement containing
+            TIMESTAMP(N) causes the import to fail with a syntax
+            error.
+            To fix this problem, edit the dump file in a text
+            editor to replace any instances of TIMESTAMP(N) with
+            TIMESTAMP prior to importing the file. Be sure to
+            use a plain text editor for this, and not a word
+            processor; otherwise, the result is almost certain
+            to be unusable for importing into the MySQL server.
+
+          + When trying replicate any CREATE TABLE or ALTER
+            TABLE statement containing TIMESTAMP(N) from a
+            master MySQL server that supports the TIMESTAMP(N)
+            syntax to a MySQL 5.5.3 or newer slave, the
+            statement causes replication to fail. Similarly,
+            when you try to restore from a binary log written by
+            a server that supports TIMESTAMP(N) to a MySQL 5.5.3
+            or newer server, any CREATE TABLE or ALTER TABLE
+            statement containing TIMESTAMP(N) causes the backup
             to fail. This holds true regardless of the logging
             format.
-            It may be possible to fix such issues using a hex editor,
-            by replacing any width arguments used with TIMESTAMP, and
-            the parentheses containing them, with space characters
-            (hexadecimal 20). Be sure to use a programmer's binary
-            hex editor and not a regular text editor or word
-            processor for this; otherwise, the result is almost
-            certain to be a corrupted binary log file. To guard
-            against accidental corruption of the binary log, you
-            should always work on a copy of the file rather than the
-            original.
+            It may be possible to fix such issues using a hex
+            editor, by replacing any width arguments used with
+            TIMESTAMP, and the parentheses containing them, with
+            space characters (hexadecimal 20). Be sure to use a
+            programmer's binary hex editor and not a regular
+            text editor or word processor for this; otherwise,
+            the result is almost certain to be a corrupted
+            binary log file. To guard against accidental
+            corruption of the binary log, you should always work
+            on a copy of the file rather than the original.
        You should try to handle potential issues of these types
        proactively by updating with ALTER TABLE any TIMESTAMP(N)
-       columns in your databases so that they use TIMESTAMP instead,
-       before performing any upgrades.
+       columns in your databases so that they use TIMESTAMP
+       instead, before performing any upgrades.
 
      * Incompatible change: As of MySQL 5.5.3, the Unicode
        implementation has been extended to provide support for
        supplementary characters that lie outside the Basic
        Multilingual Plane (BMP). Noteworthy features:
 
-          + utf16 and utf32 character sets have been added. These
-            correspond to the UTF-16 and UTF-32 encodings of the
-            Unicode character set, and they both support
+          + utf16 and utf32 character sets have been added.
+            These correspond to the UTF-16 and UTF-32 encodings
+            of the Unicode character set, and they both support
             supplementary characters.
 
-          + The utf8mb4 character set has been added. This is similar
-            to utf8, but its encoding allows up to four bytes per
-            character to enable support for supplementary characters.
-
-          + The ucs2 character set is essentially unchanged except
-            for the inclusion of some newer BMP characters.
-       In most respects, upgrading to MySQL 5.5 should present few
-       problems with regard to Unicode usage, although there are some
-       potential areas of incompatibility. These are the primary
-       areas of concern:
-
-          + For the variable-length character data types (VARCHAR and
-            the TEXT types), the maximum length in characters is less
-            for utf8mb4 columns than for utf8 columns.
-
-          + For all character data types (CHAR, VARCHAR, and the TEXT
-            types), the maximum number of characters that can be
-            indexed is less for utf8mb4 columns than for utf8
+          + The utf8mb4 character set has been added. This is
+            similar to utf8, but its encoding allows up to four
+            bytes per character to enable support for
+            supplementary characters.
+
+          + The ucs2 character set is essentially unchanged
+            except for the inclusion of some newer BMP
+            characters.
+       In most respects, upgrading to MySQL 5.5 should present
+       few problems with regard to Unicode usage, although there
+       are some potential areas of incompatibility. These are
+       the primary areas of concern:
+
+          + For the variable-length character data types
+            (VARCHAR and the TEXT types), the maximum length in
+            characters is less for utf8mb4 columns than for utf8
             columns.
+
+          + For all character data types (CHAR, VARCHAR, and the
+            TEXT types), the maximum number of characters that
+            can be indexed is less for utf8mb4 columns than for
+            utf8 columns.
        Consequently, if you want to upgrade tables from utf8 to
-       utf8mb4 to take advantage of supplementary-character support,
-       it may be necessary to change some column or index
-       definitions.
-       For additional details about the new Unicode character sets
-       and potential incompatibilities, see Section 10.1.10, "Unicode
-       Support," and Section 10.1.11, "Upgrading from Previous to
-       Current Unicode Support."
-
-     * Incompatible change: As of MySQL 5.5.3, the server includes
-       dtoa, a library for conversion between strings and numbers by
-       David M. Gay. In MySQL, this library provides the basis for
-       improved conversion between string or DECIMAL values and
-       approximate-value (FLOAT or DOUBLE) numbers.
-       Because the conversions produced by this library differ in
-       some cases from previous results, the potential exists for
-       incompatibilities in applications that rely on previous
-       results. For example, applications that depend on a specific
-       exact result from previous conversions might need adjustment
-       to accommodate additional precision.
+       utf8mb4 to take advantage of supplementary-character
+       support, it may be necessary to change some column or
+       index definitions.
+       For additional details about the new Unicode character
+       sets and potential incompatibilities, see Section
+       10.1.10, "Unicode Support," and Section 10.1.11,
+       "Upgrading from Previous to Current Unicode Support."
+
+     * Incompatible change: As of MySQL 5.5.3, the server
+       includes dtoa, a library for conversion between strings
+       and numbers by David M. Gay. In MySQL, this library
+       provides the basis for improved conversion between string
+       or DECIMAL values and approximate-value (FLOAT or DOUBLE)
+       numbers.
+       Because the conversions produced by this library differ
+       in some cases from previous results, the potential exists
+       for incompatibilities in applications that rely on
+       previous results. For example, applications that depend
+       on a specific exact result from previous conversions
+       might need adjustment to accommodate additional
+       precision.
        For additional information about the properties of dtoa
-       conversions, see Section 12.2, "Type Conversion in Expression
-       Evaluation."
+       conversions, see Section 12.2, "Type Conversion in
+       Expression Evaluation."
 
-     * Incompatible change: In MySQL 5.5, several changes were made
-       regarding the language and character set of error messages:
-
-          + The --language option for specifying the directory for
-            the error message file is now deprecated. The new
-            lc_messages_dir and lc_messages system variables should
-            be used instead, and the server treats --language as an
-            alias for lc_messages_dir.
+     * Incompatible change: In MySQL 5.5, several changes were
+       made regarding the language and character set of error
+       messages:
+
+          + The --language option for specifying the directory
+            for the error message file is now deprecated. The
+            new lc_messages_dir and lc_messages system variables
+            should be used instead, and the server treats
+            --language as an alias for lc_messages_dir.
 
           + The language system variable has been removed and
-            replaced with the new lc_messages_dir and lc_messages
-            system variables. lc_messages_dir has only a global value
-            and is read only. lc_messages has global and session
-            values and can be modified at runtime, so the error
-            message language can be changed while the server is
-            running, and individual clients each can have a different
-            error message language by changing their session
-            lc_messages value to a different locale name.
-
-          + Error messages previously were constructed in a mix of
-            character sets. This issue is resolved by constructing
-            error messages internally within the server using UTF-8
-            and returning them to the client in the character set
-            specified by the character_set_results system variable.
-            The content of error messages therefore may in some cases
-            differ from the messages returned previously.
-       For more information, see Section 10.2, "Setting the Error
-       Message Language," and Section 10.1.6, "Character Set for
-       Error Messages."
-
-     * Incompatible change: MySQL 5.5 implements new functions used
-       to calculate row placement for tables partitioned by KEY and
-       LINEAR KEY. Tables that were created using KEY or LINEAR KEY
-       partitioning in MySQL 5.1 can be upgraded in MySQL 5.5.31 and
-       later using ALTER TABLE ... PARTITION BY ALGORITHM=2 [LINEAR]
-       KEY (...). (Bug #14521864, Bug #66462)
+            replaced with the new lc_messages_dir and
+            lc_messages system variables. lc_messages_dir has
+            only a global value and is read only. lc_messages
+            has global and session values and can be modified at
+            runtime, so the error message language can be
+            changed while the server is running, and individual
+            clients each can have a different error message
+            language by changing their session lc_messages value
+            to a different locale name.
+
+          + Error messages previously were constructed in a mix
+            of character sets. This issue is resolved by
+            constructing error messages internally within the
+            server using UTF-8 and returning them to the client
+            in the character set specified by the
+            character_set_results system variable. The content
+            of error messages therefore may in some cases differ
+            from the messages returned previously.
+       For more information, see Section 10.2, "Setting the
+       Error Message Language," and Section 10.1.6, "Character
+       Set for Error Messages."
+
+     * Incompatible change: MySQL 5.5 implements new functions
+       used to calculate row placement for tables partitioned by
+       KEY and LINEAR KEY. Tables that were created using KEY or
+       LINEAR KEY partitioning in MySQL 5.1 can be upgraded in
+       MySQL 5.5.31 and later using ALTER TABLE ... PARTITION BY
+       ALGORITHM=2 [LINEAR] KEY (...). (Bug #14521864, Bug
+       #66462)
 
 SQL Changes
 
 
-     * Incompatible change: Previously, the parser accepted an INTO
-       clause in nested SELECT statements, which is invalid because
-       such statements must return their results to the outer
-       context. As of MySQL 5.5.3, this syntax is no longer permitted
-       and statements that use it must be changed.
-
-     * Incompatible change: In MySQL 5.5.3, several changes were made
-       to alias resolution in multiple-table DELETE statements so
-       that it is no longer possible to have inconsistent or
-       ambiguous table aliases.
+     * Incompatible change: Previously, the parser accepted an
+       INTO clause in nested SELECT statements, which is invalid
+       because such statements must return their results to the
+       outer context. As of MySQL 5.5.3, this syntax is no
+       longer permitted and statements that use it must be
+       changed.
+
+     * Incompatible change: In MySQL 5.5.3, several changes were
+       made to alias resolution in multiple-table DELETE
+       statements so that it is no longer possible to have
+       inconsistent or ambiguous table aliases.
 
           + In MySQL 5.1.23, alias declarations outside the
-            table_references part of the statement were disallowed
-            for the USING variant of multiple-table DELETE syntax, to
-            reduce the possibility of ambiguous aliases that could
-            lead to ambiguous statements that have unexpected results
-            such as deleting rows from the wrong table.
+            table_references part of the statement were
+            disallowed for the USING variant of multiple-table
+            DELETE syntax, to reduce the possibility of
+            ambiguous aliases that could lead to ambiguous
+            statements that have unexpected results such as
+            deleting rows from the wrong table.
             As of MySQL 5.5.3, alias declarations outside
-            table_references are disallowed for all multiple-table
-            DELETE statements. Alias declarations are permitted only
-            in the table_references part.
+            table_references are disallowed for all
+            multiple-table DELETE statements. Alias declarations
+            are permitted only in the table_references part.
             Incorrect:
 DELETE FROM t1 AS a2 USING t1 AS a1 INNER JOIN t2 AS a2;
 DELETE t1 AS a2 FROM t1 AS a1 INNER JOIN t2 AS a2;
+
             Correct:
 DELETE FROM t1 USING t1 AS a1 INNER JOIN t2 AS a2;
 DELETE t1 FROM t1 AS a1 INNER JOIN t2 AS a2;
 
-          + Previously, for alias references in the list of tables
-            from which to delete rows in a multiple-table delete, the
-            default database is used unless one is specified
-            explicitly. For example, if the default database is db1,
-            the following statement does not work because the
-            unqualified alias reference a2 is interpreted as having a
-            database of db1:
+
+          + Previously, for alias references in the list of
+            tables from which to delete rows in a multiple-table
+            delete, the default database is used unless one is
+            specified explicitly. For example, if the default
+            database is db1, the following statement does not
+            work because the unqualified alias reference a2 is
+            interpreted as having a database of db1:
 DELETE a1, a2 FROM db1.t1 AS a1 INNER JOIN db2.t2 AS a2
 WHERE a1.id=a2.id;
+
             To correctly match an alias that refers to a table
-            outside the default database, you must explicitly qualify
-            the reference with the name of the proper database:
+            outside the default database, you must explicitly
+            qualify the reference with the name of the proper
+            database:
 DELETE a1, db2.a2 FROM db1.t1 AS a1 INNER JOIN db2.t2 AS a2
 WHERE a1.id=a2.id;
+
             As of MySQL 5.5.3, alias resolution does not require
             qualification and alias references should not be
-            qualified with the database name. Qualified names are
-            interpreted as referring to tables, not aliases.
+            qualified with the database name. Qualified names
+            are interpreted as referring to tables, not aliases.
        Statements containing alias constructs that are no longer
        permitted must be rewritten.
 
      * Some keywords may be reserved in MySQL 5.5 that were not
        reserved in MySQL 5.1. See Section 9.3, "Reserved Words."
 
-2.12.1.2. Upgrading from MySQL 5.4 to 5.5
+2.11.1.2 Upgrading from MySQL 5.4 to 5.5
 
-   This section is for the special case of upgrading to MySQL 5.5
-   from the short-lived MySQL 5.4 development series, which is no
-   longer being worked on.
+   This section is for the special case of upgrading to MySQL
+   5.5 from the short-lived MySQL 5.4 development series, which
+   is no longer being worked on.
    Note
 
-   It is good practice to back up your data before installing any new
-   version of software. Although MySQL works very hard to ensure a
-   high level of quality, you should protect your data by making a
-   backup.
+   It is good practice to back up your data before installing
+   any new version of software. Although MySQL works very hard
+   to ensure a high level of quality, you should protect your
+   data by making a backup.
 
-   To upgrade to 5.5 from any previous version, MySQL recommends that
-   you dump your tables with mysqldump before upgrading and reload
-   the dump file after upgrading. Use the --all-databases option to
-   include all databases in the dump. If your databases include
-   stored programs, use the --routines and --events options as well.
+   To upgrade to 5.5 from any previous version, MySQL recommends
+   that you dump your tables with mysqldump before upgrading and
+   reload the dump file after upgrading. Use the --all-databases
+   option to include all databases in the dump. If your
+   databases include stored programs, use the --routines and
+   --events options as well.
 
-   In general, you should do the following when upgrading from MySQL
-   5.4 to 5.5:
+   In general, you should do the following when upgrading from
+   MySQL 5.4 to 5.5:
 
-     * Read all the items in these sections to see whether any of
-       them might affect your applications:
+     * Read all the items in these sections to see whether any
+       of them might affect your applications:
 
-          + Section 2.12.1, "Upgrading MySQL," has general update
-            information.
+          + Section 2.11.1, "Upgrading MySQL," has general
+            update information.
 
           + The items in the change lists provided later in this
-            section enable you to identify upgrade issues that apply
-            to your current MySQL installation. Some
-            incompatibilities discussed there require your attention
-            before upgrading. Others should be dealt with after
-            upgrading.
+            section enable you to identify upgrade issues that
+            apply to your current MySQL installation. Some
+            incompatibilities discussed there require your
+            attention before upgrading. Others should be dealt
+            with after upgrading.
 
           + The MySQL 5.5 Release Notes
             (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/)
-            describe significant new features you can use in 5.5 or
-            that differ from those found in earlier MySQL releases.
-            Some of these changes may result in incompatibilities.
-       Note particularly any changes that are marked Known issue or
-       Incompatible change. These incompatibilities with earlier
-       versions of MySQL may require your attention before you
-       upgrade. Our aim is to avoid these changes, but occasionally
-       they are necessary to correct problems that would be worse
-       than an incompatibility between releases. If any upgrade issue
-       applicable to your installation involves an incompatibility
-       that requires special handling, follow the instructions given
-       in the incompatibility description. Sometimes this involves
-       dumping and reloading tables, or use of a statement such as
-       CHECK TABLE or REPAIR TABLE.
-       For dump and reload instructions, see Section 2.12.4,
-       "Rebuilding or Repairing Tables or Indexes." Any procedure
-       that involves REPAIR TABLE with the USE_FRM option must be
-       done before upgrading. Use of this statement with a version of
-       MySQL different from the one used to create the table (that
-       is, using it after upgrading) may damage the table. See
-       Section 13.7.2.5, "REPAIR TABLE Syntax."
-
-     * Before upgrading to a new version of MySQL, Section 2.12.3,
-       "Checking Whether Tables or Indexes Must Be Rebuilt," to see
-       whether changes to table formats or to character sets or
-       collations were made between your current version of MySQL and
-       the version to which you are upgrading. If so and these
-       changes result in an incompatibility between MySQL versions,
-       you will need to upgrade the affected tables using the
-       instructions in Section 2.12.4, "Rebuilding or Repairing
-       Tables or Indexes."
-
-     * After upgrading to a new version of MySQL, run mysql_upgrade
-       (see Section 4.4.7, "mysql_upgrade --- Check and Upgrade MySQL
-       Tables"). This program checks your tables, and attempts to
-       repair them if necessary. It also updates your grant tables to
-       make sure that they have the current structure so that you can
-       take advantage of any new capabilities. (Some releases of
-       MySQL introduce changes to the structure of the grant tables
-       to add new privileges or features.)
+            describe significant new features you can use in 5.5
+            or that differ from those found in earlier MySQL
+            releases. Some of these changes may result in
+            incompatibilities.
+       Note particularly any changes that are marked Known issue
+       or Incompatible change. These incompatibilities with
+       earlier versions of MySQL may require your attention
+       before you upgrade. Our aim is to avoid these changes,
+       but occasionally they are necessary to correct problems
+       that would be worse than an incompatibility between
+       releases. If any upgrade issue applicable to your
+       installation involves an incompatibility that requires
+       special handling, follow the instructions given in the
+       incompatibility description. Sometimes this involves
+       dumping and reloading tables, or use of a statement such
+       as CHECK TABLE or REPAIR TABLE.
+       For dump and reload instructions, see Section 2.11.4,
+       "Rebuilding or Repairing Tables or Indexes." Any
+       procedure that involves REPAIR TABLE with the USE_FRM
+       option must be done before upgrading. Use of this
+       statement with a version of MySQL different from the one
+       used to create the table (that is, using it after
+       upgrading) may damage the table. See Section 13.7.2.5,
+       "REPAIR TABLE Syntax."
+
+     * Before upgrading to a new version of MySQL, Section
+       2.11.3, "Checking Whether Tables or Indexes Must Be
+       Rebuilt," to see whether changes to table formats or to
+       character sets or collations were made between your
+       current version of MySQL and the version to which you are
+       upgrading. If so and these changes result in an
+       incompatibility between MySQL versions, you will need to
+       upgrade the affected tables using the instructions in
+       Section 2.11.4, "Rebuilding or Repairing Tables or
+       Indexes."
+
+     * After upgrading to a new version of MySQL, run
+       mysql_upgrade (see Section 4.4.7, "mysql_upgrade ---
+       Check and Upgrade MySQL Tables"). This program checks
+       your tables, and attempts to repair them if necessary. It
+       also updates your grant tables to make sure that they
+       have the current structure so that you can take advantage
+       of any new capabilities. (Some releases of MySQL
+       introduce changes to the structure of the grant tables to
+       add new privileges or features.)
        mysql_upgrade does not upgrade the contents of the help
        tables. For upgrade instructions, see Section 5.1.10,
        "Server-Side Help."
@@ -8189,524 +9000,569 @@
      * If you run MySQL Server on Windows, see Section 2.3.9,
        "Upgrading MySQL on Windows."
 
-     * If you use replication, see Section 16.4.3, "Upgrading a
+     * If you use replication, see Section 17.4.3, "Upgrading a
        Replication Setup," for information on upgrading your
        replication setup.
 
-   If your MySQL installation contains a large amount of data that
-   might take a long time to convert after an in-place upgrade, you
-   might find it useful to create a "dummy" database instance for
-   assessing what conversions might be needed and the work involved
-   to perform them. Make a copy of your MySQL instance that contains
-   a full copy of the mysql database, plus all other databases
-   without data. Run your upgrade procedure on this dummy instance to
-   see what actions might be needed so that you can better evaluate
-   the work involved when performing actual data conversion on your
+   If your MySQL installation contains a large amount of data
+   that might take a long time to convert after an in-place
+   upgrade, you might find it useful to create a "dummy"
+   database instance for assessing what conversions might be
+   needed and the work involved to perform them. Make a copy of
+   your MySQL instance that contains a full copy of the mysql
+   database, plus all other databases without data. Run your
+   upgrade procedure on this dummy instance to see what actions
+   might be needed so that you can better evaluate the work
+   involved when performing actual data conversion on your
    original database instance.
 
-   The following lists describe changes that may affect applications
-   and that you should watch out for when upgrading from MySQL 5.4 to
-   5.5.
+   The following lists describe changes that may affect
+   applications and that you should watch out for when upgrading
+   from MySQL 5.4 to 5.5.
 
 Configuration Changes
 
 
      * Incompatible change: In MySQL 5.5, the server includes a
-       plugin services interface that complements the plugin API. The
-       services interface enables server functionality to be exposed
-       as a "service" that plugins can access through a function-call
-       interface. The libmysqlservices library provides access to the
-       available services and dynamic plugins now must be linked
-       against this library (use the -lmysqlservices flag). For an
-       example showing how to configure for CMake, see Section
-       23.2.5, "MySQL Services for Plugins."
+       plugin services interface that complements the plugin
+       API. The services interface enables server functionality
+       to be exposed as a "service" that plugins can access
+       through a function-call interface. The libmysqlservices
+       library provides access to the available services and
+       dynamic plugins now must be linked against this library
+       (use the -lmysqlservices flag). For an example showing
+       how to configure for CMake, see Section 24.2.5, "MySQL
+       Services for Plugins."
 
 Server Changes
 
 
-     * Incompatible change: As of MySQL 5.5.7, the server requires
-       that a new grant table, proxies_priv, be present in the mysql
-       database. If you are upgrading from a previous MySQL release
-       rather than performing a new installation, the server will
-       find that this table is missing and exit during startup with
-       the following message:
+     * On Linux systems, the libaio library may be needed.
+       Install it first, if it is not already present on your
+       system.
+
+     * Incompatible change: As of MySQL 5.5.7, the server
+       requires that a new grant table, proxies_priv, be present
+       in the mysql database. If you are upgrading from a
+       previous MySQL release rather than performing a new
+       installation, the server will find that this table is
+       missing and exit during startup with the following
+       message:
 Table 'mysql.proxies_priv' doesn't exist
-       To create the proxies_priv table, start the server with the
-       --skip-grant-tables option to cause it to skip the normal
-       grant table checks, then run mysql_upgrade. For example:
+
+       To create the proxies_priv table, start the server with
+       the --skip-grant-tables option to cause it to skip the
+       normal grant table checks, then run mysql_upgrade. For
+       example:
 shell> mysqld --skip-grant-tables &
 shell> mysql_upgrade
+
        Then stop the server and restart it normally.
-       You can specify other options on the mysqld command line if
-       necessary. Alternatively, if your installation is configured
-       so that the server normally reads options from an option file,
-       use the --defaults-file option to specify the file (enter each
-       command on a single line):
+       You can specify other options on the mysqld command line
+       if necessary. Alternatively, if your installation is
+       configured so that the server normally reads options from
+       an option file, use the --defaults-file option to specify
+       the file (enter each command on a single line):
 shell> mysqld --defaults-file=/usr/local/mysql/etc/my.cnf
          --skip-grant-tables &
 shell> mysql_upgrade
+
        With the --skip-grant-tables option, the server does no
-       password or privilege checking, so any client can connect and
-       effectively have all privileges. For additional security, use
-       the --skip-networking option as well to prevent remote clients
-       from connecting.
+       password or privilege checking, so any client can connect
+       and effectively have all privileges. For additional
+       security, use the --skip-networking option as well to
+       prevent remote clients from connecting.
 
      * Incompatible change: As of MySQL 5.5.3, the Unicode
        implementation has been extended to provide support for
        supplementary characters that lie outside the Basic
        Multilingual Plane (BMP). Noteworthy features:
 
-          + utf16 and utf32 character sets have been added. These
-            correspond to the UTF-16 and UTF-32 encodings of the
-            Unicode character set, and they both support
+          + utf16 and utf32 character sets have been added.
+            These correspond to the UTF-16 and UTF-32 encodings
+            of the Unicode character set, and they both support
+            supplementary characters.
+
+          + The utf8mb4 character set has been added. This is
+            similar to utf8, but its encoding allows up to four
+            bytes per character to enable support for
             supplementary characters.
 
-          + The utf8mb4 character set has been added. This is similar
-            to utf8, but its encoding allows up to four bytes per
-            character to enable support for supplementary characters.
-
-          + The ucs2 character set is essentially unchanged except
-            for the inclusion of some newer BMP characters.
-       In most respects, upgrading to MySQL 5.5 should present few
-       problems with regard to Unicode usage, although there are some
-       potential areas of incompatibility. These are the primary
-       areas of concern:
-
-          + For the variable-length character data types (VARCHAR and
-            the TEXT types), the maximum length in characters is less
-            for utf8mb4 columns than for utf8 columns.
-
-          + For all character data types (CHAR, VARCHAR, and the TEXT
-            types), the maximum number of characters that can be
-            indexed is less for utf8mb4 columns than for utf8
+          + The ucs2 character set is essentially unchanged
+            except for the inclusion of some newer BMP
+            characters.
+       In most respects, upgrading to MySQL 5.5 should present
+       few problems with regard to Unicode usage, although there
+       are some potential areas of incompatibility. These are
+       the primary areas of concern:
+
+          + For the variable-length character data types
+            (VARCHAR and the TEXT types), the maximum length in
+            characters is less for utf8mb4 columns than for utf8
             columns.
+
+          + For all character data types (CHAR, VARCHAR, and the
+            TEXT types), the maximum number of characters that
+            can be indexed is less for utf8mb4 columns than for
+            utf8 columns.
        Consequently, if you want to upgrade tables from utf8 to
-       utf8mb4 to take advantage of supplementary-character support,
-       it may be necessary to change some column or index
-       definitions.
-       For additional details about the new Unicode character sets
-       and potential incompatibilities, see Section 10.1.10, "Unicode
-       Support," and Section 10.1.11, "Upgrading from Previous to
-       Current Unicode Support."
-
-     * Incompatible change: As of MySQL 5.5.3, the server includes
-       dtoa, a library for conversion between strings and numbers by
-       David M. Gay. In MySQL, this library provides the basis for
-       improved conversion between string or DECIMAL values and
-       approximate-value (FLOAT/DOUBLE) numbers.
-       Because the conversions produced by this library differ in
-       some cases from previous results, the potential exists for
-       incompatibilities in applications that rely on previous
-       results. For example, applications that depend on a specific
-       exact result from previous conversions might need adjustment
-       to accommodate additional precision.
+       utf8mb4 to take advantage of supplementary-character
+       support, it may be necessary to change some column or
+       index definitions.
+       For additional details about the new Unicode character
+       sets and potential incompatibilities, see Section
+       10.1.10, "Unicode Support," and Section 10.1.11,
+       "Upgrading from Previous to Current Unicode Support."
+
+     * Incompatible change: As of MySQL 5.5.3, the server
+       includes dtoa, a library for conversion between strings
+       and numbers by David M. Gay. In MySQL, this library
+       provides the basis for improved conversion between string
+       or DECIMAL values and approximate-value (FLOAT/DOUBLE)
+       numbers.
+       Because the conversions produced by this library differ
+       in some cases from previous results, the potential exists
+       for incompatibilities in applications that rely on
+       previous results. For example, applications that depend
+       on a specific exact result from previous conversions
+       might need adjustment to accommodate additional
+       precision.
        For additional information about the properties of dtoa
-       conversions, see Section 12.2, "Type Conversion in Expression
-       Evaluation."
-
-     * Incompatible change: In MySQL 5.5, several changes were made
-       regarding the language and character set of error messages:
+       conversions, see Section 12.2, "Type Conversion in
+       Expression Evaluation."
 
-          + The --language option for specifying the directory for
-            the error message file is now deprecated. The new
-            lc_messages_dir and lc_messages system variables should
-            be used instead, and the server treats --language as an
-            alias for lc_messages_dir.
+     * Incompatible change: In MySQL 5.5, several changes were
+       made regarding the language and character set of error
+       messages:
+
+          + The --language option for specifying the directory
+            for the error message file is now deprecated. The
+            new lc_messages_dir and lc_messages system variables
+            should be used instead, and the server treats
+            --language as an alias for lc_messages_dir.
 
           + The language system variable has been removed and
-            replaced with the new lc_messages_dir and lc_messages
-            system variables. lc_messages_dir has only a global value
-            and is read only. lc_messages has global and session
-            values and can be modified at runtime, so the error
-            message language can be changed while the server is
-            running, and individual clients each can have a different
-            error message language by changing their session
-            lc_messages value to a different locale name.
-
-          + Error messages previously were constructed in a mix of
-            character sets. This issue is resolved by constructing
-            error messages internally within the server using UTF-8
-            and returning them to the client in the character set
-            specified by the character_set_results system variable.
-            The content of error messages therefore may in some cases
-            differ from the messages returned previously.
-       For more information, see Section 10.2, "Setting the Error
-       Message Language," and Section 10.1.6, "Character Set for
-       Error Messages."
-
-     * Before MySQL 5.1.36, plugin options were boolean options (see
-       Section 4.2.3.2, "Program Option Modifiers"). If you upgrade
-       to MySQL 5.5 from a version older than 5.1.36 and previously
-       used options of the form --plugin_name=0 or --plugin_name=1,
-       the equivalent options are now --plugin_name=OFF and
-       --plugin_name=ON, respectively. You also have the choice of
-       requiring plugins to start successfully by using
-       --plugin_name=FORCE or --plugin_name=FORCE_PLUS_PERMANENT.
+            replaced with the new lc_messages_dir and
+            lc_messages system variables. lc_messages_dir has
+            only a global value and is read only. lc_messages
+            has global and session values and can be modified at
+            runtime, so the error message language can be
+            changed while the server is running, and individual
+            clients each can have a different error message
+            language by changing their session lc_messages value
+            to a different locale name.
+
+          + Error messages previously were constructed in a mix
+            of character sets. This issue is resolved by
+            constructing error messages internally within the
+            server using UTF-8 and returning them to the client
+            in the character set specified by the
+            character_set_results system variable. The content
+            of error messages therefore may in some cases differ
+            from the messages returned previously.
+       For more information, see Section 10.2, "Setting the
+       Error Message Language," and Section 10.1.6, "Character
+       Set for Error Messages."
+
+     * Before MySQL 5.1.36, plugin options were boolean options
+       (see Section 4.2.5, "Program Option Modifiers"). If you
+       upgrade to MySQL 5.5 from a version older than 5.1.36 and
+       previously used options of the form --plugin_name=0 or
+       --plugin_name=1, the equivalent options are now
+       --plugin_name=OFF and --plugin_name=ON, respectively. You
+       also have the choice of requiring plugins to start
+       successfully by using --plugin_name=FORCE or
+       --plugin_name=FORCE_PLUS_PERMANENT.
 
 SQL Changes
 
 
-     * Incompatible change: Previously, the parser accepted an INTO
-       clause in nested SELECT statements, which is invalid because
-       such statements must return their results to the outer
-       context. As of MySQL 5.5.3, this syntax is no longer permitted
-       and statements that use it must be changed.
+     * Incompatible change: Previously, the parser accepted an
+       INTO clause in nested SELECT statements, which is invalid
+       because such statements must return their results to the
+       outer context. As of MySQL 5.5.3, this syntax is no
+       longer permitted and statements that use it must be
+       changed.
 
      * Some keywords may be reserved in MySQL 5.5 that were not
        reserved in MySQL 5.4. See Section 9.3, "Reserved Words."
 
-2.12.2. Downgrading MySQL
+2.11.2 Downgrading MySQL
 
-   This section describes what you should do to downgrade to an older
-   MySQL version in the unlikely case that the previous version
-   worked better than the new one.
-
-   It is always a good idea to make a backup beforehand, in case a
-   downgrade fails and leaves the instance in an unusable state.
-
-   To downgrade between General Availability (GA) status versions
-   within the same release series, typically you just install the new
-   binaries on top of the old ones and do not make any changes to the
-   databases.
-
-   Downgrades between milestone releases (or from a GA release to a
-   milestone release) within the same release series are not
-   supported and you may encounter issues.
+   This section describes what you should do to downgrade to an
+   older MySQL version in the unlikely case that the previous
+   version worked better than the new one.
+
+   It is always a good idea to make a backup beforehand, in case
+   a downgrade fails and leaves the instance in an unusable
+   state.
+
+   To downgrade between General Availability (GA) status
+   versions within the same release series, typically you just
+   install the new binaries on top of the old ones and do not
+   make any changes to the databases.
+
+   Downgrades between milestone releases (or from a GA release
+   to a milestone release) within the same release series are
+   not supported and you may encounter issues.
 
    The following items form a checklist of things you should do
    whenever you perform a downgrade:
 
-     * Read the upgrading section for the release series from which
-       you are downgrading to be sure that it does not have any
-       features you really need. See Section 2.12.1, "Upgrading
-       MySQL."
-
-     * If there is a downgrading section for that version, you should
-       read that as well.
-
-     * To see which new features were added between the version to
-       which you are downgrading and your current version, see the
-       Release Notes
+     * Read the upgrading section for the release series from
+       which you are downgrading to be sure that it does not
+       have any features you really need. See Section 2.11.1,
+       "Upgrading MySQL."
+
+     * If there is a downgrading section for that version, you
+       should read that as well.
+
+     * To see which new features were added between the version
+       to which you are downgrading and your current version,
+       see the Release Notes
        (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/).
 
-     * Check Section 2.12.3, "Checking Whether Tables or Indexes Must
-       Be Rebuilt," to see whether changes to table formats or to
-       character sets or collations were made between your current
-       version of MySQL and the version to which you are downgrading.
-       If so and these changes result in an incompatibility between
-       MySQL versions, you will need to downgrade the affected tables
-       using the instructions in Section 2.12.4, "Rebuilding or
-       Repairing Tables or Indexes."
-
-   In most cases, you can move the MySQL format files and data files
-   between different GA versions on the same architecture as long as
-   you stay within versions for the same release series of MySQL.
-
-   If you downgrade from one release series to another, there may be
-   incompatibilities in table storage formats. In this case, use
-   mysqldump to dump your tables before downgrading. After
-   downgrading, reload the dump file using mysql or mysqlimport to
-   re-create your tables. For examples, see Section 2.12.5, "Copying
-   MySQL Databases to Another Machine."
-
-   A typical symptom of a downward-incompatible table format change
-   when you downgrade is that you cannot open tables. In that case,
-   use the following procedure:
+     * Check Section 2.11.3, "Checking Whether Tables or Indexes
+       Must Be Rebuilt," to see whether changes to table formats
+       or to character sets or collations were made between your
+       current version of MySQL and the version to which you are
+       downgrading. If so and these changes result in an
+       incompatibility between MySQL versions, you will need to
+       downgrade the affected tables using the instructions in
+       Section 2.11.4, "Rebuilding or Repairing Tables or
+       Indexes."
+
+   In most cases, you can move the MySQL format files and data
+   files between different GA versions on the same architecture
+   as long as you stay within versions for the same release
+   series of MySQL.
+
+   If you downgrade from one release series to another, there
+   may be incompatibilities in table storage formats. In this
+   case, use mysqldump to dump your tables before downgrading.
+   After downgrading, reload the dump file using mysql or
+   mysqlimport to re-create your tables. For examples, see
+   Section 2.11.5, "Copying MySQL Databases to Another Machine."
+
+   A typical symptom of a downward-incompatible table format
+   change when you downgrade is that you cannot open tables. In
+   that case, use the following procedure:
 
     1. Stop the older MySQL server that you are downgrading to.
 
     2. Restart the newer MySQL server you are downgrading from.
 
-    3. Dump any tables that were inaccessible to the older server by
-       using mysqldump to create a dump file.
+    3. Dump any tables that were inaccessible to the older
+       server by using mysqldump to create a dump file.
 
     4. Stop the newer MySQL server and restart the older one.
 
-    5. Reload the dump file into the older server. Your tables should
-       be accessible.
+    5. Reload the dump file into the older server. Your tables
+       should be accessible.
 
-   It might also be the case that system tables in the mysql database
-   have changed and that downgrading introduces some loss of
-   functionality or requires some adjustments. Here are some
-   examples:
-
-     * Trigger creation requires the TRIGGER privilege as of MySQL
-       5.1. In MySQL 5.0, there is no TRIGGER privilege and SUPER is
-       required instead. If you downgrade from MySQL 5.1 to 5.0, you
-       will need to give the SUPER privilege to those accounts that
-       had the TRIGGER privilege in 5.1.
-
-     * Triggers were added in MySQL 5.0, so if you downgrade from 5.0
-       to 4.1, you cannot use triggers at all.
-
-     * The mysql.proc.comment column definition changed between MySQL
-       5.1 and 5.5. After a downgrade from 5.5 to 5.1, this table is
-       seen as corrupt and in need of repair. To workaround this
-       problem, execute mysql_upgrade from the version of MySQL to
-       which you downgraded.
-
-2.12.2.1. Downgrading to MySQL 5.1
-
-   When downgrading to MySQL 5.1 from MySQL 5.5, you should keep in
-   mind the following issues relating to features found in MySQL 5.5,
-   but not in MySQL 5.1:
-
-     * InnoDB.  MySQL 5.5 uses InnoDB Plugin as the built-in version
-       of InnoDB. MySQL 5.1 includes InnoDB Plugin as of 5.1.38, but
-       as an option that must be enabled explicitly. See the Release
-       Notes (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) for
+   It might also be the case that system tables in the mysql
+   database have changed and that downgrading introduces some
+   loss of functionality or requires some adjustments. Here are
+   some examples:
+
+     * Trigger creation requires the TRIGGER privilege as of
+       MySQL 5.1. In MySQL 5.0, there is no TRIGGER privilege
+       and SUPER is required instead. If you downgrade from
+       MySQL 5.1 to 5.0, you will need to give the SUPER
+       privilege to those accounts that had the TRIGGER
+       privilege in 5.1.
+
+     * Triggers were added in MySQL 5.0, so if you downgrade
+       from 5.0 to 4.1, you cannot use triggers at all.
+
+     * The mysql.proc.comment column definition changed between
+       MySQL 5.1 and 5.5. After a downgrade from 5.5 to 5.1,
+       this table is seen as corrupt and in need of repair. To
+       workaround this problem, execute mysql_upgrade from the
+       version of MySQL to which you downgraded.
+
+2.11.2.1 Downgrading to MySQL 5.1
+
+   When downgrading to MySQL 5.1 from MySQL 5.5, you should keep
+   in mind the following issues relating to features found in
+   MySQL 5.5, but not in MySQL 5.1:
+
+     * InnoDB.  MySQL 5.5 uses InnoDB Plugin as the built-in
+       version of InnoDB. MySQL 5.1 includes InnoDB Plugin as of
+       5.1.38, but as an option that must be enabled explicitly.
+       See the Release Notes
+       (http://dev.mysql.com/doc/relnotes/mysql/5.5/en/) for
        MySQL 5.1.38.
 
-     * Tables partitioned by [LINEAR] KEY.  MySQL 5.5 implements new
-       functions used to calculate row placement for tables
-       partitioned by KEY and LINEAR KEY. Tables that were created
-       using KEY or LINEAR KEY partitioning in MySQL 5.5 cannot be
-       used by a MySQL 5.1 server. In MySQL 5.5.31 and later, you can
-       downgrade such tables with ALTER TABLE ... PARTITION BY
-       ALGORITHM=1 [LINEAR] KEY (...) to make them compatible with
-       MySQL 5.1.
+     * Tables partitioned by [LINEAR] KEY.  MySQL 5.5 implements
+       new functions used to calculate row placement for tables
+       partitioned by KEY and LINEAR KEY. Tables that were
+       created using KEY or LINEAR KEY partitioning in MySQL 5.5
+       cannot be used by a MySQL 5.1 server. In MySQL 5.5.31 and
+       later, you can downgrade such tables with ALTER TABLE ...
+       PARTITION BY ALGORITHM=1 [LINEAR] KEY (...) to make them
+       compatible with MySQL 5.1.
 
-2.12.2.2. Downgrading from MySQL Enterprise Edition to MySQL
+2.11.2.2 Downgrading from MySQL Enterprise Edition to MySQL
 Community Server
 
-   This section describes the steps required to downgrade from MySQL
-   Enterprise Edition to MySQL Community Edition. This can be done at
-   any time, and is required at the expiration of a MySQL Enterprise
-   Edition subscription if you wish to continue using MySQL Server.
+   This section describes the steps required to downgrade from
+   MySQL Enterprise Edition to MySQL Community Edition. This can
+   be done at any time, and is required at the expiration of a
+   MySQL Enterprise Edition subscription if you wish to continue
+   using MySQL Server.
 
    When you perform such a downgrade, all commercially licensed
-   components of the MySQL Enterprise Edition subscription must be
-   uninstalled. These components and related considerations are
-   described in the rest of this section.
+   components of the MySQL Enterprise Edition subscription must
+   be uninstalled. These components and related considerations
+   are described in the rest of this section.
    Note
 
-   The issues described in this section are in addition to any that
-   may be encountered as a result of any upgrade or downgrade of the
-   MySQL Server version (such as between MySQL 5.5 and 5.1).
-   Information about upgrading and downgrading between MySQL release
-   series can be found elsewhere in this chapter; see Section 2.12.1,
-   "Upgrading MySQL," and Section 2.12.2, "Downgrading MySQL."
+   The issues described in this section are in addition to any
+   that may be encountered as a result of any upgrade or
+   downgrade of the MySQL Server version (such as between MySQL
+   5.5 and 5.1). Information about upgrading and downgrading
+   between MySQL release series can be found elsewhere in this
+   chapter; see Section 2.11.1, "Upgrading MySQL," and Section
+   2.11.2, "Downgrading MySQL."
 
    MySQL Enterprise Database Server.  All commercial versions of
    MySQL Database Server must be uninstalled.
 
-   Commercially licensed extensions.  All commercially licensed MySQL
-   Enterprise Database Server extensions must be uninstalled. This
-   includes the following commercial extensions:
+   Commercially licensed extensions.  All commercially licensed
+   MySQL Enterprise Database Server extensions must be
+   uninstalled. This includes the following commercial
+   extensions:
 
      * MySQL External Authentication for Windows: Following
-       uninstallation of this plugin, existing MySQL user accounts
-       must be re-created using local authentication. See Section
-       6.3, "MySQL User Account Management," for more information.
+       uninstallation of this plugin, existing MySQL user
+       accounts must be re-created using local authentication.
+       See Section 6.3, "MySQL User Account Management," for
+       more information.
 
      * MySQL External Authentication for PAM: Following
-       uninstallation of this plugin, existing MySQL user accounts
-       must be re-created using local authentication. See Section
-       6.3, "MySQL User Account Management," for more information.
+       uninstallation of this plugin, existing MySQL user
+       accounts must be re-created using local authentication.
+       See Section 6.3, "MySQL User Account Management," for
+       more information.
 
      * MySQL Enterprise Scalability (Thread Pool): Following
-       uninstallation of this plugin, existing MySQL servers revert
-       to default thread and connection handling.
+       uninstallation of this plugin, existing MySQL servers
+       revert to default thread and connection handling.
 
      * MySQL Enterprise Audit: Following uninstallation of this
-       plugin, no logging of user logins or query activity occurs.
+       plugin, no logging of user logins or query activity
+       occurs.
 
      * MySQL High Availability: Following uninstallation of this
        plugin, automated failover is no longer available.
 
    MySQL Enterprise Backup.  MySQL Enterprise Backup must be
-   uninstalled. Uninstalling this application has the effects listed
-   here:
+   uninstalled. Uninstalling this application has the effects
+   listed here:
 
      * Automated backup scripts no longer work.
 
-     * Existing backup images taken with MySQL Enterprise Backup can
-       no longer be used for recovery.
+     * Existing backup images taken with MySQL Enterprise Backup
+       can no longer be used for recovery.
 
      * Third-party integration with multimedia systems such as
-       NetBackup, Tivoli, and Oracle Secure Backup no longer works.
+       NetBackup, Tivoli, and Oracle Secure Backup no longer
+       works.
 
-   MySQL Enterprise Monitor, MySQL Query Analyzer, agents.  MySQL
-   Enterprise Monitor, MySQL Query Analyzer, and all server-side
-   agents must be uninstalled. Uninstalling these applications and
-   agents has the following effects:
+   MySQL Enterprise Monitor, MySQL Query Analyzer, agents.
+   MySQL Enterprise Monitor, MySQL Query Analyzer, and all
+   server-side agents must be uninstalled. Uninstalling these
+   applications and agents has the following effects:
 
      * Automated SNMP and SMTP alerts no longer work.
 
-     * All historical MySQL, OS monitoring, query, and performance
-       metrics as well as all trending data are lost.
+     * All historical MySQL, OS monitoring, query, and
+       performance metrics as well as all trending data are
+       lost.
 
      * All environment-specific monitoring templates, custom
        advisors, graphs and scripts are also lost.
 
-2.12.3. Checking Whether Tables or Indexes Must Be Rebuilt
+2.11.3 Checking Whether Tables or Indexes Must Be Rebuilt
 
-   A binary upgrade or downgrade is one that installs one version of
-   MySQL "in place" over an existing version, without dumping and
-   reloading tables:
+   A binary upgrade or downgrade is one that installs one
+   version of MySQL "in place" over an existing version, without
+   dumping and reloading tables:
 
-    1. Stop the server for the existing version if it is running.
+    1. Stop the server for the existing version if it is
+       running.
 
-    2. Install a different version of MySQL. This is an upgrade if
-       the new version is higher than the original version, a
+    2. Install a different version of MySQL. This is an upgrade
+       if the new version is higher than the original version, a
        downgrade if the version is lower.
 
     3. Start the server for the new version.
 
-   In many cases, the tables from the previous version of MySQL can
-   be used without problem by the new version. However, sometimes
-   changes occur that require tables or table indexes to be rebuilt,
-   as described in this section. If you have tables that are affected
-   by any of the issues described here, rebuild the tables or indexes
-   as necessary using the instructions given in Section 2.12.4,
-   "Rebuilding or Repairing Tables or Indexes."
+   In many cases, the tables from the previous version of MySQL
+   can be used without problem by the new version. However,
+   sometimes changes occur that require tables or table indexes
+   to be rebuilt, as described in this section. If you have
+   tables that are affected by any of the issues described here,
+   rebuild the tables or indexes as necessary using the
+   instructions given in Section 2.11.4, "Rebuilding or
+   Repairing Tables or Indexes."
 
 Table Incompatibilities
 
-   After a binary upgrade to MySQL 5.1 from a MySQL 5.0 installation
-   that contains ARCHIVE tables, accessing those tables causes the
-   server to crash, even if you have run mysql_upgrade or CHECK TABLE
-   ... FOR UPGRADE. To work around this problem, use mysqldump to
-   dump all ARCHIVE tables before upgrading, and reload them into
-   MySQL 5.1 after upgrading. The same problem occurs for binary
-   downgrades from MySQL 5.1 to 5.0.
-
-   The upgrade problem is fixed in MySQL 5.6.4: The server can open
-   ARCHIVE tables created in MySQL 5.0. However, it remains the
-   recommended upgrade procedure to dump 5.0 ARCHIVE tables before
-   upgrading and reload them after upgrading.
+   After a binary upgrade to MySQL 5.1 from a MySQL 5.0
+   installation that contains ARCHIVE tables, accessing those
+   tables causes the server to crash, even if you have run
+   mysql_upgrade or CHECK TABLE ... FOR UPGRADE. To work around
+   this problem, use mysqldump to dump all ARCHIVE tables before
+   upgrading, and reload them into MySQL 5.1 after upgrading.
+   The same problem occurs for binary downgrades from MySQL 5.1
+   to 5.0.
+
+   The upgrade problem is fixed in MySQL 5.6.4: The server can
+   open ARCHIVE tables created in MySQL 5.0. However, it remains
+   the recommended upgrade procedure to dump 5.0 ARCHIVE tables
+   before upgrading and reload them after upgrading.
 
 Index Incompatibilities
 
    In MySQL 5.6.3, the length limit for index prefix keys is
-   increased from 767 bytes to 3072 bytes, for InnoDB tables using
-   ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED. See Section 14.3.9.7,
-   "Limits on InnoDB Tables" for details. This change is also
-   backported to MySQL 5.5.14. If you downgrade from one of these
-   releases or higher, to an earlier release with a lower length
-   limit, the index prefix keys could be truncated at 767 bytes or
-   the downgrade could fail. This issue could only occur if the
-   configuration option innodb_large_prefix was enabled on the server
-   being downgraded.
+   increased from 767 bytes to 3072 bytes, for InnoDB tables
+   using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED. See
+   Section 14.9.7, "Limits on InnoDB Tables" for details. This
+   change is also backported to MySQL 5.5.14. If you downgrade
+   from one of these releases or higher, to an earlier release
+   with a lower length limit, the index prefix keys could be
+   truncated at 767 bytes or the downgrade could fail. This
+   issue could only occur if the configuration option
+   innodb_large_prefix was enabled on the server being
+   downgraded.
 
    If you perform a binary upgrade without dumping and reloading
    tables, you cannot upgrade directly from MySQL 4.1 to 5.1 or
-   higher. This occurs due to an incompatible change in the MyISAM
-   table index format in MySQL 5.0. Upgrade from MySQL 4.1 to 5.0 and
-   repair all MyISAM tables. Then upgrade from MySQL 5.0 to 5.1 and
-   check and repair your tables.
+   higher. This occurs due to an incompatible change in the
+   MyISAM table index format in MySQL 5.0. Upgrade from MySQL
+   4.1 to 5.0 and repair all MyISAM tables. Then upgrade from
+   MySQL 5.0 to 5.1 and check and repair your tables.
 
    Modifications to the handling of character sets or collations
-   might change the character sort order, which causes the ordering
-   of entries in any index that uses an affected character set or
-   collation to be incorrect. Such changes result in several possible
-   problems:
+   might change the character sort order, which causes the
+   ordering of entries in any index that uses an affected
+   character set or collation to be incorrect. Such changes
+   result in several possible problems:
 
      * Comparison results that differ from previous results
 
-     * Inability to find some index values due to misordered index
-       entries
+     * Inability to find some index values due to misordered
+       index entries
 
      * Misordered ORDER BY results
 
-     * Tables that CHECK TABLE reports as being in need of repair
+     * Tables that CHECK TABLE reports as being in need of
+       repair
 
-   The solution to these problems is to rebuild any indexes that use
-   an affected character set or collation, either by dropping and
-   re-creating the indexes, or by dumping and reloading the entire
-   table. In some cases, it is possible to alter affected columns to
-   use a different collation. For information about rebuilding
-   indexes, see Section 2.12.4, "Rebuilding or Repairing Tables or
-   Indexes."
-
-   To check whether a table has indexes that must be rebuilt, consult
-   the following list. It indicates which versions of MySQL
-   introduced character set or collation changes that require indexes
-   to be rebuilt. Each entry indicates the version in which the
-   change occurred and the character sets or collations that the
-   change affects. If the change is associated with a particular bug
-   report, the bug number is given.
+   The solution to these problems is to rebuild any indexes that
+   use an affected character set or collation, either by
+   dropping and re-creating the indexes, or by dumping and
+   reloading the entire table. In some cases, it is possible to
+   alter affected columns to use a different collation. For
+   information about rebuilding indexes, see Section 2.11.4,
+   "Rebuilding or Repairing Tables or Indexes."
+
+   To check whether a table has indexes that must be rebuilt,
+   consult the following list. It indicates which versions of
+   MySQL introduced character set or collation changes that
+   require indexes to be rebuilt. Each entry indicates the
+   version in which the change occurred and the character sets
+   or collations that the change affects. If the change is
+   associated with a particular bug report, the bug number is
+   given.
 
    The list applies both for binary upgrades and downgrades. For
-   example, Bug #27877 was fixed in MySQL 5.1.24, so it applies to
-   upgrades from versions older than 5.1.24 to 5.1.24 or newer, and
-   to downgrades from 5.1.24 or newer to versions older than 5.1.24.
-
-   In many cases, you can use CHECK TABLE ... FOR UPGRADE to identify
-   tables for which index rebuilding is required. It will report this
-   message:
+   example, Bug #27877 was fixed in MySQL 5.1.24, so it applies
+   to upgrades from versions older than 5.1.24 to 5.1.24 or
+   newer, and to downgrades from 5.1.24 or newer to versions
+   older than 5.1.24.
+
+   In many cases, you can use CHECK TABLE ... FOR UPGRADE to
+   identify tables for which index rebuilding is required. It
+   will report this message:
 Table upgrade required.
 Please do "REPAIR TABLE `tbl_name`" or dump/reload to fix it!
 
-   In these cases, you can also use mysqlcheck --check-upgrade or
-   mysql_upgrade, which execute CHECK TABLE. However, the use of
-   CHECK TABLE applies only after upgrades, not downgrades. Also,
-   CHECK TABLE is not applicable to all storage engines. For details
-   about which storage engines CHECK TABLE supports, see Section
-   13.7.2.2, "CHECK TABLE Syntax."
+   In these cases, you can also use mysqlcheck --check-upgrade
+   or mysql_upgrade, which execute CHECK TABLE. However, the use
+   of CHECK TABLE applies only after upgrades, not downgrades.
+   Also, CHECK TABLE is not applicable to all storage engines.
+   For details about which storage engines CHECK TABLE supports,
+   see Section 13.7.2.2, "CHECK TABLE Syntax."
 
    These changes cause index rebuilding to be necessary:
 
      * MySQL 5.1.24 (Bug #27877)
        Affects indexes that use the utf8_general_ci or
-       ucs2_general_ci collation for columns that contain 'ß' LATIN
-       SMALL LETTER SHARP S (German). The bug fix corrected an error
-       in the original collations but introduced an incompatibility
-       such that 'ß' compares equal to characters with which it
-       previously compared different.
-       Affected tables can be detected by CHECK TABLE ... FOR UPGRADE
-       as of MySQL 5.1.30 (see Bug #40053).
-       A workaround for this issue is implemented as of MySQL 5.1.62,
-       5.5.21, and 5.6.5. The workaround involves altering affected
-       columns to use the utf8_general_mysql500_ci and
-       ucs2_general_mysql500_ci collations, which preserve the
-       original pre-5.1.24 ordering of utf8_general_ci and
-       ucs2_general_ci.
+       ucs2_general_ci collation for columns that contain 'ß'
+       LATIN SMALL LETTER SHARP S (German). The bug fix
+       corrected an error in the original collations but
+       introduced an incompatibility such that 'ß' compares
+       equal to characters with which it previously compared
+       different.
+       Affected tables can be detected by CHECK TABLE ... FOR
+       UPGRADE as of MySQL 5.1.30 (see Bug #40053).
+       A workaround for this issue is implemented as of MySQL
+       5.1.62, 5.5.21, and 5.6.5. The workaround involves
+       altering affected columns to use the
+       utf8_general_mysql500_ci and ucs2_general_mysql500_ci
+       collations, which preserve the original pre-5.1.24
+       ordering of utf8_general_ci and ucs2_general_ci.
 
      * MySQL 5.0.48, 5.1.23 (Bug #27562)
-       Affects indexes that use the ascii_general_ci collation for
-       columns that contain any of these characters: '`' GRAVE
-       ACCENT, '[' LEFT SQUARE BRACKET, '\' REVERSE SOLIDUS, ']'
-       RIGHT SQUARE BRACKET, '~' TILDE
-       Affected tables can be detected by CHECK TABLE ... FOR UPGRADE
-       as of MySQL 5.1.29 (see Bug #39585).
+       Affects indexes that use the ascii_general_ci collation
+       for columns that contain any of these characters: '`'
+       GRAVE ACCENT, '[' LEFT SQUARE BRACKET, '\' REVERSE
+       SOLIDUS, ']' RIGHT SQUARE BRACKET, '~' TILDE
+       Affected tables can be detected by CHECK TABLE ... FOR
+       UPGRADE as of MySQL 5.1.29 (see Bug #39585).
 
      * MySQL 5.0.48, 5.1.21 (Bug #29461)
-       Affects indexes for columns that use any of these character
-       sets: eucjpms, euc_kr, gb2312, latin7, macce, ujis
-       Affected tables can be detected by CHECK TABLE ... FOR UPGRADE
-       as of MySQL 5.1.29 (see Bug #39585).
+       Affects indexes for columns that use any of these
+       character sets: eucjpms, euc_kr, gb2312, latin7, macce,
+       ujis
+       Affected tables can be detected by CHECK TABLE ... FOR
+       UPGRADE as of MySQL 5.1.29 (see Bug #39585).
 
-2.12.4. Rebuilding or Repairing Tables or Indexes
+2.11.4 Rebuilding or Repairing Tables or Indexes
 
    This section describes how to rebuild a table. This can be
    necessitated by changes to MySQL such as how data types are
    handled or changes to character set handling. For example, an
-   error in a collation might have been corrected, necessitating a
-   table rebuild to update the indexes for character columns that use
-   the collation. (For examples, see Section 2.12.3, "Checking
-   Whether Tables or Indexes Must Be Rebuilt.") It might also be that
-   a table repair or upgrade should be done as indicated by a table
-   check operation such as that performed by CHECK TABLE, mysqlcheck,
-   or mysql_upgrade.
-
-   Methods for rebuilding a table include dumping and reloading it,
-   or using ALTER TABLE or REPAIR TABLE.
-   Note
-
-   If you are rebuilding tables because a different version of MySQL
-   will not handle them after a binary (in-place) upgrade or
-   downgrade, you must use the dump-and-reload method. Dump the
-   tables before upgrading or downgrading using your original version
-   of MySQL. Then reload the tables after upgrading or downgrading.
-
-   If you use the dump-and-reload method of rebuilding tables only
-   for the purpose of rebuilding indexes, you can perform the dump
-   either before or after upgrading or downgrading. Reloading still
-   must be done afterward.
+   error in a collation might have been corrected, necessitating
+   a table rebuild to update the indexes for character columns
+   that use the collation. (For examples, see Section 2.11.3,
+   "Checking Whether Tables or Indexes Must Be Rebuilt.") It
+   might also be that a table repair or upgrade should be done
+   as indicated by a table check operation such as that
+   performed by CHECK TABLE, mysqlcheck, or mysql_upgrade.
+
+   Methods for rebuilding a table include dumping and reloading
+   it, or using ALTER TABLE or REPAIR TABLE. REPAIR TABLE only
+   applies to MyISAM, ARCHIVE, and CSV tables.
+   Note
+
+   If you are rebuilding tables because a different version of
+   MySQL will not handle them after a binary (in-place) upgrade
+   or downgrade, you must use the dump-and-reload method. Dump
+   the tables before upgrading or downgrading using your
+   original version of MySQL. Then reload the tables after
+   upgrading or downgrading.
+
+   If you use the dump-and-reload method of rebuilding tables
+   only for the purpose of rebuilding indexes, you can perform
+   the dump either before or after upgrading or downgrading.
+   Reloading still must be done afterward.
 
-   To rebuild a table by dumping and reloading it, use mysqldump to
-   create a dump file and mysql to reload the file:
+   To rebuild a table by dumping and reloading it, use mysqldump
+   to create a dump file and mysql to reload the file:
 shell> mysqldump db_name t1 > dump.sql
 shell> mysql db_name < dump.sql
 
@@ -8715,85 +9571,94 @@
 shell> mysqldump db_name > dump.sql
 shell> mysql db_name < dump.sql
 
-   To rebuild all tables in all databases, use the --all-databases
-   option:
+   To rebuild all tables in all databases, use the
+   --all-databases option:
 shell> mysqldump --all-databases > dump.sql
 shell> mysql < dump.sql
 
-   To rebuild a table with ALTER TABLE, use a "null" alteration; that
-   is, an ALTER TABLE statement that "changes" the table to use the
-   storage engine that it already has. For example, if t1 is a MyISAM
-   table, use this statement:
-mysql> ALTER TABLE t1 ENGINE = MyISAM;
-
-   If you are not sure which storage engine to specify in the ALTER
-   TABLE statement, use SHOW CREATE TABLE to display the table
-   definition.
-
-   If you must rebuild a table because a table checking operation
-   indicates that the table is corrupt or needs an upgrade, you can
-   use REPAIR TABLE if that statement supports the table's storage
-   engine. For example, to repair a MyISAM table, use this statement:
+   To rebuild a table with ALTER TABLE, use a "null" alteration;
+   that is, an ALTER TABLE statement that "changes" the table to
+   use the storage engine that it already has. For example, if
+   t1 is an InnoDB table, use this statement:
+mysql> ALTER TABLE t1 ENGINE = InnoDB;
+
+   If you are not sure which storage engine to specify in the
+   ALTER TABLE statement, use SHOW CREATE TABLE to display the
+   table definition.
+
+   If you need to rebuild an InnoDB table because a CHECK TABLE
+   operation indicates that a table upgrade is required, use
+   mysqldump to create a dump file and mysql to reload the file,
+   as described earlier. If the CHECK TABLE operation indicates
+   that there is a corruption or causes InnoDB to fail, refer to
+   Section 14.21.2, "Forcing InnoDB Recovery" for information
+   about using the innodb_force_recovery option to restart
+   InnoDB. To understand the type of problem that CHECK TABLE
+   may be encountering, refer to the InnoDB notes in Section
+   13.7.2.2, "CHECK TABLE Syntax."
+
+   For MyISAM, ARCHIVE, or CSV tables, you can use REPAIR TABLE
+   if the table checking operation indicates that there is a
+   corruption or that an upgrade is required. For example, to
+   repair a MyISAM table, use this statement:
 mysql> REPAIR TABLE t1;
 
-   For storage engines such as InnoDB that REPAIR TABLE does not
-   support, use mysqldump to create a dump file and mysql to reload
-   the file, as described earlier.
-
-   For specifics about which storage engines REPAIR TABLE supports,
-   see Section 13.7.2.5, "REPAIR TABLE Syntax."
-
-   mysqlcheck --repair provides command-line access to the REPAIR
-   TABLE statement. This can be a more convenient means of repairing
-   tables because you can use the --databases or --all-databases
-   option to repair all tables in specific databases or all
-   databases, respectively:
+   mysqlcheck --repair provides command-line access to the
+   REPAIR TABLE statement. This can be a more convenient means
+   of repairing tables because you can use the --databases or
+   --all-databases option to repair all tables in specific
+   databases or all databases, respectively:
 shell> mysqlcheck --repair --databases db_name ...
 shell> mysqlcheck --repair --all-databases
 
-   For incompatibilities introduced in MySQL 5.1.24 by the fix for
-   Bug #27877 that corrected the utf8_general_ci and ucs2_general_ci
-   collations, a workaround is implemented as of MySQL 5.1.62,
-   5.5.21, and 5.6.5. Upgrade to one of those versions, then convert
-   each affected table using one of the following methods. In each
-   case, the workaround altering affected columns to use the
-   utf8_general_mysql500_ci and ucs2_general_mysql500_ci collations,
-   which preserve the original pre-5.1.24 ordering of utf8_general_ci
-   and ucs2_general_ci.
+   For incompatibilities introduced in MySQL 5.1.24 by the fix
+   for Bug #27877 that corrected the utf8_general_ci and
+   ucs2_general_ci collations, a workaround is implemented as of
+   MySQL 5.1.62, 5.5.21, and 5.6.5. Upgrade to one of those
+   versions, then convert each affected table using one of the
+   following methods. In each case, the workaround altering
+   affected columns to use the utf8_general_mysql500_ci and
+   ucs2_general_mysql500_ci collations, which preserve the
+   original pre-5.1.24 ordering of utf8_general_ci and
+   ucs2_general_ci.
 
      * To convert an affected table after a binary upgrade that
-       leaves the table files in place, alter the table to use the
-       new collation. Suppose that the table t1 contains one or more
-       problematic utf8 columns. To convert the table at the table
-       level, use a statement like this:
+       leaves the table files in place, alter the table to use
+       the new collation. Suppose that the table t1 contains one
+       or more problematic utf8 columns. To convert the table at
+       the table level, use a statement like this:
 ALTER TABLE t1
 CONVERT TO CHARACTER SET utf8 COLLATE utf8_general_mysql500_ci;
+
        To apply the change on a column-specific basis, use a
-       statement like this (be sure to repeat the column definition
-       as originally specified except for the COLLATE clause):
+       statement like this (be sure to repeat the column
+       definition as originally specified except for the COLLATE
+       clause):
 ALTER TABLE t1
-MODIFY c1 CHAR(N) CHARACTER SET utf8 COLLATE utf8_general_mysql500_ci
-;
+MODIFY c1 CHAR(N) CHARACTER SET utf8 COLLATE utf8_general_mysql500_ci;
+
 
-     * To upgrade the table using a dump and reload procedure, dump
-       the table using mysqldump, modify the CREATE TABLE statement
-       in the dump file to use the new collation, and reload the
-       table.
+     * To upgrade the table using a dump and reload procedure,
+       dump the table using mysqldump, modify the CREATE TABLE
+       statement in the dump file to use the new collation, and
+       reload the table.
 
-   After making the appropriate changes, CHECK TABLE should report no
-   error.
+   After making the appropriate changes, CHECK TABLE should
+   report no error.
 
-2.12.5. Copying MySQL Databases to Another Machine
+2.11.5 Copying MySQL Databases to Another Machine
+
+   In cases where you need to transfer databases between
+   different architectures, you can use mysqldump to create a
+   file containing SQL statements. You can then transfer the
+   file to the other machine and feed it as input to the mysql
+   client.
+   Note
 
    You can copy the .frm, .MYI, and .MYD files for MyISAM tables
    between different architectures that support the same
    floating-point format. (MySQL takes care of any byte-swapping
-   issues.) See Section 14.4, "The MyISAM Storage Engine."
-
-   In cases where you need to transfer databases between different
-   architectures, you can use mysqldump to create a file containing
-   SQL statements. You can then transfer the file to the other
-   machine and feed it as input to the mysql client.
+   issues.) See Section 15.3, "The MyISAM Storage Engine."
 
    Use mysqldump --help to see what options are available.
 
@@ -8803,28 +9668,28 @@
 shell> mysqladmin -h 'other_hostname' create db_name
 shell> mysqldump db_name | mysql -h 'other_hostname' db_name
 
-   If you want to copy a database from a remote machine over a slow
-   network, you can use these commands:
+   If you want to copy a database from a remote machine over a
+   slow network, you can use these commands:
 shell> mysqladmin create db_name
-shell> mysqldump -h 'other_hostname' --compress db_name | mysql db_na
-me
+shell> mysqldump -h 'other_hostname' --compress db_name | mysql db_nam
+e
 
-   You can also store the dump in a file, transfer the file to the
-   target machine, and then load the file into the database there.
-   For example, you can dump a database to a compressed file on the
-   source machine like this:
+   You can also store the dump in a file, transfer the file to
+   the target machine, and then load the file into the database
+   there. For example, you can dump a database to a compressed
+   file on the source machine like this:
 shell> mysqldump --quick db_name | gzip > db_name.gz
 
-   Transfer the file containing the database contents to the target
-   machine and run these commands there:
+   Transfer the file containing the database contents to the
+   target machine and run these commands there:
 shell> mysqladmin create db_name
 shell> gunzip < db_name.gz | mysql db_name
 
    You can also use mysqldump and mysqlimport to transfer the
-   database. For large tables, this is much faster than simply using
-   mysqldump. In the following commands, DUMPDIR represents the full
-   path name of the directory you use to store the output from
-   mysqldump.
+   database. For large tables, this is much faster than simply
+   using mysqldump. In the following commands, DUMPDIR
+   represents the full path name of the directory you use to
+   store the output from mysqldump.
 
    First, create the directory for the output files and dump the
    database:
@@ -8832,48 +9697,46 @@
 shell> mysqldump --tab=DUMPDIR db_name
 
    Then transfer the files in the DUMPDIR directory to some
-   corresponding directory on the target machine and load the files
-   into MySQL there:
+   corresponding directory on the target machine and load the
+   files into MySQL there:
 shell> mysqladmin create db_name           # create database
-shell> cat DUMPDIR/*.sql | mysql db_name   # create tables in databas
-e
+shell> cat DUMPDIR/*.sql | mysql db_name   # create tables in database
 shell> mysqlimport db_name DUMPDIR/*.txt   # load data into tables
 
-   Do not forget to copy the mysql database because that is where the
-   grant tables are stored. You might have to run commands as the
-   MySQL root user on the new machine until you have the mysql
-   database in place.
-
-   After you import the mysql database on the new machine, execute
-   mysqladmin flush-privileges so that the server reloads the grant
-   table information.
-
-2.13. Environment Variables
-
-   This section lists all the environment variables that are used
-   directly or indirectly by MySQL. Most of these can also be found
-   in other places in this manual.
-
-   Note that any options on the command line take precedence over
-   values specified in option files and environment variables, and
-   values in option files take precedence over values in environment
-   variables.
-
-   In many cases, it is preferable to use an option file instead of
-   environment variables to modify the behavior of MySQL. See Section
-   4.2.3.3, "Using Option Files."
+   Do not forget to copy the mysql database because that is
+   where the grant tables are stored. You might have to run
+   commands as the MySQL root user on the new machine until you
+   have the mysql database in place.
+
+   After you import the mysql database on the new machine,
+   execute mysqladmin flush-privileges so that the server
+   reloads the grant table information.
+
+2.12 Environment Variables
+
+   This section lists all the environment variables that are
+   used directly or indirectly by MySQL. Most of these can also
+   be found in other places in this manual.
+
+   Options on the command line take precedence over values
+   specified in option files and environment variables, and
+   values in option files take precedence over values in
+   environment variables.
+
+   In many cases, it is preferable to use an option file instead
+   of environment variables to modify the behavior of MySQL. See
+   Section 4.2.6, "Using Option Files."
    Variable Description
    CXX The name of your C++ compiler (for running CMake).
    CC The name of your C compiler (for running CMake).
-   CFLAGS Flags for your C compiler (for running CMake).
-   CXXFLAGS Flags for your C++ compiler (for running CMake).
    DBI_USER The default user name for Perl DBI.
    DBI_TRACE Trace options for Perl DBI.
    HOME The default path for the mysql history file is
    $HOME/.mysql_history.
-   LD_RUN_PATH Used to specify the location of libmysqlclient.so.
+   LD_RUN_PATH Used to specify the location of
+   libmysqlclient.so.
    LIBMYSQL_ENABLE_CLEARTEXT_PLUGIN Enable mysql_clear_password
-   authentication plugin; see Section 6.3.6.6, "The Cleartext
+   authentication plugin; see Section 6.3.7.5, "The Cleartext
    Client-Side Authentication Plugin."
    MYSQL_DEBUG Debug trace options when debugging.
    MYSQL_GROUP_SUFFIX Option group suffix value (like specifying
@@ -8881,214 +9744,223 @@
    MYSQL_HISTFILE The path to the mysql history file. If this
    variable is set, its value overrides the default for
    $HOME/.mysql_history.
-   MYSQL_HOME The path to the directory in which the server-specific
-   my.cnf file resides.
-   MYSQL_HOST The default host name used by the mysql command-line
-   client.
+   MYSQL_HOME The path to the directory in which the
+   server-specific my.cnf file resides.
+   MYSQL_HOST The default host name used by the mysql
+   command-line client.
    MYSQL_PS1 The command prompt to use in the mysql command-line
    client.
-   MYSQL_PWD The default password when connecting to mysqld. Note
-   that using this is insecure. See Section 6.1.2.1, "End-User
-   Guidelines for Password Security."
+   MYSQL_PWD The default password when connecting to mysqld.
+   Note that using this is insecure. See Section 6.1.2.1,
+   "End-User Guidelines for Password Security."
    MYSQL_TCP_PORT The default TCP/IP port number.
    MYSQL_UNIX_PORT The default Unix socket file name; used for
    connections to localhost.
    PATH Used by the shell to find MySQL programs.
    TMPDIR The directory where temporary files are created.
    TZ This should be set to your local time zone. See Section
-   C.5.4.6, "Time Zone Problems."
-   UMASK The user-file creation mode when creating files. See note
-   following table.
+   B.5.4.6, "Time Zone Problems."
+   UMASK The user-file creation mode when creating files. See
+   note following table.
    UMASK_DIR The user-directory creation mode when creating
    directories. See note following table.
-   USER The default user name on Windows when connecting to mysqld.
-
-   For information about the mysql history file, see Section 4.5.1.3,
-   "mysql Logging."
+   USER The default user name on Windows when connecting to
+   mysqld.
 
-   The UMASK and UMASK_DIR variables, despite their names, are used
-   as modes, not masks:
+   For information about the mysql history file, see Section
+   4.5.1.3, "mysql Logging."
 
-     * If UMASK is set, mysqld uses ($UMASK | 0600) as the mode for
-       file creation, so that newly created files have a mode in the
-       range from 0600 to 0666 (all values octal).
+   The UMASK and UMASK_DIR variables, despite their names, are
+   used as modes, not masks:
 
-     * If UMASK_DIR is set, mysqld uses ($UMASK_DIR | 0700) as the
-       base mode for directory creation, which then is AND-ed with
-       ~(~$UMASK & 0666), so that newly created directories have a
-       mode in the range from 0700 to 0777 (all values octal). The
-       AND operation may remove read and write permissions from the
-       directory mode, but not execute permissions.
+     * If UMASK is set, mysqld uses ($UMASK | 0600) as the mode
+       for file creation, so that newly created files have a
+       mode in the range from 0600 to 0666 (all values octal).
+
+     * If UMASK_DIR is set, mysqld uses ($UMASK_DIR | 0700) as
+       the base mode for directory creation, which then is
+       AND-ed with ~(~$UMASK & 0666), so that newly created
+       directories have a mode in the range from 0700 to 0777
+       (all values octal). The AND operation may remove read and
+       write permissions from the directory mode, but not
+       execute permissions.
 
-   MySQL assumes that the value for UMASK or UMASK_DIR is in octal if
-   it starts with a zero.
+   MySQL assumes that the value for UMASK or UMASK_DIR is in
+   octal if it starts with a zero.
 
-2.14. Perl Installation Notes
+2.13 Perl Installation Notes
 
    The Perl DBI module provides a generic interface for database
-   access. You can write a DBI script that works with many different
-   database engines without change. To use DBI, you must install the
-   DBI module, as well as a DataBase Driver (DBD) module for each
-   type of database server you want to access. For MySQL, this driver
-   is the DBD::mysql module.
-
-   Perl, and the DBD::MySQL module for DBI must be installed if you
-   want to run the MySQL benchmark scripts; see Section 8.12.2, "The
-   MySQL Benchmark Suite." They are also required for the MySQL
-   Cluster ndb_size.pl utility; see Section 17.4.23, "ndb_size.pl ---
-   NDBCLUSTER Size Requirement Estimator."
-   Note
-
-   Perl support is not included with MySQL distributions. You can
-   obtain the necessary modules from http://search.cpan.org for Unix,
-   or by using the ActiveState ppm program on Windows. The following
-   sections describe how to do this.
-
-   The DBI/DBD interface requires Perl 5.6.0, and 5.6.1 or later is
-   preferred. DBI does not work if you have an older version of Perl.
-   You should use DBD::mysql 4.009 or higher. Although earlier
-   versions are available, they do not support the full functionality
-   of MySQL 5.5.
-
-2.14.1. Installing Perl on Unix
-
-   MySQL Perl support requires that you have installed MySQL client
-   programming support (libraries and header files). Most
-   installation methods install the necessary files. If you install
-   MySQL from RPM files on Linux, be sure to install the developer
-   RPM as well. The client programs are in the client RPM, but client
-   programming support is in the developer RPM.
+   access. You can write a DBI script that works with many
+   different database engines without change. To use DBI, you
+   must install the DBI module, as well as a DataBase Driver
+   (DBD) module for each type of database server you want to
+   access. For MySQL, this driver is the DBD::mysql module.
+
+   Perl, and the DBD::MySQL module for DBI must be installed if
+   you want to run the MySQL benchmark scripts; see Section
+   8.12.2, "The MySQL Benchmark Suite." They are also required
+   for the MySQL Cluster ndb_size.pl utility; see Section
+   18.4.24, "ndb_size.pl --- NDBCLUSTER Size Requirement
+   Estimator."
+   Note
+
+   Perl support is not included with MySQL distributions. You
+   can obtain the necessary modules from http://search.cpan.org
+   for Unix, or by using the ActiveState ppm program on Windows.
+   The following sections describe how to do this.
+
+   The DBI/DBD interface requires Perl 5.6.0, and 5.6.1 or later
+   is preferred. DBI does not work if you have an older version
+   of Perl. You should use DBD::mysql 4.009 or higher. Although
+   earlier versions are available, they do not support the full
+   functionality of MySQL 5.5.
+
+2.13.1 Installing Perl on Unix
+
+   MySQL Perl support requires that you have installed MySQL
+   client programming support (libraries and header files). Most
+   installation methods install the necessary files. If you
+   install MySQL from RPM files on Linux, be sure to install the
+   developer RPM as well. The client programs are in the client
+   RPM, but client programming support is in the developer RPM.
+
+   The files you need for Perl support can be obtained from the
+   CPAN (Comprehensive Perl Archive Network) at
+   http://search.cpan.org.
 
-   The files you need for Perl support can be obtained from the CPAN
-   (Comprehensive Perl Archive Network) at http://search.cpan.org.
-
-   The easiest way to install Perl modules on Unix is to use the CPAN
-   module. For example:
+   The easiest way to install Perl modules on Unix is to use the
+   CPAN module. For example:
 shell> perl -MCPAN -e shell
 cpan> install DBI
 cpan> install DBD::mysql
 
-   The DBD::mysql installation runs a number of tests. These tests
-   attempt to connect to the local MySQL server using the default
-   user name and password. (The default user name is your login name
-   on Unix, and ODBC on Windows. The default password is "no
-   password.") If you cannot connect to the server with those values
-   (for example, if your account has a password), the tests fail. You
-   can use force install DBD::mysql to ignore the failed tests.
-
-   DBI requires the Data::Dumper module. It may be installed; if not,
-   you should install it before installing DBI.
-
-   It is also possible to download the module distributions in the
-   form of compressed tar archives and build the modules manually.
-   For example, to unpack and build a DBI distribution, use a
-   procedure such as this:
+   The DBD::mysql installation runs a number of tests. These
+   tests attempt to connect to the local MySQL server using the
+   default user name and password. (The default user name is
+   your login name on Unix, and ODBC on Windows. The default
+   password is "no password.") If you cannot connect to the
+   server with those values (for example, if your account has a
+   password), the tests fail. You can use force install
+   DBD::mysql to ignore the failed tests.
+
+   DBI requires the Data::Dumper module. It may be installed; if
+   not, you should install it before installing DBI.
+
+   It is also possible to download the module distributions in
+   the form of compressed tar archives and build the modules
+   manually. For example, to unpack and build a DBI
+   distribution, use a procedure such as this:
 
     1. Unpack the distribution into the current directory:
 shell> gunzip < DBI-VERSION.tar.gz | tar xvf -
+
        This command creates a directory named DBI-VERSION.
 
-    2. Change location into the top-level directory of the unpacked
-       distribution:
+    2. Change location into the top-level directory of the
+       unpacked distribution:
 shell> cd DBI-VERSION
 
+
     3. Build the distribution and compile everything:
 shell> perl Makefile.PL
 shell> make
 shell> make test
 shell> make install
 
-   The make test command is important because it verifies that the
-   module is working. Note that when you run that command during the
-   DBD::mysql installation to exercise the interface code, the MySQL
-   server must be running or the test fails.
+   The make test command is important because it verifies that
+   the module is working. Note that when you run that command
+   during the DBD::mysql installation to exercise the interface
+   code, the MySQL server must be running or the test fails.
 
    It is a good idea to rebuild and reinstall the DBD::mysql
-   distribution whenever you install a new release of MySQL. This
-   ensures that the latest versions of the MySQL client libraries are
-   installed correctly.
-
-   If you do not have access rights to install Perl modules in the
-   system directory or if you want to install local Perl modules, the
-   following reference may be useful:
-   http://servers.digitaldaze.com/extensions/perl/modules.html#module
-   s
-
-   Look under the heading "Installing New Modules that Require
-   Locally Installed Modules."
+   distribution whenever you install a new release of MySQL.
+   This ensures that the latest versions of the MySQL client
+   libraries are installed correctly.
+
+   If you do not have access rights to install Perl modules in
+   the system directory or if you want to install local Perl
+   modules, the following reference may be useful:
+   http://learn.perl.org/faq/perlfaq8.html#How-do-I-keep-my-own-
+   module-library-directory-
 
-2.14.2. Installing ActiveState Perl on Windows
+2.13.2 Installing ActiveState Perl on Windows
 
-   On Windows, you should do the following to install the MySQL DBD
-   module with ActiveState Perl:
+   On Windows, you should do the following to install the MySQL
+   DBD module with ActiveState Perl:
 
     1. Get ActiveState Perl from
-       http://www.activestate.com/Products/ActivePerl/ and install
-       it.
+       http://www.activestate.com/Products/ActivePerl/ and
+       install it.
 
     2. Open a console window.
 
-    3. If necessary, set the HTTP_proxy variable. For example, you
-       might try a setting like this:
+    3. If necessary, set the HTTP_proxy variable. For example,
+       you might try a setting like this:
 C:\> set HTTP_proxy=my.proxy.com:3128
 
+
     4. Start the PPM program:
 C:\> C:\perl\bin\ppm.pl
 
+
     5. If you have not previously done so, install DBI:
 ppm> install DBI
 
+
     6. If this succeeds, run the following command:
 ppm> install DBD-mysql
 
-   This procedure should work with ActiveState Perl 5.6 or newer.
+   This procedure should work with ActiveState Perl 5.6 or
+   newer.
 
-   If you cannot get the procedure to work, you should install the
-   ODBC driver instead and connect to the MySQL server through ODBC:
+   If you cannot get the procedure to work, you should install
+   the ODBC driver instead and connect to the MySQL server
+   through ODBC:
 use DBI;
 $dbh= DBI->connect("DBI:ODBC:$dsn",$user,$password) ||
   die "Got error $DBI::errstr when connecting to $dsn\n";
 
-2.14.3. Problems Using the Perl DBI/DBD Interface
+2.13.3 Problems Using the Perl DBI/DBD Interface
 
-   If Perl reports that it cannot find the ../mysql/mysql.so module,
-   the problem is probably that Perl cannot locate the
-   libmysqlclient.so shared library. You should be able to fix this
-   problem by one of the following methods:
+   If Perl reports that it cannot find the ../mysql/mysql.so
+   module, the problem is probably that Perl cannot locate the
+   libmysqlclient.so shared library. You should be able to fix
+   this problem by one of the following methods:
 
      * Copy libmysqlclient.so to the directory where your other
        shared libraries are located (probably /usr/lib or /lib).
 
-     * Modify the -L options used to compile DBD::mysql to reflect
-       the actual location of libmysqlclient.so.
-
-     * On Linux, you can add the path name of the directory where
-       libmysqlclient.so is located to the /etc/ld.so.conf file.
+     * Modify the -L options used to compile DBD::mysql to
+       reflect the actual location of libmysqlclient.so.
 
-     * Add the path name of the directory where libmysqlclient.so is
-       located to the LD_RUN_PATH environment variable. Some systems
-       use LD_LIBRARY_PATH instead.
-
-   Note that you may also need to modify the -L options if there are
-   other libraries that the linker fails to find. For example, if the
-   linker cannot find libc because it is in /lib and the link command
-   specifies -L/usr/lib, change the -L option to -L/lib or add -L/lib
-   to the existing link command.
-
-   If you get the following errors from DBD::mysql, you are probably
-   using gcc (or using an old binary compiled with gcc):
+     * On Linux, you can add the path name of the directory
+       where libmysqlclient.so is located to the /etc/ld.so.conf
+       file.
+
+     * Add the path name of the directory where
+       libmysqlclient.so is located to the LD_RUN_PATH
+       environment variable. Some systems use LD_LIBRARY_PATH
+       instead.
+
+   Note that you may also need to modify the -L options if there
+   are other libraries that the linker fails to find. For
+   example, if the linker cannot find libc because it is in /lib
+   and the link command specifies -L/usr/lib, change the -L
+   option to -L/lib or add -L/lib to the existing link command.
+
+   If you get the following errors from DBD::mysql, you are
+   probably using gcc (or using an old binary compiled with
+   gcc):
 /usr/bin/perl: can't resolve symbol '__moddi3'
 /usr/bin/perl: can't resolve symbol '__divdi3'
 
    Add -L/usr/lib/gcc-lib/... -lgcc to the link command when the
    mysql.so library gets built (check the output from make for
-   mysql.so when you compile the Perl client). The -L option should
-   specify the path name of the directory where libgcc.a is located
-   on your system.
-
-   Another cause of this problem may be that Perl and MySQL are not
-   both compiled with gcc. In this case, you can solve the mismatch
-   by compiling both with gcc.
-
-   Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights
-   reserved. Legal Notices
+   mysql.so when you compile the Perl client). The -L option
+   should specify the path name of the directory where libgcc.a
+   is located on your system.
+
+   Another cause of this problem may be that Perl and MySQL are
+   not both compiled with gcc. In this case, you can solve the
+   mismatch by compiling both with gcc.
diff -Nru mysql-5.5-5.5.35+dfsg/libmysql/authentication_win/CMakeLists.txt mysql-5.5-5.5.43/libmysql/authentication_win/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/libmysql/authentication_win/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysql/authentication_win/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2011, 2014, 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
@@ -32,7 +32,6 @@
 
 SOURCE_GROUP(Headers REGULAR_EXPRESSION ".*h$")
 
-INSTALL_DEBUG_SYMBOLS(auth_win_client)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(auth_win_client DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/libmysql/CMakeLists.txt mysql-5.5-5.5.43/libmysql/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/libmysql/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysql/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -168,12 +168,17 @@
 MERGE_LIBRARIES(mysqlclient STATIC ${LIBS} COMPONENT Development)
 
 # Visual Studio users need debug  static library for debug projects
-INSTALL_DEBUG_SYMBOLS(clientlib)
 IF(MSVC)
  INSTALL_DEBUG_TARGET(mysqlclient DESTINATION ${INSTALL_LIBDIR}/debug)
  INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
 
+MACRO(GET_TARGET_NAME target out_name)
+  GET_TARGET_PROPERTY(location ${target} LOCATION)
+  GET_FILENAME_COMPONENT(name ${location} NAME)
+  SET(${out_name} ${name})
+ENDMACRO()
+
 IF(UNIX)
   MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
     SET(DOT_VERSION ".${VERSION}")
@@ -186,11 +191,19 @@
       SET(${OUTNAME} ${LIBNAME}${EXTENSION}${DOT_VERSION})
     ENDIF() 
   ENDMACRO()
-  INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
+ENDIF()
+
+IF(UNIX)
+  GET_TARGET_NAME(mysqlclient lib_name)
+  INSTALL_SYMLINK(mysqlclient
+    ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a
+    ${INSTALL_LIBDIR} Development)
 ENDIF()
 
 IF(NOT DISABLE_SHARED)
-  MERGE_LIBRARIES(libmysql SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS} COMPONENT SharedLibraries)
+  MERGE_LIBRARIES(libmysql SHARED ${LIBS}
+    EXPORTS ${CLIENT_API_FUNCTIONS}
+    COMPONENT SharedLibraries)
   IF(UNIX)
     # libtool compatability
     IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
@@ -198,7 +211,8 @@
     ELSEIF(CMAKE_SYSTEM_NAME MATCHES "HP-UX")
       SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0")
     ELSE()
-      SET(OS_SHARED_LIB_VERSION "${SHARED_LIB_MAJOR_VERSION}.0.0")
+      SET(OS_SHARED_LIB_VERSION
+        "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0")
     ENDIF()
     # Name of shared library is mysqlclient on Unix
     SET_TARGET_PROPERTIES(libmysql PROPERTIES 
@@ -224,8 +238,13 @@
       "${CMAKE_SHARED_LIBRARY_SUFFIX}"
       ""
       linkname)
-    INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
-    SET(OS_SHARED_LIB_SYMLINKS "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
+    GET_TARGET_NAME(libmysql lib_name)
+    GET_FILENAME_COMPONENT(lib_name_we ${lib_name} NAME_WE)
+    INSTALL_SYMLINK(libmysql
+      ${lib_name} ${linkname}
+      ${INSTALL_LIBDIR} SharedLibraries)
+    SET(OS_SHARED_LIB_SYMLINKS
+      "${SHARED_LIB_MAJOR_VERSION}" "${OS_SHARED_LIB_VERSION}")
     LIST(REMOVE_DUPLICATES OS_SHARED_LIB_SYMLINKS)
     FOREACH(ver ${OS_SHARED_LIB_SYMLINKS})
       GET_VERSIONED_LIBNAME(
@@ -233,7 +252,11 @@
         "${CMAKE_SHARED_LIBRARY_SUFFIX}"
         "${ver}"
         linkname)
-      INSTALL_SYMLINK(${linkname} libmysql ${INSTALL_LIBDIR} SharedLibraries)
+      GET_VERSIONED_LIBNAME(
+        ${lib_name_we} "${CMAKE_SHARED_LIBRARY_SUFFIX}" "${ver}" lib_name_ver)
+      INSTALL_SYMLINK(libmysql
+        ${lib_name_ver} ${linkname}
+        ${INSTALL_LIBDIR} SharedLibraries)
     ENDFOREACH()
   ENDIF()
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/libmysql/conf_to_src.c mysql-5.5-5.5.43/libmysql/conf_to_src.c
--- mysql-5.5-5.5.35+dfsg/libmysql/conf_to_src.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysql/conf_to_src.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2004 MySQL AB
+/* Copyright (c) 2000, 2011, 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 -Nru mysql-5.5-5.5.35+dfsg/libmysql/errmsg.c mysql-5.5-5.5.43/libmysql/errmsg.c
--- mysql-5.5-5.5.35+dfsg/libmysql/errmsg.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysql/errmsg.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -105,6 +105,8 @@
 
 void init_client_errs(void)
 {
+  compile_time_assert(array_elements(client_errors) ==
+                      (CR_ERROR_LAST - CR_ERROR_FIRST + 2));
   (void) my_error_register(get_client_errmsgs, CR_ERROR_FIRST, CR_ERROR_LAST);
 }
 
diff -Nru mysql-5.5-5.5.35+dfsg/libmysql/libmysql.c mysql-5.5-5.5.43/libmysql/libmysql.c
--- mysql-5.5-5.5.35+dfsg/libmysql/libmysql.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysql/libmysql.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -1316,6 +1316,10 @@
     res= net_realloc(net, buf_length + length);
     if (res)
     {
+      if (net->last_errno == ER_OUT_OF_RESOURCES)
+        net->last_errno= CR_OUT_OF_MEMORY;
+      else if (net->last_errno == ER_NET_PACKET_TOO_LARGE)
+        net->last_errno= CR_NET_PACKET_TOO_LARGE;
       strmov(net->sqlstate, unknown_sqlstate);
       strmov(net->last_error, ER(net->last_errno));
     }
diff -Nru mysql-5.5-5.5.35+dfsg/libmysqld/CMakeLists.txt mysql-5.5-5.5.43/libmysqld/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/libmysqld/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysqld/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -93,6 +93,14 @@
 )
 
 
+# These files have unused result errors, so we skip Werror
+CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
+IF(HAVE_WERROR_FLAG)
+  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+  ADD_COMPILE_FLAGS(../sql/filesort.cc  COMPILE_FLAGS "-Wno-error")
+  ADD_COMPILE_FLAGS(../sql/opt_range.cc COMPILE_FLAGS "-Wno-error")
+ENDIF()
+
 ADD_CONVENIENCE_LIBRARY(sql_embedded ${SQL_EMBEDDED_SOURCES})
 DTRACE_INSTRUMENT(sql_embedded)
 ADD_DEPENDENCIES(sql_embedded GenError GenServerSource)
@@ -143,3 +151,37 @@
   MERGE_LIBRARIES(libmysqld SHARED ${LIBS} EXPORTS ${CLIENT_API_FUNCTIONS}
   COMPONENT Embedded)
 ENDIF()
+
+OPTION(WITH_EMBEDDED_SHARED_LIBRARY
+  "Generate shared version of embedded library (in addition to the static one)"
+  OFF)
+IF(WITH_EMBEDDED_SHARED_LIBRARY)
+  MERGE_LIBRARIES(libmysqld SHARED
+    mysqlserver
+    EXPORTS ${CLIENT_API_FUNCTIONS}
+    OUTPUT_NAME "mysqld"
+    COMPONENT Embedded)
+  SET_TARGET_PROPERTIES(libmysqld PROPERTIES
+    VERSION "${SHARED_LIB_MAJOR_VERSION}.${SHARED_LIB_MINOR_VERSION}.0"
+    SOVERSION "${SHARED_LIB_MAJOR_VERSION}"
+    )
+
+  GET_TARGET_PROPERTY(libmysqld_link_flags libmysqld LINK_FLAGS)
+  IF(NOT libmysqld_link_flag)
+    SET(libmysqld_link_flags)
+  ENDIF()
+  SET(libmysqld_link_flags
+    "${CMAKE_SHARED_LIBRARY_C_FLAGS} ${libmysqld_link_flags}")
+  SET_TARGET_PROPERTIES(libmysqld
+    PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
+
+  IF(LINK_FLAG_NO_UNDEFINED)
+    SET(libmysqld_link_flags
+      "${libmysqld_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
+    SET_TARGET_PROPERTIES(libmysqld
+      PROPERTIES LINK_FLAGS "${libmysqld_link_flags}")
+  ENDIF()
+
+  SET_TARGET_PROPERTIES(libmysqld PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+  SET_TARGET_PROPERTIES(mysqlserver PROPERTIES CLEAN_DIRECT_OUTPUT 1)
+ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/libmysqld/examples/CMakeLists.txt mysql-5.5-5.5.43/libmysqld/examples/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/libmysqld/examples/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysqld/examples/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -33,6 +33,12 @@
 ENDIF(UNIX)
 
 MYSQL_ADD_EXECUTABLE(mysqltest_embedded ../../client/mysqltest.cc)
+# mysqltest has unused result errors, so we skip Werror
+CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
+IF(HAVE_WERROR_FLAG)
+  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+  ADD_COMPILE_FLAGS(../../client/mysqltest.cc COMPILE_FLAGS "-Wno-error")
+ENDIF()
 TARGET_LINK_LIBRARIES(mysqltest_embedded mysqlserver)
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/libmysqld/examples/test-run mysql-5.5-5.5.43/libmysqld/examples/test-run
--- mysql-5.5-5.5.35+dfsg/libmysqld/examples/test-run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysqld/examples/test-run	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
 # Copyright (C) 2001, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/libmysqld/lib_sql.cc mysql-5.5-5.5.43/libmysqld/lib_sql.cc
--- mysql-5.5-5.5.35+dfsg/libmysqld/lib_sql.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/libmysqld/lib_sql.cc	2015-02-27 08:30:34.000000000 +0000
@@ -2,6 +2,9 @@
  * Copyright (c)  2000
  * SWsoft  company
  *
+ * Modifications copyright (c) 2001, 2013. Oracle and/or its affiliates.
+ * All rights reserved.
+ *
  * This material is provided "as is", with absolutely no warranty expressed
  * or implied. Any use is at your own risk.
  *
@@ -558,7 +561,7 @@
     opt_mysql_tmpdir=getenv("TMP");
 #endif
   if (!opt_mysql_tmpdir || !opt_mysql_tmpdir[0])
-    opt_mysql_tmpdir=(char*) P_tmpdir;		/* purecov: inspected */
+    opt_mysql_tmpdir= const_cast<char*>(DEFAULT_TMPDIR); /* purecov: inspected*/
 
   init_ssl();
   umask(((~my_umask) & 0666));
diff -Nru mysql-5.5-5.5.35+dfsg/man/comp_err.1 mysql-5.5-5.5.43/man/comp_err.1
--- mysql-5.5-5.5.35+dfsg/man/comp_err.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/comp_err.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -124,8 +124,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:O,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:O,/tmp/comp_err\&.trace\*(Aq\&.
+d:t:O,\fIfile_name\fR\&. The default is
+d:t:O,/tmp/comp_err\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -264,7 +264,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/innochecksum.1 mysql-5.5-5.5.43/man/innochecksum.1
--- mysql-5.5-5.5.35+dfsg/man/innochecksum.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/innochecksum.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBinnochecksum\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,6 +43,8 @@
 tablespace file, calculates the checksum for each page, compares the calculated checksum to the stored checksum, and reports mismatches, which indicate damaged pages\&. It was originally developed to speed up verifying the integrity of tablespace files after power outages but can also be used after file copies\&. Because checksum mismatches will cause
 InnoDB
 to deliberately shut down a running server, it can be preferable to use this tool rather than waiting for a server in production usage to encounter the damaged pages\&.
+\fBinnochecksum\fR
+supports files up to 2GB in size\&.
 .PP
 \fBinnochecksum\fR
 cannot be used on tablespace files that the server already has open\&. For such files, you should use
@@ -150,7 +152,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/msql2mysql.1 mysql-5.5-5.5.43/man/msql2mysql.1
--- mysql-5.5-5.5.35+dfsg/man/msql2mysql.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/msql2mysql.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmsql2mysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/myisamchk.1 mysql-5.5-5.5.43/man/myisamchk.1
--- mysql-5.5-5.5.35+dfsg/man/myisamchk.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/myisamchk.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisamchk\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -249,10 +249,8 @@
 \fBmyisamchk\fR
 supports the following options, which can be specified on the command line or in the
 [myisamchk]
-group of an option file\&.
-\fBmyisamchk\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+group of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .SH "MYISAMCHK GENERAL OPTIONS"
 .\" options: myisamchk
 .\" myisamchk: options
@@ -308,8 +306,100 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/myisamchk\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/myisamchk\&.trace\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: defaults-extra-file option
+.\" defaults-extra-file option: myisamchk
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: defaults-file option
+.\" defaults-file option: myisamchk
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: defaults-group-suffix option
+.\" defaults-group-suffix option: myisamchk
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmyisamchk\fR
+normally reads the
+[myisamchk]
+group\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmyisamchk\fR
+also reads the
+[myisamchk_other]
+group\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: no-defaults option
+.\" no-defaults option: myisamchk
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" myisamchk: print-defaults option
+.\" print-defaults option: myisamchk
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
 .RE
 .sp
 .RS 4
@@ -2490,7 +2580,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/myisam_ftdump.1 mysql-5.5-5.5.43/man/myisam_ftdump.1
--- mysql-5.5-5.5.35+dfsg/man/myisam_ftdump.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/myisam_ftdump.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -251,7 +251,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/myisamlog.1 mysql-5.5-5.5.43/man/myisamlog.1
--- mysql-5.5-5.5.35+dfsg/man/myisamlog.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/myisamlog.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisamlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -228,7 +228,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/myisampack.1 mysql-5.5-5.5.43/man/myisampack.1
--- mysql-5.5-5.5.35+dfsg/man/myisampack.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/myisampack.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmyisampack\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -83,6 +83,18 @@
 .\}
 After packing a table, it becomes read only\&. This is generally intended (such as when accessing packed tables on a CD)\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisampack\fR
+does not support partitioned tables\&.
+.RE
 .PP
 Invoke
 \fBmyisampack\fR
@@ -110,7 +122,7 @@
 .PP
 \fBmyisampack\fR
 supports the following options\&. It also reads option files and supports the options for processing them described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -177,8 +189,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -841,7 +853,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/my_print_defaults.1 mysql-5.5-5.5.43/man/my_print_defaults.1
--- mysql-5.5-5.5.35+dfsg/man/my_print_defaults.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/my_print_defaults.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -115,8 +115,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/my_print_defaults\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/my_print_defaults\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -204,7 +204,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql.1 mysql-5.5-5.5.43/man/mysql.1
--- mysql-5.5-5.5.35+dfsg/man/mysql.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -121,10 +121,8 @@
 [mysql]
 and
 [client]
-groups of an option file\&.
-\fBmysql\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -160,11 +158,32 @@
 \fBmysql\fR
 to start faster, but you must issue the
 rehash
-command if you want to use name completion\&.
+command or its
+\e#
+shortcut if you want to use name completion\&.
 .sp
 To complete a name, enter the first part and press Tab\&. If the name is unambiguous,
 \fBmysql\fR
 completes it\&. Otherwise, you can press Tab again to see the possible names that begin with what you have typed so far\&. Completion does not occur if there is no default database\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+This feature requires a MySQL client that is compiled with the
+\fBreadline\fR
+library\&. Typically, the
+\fBreadline\fR
+library is not available on Windows\&.
+.sp .5v
+.RE
 .RE
 .sp
 .RS 4
@@ -219,7 +238,7 @@
 .\" bind-address option: mysql
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported only in the version of the
 \fBmysql\fR
@@ -337,8 +356,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysql\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysql\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -384,7 +403,7 @@
 .\" default-auth option: mysql
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.7\&.
@@ -408,7 +427,7 @@
 .sp
 A common issue that can occur when the operating system uses
 utf8
-or another multi\-byte character set is that output from the
+or another multibyte character set is that output from the
 \fBmysql\fR
 client is formatted incorrectly, due to the fact that the MySQL client uses the
 latin1
@@ -426,6 +445,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: defaults-extra-file option
+.\" defaults-extra-file option: mysql
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql: defaults-file option
+.\" defaults-file option: mysql
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql: defaults-group-suffix option
+.\" defaults-group-suffix option: mysql
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysql\fR
+normally reads the
+[client]
+and
+[mysql]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysql\fR
+also reads the
+[client_other]
+and
+[mysql_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: delimiter option
 .\" delimiter option: mysql
 \fB\-\-delimiter=\fR\fB\fIstr\fR\fR
@@ -470,7 +553,7 @@
 Enable the
 mysql_clear_password
 cleartext authentication plugin\&. (See
-Section\ \&6.3.6.6, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.5\&.27\&.
+Section\ \&6.3.7.5, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.5\&.27\&.
 .RE
 .sp
 .RS 4
@@ -488,7 +571,7 @@
 .sp
 Execute the statement and quit\&. The default output format is like that produced with
 \fB\-\-batch\fR\&. See
-Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
+Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq, for some examples\&. With this option,
 \fBmysql\fR
 does not use the history file\&.
 .RE
@@ -656,7 +739,7 @@
 \fB\-A\fR
 .sp
 This has the same effect as
-\fB\-skip\-auto\-rehash\fR\&. See the description for
+\fB\-\-skip\-auto\-rehash\fR\&. See the description for
 \fB\-\-auto\-rehash\fR\&.
 .RE
 .sp
@@ -684,6 +767,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: no-defaults option
+.\" no-defaults option: mysql
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: no-named-commands option
 .\" no-named-commands option: mysql
 \fB\-\-no\-named\-commands\fR,
@@ -954,6 +1054,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: print-defaults option
+.\" print-defaults option: mysql
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: prompt option
 .\" prompt option: mysql
 \fB\-\-prompt=\fR\fB\fIformat_str\fR\fR
@@ -1132,6 +1247,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql: shared-memory-base-name option
+.\" shared-memory-base-name option: mysql
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql: show-warnings option
 .\" show-warnings option: mysql
 \fB\-\-show\-warnings\fR
@@ -1241,7 +1376,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -1699,8 +1834,8 @@
 \(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
 \(lq;\(rq
 as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
-Section\ \&22.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
-Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.
+Section\ \&23.8.17, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
+Section\ \&20.1, \(lqDefining Stored Programs\(rq)\&.
 .RE
 .sp
 .RS 4
@@ -1831,7 +1966,7 @@
 nowarning,
 \ew
 .sp
-Enable display of warnings after each statement\&.
+Disable display of warnings after each statement\&.
 .RE
 .sp
 .RS 4
@@ -2512,7 +2647,7 @@
 In this example, note that the backslashes are doubled\&. If you set the prompt using the
 prompt
 option in an option file, it is advisable to double the backslashes when using the special prompt options\&. There is some overlap in the set of permissible prompt options and the set of special escape sequences that are recognized in option files\&. (The rules for escape sequences in option files are listed in
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
 \es
 is interpreted as a space rather than as the current seconds value\&. The following example shows how to define a prompt within an option file to include the current time in
 HH:MM:SS>
@@ -2575,8 +2710,7 @@
 in your home directory\&. To specify a different file, set the value of the
 MYSQL_HISTFILE
 environment variable\&.
-        How Logging Occurs
-.PP
+How Logging Occurs.PP
 Statement logging occurs as follows:
 .sp
 .RS 4
@@ -2663,8 +2797,7 @@
 .RE
 .\}
 .sp
-        Controlling the History File
-.PP
+Controlling the History File.PP
 The
 \&.mysql_history
 file should be protected with a restrictive access mode because sensitive information might be written to it, such as the text of SQL statements that contain passwords\&. See
@@ -2826,7 +2959,7 @@
 .RE
 .\}
 .PP
-The search string can contain the the wildcard characters
+The search string can contain the wildcard characters
 \(lq%\(rq
 and
 \(lq_\(rq\&. These have the same meaning as for pattern\-matching operations performed with the
@@ -3221,11 +3354,11 @@
 option\&.
 .PP
 For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
-Section\ \&22.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
+Section\ \&23.8.16, \(lqControlling Automatic Reconnection Behavior\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlaccess.1 mysql-5.5-5.5.43/man/mysqlaccess.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlaccess.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlaccess.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlaccess\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -432,7 +432,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqladmin.1 mysql-5.5-5.5.43/man/mysqladmin.1
--- mysql-5.5-5.5.35+dfsg/man/mysqladmin.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqladmin.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqladmin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -84,7 +84,7 @@
 Tell the server to write debug information to the error log\&. Format and content of this information is subject to change\&.
 .sp
 This includes information about the Event Scheduler\&. See
-Section\ \&19.4.5, \(lqEvent Scheduler Status\(rq\&.
+Section\ \&20.4.5, \(lqEvent Scheduler Status\(rq\&.
 .RE
 .sp
 .RS 4
@@ -609,10 +609,8 @@
 [mysqladmin]
 and
 [client]
-groups of an option file\&.
-\fBmysqladmin\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -642,7 +640,7 @@
 .\" bind-address option: mysqladmin
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported only in the version of
 \fBmysqladmin\fR
@@ -715,8 +713,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysqladmin\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysqladmin\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -761,7 +759,7 @@
 .\" default-auth option: mysqladmin
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.9\&.
@@ -793,6 +791,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: defaults-extra-file option
+.\" defaults-extra-file option: mysqladmin
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: defaults-file option
+.\" defaults-file option: mysqladmin
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqladmin
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqladmin\fR
+normally reads the
+[client]
+and
+[mysqladmin]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqladmin\fR
+also reads the
+[client_other]
+and
+[mysqladmin_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: enable-cleartext-plugin option
 .\" enable-cleartext-plugin option: mysqladmin
 \fB\-\-enable\-cleartext\-plugin\fR
@@ -800,7 +862,7 @@
 Enable the
 mysql_clear_password
 cleartext authentication plugin\&. (See
-Section\ \&6.3.6.6, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.5\&.27\&.
+Section\ \&6.3.7.5, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.5\&.27\&.
 .RE
 .sp
 .RS 4
@@ -861,6 +923,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: no-defaults option
+.\" no-defaults option: mysqladmin
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: password option
 .\" password option: mysqladmin
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -944,6 +1023,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: print-defaults option
+.\" print-defaults option: mysqladmin
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: protocol option
 .\" protocol option: mysqladmin
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -980,6 +1074,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqladmin: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqladmin
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqladmin: silent option
 .\" silent option: mysqladmin
 \fB\-\-silent\fR,
@@ -1044,7 +1158,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -1168,7 +1282,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlbinlog.1 mysql-5.5-5.5.43/man/mysqlbinlog.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlbinlog.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlbinlog.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlbinlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@
 \fBmysqlbinlog\fR
 to display the contents of relay log files written by a slave server in a replication setup because relay logs have the same format as binary logs\&. The binary log and relay log are discussed further in
 Section\ \&5.2.4, \(lqThe Binary Log\(rq, and
-Section\ \&16.2.2, \(lqReplication Relay and Status Logs\(rq\&.
+Section\ \&17.2.2, \(lqReplication Relay and Status Logs\(rq\&.
 .PP
 Invoke
 \fBmysqlbinlog\fR
@@ -74,7 +74,7 @@
 .PP
 The output includes events contained in
 binlog\&.000003\&. For statement\-based logging, event information includes the SQL statement, the ID of the server on which it was executed, the timestamp when the statement was executed, how much time it took, and so forth\&. For row\-based logging, the event indicates a row change rather than an SQL statement\&. See
-Section\ \&16.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
+Section\ \&17.1.2, \(lqReplication Formats\(rq, for information about logging modes\&.
 .PP
 Events are preceded by header comments that provide additional information\&. For example:
 .sp
@@ -92,7 +92,7 @@
 .PP
 In the first line, the number following
 at
-indicates the starting position of the event in the binary log file\&.
+indicates the file offset, or starting position, of the event in the binary log file\&.
 .PP
 The second line starts with a date and time indicating when the statement started on the server where the event originated\&. For replication, this timestamp is propagated to slave servers\&.
 server id
@@ -107,6 +107,22 @@
 is the time spent executing the event, on a master server\&. On a slave, it is the difference of the end execution time on the slave minus the beginning execution time on the master\&. The difference serves as an indicator of how much replication lags behind the master\&.
 error_code
 indicates the result from executing the event\&. Zero means that no error occurred\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+.PP
+When using event groups, the file offsets of events may be grouped together and the comments of events may be grouped together\&. Do not mistake these grouped events for blank file offsets\&.
+.sp .5v
+.RE
 .PP
 The output from
 \fBmysqlbinlog\fR
@@ -128,15 +144,21 @@
 \fB\-\-read\-from\-remote\-server\fR
 option\&.
 .PP
+When running
+\fBmysqlbinlog\fR
+against a large binary log, be careful that the filesystem has enough space for the resulting files\&. To configure the directory that
+\fBmysqlbinlog\fR
+uses for temporary files, use the
+TMPDIR
+environment variable\&.
+.PP
 \fBmysqlbinlog\fR
 supports the following options, which can be specified on the command line or in the
 [mysqlbinlog]
 and
 [client]
-groups of an option file\&.
-\fBmysqlbinlog\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -301,7 +323,7 @@
 .\" bind-address option: mysqlbinlog
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported beginning with MySQL 5\&.5\&.8\&.
 .RE
@@ -503,8 +525,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysqlbinlog\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysqlbinlog\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -549,7 +571,7 @@
 .\" default-auth option: mysqlbinlog
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.10\&.
@@ -563,6 +585,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: defaults-extra-file option
+.\" defaults-extra-file option: mysqlbinlog
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlbinlog: defaults-file option
+.\" defaults-file option: mysqlbinlog
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlbinlog: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlbinlog
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlbinlog\fR
+normally reads the
+[client]
+and
+[mysqlbinlog]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlbinlog\fR
+also reads the
+[client_other]
+and
+[mysqlbinlog_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: disable-log-bin option
 .\" disable-log-bin option: mysqlbinlog
 \fB\-\-disable\-log\-bin\fR,
@@ -697,6 +783,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: no-defaults option
+.\" no-defaults option: mysqlbinlog
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: offset option
 .\" offset option: mysqlbinlog
 \fB\-\-offset=\fR\fB\fIN\fR\fR,
@@ -801,6 +904,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: print-defaults option
+.\" print-defaults option: mysqlbinlog
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: protocol option
 .\" protocol option: mysqlbinlog
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -918,6 +1036,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlbinlog: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqlbinlog
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlbinlog: short-form option
 .\" short-form option: mysqlbinlog
 \fB\-\-short\-form\fR,
@@ -2053,7 +2191,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-For multi\-byte character sets, the maximum number of bytes per character is not present in the binary log, so the length for string types is displayed in bytes rather than in characters\&. For example,
+For multibyte character sets, the maximum number of bytes per character is not present in the binary log, so the length for string types is displayed in bytes rather than in characters\&. For example,
 STRING(4)
 will be used as the data type for values from either of these column types:
 .sp
@@ -2102,7 +2240,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlbug.1 mysql-5.5-5.5.43/man/mysqlbug.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlbug.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlbug.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlbug\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlcheck.1 mysql-5.5-5.5.43/man/mysqlcheck.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlcheck.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlcheck.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlcheck\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -110,7 +110,7 @@
 If
 \fBmysqlcheck\fR
 is unable to repair a table, see
-Section\ \&2.12.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
+Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
 for manual table repair strategies\&. This will be the case, for example, for
 InnoDB
 tables, which can be checked with
@@ -204,10 +204,8 @@
 [mysqlcheck]
 and
 [client]
-groups of an option file\&.
-\fBmysqlcheck\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -240,7 +238,13 @@
 .sp
 Check all tables in all databases\&. This is the same as using the
 \fB\-\-databases\fR
-option and naming all the databases on the command line\&.
+option and naming all the databases on the command line, except that the
+INFORMATION_SCHEMA
+and
+performace_schema
+databases are not dumped\&. They can be dumped by explicitly naming them with the
+\fB\-\-databases\fR
+option\&.
 .RE
 .sp
 .RS 4
@@ -302,7 +306,7 @@
 .\" bind-address option: mysqlcheck
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported only in the version of
 \fBmysqlcheck\fR
@@ -412,6 +416,16 @@
 Process all tables in the named databases\&. Normally,
 \fBmysqlcheck\fR
 treats the first name argument on the command line as a database name and following names as table names\&. With this option, it treats all name arguments as database names\&.
+.sp
+This option may be used to dump the
+INFORMATION_SCHEMA
+and
+performace_schema
+databases, which normally are not dumped even with the
+\fB\-\-all\-databases\fR
+option\&. (Also use the
+\fB\-\-skip\-lock\-tables\fR
+option\&.)
 .RE
 .sp
 .RS 4
@@ -430,8 +444,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -490,6 +504,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: defaults-extra-file option
+.\" defaults-extra-file option: mysqlcheck
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: defaults-file option
+.\" defaults-file option: mysqlcheck
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlcheck: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlcheck
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlcheck\fR
+normally reads the
+[client]
+and
+[mysqlcheck]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlcheck\fR
+also reads the
+[client_other]
+and
+[mysqlcheck_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: extended option
 .\" extended option: mysqlcheck
 \fB\-\-extended\fR,
@@ -512,7 +590,7 @@
 .\" default-auth option: mysqlcheck
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.10\&.
@@ -622,6 +700,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: no-defaults option
+.\" no-defaults option: mysqlcheck
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: optimize option
 .\" optimize option: mysqlcheck
 \fB\-\-optimize\fR,
@@ -721,6 +816,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: print-defaults option
+.\" print-defaults option: mysqlcheck
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: protocol option
 .\" protocol option: mysqlcheck
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -771,6 +881,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlcheck: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqlcheck
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlcheck: silent option
 .\" silent option: mysqlcheck
 \fB\-\-silent\fR,
@@ -811,7 +941,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -931,7 +1061,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_client_test.1 mysql-5.5-5.5.43/man/mysql_client_test.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_client_test.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_client_test.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/25/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "02/25/2015" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -335,7 +335,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_client_test_embedded.1 mysql-5.5-5.5.43/man/mysql_client_test_embedded.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_client_test_embedded.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_client_test_embedded.1	2015-02-27 08:30:42.000000000 +0000
@@ -1 +1 @@
-.so man-gpl-tmp2/mysql_client_test.1
+.so man/mysql_client_test.1
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_config.1 mysql-5.5-5.5.43/man/mysql_config.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_config.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_config.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -231,7 +231,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_convert_table_format.1 mysql-5.5-5.5.43/man/mysql_convert_table_format.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_convert_table_format.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_convert_table_format.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -44,7 +44,7 @@
 and
 DBD::mysql
 Perl modules be installed (see
-Section\ \&2.14, \(lqPerl Installation Notes\(rq)\&.
+Section\ \&2.13, \(lqPerl Installation Notes\(rq)\&.
 .PP
 Invoke
 \fBmysql_convert_table_format\fR
@@ -225,7 +225,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqld.8 mysql-5.5-5.5.43/man/mysqld.8
--- mysql-5.5-5.5.35+dfsg/man/mysqld.8	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqld.8	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqld\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -62,7 +62,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqld_multi.1 mysql-5.5-5.5.43/man/mysqld_multi.1
--- mysql-5.5-5.5.35+dfsg/man/mysqld_multi.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqld_multi.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqld_multi\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -49,7 +49,7 @@
 in
 my\&.cnf
 (or in the file named by the
-\fB\-\-config\-file\fR
+\fB\-\-defaults\-file\fR
 option)\&.
 \fIN\fR
 can be any positive integer\&. This number is referred to in the following discussion as the option group number, or
@@ -59,7 +59,7 @@
 [mysqld]
 group used for starting
 \fBmysqld\fR\&. (See, for example,
-Section\ \&2.11.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
+Section\ \&2.10.3, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
 Section\ \&5.3, \(lqRunning Multiple MySQL Instances on One Machine\(rq\&.
 .PP
 To invoke
@@ -701,11 +701,11 @@
 .\}
 .PP
 See
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqld_safe.1 mysql-5.5-5.5.43/man/mysqld_safe.1
--- mysql-5.5-5.5.35+dfsg/man/mysqld_safe.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqld_safe.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqld_safe\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
 if they are specified on the command line, but ignored if they are specified in the
 [mysqld_safe]
 group of an option file\&. See
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .PP
 \fBmysqld_safe\fR
 reads all options from the
@@ -100,13 +100,15 @@
 \fBmysqld_safe\fR
 also reads
 [safe_mysqld]
-sections, although you should rename such sections to
+sections, although it is preferable to rename
+[safe_mysqld]
+sections to
 [mysqld_safe]
-in MySQL 5\&.5 installations\&.
+sections\&.
 .PP
 \fBmysqld_safe\fR
 supports the following options\&. It also reads option files and supports the options for processing them described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+Section\ \&4.2.7, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -472,11 +474,26 @@
 The number of files that
 \fBmysqld\fR
 should be able to open\&. The option value is passed to
-\fBulimit \-n\fR\&. Note that you need to start
+\fBulimit \-n\fR\&.
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
+You must start
 \fBmysqld_safe\fR
 as
 root
-for this to work properly!
+for this to function properly\&.
+.sp .5v
+.RE
 .RE
 .sp
 .RS 4
@@ -587,7 +604,7 @@
 syslog
 is used, the
 daemon\&.err
-syslog priority/facility is used for all log messages\&.
+syslog facility/severity is used for all log messages\&.
 .RE
 .sp
 .RS 4
@@ -607,11 +624,11 @@
 \fBmysqld_safe\fR
 and
 \fBmysqld\fR
-are written with a tag of
+are written with identifiers of
 mysqld_safe
 and
-mysqld, respectively\&. To specify a suffix for the tag, use
-\fB\-\-syslog\-tag=\fR\fB\fItag\fR\fR, which modifies the tags to be
+mysqld, respectively\&. To specify a suffix for the identifiers, use
+\fB\-\-syslog\-tag=\fR\fB\fItag\fR\fR, which modifies the identifiers to be
 mysqld_safe\-\fItag\fR
 and
 mysqld\-\fItag\fR\&.
@@ -688,7 +705,7 @@
 The
 \fBmysqld_safe\fR
 script is written so that it normally can start a server that was installed from either a source or a binary distribution of MySQL, even though these types of distributions typically install the server in slightly different locations\&. (See
-Section\ \&2.1.5, \(lqInstallation Layouts\(rq\&.)
+Section\ \&2.1.4, \(lqInstallation Layouts\(rq\&.)
 \fBmysqld_safe\fR
 expects one of the following conditions to be true:
 .sp
@@ -754,7 +771,7 @@
 .PP
 If
 \fBmysqld_safe\fR
-fails, even when invoked from the MySQL installation directory, you can specify the
+fails, even when invoked from the MySQL installation directory, specify the
 \fB\-\-ledir\fR
 and
 \fB\-\-datadir\fR
@@ -789,11 +806,7 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-syslog\fR: Write error messages to
-syslog
-on systems that support the
-\fBlogger\fR
-program\&.
+\fB\-\-log\-error=\fR\fB\fIfile_name\fR\fR: Write error messages to the named error file\&.
 .RE
 .sp
 .RS 4
@@ -804,11 +817,11 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-skip\-syslog\fR: Do not write error messages to
-syslog\&. Messages are written to the default error log file (\fIhost_name\fR\&.err
-in the data directory), or to a named file if the
-\fB\-\-log\-error\fR
-option is given\&.
+\fB\-\-syslog\fR: Write error messages to
+syslog
+on systems that support the
+\fBlogger\fR
+program\&.
 .RE
 .sp
 .RS 4
@@ -819,16 +832,20 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-\fB\-\-log\-error=\fR\fB\fIfile_name\fR\fR: Write error messages to the named error file\&.
+\fB\-\-skip\-syslog\fR: Do not write error messages to
+syslog\&. Messages are written to the default error log file (\fIhost_name\fR\&.err
+in the data directory), or to a named file if the
+\fB\-\-log\-error\fR
+option is given\&.
 .RE
 .PP
 If none of these options is given, the default is
 \fB\-\-skip\-syslog\fR\&.
 .PP
 If
-\fB\-\-syslog\fR
-and
 \fB\-\-log\-error\fR
+and
+\fB\-\-syslog\fR
 are both given, a warning is issued and
 \fB\-\-log\-error\fR
 takes precedence\&.
@@ -856,7 +873,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqldump.1 mysql-5.5-5.5.43/man/mysqldump.1
--- mysql-5.5-5.5.35+dfsg/man/mysqldump.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqldump.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqldump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -75,8 +75,48 @@
 tables, you can also use
 \fBmysqlhotcopy\fR
 for this purpose\&.
-        Performance and Scalability Considerations
+.if n \{\
+.sp
+.\}
+.RS 4
+.it 1 an-trap
+.nr an-no-space-flag 1
+.nr an-break-flag 1
+.br
+.ps +1
+\fBNote\fR
+.ps -1
+.br
 .PP
+A dump made using PowerShell on Windows with output redirection creates a file that has UTF\-16 encoding:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+mysqldump [options] > dump\&.sql
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+However, UTF\-16 is not permitted as a connection character set (see
+Section\ \&10.1.4, \(lqConnection Character Sets and Collations\(rq), so the dump file will not load correctly\&. To work around this issue, use the
+\fB\-\-result\-file\fR
+option, which creates the output in ASCII format:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+mysqldump [options] \-\-result\-file=dump\&.sql
+.fi
+.if n \{\
+.RE
+.\}
+.sp .5v
+.RE
+Performance and Scalability Considerations.PP
 mysqldump
 advantages include the convenience and flexibility of viewing or even editing the output before restoring\&. You can clone databases for development and DBA work, or produce slight variations of an existing database for testing\&. It is not intended as a fast or scalable solution for backing up substantial amounts of data\&. With large data sizes, even if the backup step takes a reasonable time, restoring the data can be very slow because replaying the SQL statements involves disk I/O for insertion, index creation, and so on\&.
 .PP
@@ -105,7 +145,7 @@
 backups with minimal disruption; it can also back up tables from
 MyISAM
 and other storage engines; and it provides a number of convenient options to accommodate different backup scenarios\&. See
-Section\ \&24.2, \(lqMySQL Enterprise Backup\(rq\&.
+Section\ \&25.2, \(lqMySQL Enterprise Backup\(rq\&.
 .RE
 .sp
 .RS 4
@@ -150,8 +190,7 @@
 For additional information about
 \fBmysqldump\fR, see
 Section\ \&7.4, \(lqUsing mysqldump for Backups\(rq\&.
-        Syntax
-.PP
+Syntax.PP
 There are in general three ways to use
 \fBmysqldump\fR\(emin order to dump a set of one or more tables, a set of one or more complete databases, or an entire MySQL server\(emas shown here:
 .sp
@@ -177,12 +216,12 @@
 \fBmysqldump\fR
 does not dump the
 INFORMATION_SCHEMA
-database by default\&.
-\fBmysqldump\fR
-dumps
-INFORMATION_SCHEMA
-only if you name it explicitly on the command line, although currently you must also use the
+or
+performance_schema
+database by default\&. To dump either of these, name it explicitly on the command line and also use the
 \fB\-\-skip\-lock\-tables\fR
+option\&. You can also name them with the
+\fB\-\-databases\fR
 option\&. Before MySQL 5\&.5
 \fBmysqldump\fR
 silently ignores
@@ -345,10 +384,8 @@
 [mysqldump]
 and
 [client]
-groups of an option file\&.
-\fBmysqldump\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -553,7 +590,7 @@
 .\" bind-address option: mysqldump
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported only in the version of
 \fBmysqldump\fR
@@ -738,8 +775,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default value is
-\*(Aqd:t:o,/tmp/mysqldump\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default value is
+d:t:o,/tmp/mysqldump\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -784,7 +821,7 @@
 .\" default-auth option: mysqldump
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.9\&.
@@ -808,8 +845,71 @@
 Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&. If no character set is specified,
 \fBmysqldump\fR
 uses
-utf8, and earlier versions use
-latin1\&.
+utf8\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: defaults-extra-file option
+.\" defaults-extra-file option: mysqldump
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: defaults-file option
+.\" defaults-file option: mysqldump
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqldump
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqldump\fR
+normally reads the
+[client]
+and
+[mysqldump]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqldump\fR
+also reads the
+[client_other]
+and
+[mysqldump_other]
+groups\&.
 .RE
 .sp
 .RS 4
@@ -928,13 +1028,20 @@
 \fB\-\-master\-data\fR
 except that it is used to dump a replication slave server to produce a dump file that can be used to set up another server as a slave that has the same master as the dumped server\&. It causes the dump output to include a
 CHANGE MASTER TO
-statement that indicates the binary log coordinates (file name and position) of the dumped slave\*(Aqs master (rather than the coordinates of the dumped server, as is done by the
+statement that indicates the binary log coordinates (file name and position) of the dumped slave\*(Aqs master\&. These are the master server coordinates from which the slave should start replicating\&.
+.sp
+\fB\-\-dump\-slave\fR
+causes the coordinates from the master to be used rather than those of the dumped server, as is done by the
+\fB\-\-master\-data\fR
+option\&. In addition, specfiying this option causes the
 \fB\-\-master\-data\fR
-option)\&. These are the master server coordinates from which the slave should start replicating\&. This option was added in MySQL 5\&.5\&.3\&.
+option to be overridden, if used, and effectively ignored\&.
 .sp
 The option value is handled the same way as for
 \fB\-\-master\-data\fR
-and has the same effect as
+(setting no value or 1 causes a
+CHANGE MASTER TO
+statement to be written to the dump, setting 2 causes the statement to be written but encased in SQL comments) and has the same effect as
 \fB\-\-master\-data\fR
 in terms of enabling or disabling other options and in how locking is handled\&.
 .sp
@@ -948,6 +1055,8 @@
 and
 \fB\-\-include\-master\-host\-port\fR
 options can also be used\&.
+.sp
+This option was added in MySQL 5\&.5\&.3\&.
 .RE
 .sp
 .RS 4
@@ -963,7 +1072,9 @@
 \fB\-\-events\fR,
 \fB\-E\fR
 .sp
-Include Event Scheduler events for the dumped databases in the output\&.
+Include Event Scheduler events for the dumped databases in the output\&. This option requires the
+EVENT
+privileges for those databases\&.
 .RE
 .sp
 .RS 4
@@ -1329,7 +1440,9 @@
 .sp
 It is also possible to set up a slave by dumping an existing slave of the master\&. In MySQL 5\&.5\&.3 and later, you can create such a dump using the
 \fB\-\-dump\-slave\fR
-option\&.
+option, which overrides
+\fB\-\-master\-data\fR
+and causes it to be ignored if both options are used\&.
 .sp
 In MySQL 5\&.2\&.2 and earlier, use the following procedure on the existing slave:
 .sp
@@ -1586,6 +1699,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: no-defaults option
+.\" no-defaults option: mysqldump
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: no-set-names option
 .\" no-set-names option: mysqldump
 \fB\-\-no\-set\-names\fR,
@@ -1753,6 +1883,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: print-defaults option
+.\" print-defaults option: mysqldump
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: protocol option
 .\" protocol option: mysqldump
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -1909,6 +2054,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqldump
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: single-transaction option
 .\" single-transaction option: mysqldump
 \fB\-\-single\-transaction\fR
@@ -1930,7 +2095,7 @@
 MEMORY
 tables dumped while using this option may still change state\&.
 .sp
-Before MySQL 5\&.5\&.3, while a
+While a
 \fB\-\-single\-transaction\fR
 dump is in process, to ensure a valid dump file (correct table contents and binary log coordinates), no other connection should use the following statements:
 ALTER TABLE,
@@ -1941,7 +2106,7 @@
 SELECT
 that is performed by
 \fBmysqldump\fR
-to retrieve the table contents to obtain incorrect contents or fail\&. As of MySQL 5\&.5\&.3, metadata locking prevents this situation\&.
+to retrieve the table contents to obtain incorrect contents or fail\&.
 .sp
 The
 \fB\-\-single\-transaction\fR
@@ -1959,10 +2124,11 @@
 NDB
 backup and restore instead\&.
 .sp
-To dump large tables, you should combine the
+To dump large tables, combine the
 \fB\-\-single\-transaction\fR
-option with
-\fB\-\-quick\fR\&.
+option with the
+\fB\-\-quick\fR
+option\&.
 .RE
 .sp
 .RS 4
@@ -2031,7 +2197,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -2482,7 +2648,7 @@
 .RS 4
 .\}
 .nf
-shell> \fBmysqldump \-\-all\-databases \-\-single\-transaction > all_databases\&.sql\fR
+shell> \fBmysqldump \-\-all\-databases \-\-master\-data \-\-single\-transaction > all_databases\&.sql\fR
 .fi
 .if n \{\
 .RE
@@ -2537,11 +2703,11 @@
 .\" mysqldump: workarounds
 .PP
 If you encounter problems backing up views, please read the section that covers restrictions on views which describes a workaround for backing up views when this fails due to insufficient privileges\&. See
-Section\ \&E.5, \(lqRestrictions on Views\(rq\&.
+Section\ \&D.5, \(lqRestrictions on Views\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqldumpslow.1 mysql-5.5-5.5.43/man/mysqldumpslow.1
--- mysql-5.5-5.5.35+dfsg/man/mysqldumpslow.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqldumpslow.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqldumpslow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -323,7 +323,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_find_rows.1 mysql-5.5-5.5.43/man/mysql_find_rows.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_find_rows.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_find_rows.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -160,7 +160,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_fix_extensions.1 mysql-5.5-5.5.43/man/mysql_fix_extensions.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_fix_extensions.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_fix_extensions.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -70,7 +70,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlhotcopy.1 mysql-5.5-5.5.43/man/mysqlhotcopy.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlhotcopy.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlhotcopy.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlhotcopy\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -113,8 +113,8 @@
 [mysqlhotcopy]
 and
 [client]
-groups of an option file\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -544,7 +544,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlimport.1 mysql-5.5-5.5.43/man/mysqlimport.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlimport.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlimport.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlimport\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -78,10 +78,8 @@
 [mysqlimport]
 and
 [client]
-groups of an option file\&.
-\fBmysqlimport\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -111,7 +109,7 @@
 .\" bind-address option: mysqlimport
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported only in the version of
 \fBmysqlimport\fR
@@ -182,8 +180,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -246,7 +244,7 @@
 .\" default-auth option: mysqlimport
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.10\&.
@@ -260,6 +258,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: defaults-extra-file option
+.\" defaults-extra-file option: mysqlimport
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlimport: defaults-file option
+.\" defaults-file option: mysqlimport
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlimport: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlimport
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlimport\fR
+normally reads the
+[client]
+and
+[mysqlimport]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlimport\fR
+also reads the
+[client_other]
+and
+[mysqlimport_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: delete option
 .\" delete option: mysqlimport
 \fB\-\-delete\fR,
@@ -445,6 +507,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: no-defaults option
+.\" no-defaults option: mysqlimport
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: password option
 .\" password option: mysqlimport
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -528,6 +607,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: print-defaults option
+.\" print-defaults option: mysqlimport
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: protocol option
 .\" protocol option: mysqlimport
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -566,6 +660,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlimport: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqlimport
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlimport: silent option
 .\" silent option: mysqlimport
 \fB\-\-silent\fR,
@@ -606,7 +720,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -710,7 +824,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_install_db.1 mysql-5.5-5.5.43/man/mysql_install_db.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_install_db.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_install_db.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -56,13 +56,12 @@
 .\}
 .PP
 Because the MySQL server,
-\fBmysqld\fR, needs to access the data directory when it runs later, you should either run
+\fBmysqld\fR, must access the data directory when it runs later, you should either run
 \fBmysql_install_db\fR
 from the same system account that will be used for running
-\fBmysqld\fR
-or run it as
+\fBmysqld\fR, or run it as
 root
-and use the
+and specify the
 \fB\-\-user\fR
 option to indicate the user name that
 \fBmysqld\fR
@@ -85,15 +84,7 @@
 .if n \{\
 .RE
 .\}
-.PP
-\fBmysql_install_db\fR
-needs to invoke
-\fBmysqld\fR
-with the
-\fB\-\-bootstrap\fR
-and
-\fB\-\-skip\-grant\-tables\fR
-options\&.
+.sp
 .if n \{\
 .sp
 .\}
@@ -128,11 +119,23 @@
 can also be specified in the
 [mysqld]
 group\&.) Other options are passed to
-\fBmysqld\fR\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
-\fBmysql_install_db\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+\fBmysqld\fR\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: help option
+.\" help option: mysql_install_db
+\fB\-\-help\fR
+.sp
+Display a help message and exit\&.
+.RE
 .sp
 .RS 4
 .ie n \{\
@@ -157,12 +160,41 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_install_db: builddir option
+.\" builddir option: mysql_install_db
+\fB\-\-builddir=\fR\fB\fIpath\fR\fR
+.sp
+For use with
+\fB\-\-srcdir\fR
+and out\-of\-source builds\&. Set this to the location of the directory where the built files reside\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: cross-bootstrap option
+.\" cross-bootstrap option: mysql_install_db
+\fB\-\-cross\-bootstrap\fR
+.sp
+For internal use\&. This option is used for building system tables on one host intended for another\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_install_db: datadir option
 .\" datadir option: mysql_install_db
-.\" mysql_install_db: ldata option
-.\" ldata option: mysql_install_db
-\fB\-\-datadir=\fR\fB\fIpath\fR\fR,
-\fB\-\-ldata=\fR\fB\fIpath\fR\fR
+\fB\-\-datadir=\fR\fB\fIpath\fR\fR
 .sp
 The path to the MySQL data directory\&.
 .RE
@@ -175,13 +207,77 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" defaults-extra-file option
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" defaults-file option
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&.
+\fIfile_name\fR
+is interpreted relative to the current directory if given as a relative path name rather than a full path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_install_db: force option
 .\" force option: mysql_install_db
 \fB\-\-force\fR
 .sp
 Cause
 \fBmysql_install_db\fR
-to run even if DNS does not work\&. Grant table entries that normally use host names will use IP addresses\&.
+to run even if DNS does not work\&. Grant table entries normally created using host names will use IP addresses instead\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_install_db: ldata option
+.\" ldata option: mysql_install_db
+\fB\-\-ldata=\fR\fB\fIpath\fR\fR
+.sp
+A synonym for
+\fB\-\-datadir\fR\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" no-defaults option
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
 .RE
 .sp
 .RS 4
@@ -246,9 +342,9 @@
 The system (login) user name to use for running
 \fBmysqld\fR\&. Files and directories created by
 \fBmysqld\fR
-will be owned by this user\&. You must be
+will be owned by this user\&. You must be the system
 root
-to use this option\&. By default,
+user to use this option\&. By default,
 \fBmysqld\fR
 runs using your current login name and files and directories that it creates will be owned by you\&.
 .RE
@@ -285,7 +381,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_plugin.1 mysql-5.5-5.5.43/man/mysql_plugin.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_plugin.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_plugin.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_plugin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_PLUGIN\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_PLUGIN\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -163,8 +163,8 @@
 \fB\-\-basedir\fR,
 \fB\-\-datadir\fR, and
 \fB\-\-plugin\-dir\fR
-options and ignores others\&. For information about option files, see
-Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.
+options and ignores others\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -370,7 +370,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_secure_installation.1 mysql-5.5-5.5.43/man/mysql_secure_installation.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_secure_installation.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_secure_installation.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -90,7 +90,7 @@
 .PP
 \fBmysql_secure_installation\fR
 helps you implement security recommendations similar to those described at
-Section\ \&2.11.2, \(lqSecuring the Initial MySQL Accounts\(rq\&.
+Section\ \&2.10.2, \(lqSecuring the Initial MySQL Accounts\(rq\&.
 .PP
 Invoke
 \fBmysql_secure_installation\fR
@@ -110,7 +110,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql.server.1 mysql-5.5-5.5.43/man/mysql.server.1
--- mysql-5.5-5.5.35+dfsg/man/mysql.server.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql.server.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -36,7 +36,8 @@
 .SH "DESCRIPTION"
 .PP
 MySQL distributions on Unix include a script named
-\fBmysql\&.server\fR\&. It can be used on systems such as Linux and Solaris that use System V\-style run directories to start and stop system services\&. It is also used by the Mac OS X Startup Item for MySQL\&.
+\fBmysql\&.server\fR, which starts the server using
+\fBmysqld_safe\fR\&. It can be used on systems such as Linux and Solaris that use System V\-style run directories to start and stop system services\&. It is also used by the OS X Startup Item for MySQL\&.
 .PP
 \fBmysql\&.server\fR
 can be found in the
@@ -57,7 +58,7 @@
 If you install MySQL from a source distribution or using a binary distribution format that does not install
 \fBmysql\&.server\fR
 automatically, you can install it manually\&. Instructions are provided in
-Section\ \&2.11.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
+Section\ \&2.10.3, \(lqStarting and Stopping MySQL Automatically\(rq\&.
 .PP
 \fBmysql\&.server\fR
 reads options from the
@@ -116,6 +117,31 @@
 \fB\-\-pid\-file=\fR\fB\fIfile_name\fR\fR
 .sp
 The path name of the file in which the server should write its process ID\&.
+.sp
+If this option is not given,
+\fBmysql\&.server\fR
+uses a default value of
+\fIhost_name\fR\&.pid\&. The PID file value passed to
+\fBmysqld_safe\fR
+overrides any value specified in the
+[mysqld_safe]
+option file group\&. Because
+\fBmysql\&.server\fR
+reads the
+[mysqld]
+option file group but not the
+[mysqld_safe]
+group, you can ensure that
+\fBmysqld_safe\fR
+gets the same value when invoke using
+\fBmysql\&.server\fR
+as when invoked manually by putting the same
+pid\-file
+setting in both the
+[mysqld_safe]
+and
+[mysqld]
+groups\&.
 .RE
 .sp
 .RS 4
@@ -128,49 +154,16 @@
 .\}
 .\" mysql.server: service-startup-timeout option
 .\" service-startup-timeout option: mysql.server
-\fB\-\-service\-startup\-timeout=\fR\fB\fIfile_name\fR\fR
+\fB\-\-service\-startup\-timeout=\fR\fB\fIseconds\fR\fR
 .sp
 How long in seconds to wait for confirmation of server startup\&. If the server does not start within this time,
 \fBmysql\&.server\fR
 exits with an error\&. The default value is 900\&. A value of 0 means not to wait at all for startup\&. Negative values mean to wait forever (no timeout)\&.
 .RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql.server: use-mysqld_safe option
-.\" use-mysqld_safe option: mysql.server
-\fB\-\-use\-mysqld_safe\fR
-.sp
-Use
-\fBmysqld_safe\fR
-to start the server\&. This is the default\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-.\" mysql.server: user option
-.\" user option: mysql.server
-\fB\-\-user=\fR\fB\fIuser_name\fR\fR
-.sp
-The login user name to use for running
-\fBmysqld\fR\&.
-.RE
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_setpermission.1 mysql-5.5-5.5.43/man/mysql_setpermission.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_setpermission.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_setpermission.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_setpermission\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -43,7 +43,7 @@
 and
 DBD::mysql
 Perl modules be installed (see
-Section\ \&2.14, \(lqPerl Installation Notes\(rq)\&.
+Section\ \&2.13, \(lqPerl Installation Notes\(rq)\&.
 .PP
 Invoke
 \fBmysql_setpermission\fR
@@ -172,7 +172,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlshow.1 mysql-5.5-5.5.43/man/mysqlshow.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlshow.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlshow.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlshow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -125,10 +125,8 @@
 [mysqlshow]
 and
 [client]
-groups of an option file\&.
-\fBmysqlshow\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -158,7 +156,7 @@
 .\" bind-address option: mysqlshow
 \fB\-\-bind\-address=\fR\fB\fIip_address\fR\fR
 .sp
-On a computer having multiple network interfaces, this option can be used to select which interface is employed when connecting to the MySQL server\&.
+On a computer having multiple network interfaces, use this option to select which interface to use for connecting to the MySQL server\&.
 .sp
 This option is supported only in the version of
 \fBmysqlshow\fR
@@ -229,8 +227,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o\&.
 .RE
 .sp
 .RS 4
@@ -293,7 +291,7 @@
 .\" default-auth option: mysqlshow
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.10\&.
@@ -307,6 +305,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: defaults-extra-file option
+.\" defaults-extra-file option: mysqlshow
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlshow: defaults-file option
+.\" defaults-file option: mysqlshow
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlshow: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlshow
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlshow\fR
+normally reads the
+[client]
+and
+[mysqlshow]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlshow\fR
+also reads the
+[client_other]
+and
+[mysqlshow_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: host option
 .\" host option: mysqlshow
 \fB\-\-host=\fR\fB\fIhost_name\fR\fR,
@@ -339,6 +401,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: no-defaults option
+.\" no-defaults option: mysqlshow
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: password option
 .\" password option: mysqlshow
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
@@ -422,6 +501,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: print-defaults option
+.\" print-defaults option: mysqlshow
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: protocol option
 .\" protocol option: mysqlshow
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -438,6 +532,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlshow: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqlshow
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlshow: show-table-type option
 .\" show-table-type option: mysqlshow
 \fB\-\-show\-table\-type\fR,
@@ -482,7 +596,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -551,7 +665,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqlslap.1 mysql-5.5-5.5.43/man/mysqlslap.1
--- mysql-5.5-5.5.35+dfsg/man/mysqlslap.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqlslap.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqlslap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -162,10 +162,8 @@
 [mysqlslap]
 and
 [client]
-groups of an option file\&.
-\fBmysqlslap\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. For information about option files used by MySQL programs, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -466,8 +464,8 @@
 Write a debugging log\&. A typical
 \fIdebug_options\fR
 string is
-\*(Aqd:t:o,\fIfile_name\fR\*(Aq\&. The default is
-\*(Aqd:t:o,/tmp/mysqlslap\&.trace\*(Aq\&.
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:o,/tmp/mysqlslap\&.trace\&.
 .RE
 .sp
 .RS 4
@@ -513,7 +511,7 @@
 .\" default-auth option: mysqlslap
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.10\&.
@@ -527,6 +525,70 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: defaults-extra-file option
+.\" defaults-extra-file option: mysqlslap
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlslap: defaults-file option
+.\" defaults-file option: mysqlslap
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqlslap: defaults-group-suffix option
+.\" defaults-group-suffix option: mysqlslap
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysqlslap\fR
+normally reads the
+[client]
+and
+[mysqlslap]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysqlslap\fR
+also reads the
+[client_other]
+and
+[mysqlslap_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: delimiter option
 .\" delimiter option: mysqlslap
 \fB\-\-delimiter=\fR\fB\fIstr\fR\fR,
@@ -567,7 +629,7 @@
 Enable the
 mysql_clear_password
 cleartext authentication plugin\&. (See
-Section\ \&6.3.6.6, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.5\&.27\&.
+Section\ \&6.3.7.5, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.) This option was added in MySQL 5\&.5\&.27\&.
 .RE
 .sp
 .RS 4
@@ -643,6 +705,23 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: no-defaults option
+.\" no-defaults option: mysqlslap
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: number-char-cols option
 .\" number-char-cols option: mysqlslap
 \fB\-\-number\-char\-cols=\fR\fB\fIN\fR\fR,
@@ -828,21 +907,6 @@
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqlslap: shared-memory-base-name option
-.\" shared-memory-base-name option: mysqlslap
-\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
-.sp
-On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. This option applies only if the server supports shared\-memory connections\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 .\" mysqlslap: post-system option
 .\" post-system option: mysqlslap
 \fB\-\-post\-system=\fR\fB\fIstr\fR\fR
@@ -892,6 +956,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: print-defaults option
+.\" print-defaults option: mysqlslap
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: protocol option
 .\" protocol option: mysqlslap
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
@@ -926,6 +1005,21 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqlslap: shared-memory-base-name option
+.\" shared-memory-base-name option: mysqlslap
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. This option applies only if the server supports shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqlslap: silent option
 .\" silent option: mysqlslap
 \fB\-\-silent\fR,
@@ -966,7 +1060,7 @@
 Options that begin with
 \fB\-\-ssl\fR
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&6.3.8.4, \(lqSSL Command Options\(rq\&.
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
 .RE
 .sp
 .RS 4
@@ -1019,7 +1113,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql-stress-test.pl.1 mysql-5.5-5.5.43/man/mysql-stress-test.pl.1
--- mysql-5.5-5.5.35+dfsg/man/mysql-stress-test.pl.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql-stress-test.pl.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/25/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "02/25/2015" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -498,7 +498,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqltest.1 mysql-5.5-5.5.43/man/mysqltest.1
--- mysql-5.5-5.5.35+dfsg/man/mysqltest.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqltest.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysqltest\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/25/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "02/25/2015" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -909,7 +909,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
@@ -921,7 +921,7 @@
 .IP " 1." 4
 The SHA-256 Authentication Plugin
 .RS 4
-\%http://dev.mysql.com/doc/refman/5.6/en/sha256-authentication-plugin.html
+\%http://dev.mysql.com/doc/refman/5.7/en/sha256-authentication-plugin.html
 .RE
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysqltest_embedded.1 mysql-5.5-5.5.43/man/mysqltest_embedded.1
--- mysql-5.5-5.5.35+dfsg/man/mysqltest_embedded.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysqltest_embedded.1	2015-02-27 08:30:42.000000000 +0000
@@ -1 +1 @@
-.so man-gpl-tmp2/mysqltest.1
+.so man/mysqltest.1
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql-test-run.pl.1 mysql-5.5-5.5.43/man/mysql-test-run.pl.1
--- mysql-5.5-5.5.35+dfsg/man/mysql-test-run.pl.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql-test-run.pl.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/25/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "11/04/2013" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "02/25/2015" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -1582,7 +1582,7 @@
 was added in MySQL 5\&.1\&.45 as a more logical alternative to
 \fB\-\-build\-thread\fR\&. If both are used,
 \fB\-\-port\-base\fR
-takes presedence\&.
+takes precedence\&.
 .RE
 .sp
 .RS 4
@@ -1797,7 +1797,7 @@
 .\" skip-ndb option: mysql-test-run.pl
 \fB\-\-skip\-ndb\fR
 .sp
-Do not start NDB Cluster; skip Cluster test cases\&. From MySQL 5\&.1\&.52, this is the default and so this option does not do anything but is kept for backwards compatibility\&.
+Do not start NDB Cluster; skip Cluster test cases\&. From MySQL 5\&.1\&.52, this is the default and so this option does not do anything but is kept for backward compatibility\&.
 .RE
 .sp
 .RS 4
@@ -2551,7 +2551,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 2006, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_tzinfo_to_sql.1 mysql-5.5-5.5.43/man/mysql_tzinfo_to_sql.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_tzinfo_to_sql.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_tzinfo_to_sql.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,7 @@
 mysql
 database\&. It is used on systems that have a
 zoneinfo
-database (the set of files describing time zones)\&. Examples of such systems are Linux, FreeBSD, Solaris, and Mac OS X\&. One likely location for these files is the
+database (the set of files describing time zones)\&. Examples of such systems are Linux, FreeBSD, Solaris, and OS X\&. One likely location for these files is the
 /usr/share/zoneinfo
 directory (/usr/share/lib/zoneinfo
 on Solaris)\&. If your system does not have a zoneinfo database, you can use the downloadable package described in
@@ -122,7 +122,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_upgrade.1 mysql-5.5-5.5.43/man/mysql_upgrade.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_upgrade.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_upgrade.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_upgrade\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,14 +42,21 @@
 \fBmysql_upgrade\fR
 also upgrades the system tables so that you can take advantage of new privileges or capabilities that might have been added\&.
 .PP
-\fBmysql_upgrade\fR
-should be executed each time you upgrade MySQL\&.
-.PP
 If
 \fBmysql_upgrade\fR
 finds that a table has a possible incompatibility, it performs a table check and, if problems are found, attempts a table repair\&. If the table cannot be repaired, see
-Section\ \&2.12.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
+Section\ \&2.11.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
 for manual table repair strategies\&.
+.PP
+You should execute
+\fBmysql_upgrade\fR
+each time you upgrade MySQL\&.
+.PP
+If you install MySQL from RPM packages on Linux, you must install the server and client RPMs\&.
+\fBmysql_upgrade\fR
+is included in the server RPM but requires the client RPM because the latter includes
+\fBmysqlcheck\fR\&. (See
+Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq\&.)
 .if n \{\
 .sp
 .\}
@@ -88,12 +95,12 @@
 .PP
 Some upgrade incompatibilities may require special handling before you upgrade your MySQL installation and run
 \fBmysql_upgrade\fR\&. See
-Section\ \&2.12.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
+Section\ \&2.11.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
 .sp .5v
 .RE
 .PP
 To use
-\fBmysql_upgrade\fR, make sure that the server is running, and then invoke it like this:
+\fBmysql_upgrade\fR, make sure that the server is running\&. Then invoke it like this:
 .sp
 .if n \{\
 .RS 4
@@ -108,6 +115,26 @@
 After running
 \fBmysql_upgrade\fR, stop the server and restart it so that any changes made to the system tables take effect\&.
 .PP
+If you have multiple MySQL server instances running, invoke
+\fBmysql_upgrade\fR
+with connection parameters appropriate for connecting to the desired server\&. For example, with servers running on the local host on parts 3306 through 3308, upgrade each of them by connecting to the appropriate port:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBmysql_upgrade \-\-protocol=tcp \-P 3306 [\fR\fB\fIother_options\fR\fR\fB]\fR
+shell> \fBmysql_upgrade \-\-protocol=tcp \-P 3307 [\fR\fB\fIother_options\fR\fR\fB]\fR
+shell> \fBmysql_upgrade \-\-protocol=tcp \-P 3308 [\fR\fB\fIother_options\fR\fR\fB]\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+For local host connections on Unix, the
+\fB\-\-protocol=tcp\fR
+option forces a connection using TCP/IP rather than the Unix socket file\&.
+.PP
 \fBmysql_upgrade\fR
 executes the following commands to check and repair tables and to upgrade the system tables:
 .sp
@@ -115,9 +142,11 @@
 .RS 4
 .\}
 .nf
-mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-auto\-repair
-mysql < \fIfix_priv_tables\fR
-mysqlcheck \-\-all\-databases \-\-check\-upgrade \-\-fix\-db\-names \-\-fix\-table\-names
+mysqlcheck \-\-no\-defaults \-\-all\-databases
+ \-\-fix\-db\-names \-\-fix\-table\-names
+mysqlcheck \-\-no\-defaults \-\-check\-upgrade \-\-all\-databases
+ \-\-auto\-repair
+mysql < fix_priv_tables
 .fi
 .if n \{\
 .RE
@@ -133,6 +162,28 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+\fBmysql_upgrade\fR
+also adds
+\fB\-\-write\-binlog\fR
+or
+\fB\-\-skip\-write\-binlog\fR
+to the
+\fBmysqlcheck\fR
+commands, depending on whether the
+\fB\-\-write\-binlog\fR
+option was specified on the
+\fBmysql_upgrade\fR
+command\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 Because
 \fBmysql_upgrade\fR
 invokes
@@ -189,12 +240,6 @@
 \fB\-\-force\fR
 option\&.
 .PP
-If you install MySQL from RPM packages on Linux, you must install the server and client RPMs\&.
-\fBmysql_upgrade\fR
-is included in the server RPM but requires the client RPM because the latter includes
-\fBmysqlcheck\fR\&. (See
-Section\ \&2.5.1, \(lqInstalling MySQL on Linux Using RPM Packages\(rq\&.)
-.PP
 \fBmysql_upgrade\fR
 does not upgrade the contents of the help tables\&. For upgrade instructions, see
 Section\ \&5.1.10, \(lqServer-Side Help\(rq\&.
@@ -204,13 +249,9 @@
 [mysql_upgrade]
 and
 [client]
-groups of an option file\&. Other options are passed to
-\fBmysqlcheck\fR\&. For example, it might be necessary to specify the
-\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR
-option\&.
-\fBmysql_upgrade\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+groups of an option file\&. Unrecognized options are passed to
+\fBmysqlcheck\fR\&. For information about option files, see
+Section\ \&4.2.6, \(lqUsing Option Files\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -237,7 +278,7 @@
 .\}
 .\" mysql_upgrade: basedir option
 .\" basedir option: mysql_upgrade
-\fB\-\-basedir=\fR\fB\fIpath\fR\fR
+\fB\-\-basedir=\fR\fB\fIdir_name\fR\fR
 .sp
 The path to the MySQL installation directory\&. This option is accepted for backward compatibility but ignored\&. It is removed in MySQL 5\&.7\&.
 .RE
@@ -250,9 +291,40 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: character-sets-dir option
+.\" character-sets-dir option: mysql_upgrade
+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
+.sp
+The directory where character sets are installed\&. See
+Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: compress option
+.\" compress option: mysql_upgrade
+\fB\-\-compress\fR
+.sp
+Compress all information sent between the client and the server if both support compression\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: datadir option
 .\" datadir option: mysql_upgrade
-\fB\-\-datadir=\fR\fB\fIpath\fR\fR
+\fB\-\-datadir=\fR\fB\fIdir_name\fR\fR
 .sp
 The path to the data directory\&. This option is accepted for backward compatibility but ignored\&. It is removed in MySQL 5\&.7\&.
 .RE
@@ -265,6 +337,26 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: debug option
+.\" debug option: mysql_upgrade
+\fB\-\-debug[=\fR\fB\fIdebug_options\fR\fR\fB]\fR,
+\fB\-# [\fR\fB\fIdebug_options\fR\fR\fB]\fR
+.sp
+Write a debugging log\&. A typical
+\fIdebug_options\fR
+string is
+d:t:o,\fIfile_name\fR\&. The default is
+d:t:O,/tmp/mysql_upgrade\&.trace\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: debug-check option
 .\" debug-check option: mysql_upgrade
 \fB\-\-debug\-check\fR
@@ -300,7 +392,7 @@
 .\" default-auth option: mysql_upgrade
 \fB\-\-default\-auth=\fR\fB\fIplugin\fR\fR
 .sp
-The client\-side authentication plugin to use\&. See
+A hint about the client\-side authentication plugin to use\&. See
 Section\ \&6.3.6, \(lqPluggable Authentication\(rq\&.
 .sp
 This option was added in MySQL 5\&.5\&.10\&.
@@ -314,15 +406,95 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: default-character-set option
+.\" default-character-set option: mysql_upgrade
+\fB\-\-default\-character\-set=\fR\fB\fIcharset_name\fR\fR
+.sp
+Use
+\fIcharset_name\fR
+as the default character set\&. See
+Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: defaults-extra-file option
+.\" defaults-extra-file option: mysql_upgrade
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Read this option file after the global option file but (on Unix) before the user option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: defaults-file option
+.\" defaults-file option: mysql_upgrade
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+.sp
+Use only the given option file\&. If the file does not exist or is otherwise inaccessible, an error occurs\&. Before MySQL 5\&.5\&.8,
+\fIfile_name\fR
+must be the full path name to the file\&. As of MySQL 5\&.5\&.8, the name is interpreted relative to the current directory if given as a relative path name\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: defaults-group-suffix option
+.\" defaults-group-suffix option: mysql_upgrade
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR
+.sp
+Read not only the usual option groups, but also groups with the usual names and a suffix of
+\fIstr\fR\&. For example,
+\fBmysql_upgrade\fR
+normally reads the
+[client]
+and
+[mysql_upgrade]
+groups\&. If the
+\fB\-\-defaults\-group\-suffix=_other\fR
+option is given,
+\fBmysql_upgrade\fR
+also reads the
+[client_other]
+and
+[mysql_upgrade_other]
+groups\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: force option
 .\" force option: mysql_upgrade
 \fB\-\-force\fR
 .sp
 Ignore the
 mysql_upgrade_info
-file and force execution of
-\fBmysqlcheck\fR
-even if
+file and force execution even if
 \fBmysql_upgrade\fR
 has already been executed for the current version of MySQL\&.
 .RE
@@ -335,6 +507,84 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: host option
+.\" host option: mysql_upgrade
+\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
+\fB\-h \fR\fB\fIhost_name\fR\fR
+.sp
+Connect to the MySQL server on the given host\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: no-defaults option
+.\" no-defaults option: mysql_upgrade
+\fB\-\-no\-defaults\fR
+.sp
+Do not read any option files\&. If program startup fails due to reading unknown options from an option file,
+\fB\-\-no\-defaults\fR
+can be used to prevent them from being read\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: password option
+.\" password option: mysql_upgrade
+\fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
+\fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
+.sp
+The password to use when connecting to the server\&. If you use the short option form (\fB\-p\fR), you
+\fIcannot\fR
+have a space between the option and the password\&. If you omit the
+\fIpassword\fR
+value following the
+\fB\-\-password\fR
+or
+\fB\-p\fR
+option on the command line,
+\fBmysql_upgrade\fR
+prompts for one\&.
+.sp
+Specifying a password on the command line should be considered insecure\&. See
+Section\ \&6.1.2.1, \(lqEnd-User Guidelines for Password Security\(rq\&. You can use an option file to avoid giving the password on the command line\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: pipe option
+.\" pipe option: mysql_upgrade
+\fB\-\-pipe\fR,
+\fB\-W\fR
+.sp
+On Windows, connect to the server using a named pipe\&. This option applies only if the server supports named\-pipe connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: plugin-dir option
 .\" plugin-dir option: mysql_upgrade
 \fB\-\-plugin\-dir=\fR\fB\fIpath\fR\fR
@@ -357,9 +607,111 @@
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql_upgrade: port option
+.\" port option: mysql_upgrade
+\fB\-\-port=\fR\fB\fIport_num\fR\fR,
+\fB\-P \fR\fB\fIport_num\fR\fR
+.sp
+The TCP/IP port number to use for the connection\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: print-defaults option
+.\" print-defaults option: mysql_upgrade
+\fB\-\-print\-defaults\fR
+.sp
+Print the program name and all options that it gets from option files\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: protocol option
+.\" protocol option: mysql_upgrade
+\fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
+.sp
+The connection protocol to use for connecting to the server\&. It is useful when the other connection parameters normally would cause a protocol to be used other than the one you want\&. For details on the permissible values, see
+Section\ \&4.2.2, \(lqConnecting to the MySQL Server\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: shared-memory-base-name option
+.\" shared-memory-base-name option: mysql_upgrade
+\fB\-\-shared\-memory\-base\-name=\fR\fB\fIname\fR\fR
+.sp
+On Windows, the shared\-memory name to use, for connections made using shared memory to a local server\&. The default value is
+MYSQL\&. The shared\-memory name is case sensitive\&.
+.sp
+The server must be started with the
+\fB\-\-shared\-memory\fR
+option to enable shared\-memory connections\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: socket option
+.\" socket option: mysql_upgrade
+\fB\-\-socket=\fR\fB\fIpath\fR\fR,
+\fB\-S \fR\fB\fIpath\fR\fR
+.sp
+For connections to
+localhost, the Unix socket file to use, or, on Windows, the name of the named pipe to use\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: SSL options
+.\" SSL options: mysql_upgrade
+\fB\-\-ssl*\fR
+.sp
+Options that begin with
+\fB\-\-ssl\fR
+specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
+Section\ \&6.3.9.4, \(lqSSL Command Options\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql_upgrade: tmpdir option
 .\" tmpdir option: mysql_upgrade
-\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR,
+\fB\-\-tmpdir=\fR\fB\fIdir_name\fR\fR,
 \fB\-t \fR\fB\fIpath\fR\fR
 .sp
 The path name of the directory to use for creating temporary files\&.
@@ -456,7 +808,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_waitpid.1 mysql-5.5-5.5.43/man/mysql_waitpid.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_waitpid.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_waitpid.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_waitpid\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -129,7 +129,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/mysql_zap.1 mysql-5.5-5.5.43/man/mysql_zap.1
--- mysql-5.5-5.5.35+dfsg/man/mysql_zap.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/mysql_zap.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBmysql_zap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -125,7 +125,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_blob_tool.1 mysql-5.5-5.5.43/man/ndb_blob_tool.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_blob_tool.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_blob_tool.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_blob_tool\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_BLOB_TOOL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_BLOB_TOOL\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -94,7 +94,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.14.\ \&ndb_blob_tool Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.73.\ \& This table describes command-line options for the ndb_blob_tool program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -103,7 +103,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -118,7 +118,7 @@
 Check for orphan blob parts
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -126,10 +126,10 @@
 .PP
 -d
 T}:T{
-Database to find the table in\&.
+Database to find the table in.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -138,7 +138,7 @@
 Delete orphan blob parts
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -147,7 +147,7 @@
 Write orphan keys to specified file
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -158,7 +158,7 @@
 Verbose output
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -177,8 +177,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -186,11 +185,8 @@
 \-\-check\-orphans
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -220,9 +216,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -230,16 +224,8 @@
 \-\-database=db_name
 T}
 T{
-\ \&
-T}:T{
-\-d
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -268,8 +254,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -277,11 +262,8 @@
 \-\-delete\-orphans
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -310,8 +292,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -319,11 +300,8 @@
 \-\-dump\-file=file
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 file name
@@ -353,9 +331,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -363,16 +339,8 @@
 \-\-verbose
 T}
 T{
-\ \&
-T}:T{
-\-v
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -386,8 +354,7 @@
 .sp 1
 Provide extra information in the tool\*(Aqs output regarding its progress\&.
 .RE
-        Example
-.PP
+Example.PP
 First we create an
 NDB
 table in the
@@ -479,11 +446,11 @@
 column parts are created by
 NDB
 for this column\&. See
-Section\ \&11.6, \(lqData Type Storage Requirements\(rq, for more information\&.
+Section\ \&11.7, \(lqData Type Storage Requirements\(rq, for more information\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb-common-options.1 mysql-5.5-5.5.43/man/ndb-common-options.1
--- mysql-5.5-5.5.35+dfsg/man/ndb-common-options.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb-common-options.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: Options Common to MySQL Cluster Programs
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "OPTIONS COMMON TO MY" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "OPTIONS COMMON TO MY" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -97,7 +97,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.29.\ \&Common MySQL Cluster Program Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.88.\ \& This table describes command-line options common to all MySQL Cluster programs
 .TS
 allbox tab(:);
 lB lB lB.
@@ -106,7 +106,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -129,7 +129,7 @@
 Display help message and exit
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -139,22 +139,22 @@
 .PP
 -c
 T}:T{
-Set connection string for connecting to ndb_mgmd\&. Syntax:
-            [nodeid=<id>;][host=]<hostname>[:<port>]\&.
-            Overrides entries specified in NDB_CONNECTSTRING or my\&.cnf\&.
+Set connection string for connecting to ndb_mgmd. Syntax:
+      [nodeid=<id>;][host=]<hostname>[:<port>].
+      Overrides entries specified in NDB_CONNECTSTRING or my.cnf.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --ndb-mgmd-host=host[:port]
 T}:T{
-Set the host (and port, if desired) for connecting to the management
-            server
+Set the host (and port, if desired) for connecting to management
+      server
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -163,7 +163,7 @@
 Set node id for this node
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -172,26 +172,26 @@
 Select nodes for transactions in a more optimal way
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --character-sets-dir=path
 T}:T{
-Directory where character sets are
+Directory where character sets are installed
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --debug=options
 T}:T{
-Enable output from debug calls\&. Can be used only for versions compiled
-            with debugging enabled
+Enable output from debug calls. Can be used only for versions
+      compiled with debugging enabled
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -200,7 +200,7 @@
 Write core on errors (defaults to TRUE in debug builds)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -211,16 +211,16 @@
 Output version information and exit
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
 .PP
 For options specific to individual MySQL Cluster programs, see
-Section\ \&17.4, \(lqMySQL Cluster Programs\(rq\&.
+Section\ \&18.4, \(lqMySQL Cluster Programs\(rq\&.
 .PP
 See
-Section\ \&17.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
+Section\ \&18.3.4.2, \(lqMySQL Server Options for MySQL Cluster\(rq, for
 \fBmysqld\fR
 options relating to MySQL Cluster\&.
 .sp
@@ -241,7 +241,6 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
 l l s s.
 T{
 \fBCommand\-Line Format\fR
@@ -253,11 +252,6 @@
 T}:T{
 \-\-usage
 T}
-T{
-\ \&
-T}:T{
-\-?
-T}
 .TE
 .sp 1
 Prints a short list with descriptions of the available command options\&.
@@ -277,8 +271,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -286,11 +279,8 @@
 \-\-character\-sets\-dir=path
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 file name
@@ -322,9 +312,7 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -337,16 +325,8 @@
 \-\-connect\-string=connectstring
 T}
 T{
-\ \&
-T}:T{
-\-c
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -371,7 +351,7 @@
 .\}
 .sp
 For more information, see
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq\&.
 .RE
 .sp
 .RS 4
@@ -387,8 +367,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -396,11 +375,8 @@
 \-\-core\-file
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -440,8 +416,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -449,11 +424,8 @@
 \-\-debug=options
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -483,9 +455,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -493,16 +463,8 @@
 \-\-ndb\-mgmd\-host=host[:port]
 T}
 T{
-\fBOption\-File Format\fR
-T}:T{
-ndb\-mgmd\-host
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -532,8 +494,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -541,11 +502,8 @@
 \-\-ndb\-nodeid=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -559,7 +517,7 @@
 .sp 1
 Sets this node\*(Aqs MySQL Cluster node ID\&.
 \fIThe range of permitted values depends on the node\*(Aqs type (data, management, or API) and the MySQL Cluster software version\fR\&. See
-Section\ \&17.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
+Section\ \&18.1.6.2, \(lqLimits and Differences of MySQL Cluster from Standard MySQL Limits\(rq, for more information\&.
 .RE
 .sp
 .RS 4
@@ -575,8 +533,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -584,11 +541,8 @@
 \-\-ndb\-optimized\-node\-selection
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -617,29 +571,23 @@
 \fB\-V\fR
 .TS
 allbox tab(:);
-l l s s
 l l s s.
 T{
 \fBCommand\-Line Format\fR
 T}:T{
 \-\-version
 T}
-T{
-\ \&
-T}:T{
-\-V
-T}
 .TE
 .sp 1
 Prints the MySQL Cluster version number of the executable\&. The version number is relevant because not all versions can be used together, and the MySQL Cluster startup process verifies that the versions of the binaries being used can co\-exist in the same cluster\&. This is also important when performing an online (rolling) software upgrade or downgrade of MySQL Cluster\&.
 .sp
 See
-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq), for more information\&.
 .RE
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_config.1 mysql-5.5-5.5.43/man/ndb_config.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_config.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_config.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CONFIG\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CONFIG\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -69,7 +69,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.15.\ \&ndb_config Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.74.\ \& This table describes command-line options for the ndb_config program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -78,7 +78,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -100,20 +100,20 @@
 .PP
 --nodes
 T}:T{
-Print node information (DB section) only\&.
+Print node information (DB section) only.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --connections
 T}:T{
-Print CONNECTIONS section information only\&. Cannot be used with \-\-nodes
-            or \-\-system option\&.
+Print CONNECTIONS section information only. Cannot be used with
+      --nodes or --system option.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -124,7 +124,7 @@
 One or more query options (attributes)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -133,7 +133,7 @@
 Specify host
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -142,7 +142,7 @@
 Specify node type
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -153,7 +153,7 @@
 Get configuration of node with this ID
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -164,7 +164,7 @@
 Field separator
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -175,76 +175,76 @@
 Row separator
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --config-file=path
 T}:T{
-Set the path to config\&.ini file
+Set the path to config.ini file
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --mycnf
 T}:T{
-Read configuration data from my\&.cnf file
+Read configuration data from my.cnf file
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 -c
 T}:T{
-Short form for \-\-ndb\-connectstring
+Short form for --ndb-connectstring
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --configinfo
 T}:T{
-Dumps information about all NDB configuration parameters in text format
-            with default, maximum, and minimum values\&. Use with \-\-xml to
-            obtain XML output\&.
+Dumps information about all NDB configuration parameters in text
+      format with default, maximum, and minimum values. Use with --xml
+      to obtain XML output.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --configinfo --xml
 T}:T{
-Use \-\-xml with \-\-configinfo to obtain a dump of all NDB configuration
-            parameters in XML format with default, maximum, and minimum
-            values\&.
+Use --xml with --configinfo to obtain a dump of all NDB
+      configuration parameters in XML format with default, maximum, and
+      minimum values.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --system
 T}:T{
-Print SYSTEM section information only\&. Cannot be used with \-\-nodes or
-            \-\-connections option\&.
+Print SYSTEM section information only. Cannot be used with --nodes
+      or --connections option.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --config_from_node=#
 T}:T{
-Obtain configuration data from the node having this ID (must be a data
-            node)\&.
+Obtain configuration data from the node having this ID (must be a
+      data node).
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -265,7 +265,6 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
 l l s s.
 T{
 \fBCommand\-Line Format\fR
@@ -277,11 +276,6 @@
 T}:T{
 \-\-usage
 T}
-T{
-\ \&
-T}:T{
-\-?
-T}
 .TE
 .sp 1
 Causes
@@ -303,7 +297,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -313,11 +307,8 @@
 \-\-config_from_node=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -328,9 +319,14 @@
 none
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+1
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-1 \&.\&. 48
+48
 T}
 .TE
 .sp 1
@@ -355,18 +351,12 @@
 \fB\-V\fR
 .TS
 allbox tab(:);
-l l s s
 l l s s.
 T{
 \fBCommand\-Line Format\fR
 T}:T{
 \-\-version
 T}
-T{
-\ \&
-T}:T{
-\-V
-T}
 .TE
 .sp 1
 Causes
@@ -390,9 +380,7 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -405,16 +393,8 @@
 \-\-connect\-string=connectstring
 T}
 T{
-\ \&
-T}:T{
-\-c
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -427,7 +407,7 @@
 .TE
 .sp 1
 Specifies the connection string to use in connecting to the management server\&. The format for the connection string is the same as described in
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, and defaults to
 localhost:1186\&.
 .RE
 .sp
@@ -445,8 +425,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -454,11 +433,8 @@
 \-\-config\-file=path
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 file name
@@ -488,8 +464,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -497,11 +472,8 @@
 \-\-mycnf
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -534,9 +506,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -544,16 +514,8 @@
 \-\-query=string
 T}
 T{
-\ \&
-T}:T{
-\-q
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -611,8 +573,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -620,11 +581,8 @@
 \-\-host=name
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -686,8 +644,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -695,11 +652,8 @@
 \-\-ndb\-nodeid=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -730,8 +684,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -739,11 +692,8 @@
 \-\-nodes
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -779,8 +729,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -788,11 +737,8 @@
 \-\-connections
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -828,8 +774,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -837,11 +782,8 @@
 \-\-system
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -880,8 +822,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s
 ^ lt l s
 ^ ^ l s
@@ -892,11 +833,8 @@
 \-\-type=name
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 enumeration
@@ -904,6 +842,7 @@
 :T{
 \fBDefault\fR
 T}:T{
+[none]
 T}
 :T{
 \fBValid Values\fR
@@ -941,9 +880,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -951,16 +888,8 @@
 \-\-fields=string
 T}
 T{
-\ \&
-T}:T{
-\-f
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1013,9 +942,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1023,16 +950,8 @@
 \-\-rows=string
 T}
 T{
-\ \&
-T}:T{
-\-r
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1192,8 +1111,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1201,11 +1119,8 @@
 \-\-configinfo \-\-xml
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -1229,7 +1144,7 @@
 .\}
 .nf
 shell> \fBndb_config \-\-configinfo \-\-xml\fR
-<configvariables protocolversion="1" ndbversionstring="5\&.5\&.34\-ndb\-7\&.2\&.15"
+<configvariables protocolversion="1" ndbversionstring="5\&.5\&.42\-ndb\-7\&.2\&.20"
                     ndbversion="458758" ndbversionmajor="7" ndbversionminor="0"
                     ndbversionbuild="6">
   <section name="SYSTEM">
@@ -1383,7 +1298,7 @@
 \fB\-\-configinfo\fR
 serves no purpose\&.
 .RE
-        Examples
+Examples
 .sp
 .RS 4
 .ie n \{\
@@ -1520,7 +1435,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_cpcd.1 mysql-5.5-5.5.43/man/ndb_cpcd.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_cpcd.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_cpcd.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_cpcd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_CPCD\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_CPCD\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -39,7 +39,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndbd.8 mysql-5.5-5.5.43/man/ndbd.8
--- mysql-5.5-5.5.35+dfsg/man/ndbd.8	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndbd.8	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD\FR" "8" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.10.\ \&ndbd Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.69.\ \& This table describes command-line options for the ndbd program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -68,7 +68,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -87,11 +87,11 @@
 .PP
 --initial
 T}:T{
-Perform initial start of ndbd, including cleaning the file system\&.
-            Consult the documentation before using this option
+Perform initial start of ndbd, including cleaning the file system.
+      Consult the documentation before using this option
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -99,11 +99,11 @@
 .PP
 -n
 T}:T{
-Don\*(Aqt start ndbd immediately; ndbd waits for command to start from
-            ndb_mgmd
+Don't start ndbd immediately; ndbd waits for command to start
+      from ndb_mgmd
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -111,10 +111,10 @@
 .PP
 -d
 T}:T{
-Start ndbd as daemon (default); override with \-\-nodaemon
+Start ndbd as daemon (default); override with --nodaemon
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -123,36 +123,36 @@
 Do not start ndbd as daemon; provided for testing purposes
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --foreground
 T}:T{
 Run ndbd in foreground, provided for debugging purposes (implies
-            \-\-nodaemon)
+      --nodaemon)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --nowait-nodes=list
 T}:T{
-Do not wait for these data nodes to start (takes comma\-separated list of
-            node IDs)\&. Also requires \-\-ndb\-nodeid to be used\&.
+Do not wait for these data nodes to start (takes comma-separated
+      list of node IDs). Also requires --ndb-nodeid to be used.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --initial-start
 T}:T{
-Perform partial initial start (requires \-\-nowait\-nodes)
+Perform partial initial start (requires --nowait-nodes)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -161,46 +161,47 @@
 Local bind address
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --install[=name]
 T}:T{
-Used to install the data node process as a Windows service\&. Does not
-            apply on non\-Windows platforms\&.
+Used to install the data node process as a Windows service. Does
+      not apply on non-Windows platforms.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --remove[=name]
 T}:T{
-Used to remove a data node process that was previously installed as a
-            Windows service\&. Does not apply on non\-Windows platforms\&.
+Used to remove a data node process that was previously installed
+      as a Windows service. Does not apply on non-Windows platforms.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --connect-retries=#
 T}:T{
-Number of times to try contacting the management server; set to \-1 to
-            keep trying indefinitely
+Number of times to try contacting the management server; set to -1
+      to keep trying indefinitely
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.9
+ADDED: NDB 7.2.9
 T}
 T{
 .PP
 --connect-delay=#
 T}:T{
-Time to wait between attempts to contact a management server, in seconds
+Time to wait between attempts to contact a management server, in
+      seconds
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.9
+ADDED: NDB 7.2.9
 T}
 .TE
 .sp 1
@@ -237,8 +238,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -246,11 +246,8 @@
 \-\-bind\-address=name
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -279,9 +276,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -289,16 +284,8 @@
 \-\-daemon
 T}
 T{
-\ \&
-T}:T{
-\-d
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -337,8 +324,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -346,11 +332,8 @@
 \-\-nodaemon
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -389,8 +372,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -398,11 +380,8 @@
 \-\-foreground
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -443,8 +422,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -452,11 +430,8 @@
 \-\-initial
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -556,7 +531,7 @@
 .IP \(bu 2.3
 .\}
 MySQL Cluster Disk Data files (see
-Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
 .RE
 .sp
 This option also has no effect on recovery of data by a data node that is just starting (or restarting) from data nodes that are already running\&. This recovery of data occurs automatically, and requires no user intervention in a MySQL Cluster that is running normally\&.
@@ -581,8 +556,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -590,11 +564,8 @@
 \-\-initial\-start
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -660,8 +631,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -669,11 +639,8 @@
 \-\-nowait\-nodes=list
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -718,9 +685,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -728,16 +693,8 @@
 \-\-nostart
 T}
 T{
-\ \&
-T}:T{
-\-n
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -756,7 +713,7 @@
 connects to the management server, obtains configuration data from it, and initializes communication objects\&. However, it does not actually start the execution engine until specifically requested to do so by the management server\&. This can be accomplished by issuing the proper
 START
 command in the management client (see
-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
+Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
 .RE
 .sp
 .RS 4
@@ -774,7 +731,7 @@
 allbox tab(:);
 l l s s
 l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -782,11 +739,13 @@
 \-\-install[=name]
 T}
 T{
-\ \&
+\fBPlatform Specific\fR
 T}:T{
-\fBPermitted Values\fR
+Windows
 T}
-:T{
+T{
+\fBPermitted Values\fR
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -842,7 +801,7 @@
 allbox tab(:);
 l l s s
 l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -850,11 +809,13 @@
 \-\-remove[=name]
 T}
 T{
-\ \&
+\fBPlatform Specific\fR
 T}:T{
-\fBPermitted Values\fR
+Windows
 T}
-:T{
+T{
+\fBPermitted Values\fR
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -891,14 +852,14 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.27\-ndb\-7\&.2\&.9
+5\&.5\&.28\-ndb\-7\&.2\&.9
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -906,11 +867,8 @@
 \-\-connect\-retries=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -921,9 +879,14 @@
 12
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
 T}:T{
-\-1 \&.\&. 65535
+\-1
+T}
+:T{
+\fBMax Value\fR
+T}:T{
+65535
 T}
 .TE
 .sp 1
@@ -949,14 +912,14 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.27\-ndb\-7\&.2\&.9
+5\&.5\&.28\-ndb\-7\&.2\&.9
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -964,11 +927,8 @@
 \-\-connect\-delay=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -979,9 +939,14 @@
 5
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
 T}:T{
-0 \&.\&. 3600
+0
+T}
+:T{
+\fBMax Value\fR
+T}:T{
+3600
 T}
 .TE
 .sp 1
@@ -1163,9 +1128,10 @@
 .\}
 .PP
 See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
-\fBndbd\fR(8), describes other options for
-\fBndbd\fR\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for additional information about this issue\&.
+Options Common to MySQL Cluster Programs(1), describes other command\-line options which can be used with
+\fBndbd\fR\&. For information about data node configuration parameters, see
+Section\ \&18.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq\&.
 .PP
 When
 \fBndbd\fR
@@ -1189,11 +1155,11 @@
 For a machine with many CPUs it is possible to use several
 \fBndbd\fR
 processes which belong to different node groups; however, such a configuration is still considered experimental and is not supported for MySQL 5\&.5 in a production setting\&. See
-Section\ \&17.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
+Section\ \&18.1.6, \(lqKnown Limitations of MySQL Cluster\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_delete_all.1 mysql-5.5-5.5.43/man/ndb_delete_all.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_delete_all.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_delete_all.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_delete_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DELETE_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DELETE_ALL\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -42,7 +42,7 @@
 DELETE
 or even
 TRUNCATE TABLE\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -70,7 +70,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.16.\ \&ndb_delete_all Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.75.\ \& This table describes command-line options for the ndb_delete_all program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -79,7 +79,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -88,14 +88,14 @@
 l l l.
 T{
 .PP
-\-\-database=dbname,
+--database=dbname,
 .PP
-\-d
+-d
 T}:T{
 Name of the database in which the table is found
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -103,28 +103,29 @@
 .PP
 -t
 T}:T{
-Perform the delete in a single transaction (may run out of operations)
+Perform the delete in a single transaction (may run out of
+      operations)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-tupscan
+--tupscan
 T}:T{
 Run tup scan
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-diskscan
+--diskscan
 T}:T{
 Run disk scan
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -162,7 +163,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_desc.1 mysql-5.5-5.5.43/man/ndb_desc.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_desc.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_desc.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_desc\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DESC\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DESC\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -39,7 +39,7 @@
 provides a detailed description of one or more
 NDB
 tables\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -63,8 +63,7 @@
 .RE
 .\}
 .sp
-        Sample Output
-.PP
+Sample Output.PP
 MySQL table creation and population statements:
 .sp
 .if n \{\
@@ -239,7 +238,7 @@
 .\}
 .PP
 (For more information on the statements just shown and the objects created by them, see
-Section\ \&17.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
+Section\ \&18.5.12.1, \(lqMySQL Cluster Disk Data Objects\(rq, as well as
 Section\ \&13.1.14, \(lqCREATE LOGFILE GROUP Syntax\(rq, and
 Section\ \&13.1.18, \(lqCREATE TABLESPACE Syntax\(rq\&.)
 .PP
@@ -334,7 +333,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.17.\ \&ndb_desc Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.76.\ \& This table describes command-line options for the ndb_desc program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -343,7 +342,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -359,11 +358,11 @@
 .PP
 -b
 T}:T{
-Include partition information for BLOB tables in output\&. Requires that
-            the \-p option also be used
+Include partition information for BLOB tables in output. Requires
+      that the -p option also be used
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -374,7 +373,7 @@
 Name of database containing table
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -382,11 +381,11 @@
 .PP
 -n
 T}:T{
-Include partition\-to\-data\-node mappings in output\&. Requires that the \-p
-            option also be used
+Include partition-to-data-node mappings in output. Requires that
+      the -p option also be used
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -397,7 +396,7 @@
 Display information about partitions
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -408,7 +407,7 @@
 Number of times to retry the connection (once per second)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -416,11 +415,11 @@
 .PP
 -t
 T}:T{
-Specify the table in which to find an index\&. When this option is used,
-            \-p and \-n have no effect and are ignored\&.
+Specify the table in which to find an index. When this option is
+      used, -p and -n have no effect and are ignored.
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.9
+ADDED: NDB 7.2.9
 T}
 T{
 .PP
@@ -431,7 +430,7 @@
 Use unqualified table names
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -564,7 +563,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndbd_redo_log_reader.1 mysql-5.5-5.5.43/man/ndbd_redo_log_reader.1
--- mysql-5.5-5.5.35+dfsg/man/ndbd_redo_log_reader.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndbd_redo_log_reader.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbd_redo_log_reader\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBD_REDO_LOG_REA" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -55,7 +55,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.22.\ \&ndbd_redo_log_reader Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.81.\ \& This table describes command-line options for the ndbd_redo_log_reader program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -64,7 +64,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -77,7 +77,7 @@
 Do not print records
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -86,7 +86,7 @@
 Do not check records for errors
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -95,11 +95,11 @@
 Print usage information
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.15
+ADDED: NDB 7.2.15
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -116,7 +116,7 @@
 ndb_\fI#\fR_fs/D\fI#\fR/LCP/\fI#\fR/T\fI#\fRF\fI#\fR\&.Data\&. In each case, the
 \fI#\fR
 represents a number (not necessarily the same number)\&. For more information, see
-\m[blue]\fBMySQL Cluster Data Node FileSystemDir Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
+\m[blue]\fBMySQL Cluster Data Node File System Directory Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .PP
 The name of the file to be read may be followed by one or more of the options listed here:
 .sp
@@ -131,8 +131,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -140,11 +139,8 @@
 \-noprint
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -170,8 +166,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -179,11 +174,8 @@
 \-nocheck
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -213,7 +205,7 @@
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.34\-ndb\-7\&.2\&.15
+5\&.5\&.35\-ndb\-7\&.2\&.15
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -239,7 +231,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
@@ -249,7 +241,7 @@
 .sp
 .SH "NOTES"
 .IP " 1." 4
-MySQL Cluster Data Node FileSystemDir Files
+MySQL Cluster Data Node File System Directory Files
 .RS 4
 \%http://dev.mysql.com/doc/ndbapi/en/ndb-internals-ndbd-filesystemdir-files.html
 .RE
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_drop_index.1 mysql-5.5-5.5.43/man/ndb_drop_index.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_drop_index.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_drop_index.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_drop_index\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_INDEX\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_INDEX\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 NDB
 table\&.
 \fIIt is recommended that you use this utility only as an example for writing NDB API applications\fR\(emsee the Warning later in this section for details\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -68,7 +68,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.18.\ \&ndb_drop_index Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.77.\ \& This table describes command-line options for the ndb_drop_index program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -77,20 +77,20 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l.
 T{
 .PP
-\-\-database=dbname,
+--database=dbname,
 .PP
-\-d
+-d
 T}:T{
 Name of the database in which the table is found
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -123,7 +123,7 @@
 Reading table information for completion of table and column names
 You can turn off this feature to get a quicker startup with \-A
 Welcome to the MySQL monitor\&.  Commands end with ; or \eg\&.
-Your MySQL connection id is 7 to server version: 5\&.5\&.34\-ndb\-7\&.2\&.15
+Your MySQL connection id is 7 to server version: 5\&.5\&.42\-ndb\-7\&.2\&.20
 Type \*(Aqhelp;\*(Aq or \*(Aq\eh\*(Aq for help\&. Type \*(Aq\ec\*(Aq to clear the buffer\&.
 mysql> \fBSHOW TABLES;\fR
 +\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
@@ -154,7 +154,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_drop_table.1 mysql-5.5-5.5.43/man/ndb_drop_table.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_drop_table.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_drop_table.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_drop_table\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_DROP_TABLE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_DROP_TABLE\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -45,7 +45,7 @@
 statement on an
 NDB
 table\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -66,7 +66,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.19.\ \&ndb_drop_table Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.78.\ \& This table describes command-line options for the ndb_drop_table program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -75,27 +75,27 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l.
 T{
 .PP
-\-\-database=dbname,
+--database=dbname,
 .PP
-\-d
+-d
 T}:T{
 Name of the database in which the table is found
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_error_reporter.1 mysql-5.5-5.5.43/man/ndb_error_reporter.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_error_reporter.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_error_reporter.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_error_reporter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_ERROR_REPORTE" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_ERROR_REPORTE" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -58,7 +58,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.20.\ \&ndb_error_reporter Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.79.\ \& This table describes command-line options for the ndb_error_reporter program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -67,7 +67,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -78,42 +78,43 @@
 .PP
 --connection-timeout=timeout
 T}:T{
-Number of seconds to wait when connecting to nodes before timing out\&.
+Number of seconds to wait when connecting to nodes before timing
+      out.
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.14
+ADDED: NDB 7.2.14
 T}
 T{
 .PP
 --dry-scp
 T}:T{
-Disable scp with remote hosts; used only for testing\&.
+Disable scp with remote hosts; used only for testing.
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.14
+ADDED: NDB 7.2.14
 T}
 T{
 .PP
 --fs
 T}:T{
-Include file system data in error report; can use a large amount of disk
-            space
+Include file system data in error report; can use a large amount
+      of disk space
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --skip-nodegroup=nodegroup_id
 T}:T{
-Skip all nodes in the node group having this ID\&.
+Skip all nodes in the node group having this ID.
 T}:T{
 .PP
-ADDED: NDB 7\&.2\&.14
+ADDED: NDB 7.2.14
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -151,13 +152,12 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.33\-ndb\-7\&.2\&.14
+5\&.5\&.34\-ndb\-7\&.2\&.14
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -165,11 +165,8 @@
 \-\-connection\-timeout=timeout
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 integer
@@ -198,13 +195,12 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.33\-ndb\-7\&.2\&.14
+5\&.5\&.34\-ndb\-7\&.2\&.14
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -212,11 +208,8 @@
 \-\-dry\-scp
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -246,8 +239,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -255,11 +247,8 @@
 \-\-fs
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -292,13 +281,12 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBIntroduced\fR
 T}:T{
-5\&.5\&.33\-ndb\-7\&.2\&.14
+5\&.5\&.34\-ndb\-7\&.2\&.14
 T}
 T{
 \fBCommand\-Line Format\fR
@@ -306,11 +294,8 @@
 \-\-connection\-timeout=timeout
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 integer
@@ -327,7 +312,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_index_stat.1 mysql-5.5-5.5.43/man/ndb_index_stat.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_index_stat.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_index_stat.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_index_stat\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_INDEX_STAT\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_INDEX_STAT\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -36,9 +36,10 @@
 .SH "DESCRIPTION"
 .PP
 \fBndb_index_stat\fR
-\&.\&.\&.
-        Usage
-.PP
+provides per\-fragment statistical information about indexes on
+NDB
+tables\&. This includes cache version and age, number of index entries per partition, and memory consumption by indexes\&.
+Usage.PP
 To obtain basic index statistics about a given
 NDB
 table, invoke
@@ -66,22 +67,71 @@
 in the
 test
 database:
+.\" ndb_index_stat: interpreting output
+.\" ndb_index_stat: example
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
 shell> \fBndb_index_stat \-d test mytable\fR
-table:mytable index:PRIMARY fragCount:4
-sampleVersion:2 loadTime:1336751773 sampleCount:0 keyBytes:0
-query cache: valid:1 sampleCount:0 totalBytes:0
-times in ms: save: 12\&.380 sort: 0\&.001
+table:City index:PRIMARY fragCount:2
+sampleVersion:3 loadTime:1399585986 sampleCount:1994 keyBytes:7976
+query cache: valid:1 sampleCount:1994 totalBytes:27916
+times in ms: save: 7\&.133 sort: 1\&.974 sort per sample: 0\&.000
 NDBT_ProgramExit: 0 \- OK
 .fi
 .if n \{\
 .RE
 .\}
 .PP
+sampleVersion
+is the version number of the cache from which the statistics data is taken\&. Running
+\fBndb_index_stat\fR
+with the
+\fB\-\-update\fR
+option causes sampleVersion to be incremented\&.
+.PP
+loadTime
+shows when the cache was last updated\&. This is expressed as seconds since the Unix Epoch\&.
+.PP
+sampleCount
+is the number of index entries found per partition\&. You can estimate the total number of entries by multiplying this by the number of fragments (shown as
+fragCount)\&.
+.PP
+sampleCount
+can be compared with the cardinality of
+SHOW INDEX
+or
+INFORMATION_SCHEMA\&.STATISTICS, although the latter two provide a view of the table as a whole, while
+\fBndb_index_stat\fR
+provides a per\-fragment average\&.
+.PP
+keyBytes
+is the number of bytes used by the index\&. In this example, the primary key is an integer, which requires four bytes for each index, so
+keyBytes
+can be calculated in this case as shown here:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+    keyBytes = sampleCount * (4 bytes per index) = 1994 * 4 = 7976
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+This information can also be obtained using the corresponding column definitions from
+INFORMATION_SCHEMA\&.COLUMNS
+(this requires a MySQL Server and a MySQL client application)\&.
+.PP
+totalBytes
+is the total memory consumed by all indexes on the table, in bytes\&.
+.PP
+Timings shown in the preceding examples are specific to each invocation of
+\fBndb_index_stat\fR\&.
+.PP
 The
 \fB\-\-verbose\fR
 option provides some additional output, as shown here:
@@ -108,8 +158,7 @@
 .RE
 .\}
 .sp
-        Options
-.PP
+Options.PP
 The following table includes options that are specific to the MySQL Cluster
 \fBndb_index_stat\fR
 utility\&. Additional descriptions are listed following the table\&. For options common to most MySQL Cluster programs (including
@@ -120,7 +169,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.21.\ \&ndb_index_stat Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.80.\ \& This table describes command-line options for the ndb_index_stat program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -129,7 +178,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -148,146 +197,146 @@
 l l l.
 T{
 .PP
-\-\-database=name,
+--database=name,
 .PP
-\-d
+-d
 T}:T{
-Name of the database containing the table\&.
+Name of the database containing the table.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-delete
+--delete
 T}:T{
-Delete index statistics for the given table, stopping any auto\-update
-            previously configured\&.
+Delete index statistics for the given table, stopping any
+      auto-update previously configured.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-update
+--update
 T}:T{
-Update index statistics for the given table, restarting any auto\-update
-            previously configured\&.
+Update index statistics for the given table, restarting any
+      auto-update previously configured.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-dump
+--dump
 T}:T{
-Print the query cache\&.
+Print the query cache.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-query=#
+--query=#
 T}:T{
-Perform a number of random range queries on first key attr (must be int
-            unsigned)\&.
+Perform a number of random range queries on first key attr (must
+      be int unsigned).
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-drop
+--sys-drop
 T}:T{
-Drop any statistics tables and events in NDB kernel (all statistics are
-            lost)
+Drop any statistics tables and events in NDB kernel (all
+      statistics are lost)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-create
+--sys-create
 T}:T{
-Create all statistics tables and events in NDB kernel, if none of them
-            already exist
+Create all statistics tables and events in NDB kernel, if none of
+      them already exist
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-create\-if\-not\-exist
+--sys-create-if-not-exist
 T}:T{
 Create any statistics tables and events in NDB kernel that do not
-            already exist\&.
+      already exist.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-create\-if\-not\-valid
+--sys-create-if-not-valid
 T}:T{
-Create any statistics tables or events that do not already exist in the
-            NDB kernel\&. after dropping any that are invalid\&.
+Create any statistics tables or events that do not already exist
+      in the NDB kernel. after dropping any that are invalid.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-check
+--sys-check
 T}:T{
-Verify that NDB system index statistics and event tables exist\&.
+Verify that NDB system index statistics and event tables exist.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-skip\-tables
+--sys-skip-tables
 T}:T{
-Do not apply sys\-* options to tables\&.
+Do not apply sys-* options to tables.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-sys\-skip\-events
+--sys-skip-events
 T}:T{
-Do not apply sys\-* options to events\&.
+Do not apply sys-* options to events.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-verbose,
+--verbose,
 .PP
-\-v
+-v
 T}:T{
 Turn on verbose output
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-loops=#
+--loops=#
 T}:T{
-Set the number of times to perform a given command\&. Default is 0\&.
+Set the number of times to perform a given command. Default is 0.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
 .PP
-\fBndb_index_stat statistics options\fR. The following options are used to generate index statistics\&. They work with a given table and database\&. They cannot be mixed with
-ndb_index_stat system options\&.
+\fBndb_index_stat statistics options\fR. The following options are used to generate index statistics\&. They work with a given table and database\&. They cannot be mixed with system options (see
+ndb_index_stat system options)\&.
 .sp
 .RS 4
 .ie n \{\
@@ -304,8 +353,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -315,16 +363,8 @@
 \-\-database=name
 T}
 T{
-\ \&
-T}:T{
-\-d
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -335,9 +375,12 @@
 [none]
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -357,7 +400,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -367,11 +410,8 @@
 \-\-delete
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -379,12 +419,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
+T}
+:T{
+\fBMin Value\fR
+T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -404,7 +447,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -414,11 +457,8 @@
 \-\-update
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -426,16 +466,19 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
+T}
+:T{
+\fBMin Value\fR
+T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
-Update the index statistics for the given table, and restart any auto\-update that previously configured\&.
+Update the index statistics for the given table, and restart any auto\-update that was previously configured\&.
 .RE
 .sp
 .RS 4
@@ -451,7 +494,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -461,11 +504,8 @@
 \-\-dump
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -473,12 +513,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -498,7 +541,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -508,11 +551,8 @@
 \-\-query=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -523,17 +563,22 @@
 0
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
 T}:T{
-0 \&.\&. MAX_INT
+0
+T}
+:T{
+\fBMax Value\fR
+T}:T{
+MAX_INT
 T}
 .TE
 .sp 1
 Perform random range queries on first key attribute (must be int unsigned)\&.
 .RE
 .PP
-\fBndb_index_stat system options\fR. The following options are used to generate and update the statistics tables in the NDB kernel\&. They cannot be mixed with
-ndb_index_stat statistics options\&.
+\fBndb_index_stat system options\fR. The following options are used to generate and update the statistics tables in the NDB kernel\&. None of these options can be mixed with statistics options (see
+ndb_index_stat statistics options)\&.
 .sp
 .RS 4
 .ie n \{\
@@ -548,7 +593,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -558,11 +603,8 @@
 \-\-sys\-drop
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -570,12 +612,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
+T}
+:T{
+\fBMin Value\fR
+T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -596,7 +641,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -606,11 +651,8 @@
 \-\-sys\-create
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -618,12 +660,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -643,7 +688,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -653,11 +698,8 @@
 \-\-sys\-create\-if\-not\-exist
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -665,12 +707,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
+T}
+:T{
+\fBMin Value\fR
+T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -690,7 +735,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -700,11 +745,8 @@
 \-\-sys\-create\-if\-not\-valid
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -712,12 +754,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -737,7 +782,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -747,11 +792,8 @@
 \-\-sys\-check
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -759,12 +801,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -784,7 +829,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -794,11 +839,8 @@
 \-\-sys\-skip\-tables
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -806,12 +848,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
+T}
+:T{
+\fBMin Value\fR
+T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -833,7 +878,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -843,11 +888,8 @@
 \-\-sys\-skip\-events
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -855,12 +897,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -882,8 +927,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -893,16 +937,8 @@
 \-\-verbose
 T}
 T{
-\ \&
-T}:T{
-\-v
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -910,12 +946,15 @@
 :T{
 \fBDefault\fR
 T}:T{
-true
+false
+T}
+:T{
+\fBMin Value\fR
+T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMax Value\fR
 T}:T{
-\&.\&.
 T}
 .TE
 .sp 1
@@ -935,7 +974,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -945,11 +984,8 @@
 \-\-loops=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -960,9 +996,14 @@
 0
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+0
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-0 \&.\&. MAX_INT
+MAX_INT
 T}
 .TE
 .sp 1
@@ -971,7 +1012,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndbinfo_select_all.1 mysql-5.5-5.5.43/man/ndbinfo_select_all.1
--- mysql-5.5-5.5.35+dfsg/man/ndbinfo_select_all.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndbinfo_select_all.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbinfo_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBINFO_SELECT_AL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBINFO_SELECT_AL" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -121,7 +121,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.11.\ \&ndbinfo_select_all Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.70.\ \& This table describes command-line options for the ndbinfo_select_all program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -130,7 +130,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -141,10 +141,10 @@
 .PP
 --delay=#
 T}:T{
-Set the delay in seconds between loops\&. Default is 5\&.
+Set the delay in seconds between loops. Default is 5.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -152,10 +152,10 @@
 .PP
 -l
 T}:T{
-Set the number of times to perform the select\&. Default is 1\&.
+Set the number of times to perform the select. Default is 1.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -163,10 +163,10 @@
 .PP
 -d
 T}:T{
-Name of the database where the table located\&.
+Name of the database where the table located.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -174,10 +174,10 @@
 .PP
 -p
 T}:T{
-Set the degree of parallelism\&.
+Set the degree of parallelism.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -195,7 +195,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -205,11 +205,8 @@
 \-\-delay=#
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -220,9 +217,14 @@
 5
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
 T}:T{
-0 \&.\&. MAX_INT
+0
+T}
+:T{
+\fBMax Value\fR
+T}:T{
+MAX_INT
 T}
 .TE
 .sp 1
@@ -246,8 +248,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -257,16 +258,8 @@
 \-\-loops=#
 T}
 T{
-\ \&
-T}:T{
-\-l
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -277,9 +270,14 @@
 1
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
+T}:T{
+0
+T}
+:T{
+\fBMax Value\fR
 T}:T{
-0 \&.\&. MAX_INT
+MAX_INT
 T}
 .TE
 .sp 1
@@ -290,7 +288,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_mgm.1 mysql-5.5-5.5.43/man/ndb_mgm.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_mgm.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_mgm.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_mgm\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGM\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGM\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -87,7 +87,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.13.\ \&ndb_mgm Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.72.\ \& This table describes command-line options for the ndb_mgm program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -96,7 +96,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -110,7 +110,7 @@
 Specify number of tries for connecting to ndb_mgmd (0 = infinite)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -121,7 +121,7 @@
 Execute command and exit
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -140,18 +140,12 @@
 \fB\-e \fR\fBcommand\fR
 .TS
 allbox tab(:);
-l l s s
 l l s s.
 T{
 \fBCommand\-Line Format\fR
 T}:T{
 \-\-execute=name
 T}
-T{
-\ \&
-T}:T{
-\-e
-T}
 .TE
 .sp 1
 This option can be used to send a command to the MySQL Cluster management client from the system shell\&. For example, either of the following is equivalent to executing
@@ -176,7 +170,7 @@
 option works with the
 \fBmysql\fR
 command\-line client\&. See
-Section\ \&4.2.3.1, \(lqUsing Options on the Command Line\(rq\&.
+Section\ \&4.2.4, \(lqUsing Options on the Command Line\(rq\&.
 .if n \{\
 .sp
 .\}
@@ -208,9 +202,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -218,16 +210,8 @@
 \-\-try\-reconnect=#
 T}
 T{
-\ \&
-T}:T{
-\-t
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -247,11 +231,11 @@
 Additional information about using
 \fBndb_mgm\fR
 can be found in
-Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
+Section\ \&18.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_mgmd.8 mysql-5.5-5.5.43/man/ndb_mgmd.8
--- mysql-5.5-5.5.35+dfsg/man/ndb_mgmd.8	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_mgmd.8	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_mgmd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_MGMD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_MGMD\FR" "8" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -54,7 +54,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.12.\ \&ndb_mgmd Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.71.\ \& This table describes command-line options for the ndb_mgmd program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -63,7 +63,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -86,16 +86,14 @@
 .PP
 --config-file=file,
 .PP
--f,
-.PP
--c
+-f
 T}:T{
-Specify the cluster configuration file; in NDB\-6\&.4\&.0 and later, needs
-            \-\-reload or \-\-initial to override configuration cache if
-            present
+Specify the cluster configuration file; in NDB-6.4.0 and later,
+      needs --reload or --initial to override configuration cache if
+      present
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -103,10 +101,11 @@
 .PP
 --config-dir=directory
 T}:T{
-Specify the cluster management server\*(Aqs configuration cache directory
+Specify the cluster management server's configuration cache
+      directory
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -115,7 +114,7 @@
 Local bind address
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -126,7 +125,7 @@
 Print full configuration and exit
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -137,7 +136,7 @@
 Run ndb_mgmd in daemon mode (default)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -146,27 +145,27 @@
 Do not run ndb_mgmd as a daemon
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --interactive
 T}:T{
 Run ndb_mgmd in interactive mode (not officially supported in
-            production; for testing purposes only)
+      production; for testing purposes only)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --log-name=name
 T}:T{
-A name to use when writing messages applying to this node in the cluster
-            log\&.
+A name to use when writing messages applying to this node in the
+      cluster log.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -175,77 +174,77 @@
 Do not provide any node id checks
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --mycnf
 T}:T{
-Read cluster configuration data from the my\&.cnf file
+Read cluster configuration data from the my.cnf file
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --reload
 T}:T{
-Causes the management server to compare the configuration file with its
-            configuration cache
+Causes the management server to compare the configuration file
+      with its configuration cache
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --initial
 T}:T{
-Causes the management server reload its configuration data from the
-            configuration file, bypassing the configuration cache
+Causes the management server reload its configuration data from
+      the configuration file, bypassing the configuration cache
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --nowait-nodes=list
 T}:T{
-Do not wait for these management nodes when starting this management
-            server\&. Also requires \-\-ndb\-nodeid to be used\&.
+Do not wait for these management nodes when starting this
+      management server. Also requires --ndb-nodeid to be used.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --config-cache[=TRUE|FALSE]
 T}:T{
-Enable the management server configuration cache; TRUE by default\&.
+Enable the management server configuration cache; TRUE by default.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --install[=name]
 T}:T{
-Used to install the management server process as a Windows service\&. Does
-            not apply on non\-Windows platforms\&.
+Used to install the management server process as a Windows
+      service. Does not apply on non-Windows platforms.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --remove[=name]
 T}:T{
-Used to remove a management server process that was previously installed
-            as a Windows service, optionally specifying the name of the
-            service to be removed\&. Does not apply on non\-Windows
-            platforms\&.
+Used to remove a management server process that was previously
+      installed as a Windows service, optionally specifying the name of
+      the service to be removed. Does not apply on non-Windows
+      platforms.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -263,8 +262,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -272,11 +270,8 @@
 \-\-bind\-address=ip_address
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -309,8 +304,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -318,11 +312,8 @@
 \-\-no\-nodeid\-checks
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -351,8 +342,7 @@
 allbox tab(:);
 l l s s
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -365,11 +355,8 @@
 \-\-config\-dir=directory
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 file name
@@ -399,8 +386,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -408,11 +394,8 @@
 \-\-config\-cache[=TRUE|FALSE]
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -431,7 +414,7 @@
 ON), can be used to disable the management server\*(Aqs configuration cache, so that it reads its configuration from
 config\&.ini
 every time it starts (see
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. You can do this by starting the
 \fBndb_mgmd\fR
 process with any one of the following options:
 .sp
@@ -557,12 +540,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
-^ l l s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -570,31 +548,8 @@
 \-\-config\-file=file
 T}
 T{
-\ \&
-T}:T{
-\-f
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
-\fBType\fR
-T}:T{
-file name
-T}
-:T{
-\fBDefault\fR
 T}:T{
-\&./config\&.ini
-T}
-T{
-\ \&
-T}:T{
-\fBPermitted Values\fR
-T}
-:T{
 \fBType\fR
 T}:T{
 file name
@@ -622,7 +577,7 @@
 \fBndb_mgmd\fR
 was started with
 \fB\-\-config\-cache=OFF\fR\&. See
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq, for more information\&.
 .sp
 Formerly, using this option together with
 \fB\-\-initial\fR
@@ -643,8 +598,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -652,11 +606,8 @@
 \-\-mycnf
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -688,9 +639,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -698,16 +647,8 @@
 \-\-daemon
 T}
 T{
-\ \&
-T}:T{
-\-d
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -741,8 +682,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -750,11 +690,8 @@
 \-\-interactive
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -786,8 +723,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -795,11 +731,8 @@
 \-\-initial
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -812,7 +745,7 @@
 .TE
 .sp 1
 Configuration data is cached internally, rather than being read from the cluster global configuration file each time the management server is started (see
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using the
 \fB\-\-initial\fR
 option overrides this behavior, by forcing the management server to delete any existing cache files, and then to re\-read the configuration data from the cluster configuration file and to build a new cache\&.
 .sp
@@ -835,7 +768,7 @@
 ignores
 \fB\-\-initial\fR
 unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See
-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
 .sp
 Formerly, using this option together with the
 \fB\-\-config\-file\fR
@@ -855,8 +788,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -864,11 +796,8 @@
 \-\-log\-name=name
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -896,8 +825,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -905,11 +833,8 @@
 \-\-nodaemon
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -945,9 +870,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -955,16 +878,8 @@
 \-\-print\-full\-config
 T}
 T{
-\ \&
-T}:T{
-\-P
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -996,8 +911,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1005,11 +919,8 @@
 \-\-reload
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -1022,7 +933,7 @@
 .TE
 .sp 1
 In MySQL Cluster NDB 7\&.2, configuration data is stored internally rather than being read from the cluster global configuration file each time the management server is started (see
-Section\ \&17.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using this option forces the management server to check its internal data store against the cluster configuration file and to reload the configuration if it finds that the configuration file does not match the cache\&. Existing configuration cache files are preserved, but not used\&.
+Section\ \&18.3.2, \(lqMySQL Cluster Configuration Files\(rq)\&. Using this option forces the management server to check its internal data store against the cluster configuration file and to reload the configuration if it finds that the configuration file does not match the cache\&. Existing configuration cache files are preserved, but not used\&.
 .sp
 This differs in two ways from the
 \fB\-\-initial\fR
@@ -1041,7 +952,7 @@
 ignores
 \fB\-\-reload\fR
 unless it is the only management server running\&. This behavior also has implications when performing a rolling restart of a MySQL Cluster with multiple management nodes\&. See
-Section\ \&17.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
+Section\ \&18.5.5, \(lqPerforming a Rolling Restart of a MySQL Cluster\(rq, for more information\&.
 .RE
 .sp
 .RS 4
@@ -1057,7 +968,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
+l l l s
 ^ l l s
 ^ l l s
 ^ l l s.
@@ -1067,11 +978,8 @@
 \-\-nowait\-nodes=list
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 numeric
@@ -1081,9 +989,14 @@
 T}:T{
 T}
 :T{
-\fBRange\fR
+\fBMin Value\fR
 T}:T{
-1 \&.\&. 255
+1
+T}
+:T{
+\fBMax Value\fR
+T}:T{
+255
 T}
 .TE
 .sp 1
@@ -1166,7 +1079,7 @@
 The same is true with regard to the connection string used with any
 \fBmysqld\fR
 processes that you wish to start as MySQL Cluster SQL nodes connected to this cluster\&. See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for more information\&.
 .sp
 When used with
 \fBndb_mgmd\fR, this option affects the behavior of the management node with regard to other management nodes only\&. Do not confuse it with the
@@ -1200,7 +1113,7 @@
 It is not strictly necessary to specify a connection string when starting the management server\&. However, if you are using more than one management server, a connection string should be provided and each node in the cluster should specify its node ID explicitly\&.
 .PP
 See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information about using connection strings\&.
 \fBndb_mgmd\fR(8), describes other options for
 \fBndb_mgmd\fR\&.
 .PP
@@ -1227,7 +1140,7 @@
 .\" config.ini (MySQL Cluster)
 config\&.ini
 is the configuration file for the cluster as a whole\&. This file is created by the user and read by the management server\&.
-Section\ \&17.3, \(lqConfiguration of MySQL Cluster NDB 7.2\(rq, discusses how to set up this file\&.
+Section\ \&18.3, \(lqConfiguration of MySQL Cluster\(rq, discusses how to set up this file\&.
 .RE
 .sp
 .RS 4
@@ -1240,7 +1153,7 @@
 .\}
 ndb_\fInode_id\fR_cluster\&.log
 is the cluster events log file\&. Examples of such events include checkpoint startup and completion, node startup events, node failures, and levels of memory usage\&. A complete listing of cluster events with descriptions may be found in
-Section\ \&17.5, \(lqManagement of MySQL Cluster\(rq\&.
+Section\ \&18.5, \(lqManagement of MySQL Cluster\(rq\&.
 .sp
 When the size of the cluster log reaches one million bytes, the file is renamed to
 ndb_\fInode_id\fR_cluster\&.log\&.\fIseq_id\fR, where
@@ -1291,7 +1204,7 @@
 allbox tab(:);
 l l s s
 l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1299,11 +1212,13 @@
 \-\-install[=name]
 T}
 T{
-\ \&
+\fBPlatform Specific\fR
 T}:T{
-\fBPermitted Values\fR
+Windows
 T}
-:T{
+T{
+\fBPermitted Values\fR
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1354,7 +1269,7 @@
 allbox tab(:);
 l l s s
 l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1362,11 +1277,13 @@
 \-\-remove[=name]
 T}
 T{
-\ \&
+\fBPlatform Specific\fR
 T}:T{
-\fBPermitted Values\fR
+Windows
 T}
-:T{
+T{
+\fBPermitted Values\fR
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1390,7 +1307,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndbmtd.8 mysql-5.5-5.5.43/man/ndbmtd.8
--- mysql-5.5-5.5.35+dfsg/man/ndbmtd.8	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndbmtd.8	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndbmtd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDBMTD\FR" "8" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDBMTD\FR" "8" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -59,7 +59,7 @@
 also apply to
 \fBndbmtd\fR\&. For more information about these options and parameters, see
 \fBndbd\fR(8), and
-Section\ \&17.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
+Section\ \&18.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
 .PP
 \fBndbmtd\fR
 is also file system\-compatible with
@@ -203,7 +203,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_print_backup_file.1 mysql-5.5-5.5.43/man/ndb_print_backup_file.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_print_backup_file.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_print_backup_file.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_print_backup_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_BACKUP_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_BACKUP_" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@
 .PP
 \fBndb_print_backup_file\fR
 obtains diagnostic information from a cluster backup file\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -57,7 +57,7 @@
 BACKUP\-\fI#\fR, where
 \fI#\fR
 is the sequence number for the backup\&. For more information about cluster backup files and their contents, see
-Section\ \&17.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
+Section\ \&18.5.3.1, \(lqMySQL Cluster Backup Concepts\(rq\&.
 .PP
 Like
 \fBndb_print_schema_file\fR
@@ -68,13 +68,12 @@
 utilities that are intended to be run on a management server host or to connect to a management server)
 \fBndb_print_backup_file\fR
 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-        Additional Options
-.PP
+Additional Options.PP
 None\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_print_file.1 mysql-5.5-5.5.43/man/ndb_print_file.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_print_file.1	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_print_file.1	2015-02-27 08:30:42.000000000 +0000
@@ -0,0 +1,123 @@
+'\" t
+.\"     Title: \fBndb_print_file\fR
+.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
+.\"    Manual: MySQL Database System
+.\"    Source: MySQL 5.5
+.\"  Language: English
+.\"
+.TH "\FBNDB_PRINT_FILE\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
+.\" -----------------------------------------------------------------
+.\" * Define some portability stuff
+.\" -----------------------------------------------------------------
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.\" http://bugs.debian.org/507673
+.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
+.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+.ie \n(.g .ds Aq \(aq
+.el       .ds Aq '
+.\" -----------------------------------------------------------------
+.\" * set default formatting
+.\" -----------------------------------------------------------------
+.\" disable hyphenation
+.nh
+.\" disable justification (adjust text to left margin only)
+.ad l
+.\" -----------------------------------------------------------------
+.\" * MAIN CONTENT STARTS HERE *
+.\" -----------------------------------------------------------------
+.\" ndb_print_file
+.SH "NAME"
+ndb_print_file \- print NDB Disk Data file contents
+.SH "SYNOPSIS"
+.HP \w'\fBndb_print_file\ [\-v]\ [\-q]\ \fR\fB\fIfile_name\fR\fR\fB+\fR\ 'u
+\fBndb_print_file [\-v] [\-q] \fR\fB\fIfile_name\fR\fR\fB+\fR
+.SH "DESCRIPTION"
+.PP
+\fBndb_print_file\fR
+obtains information from a MySQL Cluster Disk Data file\&.
+Usage
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+ndb_print_file [\-v] [\-q] \fIfile_name\fR+
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+\fIfile_name\fR
+is the name of a MySQL Cluster Disk Data file\&. Multiple filenames are accepted, separated by spaces\&.
+.PP
+Like
+\fBndb_print_schema_file\fR
+and
+\fBndb_print_sys_file\fR
+(and unlike most of the other
+NDB
+utilities that are intended to be run on a management server host or to connect to a management server)
+\fBndb_print_file\fR
+must be run on a MySQL Cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
+Additional Options.PP
+\fBndb_print_file\fR
+supports the following options:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-v\fR: Make output verbose\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-q\fR: Suppress output (quiet mode)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fB\-\-help\fR,
+\fB\-h\fR,
+\fB\-?\fR: Suppress output (quiet mode)\&.
+.sp
+This option did not work correctly prior to MySQL Cluster NDB 7\&.2\&.18\&. (Bug #17069285)
+.RE
+.PP
+For more information, see
+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq\&.
+.SH "COPYRIGHT"
+.br
+.PP
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
+.PP
+This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
+.PP
+This documentation 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.
+.PP
+You should have received a copy of the GNU General Public License along with the program; if not, write to the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA or see http://www.gnu.org/licenses/.
+.sp
+.SH "SEE ALSO"
+For more information, please refer to the MySQL Reference Manual,
+which may already be installed locally and which is also available
+online at http://dev.mysql.com/doc/.
+.SH AUTHOR
+Oracle Corporation (http://dev.mysql.com/).
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_print_schema_file.1 mysql-5.5-5.5.43/man/ndb_print_schema_file.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_print_schema_file.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_print_schema_file.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_print_schema_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SCHEMA_" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SCHEMA_" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@
 .PP
 \fBndb_print_schema_file\fR
 obtains diagnostic information from a cluster schema file\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -51,7 +51,7 @@
 .PP
 \fIfile_name\fR
 is the name of a cluster schema file\&. For more information about cluster schema files, see
-\m[blue]\fBMySQL Cluster Data Node FileSystemDir Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
+\m[blue]\fBMySQL Cluster Data Node File System Directory Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .PP
 Like
 \fBndb_print_backup_file\fR
@@ -62,13 +62,12 @@
 utilities that are intended to be run on a management server host or to connect to a management server)
 \fBndb_schema_backup_file\fR
 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-        Additional Options
-.PP
+Additional Options.PP
 None\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
@@ -78,7 +77,7 @@
 .sp
 .SH "NOTES"
 .IP " 1." 4
-MySQL Cluster Data Node FileSystemDir Files
+MySQL Cluster Data Node File System Directory Files
 .RS 4
 \%http://dev.mysql.com/doc/ndbapi/en/ndb-internals-ndbd-filesystemdir-files.html
 .RE
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_print_sys_file.1 mysql-5.5-5.5.43/man/ndb_print_sys_file.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_print_sys_file.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_print_sys_file.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_print_sys_file\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_PRINT_SYS_FIL" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_PRINT_SYS_FIL" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -37,7 +37,7 @@
 .PP
 \fBndb_print_sys_file\fR
 obtains diagnostic information from a MySQL Cluster system file\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -54,7 +54,7 @@
 ndb_\fI#\fR_fs/D\fI#\fR/DBDIH/P\fI#\fR\&.sysfile\&. In each case, the
 \fI#\fR
 represents a number (not necessarily the same number)\&. For more information, see
-\m[blue]\fBMySQL Cluster Data Node FileSystemDir Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
+\m[blue]\fBMySQL Cluster Data Node File System Directory Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .PP
 Like
 \fBndb_print_backup_file\fR
@@ -65,13 +65,12 @@
 utilities that are intended to be run on a management server host or to connect to a management server)
 \fBndb_print_backup_file\fR
 must be run on a cluster data node, since it accesses the data node file system directly\&. Because it does not make use of the management server, this utility can be used when the management server is not running, and even when the cluster has been completely shut down\&.
-        Additional Options
-.PP
+Additional Options.PP
 None\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
@@ -81,7 +80,7 @@
 .sp
 .SH "NOTES"
 .IP " 1." 4
-MySQL Cluster Data Node FileSystemDir Files
+MySQL Cluster Data Node File System Directory Files
 .RS 4
 \%http://dev.mysql.com/doc/ndbapi/en/ndb-internals-ndbd-filesystemdir-files.html
 .RE
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_restore.1 mysql-5.5-5.5.43/man/ndb_restore.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_restore.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_restore.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_restore\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_RESTORE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_RESTORE\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -48,7 +48,7 @@
 must be executed once for each of the backup files that were created by the
 START BACKUP
 command used to create the backup (see
-Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq)\&. This is equal to the number of data nodes in the cluster at the time that the backup was created\&.
+Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq)\&. This is equal to the number of data nodes in the cluster at the time that the backup was created\&.
 .\" single user mode (MySQL Cluster): and ndb_restore
 .if n \{\
 .sp
@@ -65,7 +65,7 @@
 .PP
 Before using
 \fBndb_restore\fR, it is recommended that the cluster be running in single user mode, unless you are restoring multiple data nodes in parallel\&. See
-Section\ \&17.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
+Section\ \&18.5.8, \(lqMySQL Cluster Single User Mode\(rq, for more information\&.
 .sp .5v
 .RE
 .PP
@@ -78,7 +78,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.23.\ \&ndb_restore Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.82.\ \& This table describes command-line options for the ndb_restore program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -87,7 +87,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -130,6 +130,8 @@
 l l l
 l l l
 l l l
+l l l
+l l l
 l l l.
 T{
 .PP
@@ -137,10 +139,10 @@
 .PP
 -c
 T}:T{
-Alias for \-\-connectstring\&.
+Alias for --connectstring.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -148,10 +150,10 @@
 .PP
 -n
 T}:T{
-Back up files from node with this ID
+Restore backup files to node with this ID
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -162,7 +164,7 @@
 Restore from the backup with the given ID
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -173,7 +175,7 @@
 Restore table data and logs into NDB Cluster using the NDB API
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -184,7 +186,7 @@
 Restore metadata to NDB Cluster using the NDB API
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -192,11 +194,11 @@
 .PP
 -u
 T}:T{
-Do not upgrade array type for varsize attributes which do not already
-            resize VAR data, and do not change column attributes
+Do not upgrade array type for varsize attributes which do not
+      already resize VAR data, and do not change column attributes
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -207,7 +209,7 @@
 Allow attributes to be promoted when restoring data from backup
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -215,11 +217,11 @@
 .PP
 -P
 T}:T{
-Allow preservation of trailing spaces (including padding) when promoting
-            fixed\-width string types to variable\-width types
+Allow preservation of trailing spaces (including padding) when
+      promoting fixed-width string types to variable-width types
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -230,7 +232,7 @@
 Do not restore objects relating to Disk Data
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -238,12 +240,12 @@
 .PP
 -e
 T}:T{
-Restore epoch info into the status table\&. Convenient on a MySQL Cluster
-            replication slave for starting replication\&. The row in
-            mysql\&.ndb_apply_status with id 0 will be updated/inserted\&.
+Restore epoch info into the status table. Convenient on a MySQL
+      Cluster replication slave for starting replication. The row in
+      mysql.ndb_apply_status with id 0 will be updated/inserted.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -254,7 +256,7 @@
 Skip table structure check during restoring of data
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -265,17 +267,17 @@
 Number of parallel transactions to use while restoring data
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --print
 T}:T{
-Print metadata, data and log to stdout (equivalent to \-\-print_meta
-            \-\-print_data \-\-print_log)
+Print metadata, data and log to stdout (equivalent to --print_meta
+      --print_data --print_log)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -284,7 +286,7 @@
 Print metadata to stdout
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -293,7 +295,7 @@
 Print data to stdout
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -302,7 +304,7 @@
 Print to stdout
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -311,7 +313,7 @@
 Path to backup files directory
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -319,11 +321,11 @@
 .PP
 -f
 T}:T{
-Do not ignore system table during restore\&. Experimental only; not for
-            production use
+Do not ignore system table during restore. Experimental only; not
+      for production use
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -331,11 +333,11 @@
 .PP
 -z
 T}:T{
-Nodegroup map for NDBCLUSTER storage engine\&. Syntax: list of
-            (source_nodegroup, destination_nodegroup)
+Nodegroup map for NDBCLUSTER storage engine. Syntax: list of
+      (source_nodegroup, destination_nodegroup)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -344,7 +346,7 @@
 Fields are enclosed with the indicated character
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -353,7 +355,7 @@
 Fields are terminated by the indicated character
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -362,7 +364,7 @@
 Fields are optionally enclosed with the indicated character
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -371,7 +373,7 @@
 Lines are terminated by the indicated character
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -380,7 +382,7 @@
 Print binary types in hexadecimal format
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -388,19 +390,19 @@
 .PP
 -T
 T}:T{
-Creates a tab\-separated \&.txt file for each table in the given path
+Creates a tab-separated .txt file for each table in the given path
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --append
 T}:T{
-Append data to a tab\-delimited file
+Append data to a tab-delimited file
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -409,17 +411,17 @@
 Print status of restoration each given number of seconds
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --no-binlog
 T}:T{
 If a mysqld is connected and using binary logging, do not log the
-            restored data
+      restored data
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -428,97 +430,110 @@
 Level of verbosity in output
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --include-databases=db-list
 T}:T{
-List of one or more databases to restore (excludes those not named)
+List of one or more databases to restore (excludes those not
+      named)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --exclude-databases=db-list
 T}:T{
-List of one or more databases to exclude (includes those not named)
+List of one or more databases to exclude (includes those not
+      named)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --include-tables=table-list
 T}:T{
-List of one or more tables to restore (excludes those in same database
-            that are not named); each table reference must include the
-            database name
+List of one or more tables to restore (excludes those in same
+      database that are not named); each table reference must include
+      the database name
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --exclude-tables=table-list
 T}:T{
-List of one or more tables to exclude (includes those in same database
-            that are not not named); each table reference must include
-            the database name
+List of one or more tables to exclude (includes those in the same
+      database that are not named); each table reference must include
+      the database name
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --exclude-missing-columns
 T}:T{
-Causes columns from the backup version of a table that are missing from
-            the version of the table in the database to be ignored\&.
+Causes columns from the backup version of a table that are missing
+      from the version of the table in the database to be ignored.
+T}:T{
+.PP
+All MySQL 5.5 based releases
+T}
+T{
+.PP
+--exclude-missing-tables
+T}:T{
+Causes tables from the backup that are missing from the database
+      to be ignored.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+ADDED: NDB 7.2.18
 T}
 T{
 .PP
 --disable-indexes
 T}:T{
-Causes indexes from a backup to be ignored; may decrease time needed to
-            restore data\&.
+Causes indexes from a backup to be ignored; may decrease time
+      needed to restore data.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --rebuild-indexes
 T}:T{
-Causes multi\-threaded ordered index rebuilding of indexes found in the
-            backup\&.
+Causes multi-threaded rebuilding of ordered indexes found in the
+      backup. Number of threads used is determined by setting
+      BuildIndexThreads parameter.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --skip-broken-objects
 T}:T{
-Causes missing blob tables in the backup file to be ignored\&.
+Causes missing blob tables in the backup file to be ignored.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --skip-unknown-objects
 T}:T{
-Causes schema objects not recognized by ndb_restore to be ignored when
-            restoring a backup made from a newer MySQL Cluster version
-            to an older version\&.
+Causes schema objects not recognized by ndb_restore to be ignored
+      when restoring a backup made from a newer MySQL Cluster version to
+      an older version.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -527,7 +542,7 @@
 Restores to a database with a different name than the original
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -535,23 +550,35 @@
 .PP
 -L
 T}:T{
-Allow lossy conversions of column values (type demotions or changes in
-            sign) when restoring data from backup
+Allow lossy conversions of column values (type demotions or
+      changes in sign) when restoring data from backup
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --restore-privilege-tables
 T}:T{
-Restore MySQL privilege tables that were previously moved to NDB\&.
+Restore MySQL privilege tables that were previously moved to NDB.
+T}:T{
+.PP
+All MySQL 5.5 based releases
+T}
+T{
+.PP
+--exclude-intermediate-sql-tables[=TRUE|FALSE]
+T}:T{
+If TRUE (the default), do not restore any intermediate tables
+      (having names prefixed with '#sql-') that were left over from
+      copying ALTER TABLE operations.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+ADDED: NDB 7.2.17
 T}
 .TE
 .sp 1
+.\" ndb_restore: typical and required options
 .PP
 Typical options for this utility are shown here:
 .sp
@@ -566,13 +593,25 @@
 .RE
 .\}
 .PP
+Normally, when restoring from a MySQL Cluster backup,
+\fBndb_restore\fR
+requires at a minimum the
+\fB\-\-nodeid\fR
+(short form:
+\fB\-n\fR),
+\fB\-\-backupid\fR
+(short form:
+\fB\-b\fR), and
+\fB\-\-backup_path\fR
+options\&.
+.PP
 .\" restore_connect option (ndb_restore)
 The
 \fB\-c\fR
 option is used to specify a connection string which tells
 ndb_restore
 where to locate the cluster management server\&. (See
-Section\ \&17.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
+Section\ \&18.3.2.3, \(lqMySQL Cluster Connection Strings\(rq, for information on connection strings\&.) If this option is not used, then
 \fBndb_restore\fR
 attempts to connect to a management server on
 localhost:1186\&. This utility acts as a cluster API node, and so requires a free connection
@@ -590,7 +629,7 @@
 section in
 config\&.ini
 that is not being used for a MySQL server or other application for this reason (see
-Section\ \&17.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
+Section\ \&18.3.2.7, \(lqDefining SQL and Other API Nodes in a MySQL Cluster\(rq)\&.
 .PP
 You can verify that
 \fBndb_restore\fR
@@ -610,9 +649,12 @@
 .RE
 .\}
 .PP
-.\" restore_nodeid option (ndb_restore)
+.\" nodeid option (ndb_restore)
+The
+\fB\-\-nodeid\fR
+or
 \fB\-n\fR
-is used to specify the node ID of the data node on which the backups were taken\&.
+is used to specify the node ID of the data node on which the backup should be restored\&.
 .PP
 The first time you run the
 \fBndb_restore\fR
@@ -713,7 +755,7 @@
 INT
 or
 BIGINT\&. See
-Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
+Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for a table of type conversions currently supported by attribute promotion\&.
 .PP
 Attribute promotion by
 \fBndb_restore\fR
@@ -750,6 +792,50 @@
 \fB\-A\fR) when restoring the table data\&. Attribute promotion does not occur if this option is not used; instead, the restore operation fails with an error\&.
 .RE
 .PP
+Prior to MySQL Cluster NDB 7\&.2\&.14, conversions between character data types and
+TEXT
+or
+BLOB
+were not handled correctly (Bug #17325051)\&.
+.PP
+Prior to MySQL Cluster NDB 7\&.2\&.18, demotion of
+TEXT
+to
+TINYTEXT
+was not handled correctly (Bug #18875137)\&.
+.PP
+When converting between character data types and
+TEXT
+or
+BLOB, only conversions between character types (CHAR
+and
+VARCHAR) and binary types (BINARY
+and
+VARBINARY) can be performed at the same time\&. For example, you cannot promote an
+INT
+column to
+BIGINT
+while promoting a
+VARCHAR
+column to
+TEXT
+in the same invocation of
+\fBndb_restore\fR\&.
+.PP
+Converting between
+TEXT
+columns using different character sets is not supported\&. Beginning with MySQL Cluster NDB 7\&.2\&.18, it is expressly disallowed (Bug #18875137)\&.
+.PP
+When performing conversions of character or binary types to
+TEXT
+or
+BLOB
+with
+\fBndb_restore\fR, you may notice that it creates and uses one or more staging tables named
+\fItable_name\fR$ST\fInode_id\fR\&. These tables are not needed afterwards, and are normally deleted by
+\fBndb_restore\fR
+following a successful restoration\&.
+.PP
 .\" ndb_restore: lossy-conversions option
 .\" lossy-conversions option (ndb_restore)
 \fB\-\-lossy\-conversions\fR,
@@ -757,9 +843,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -767,16 +851,8 @@
 \-\-lossy\-conversions
 T}
 T{
-\ \&
-T}:T{
-\-L
-T}
-T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 boolean
@@ -794,7 +870,7 @@
 option\&. Using
 \fB\-\-lossy\-conversions\fR
 allows lossy conversions of column values (type demotions or changes in sign) when restoring data from backup\&. With some exceptions, the rules governing demotion are the same as for MySQL replication; see
-Section\ \&16.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
+Section\ \&17.4.1.9.2, \(lqReplication of Columns Having Different Data Types\(rq, for information about specific type conversions currently supported by attribute demotion\&.
 .PP
 \fBndb_restore\fR
 reports any truncation of data that it performs during lossy conversions once per attribute and column\&.
@@ -848,7 +924,7 @@
 option is used to specify the ID or sequence number of the backup, and is the same number shown by the management client in the
 Backup \fIbackup_id\fR completed
 message displayed upon completion of a backup\&. (See
-Section\ \&17.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
+Section\ \&18.5.3.2, \(lqUsing The MySQL Cluster Management Client to Create a Backup\(rq\&.)
 .if n \{\
 .sp
 .\}
@@ -876,7 +952,7 @@
 in the
 id
 column is updated if it already exists; such a row is inserted if it does not already exist\&. (See
-Section\ \&17.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
+Section\ \&18.6.9, \(lqMySQL Cluster Backups With MySQL Cluster Replication\(rq\&.)
 .PP
 .\" restore_data option (ndb_restore)
 \fB\-\-restore_data\fR
@@ -908,7 +984,7 @@
 This works only if the privilege tables were converted to
 NDB
 before the backup was taken\&. For more information, see
-Section\ \&17.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
+Section\ \&18.5.14, \(lqDistributed MySQL Privileges for MySQL Cluster\(rq\&.
 .PP
 .\" backup_path option (ndb_restore)
 .\" ndb_restore: backup_path option
@@ -937,7 +1013,7 @@
 must be run twice\(emonce for each database node in the cluster where the backup was taken\&. However,
 \fBndb_restore\fR
 cannot always restore backups made from a cluster running one version of MySQL to a cluster running a different MySQL version\&. See
-Section\ \&17.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
+Section\ \&18.2.7, \(lqUpgrading and Downgrading MySQL Cluster NDB 7.2\(rq, for more information\&.
 .if n \{\
 .sp
 .\}
@@ -1000,7 +1076,7 @@
 TEXT
 and
 BLOB
-column values are always truncated to the first 256 bytes in the output; this cannot currently be overridden when using
+column values are always truncated\&. In MySQL Cluster NDB 7\&.2\&.18 and earlier, such values are truncated to the first 240 bytes in the output; in MySQL Cluster NDB 7\&.2\&.19 and later, they are truncated to 256 bytes\&. (Bug #14571512, Bug #65467) This cannot currently be overridden when using
 \fB\-\-print_data\fR\&.
 .PP
 Several additional options are available for use with the
@@ -1023,18 +1099,12 @@
 \fB\-T\fR
 .TS
 allbox tab(:);
-l l s s
 l l s s.
 T{
 \fBCommand\-Line Format\fR
 T}:T{
 \-\-tab=path
 T}
-T{
-\ \&
-T}:T{
-\-T
-T}
 .TE
 .sp 1
 This option causes
@@ -1059,8 +1129,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1068,11 +1137,8 @@
 \-\-fields\-enclosed\-by=char
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1100,8 +1166,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1109,11 +1174,8 @@
 \-\-fields\-optionally\-enclosed\-by
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1146,8 +1208,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1155,11 +1216,8 @@
 \-\-fields\-terminated\-by=char
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1212,8 +1270,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1221,11 +1278,8 @@
 \-\-fields\-terminated\-by=char
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1379,7 +1433,7 @@
 This option stops
 \fBndb_restore\fR
 from restoring any MySQL Cluster Disk Data objects, such as tablespaces and log file groups; see
-Section\ \&17.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
+Section\ \&18.5.12, \(lqMySQL Cluster Disk Data Tables\(rq, for more information about these\&.
 .PP
 .\" ndb_restore: parallelism option
 .\" parallelism option (ndb_restore)
@@ -1446,8 +1500,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1455,11 +1508,8 @@
 \-\-include\-databases=db\-list
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1477,8 +1527,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1486,11 +1535,8 @@
 \-\-include\-tables=table\-list
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1603,8 +1649,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1612,11 +1657,8 @@
 \-\-exclude\-databases=db\-list
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1634,8 +1676,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1643,11 +1684,8 @@
 \-\-exclude\-tables=table\-list
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -1869,6 +1907,30 @@
 \fBndb_restore\fR
 ignores any columns missing from tables being restored as compared to the versions of those tables found in the backup\&. This option applies to all tables being restored\&. If you wish to apply this option only to selected tables or databases, you can use it in combination with one or more of the options described in the previous paragraph to do so, then restore data to the remaining tables using a complementary set of these options\&.
 .PP
+.\" ndb_restore: exclude-missing-tables option
+.\" exclude-missing-tables option (ndb_restore)
+\fB\-\-exclude\-missing\-tables\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s.
+T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.40\-ndb\-7\&.2\&.18
+T}
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-exclude\-missing\-tables
+T}
+.TE
+.sp 1
+.PP
+Beginning with MySQL Cluster NDB 7\&.2\&.17, it is also possible to restore only selected tables columns using this option, which causes
+\fBndb_restore\fR
+to ignore any tables from the backup that are not found in the target database\&.
+.PP
 .\" ndb_restore: disable-indexes option
 .\" disable-indexes option (ndb_restore)
 \fB\-\-disable\-indexes\fR
@@ -1904,7 +1966,27 @@
 \fBndb_restore\fR
 to cause multi\-threaded rebuilding of the ordered indexes while restoring a native
 NDB
-backup\&.
+backup\&. The number of threads used for building ordered indexes by
+\fBndb_restore\fR
+with this option is controlled by the
+BuildIndexThreads
+data node configuration parameter (MySQL Cluster NDB 6\&.3\&.30 and later; MySQL Cluster NDB 7\&.0\&.11 and later)\&.
+.\" indexes: and ndb_restore
+.PP
+It is necessary to use this option only for the first run of
+\fBndb_restore\fR; this causes all ordered indexes to be rebuilt without using
+\fB\-\-rebuild\-indexes\fR
+again when restoring subsequent nodes\&. You should use this option prior to inserting new rows into the database; otherwise, it is possible for a row to be inserted that later causes a unique constraint violation when trying to rebuild the indexes\&.
+.PP
+Rebuilding of unique indexes uses disk write bandwidth for redo logging and local checkpointing\&. An insufficient amount of this bandwith can lead to redo buffer overload or log overload errors\&. In such cases you can run
+\fBndb_restore\fR
+\fB\-\-rebuild\-indexes\fR
+again; the process resumes at the point where the error occurred\&. You can also do this when you have encountered temporarary errors\&. You can repeat execution of
+\fBndb_restore\fR
+\fB\-\-rebuild\-indexes\fR
+indefinitely; you may be able to stop such errors by reducing the value of
+DiskCheckpointSpeed
+to provide additional disk bandwidth to redo logging\&.
 .PP
 .\" ndb_restore: skip-broken-objects option
 .\" skip-broken-objects option (ndb_restore)
@@ -1954,8 +2036,7 @@
 .TS
 allbox tab(:);
 l l s s
-l l s s
-^ l l s
+l l l s
 ^ l l s.
 T{
 \fBCommand\-Line Format\fR
@@ -1963,11 +2044,8 @@
 \-\-rewrite\-database=olddb,newdb
 T}
 T{
-\ \&
-T}:T{
 \fBPermitted Values\fR
-T}
-:T{
+T}:T{
 \fBType\fR
 T}:T{
 string
@@ -2045,6 +2123,58 @@
 .sp .5v
 .RE
 .PP
+.\" ndb_restore: exclude-intermediate-sql-tables option
+.\" exclude-intermediate-sql-tables option (ndb_restore)
+\fB\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]\fR
+.TS
+allbox tab(:);
+l l s s
+l l s s
+l l l s
+^ l l s.
+T{
+\fBIntroduced\fR
+T}:T{
+5\&.5\&.37\-ndb\-7\&.2\&.17
+T}
+T{
+\fBCommand\-Line Format\fR
+T}:T{
+\-\-exclude\-intermediate\-sql\-tables[=TRUE|FALSE]
+T}
+T{
+\fBPermitted Values\fR
+T}:T{
+\fBType\fR
+T}:T{
+boolean
+T}
+:T{
+\fBDefault\fR
+T}:T{
+TRUE
+T}
+.TE
+.sp 1
+.PP
+When performing copying
+ALTER TABLE
+operations,
+\fBmysqld\fR
+creates intermediate tables (whose names are prefixed with
+#sql\-)\&. When
+TRUE, the
+\fB\-\-exclude\-intermediate\-sql\-tables\fR
+option keeps
+\fBndb_restore\fR
+from restoring such tables that may have been left over from such operations\&. This option is
+TRUE
+by default\&.
+.PP
+The
+\fB\-\-exclude\-intermediate\-sql\-tables\fR
+option was introduced in MySQL Cluster NDB 7\&.2\&.17\&. (Bug #17882305)
+.PP
 \fBError reporting\fR. .\" ndb_restore: errors
 \fBndb_restore\fR
 reports both temporary and permanent errors\&. In the case of temporary errors, it may able to recover from them, and reports
@@ -2074,7 +2204,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_select_all.1 mysql-5.5-5.5.43/man/ndb_select_all.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_select_all.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_select_all.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_select_all\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_ALL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_ALL\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 NDB
 table to
 stdout\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -61,7 +61,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.24.\ \&ndb_select_all Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.83.\ \& This table describes command-line options for the ndb_select_all program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -70,7 +70,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -85,6 +85,7 @@
 l l l
 l l l
 l l l
+l l l
 l l l.
 T{
 .PP
@@ -95,7 +96,7 @@
 Name of the database in which the table is found
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -106,7 +107,7 @@
 Degree of parallelism
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -117,7 +118,7 @@
 Lock type
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -128,7 +129,7 @@
 Sort resultset according to index whose name is supplied
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -139,7 +140,7 @@
 Sort resultset in descending order (requires order flag)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -150,7 +151,7 @@
 Print header (set to 0|FALSE to disable headers in output)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -161,7 +162,7 @@
 Output numbers in hexadecimal format
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -172,17 +173,17 @@
 Set a column delimiter
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --disk
 T}:T{
 Print disk references (useful only for Disk Data tables having
-            nonindexed columns)
+      nonindexed columns)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -191,7 +192,7 @@
 Print rowid
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -200,7 +201,16 @@
 Include GCI in output
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
+T}
+T{
+.PP
+--gci64
+T}:T{
+Include GCI and row epoch in output
+T}:T{
+.PP
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -211,7 +221,7 @@
 Scan in tup order
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -220,7 +230,7 @@
 Do not print table column data
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
@@ -441,9 +451,28 @@
 .\" gci option: ndb_select_all
 \fB\-\-gci\fR
 .sp
-Adds a column to the output showing the global checkpoint at which each row was last updated\&. See
-Section\ \&17.1, \(lqMySQL Cluster Overview\(rq, and
-Section\ \&17.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
+Adds a
+GCI
+column to the output showing the global checkpoint at which each row was last updated\&. See
+Section\ \&18.1, \(lqMySQL Cluster Overview\(rq, and
+Section\ \&18.5.6.2, \(lqMySQL Cluster Log Events\(rq, for more information about checkpoints\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" ndb_select_all: gci64 option
+.\" gci64 option: ndb_select_all
+\fB\-\-gci64\fR
+.sp
+Adds a
+ROW$GCI64
+column to the output showing the global checkpoint at which each row was last updated, as well as the number of the epoch in which this update occurred\&.
 .RE
 .sp
 .RS 4
@@ -476,8 +505,7 @@
 .sp
 Causes any table data to be omitted\&.
 .RE
-        Sample Output
-.PP
+Sample Output.PP
 Output from a MySQL
 SELECT
 statement:
@@ -574,7 +602,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_select_count.1 mysql-5.5-5.5.43/man/ndb_select_count.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_select_count.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_select_count.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_select_count\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SELECT_COUNT\" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SELECT_COUNT\" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@
 NDB
 tables\&. With a single table, the result is equivalent to that obtained by using the MySQL statement
 SELECT COUNT(*) FROM \fItbl_name\fR\&.
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -61,7 +61,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.25.\ \&ndb_select_count Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.84.\ \& This table describes command-line options for the ndb_select_count program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -70,7 +70,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -78,43 +78,43 @@
 l l l.
 T{
 .PP
-\-\-database=dbname,
+--database=dbname,
 .PP
-\-d
+-d
 T}:T{
 Name of the database in which the table is found
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-parallelism=#,
+--parallelism=#,
 .PP
-\-p
+-p
 T}:T{
 Degree of parallelism
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
-\-\-lock=#,
+--lock=#,
 .PP
-\-l
+-l
 T}:T{
 Lock type
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
 .PP
 You can obtain row counts from multiple tables in the same database by listing the table names separated by spaces when invoking this command, as shown under
 \fBSample Output\fR\&.
-        Sample Output
+Sample Output
 .sp
 .if n \{\
 .RS 4
@@ -131,7 +131,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_show_tables.1 mysql-5.5-5.5.43/man/ndb_show_tables.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_show_tables.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_show_tables.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_show_tables\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SHOW_TABLES\F" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SHOW_TABLES\F" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -52,7 +52,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.26.\ \&ndb_show_tables Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.85.\ \& This table describes command-line options for the ndb_show_tables program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -61,7 +61,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -79,7 +79,7 @@
 Specifies the database in which the table is found
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -90,7 +90,7 @@
 Number of times to repeat output
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -101,7 +101,7 @@
 Limit output to objects of this type
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -112,7 +112,7 @@
 Do not qualify table names
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -123,7 +123,7 @@
 Return output suitable for MySQL LOAD DATA INFILE statement
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -132,11 +132,11 @@
 Show table temporary flag
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -307,7 +307,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_size.pl.1 mysql-5.5-5.5.43/man/ndb_size.pl.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_size.pl.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_size.pl.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_size.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_SIZE\&.PL\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_SIZE\&.PL\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -38,7 +38,7 @@
 This is a Perl script that can be used to estimate the amount of space that would be required by a MySQL database if it were converted to use the
 NDBCLUSTER
 storage engine\&. Unlike the other utilities discussed in this section, it does not require access to a MySQL Cluster (in fact, there is no reason for it to do so)\&. However, it does need to access the MySQL server on which the database to be tested resides\&.
-        Requirements
+Requirements
 .sp
 .RS 4
 .ie n \{\
@@ -102,7 +102,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.27.\ \&ndb_size\&.pl Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.86.\ \& This table describes command-line options for the ndb_size.pl program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -111,7 +111,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -129,11 +129,11 @@
 .PP
 --database=dbname
 T}:T{
-The database or databases to examine; accepts a comma\-delimited list;
-            the default is ALL (use all databases found on the server)
+The database or databases to examine; accepts a comma-delimited
+      list; the default is ALL (use all databases found on the server)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -142,7 +142,7 @@
 Specify host and optional port as host[:port]
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -151,7 +151,7 @@
 Specify a socket to connect to
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -160,7 +160,7 @@
 Specify a MySQL user name
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -169,7 +169,7 @@
 Specify a MySQL user password
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -178,25 +178,25 @@
 Set output format (text or HTML)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --excludetables=tbl_list
 T}:T{
-Skip any tables in a comma\-separated list of tables
+Skip any tables in a comma-separated list of tables
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --excludedbs=db_list
 T}:T{
-Skip any databases in a comma\-separated list of databases
+Skip any databases in a comma-separated list of databases
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -205,17 +205,17 @@
 Saves all queries to the database into the file specified
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --loadqueries=file
 T}:T{
 Loads all queries from the file specified; does not connect to a
-            database
+      database
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -224,11 +224,11 @@
 Designates a table to handle unique index size calculations
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -397,7 +397,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/ndb_waiter.1 mysql-5.5-5.5.43/man/ndb_waiter.1
--- mysql-5.5-5.5.35+dfsg/man/ndb_waiter.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/ndb_waiter.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBndb_waiter\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBNDB_WAITER\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBNDB_WAITER\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -142,7 +142,7 @@
 .nr an-no-space-flag 1
 .nr an-break-flag 1
 .br
-.B Table\ \&17.28.\ \&ndb_waiter Options and Variables: MySQL Cluster NDB 7.2
+.B Table\ \&18.87.\ \& This table describes command-line options for the ndb_waiter program
 .TS
 allbox tab(:);
 lB lB lB.
@@ -151,7 +151,7 @@
 T}:T{
 Description
 T}:T{
-Added / Removed
+Added or Removed
 T}
 .T&
 l l l
@@ -169,7 +169,7 @@
 Wait for cluster to reach NO CONTACT state
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -178,7 +178,7 @@
 Wait for cluster to reach NOT STARTED state
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -187,7 +187,7 @@
 Wait for cluster to enter single user mode
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -195,20 +195,20 @@
 .PP
 -t
 T}:T{
-Wait this many seconds, then exit whether or not cluster has reached
-            desired state; default is 2 minutes (120 seconds)
+Wait this many seconds, then exit whether or not cluster has
+      reached desired state; default is 2 minutes (120 seconds)
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
 --nowait-nodes=list
 T}:T{
-List of nodes not to be waited for\&.
+List of nodes not to be waited for.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 T{
 .PP
@@ -216,14 +216,14 @@
 .PP
 -w
 T}:T{
-List of nodes to be waited for\&.
+List of nodes to be waited for.
 T}:T{
 .PP
-All MySQL 5\&.5 based releases
+All MySQL 5.5 based releases
 T}
 .TE
 .sp 1
-        Usage
+Usage
 .sp
 .if n \{\
 .RS 4
@@ -234,7 +234,7 @@
 .if n \{\
 .RE
 .\}
-        Additional Options
+Additional Options
 .sp
 .RS 4
 .ie n \{\
@@ -481,7 +481,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/perror.1 mysql-5.5-5.5.43/man/perror.1
--- mysql-5.5-5.5.35+dfsg/man/perror.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/perror.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBperror\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBPERROR\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBPERROR\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -102,7 +102,7 @@
 .RE
 .\}
 .PP
-Note that the meaning of system error messages may be dependent on your operating system\&. A given error code may mean different things on different operating systems\&.
+The meaning of system error messages may be dependent on your operating system\&. A given error code may mean different things on different operating systems\&.
 .PP
 \fBperror\fR
 supports the following options\&.
@@ -190,7 +190,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/replace.1 mysql-5.5-5.5.43/man/replace.1
--- mysql-5.5-5.5.35+dfsg/man/replace.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/replace.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBreplace\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBREPLACE\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBREPLACE\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -169,7 +169,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/resolveip.1 mysql-5.5-5.5.43/man/resolveip.1
--- mysql-5.5-5.5.35+dfsg/man/resolveip.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/resolveip.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBresolveip\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVEIP\FR" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVEIP\FR" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -108,7 +108,7 @@
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/man/resolve_stack_dump.1 mysql-5.5-5.5.43/man/resolve_stack_dump.1
--- mysql-5.5-5.5.35+dfsg/man/resolve_stack_dump.1	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/man/resolve_stack_dump.1	2015-02-27 08:30:42.000000000 +0000
@@ -1,13 +1,13 @@
 '\" t
 .\"     Title: \fBresolve_stack_dump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.77.1 <http://docbook.sf.net/>
-.\"      Date: 11/04/2013
+.\" Generator: DocBook XSL Stylesheets v1.78.1 <http://docbook.sf.net/>
+.\"      Date: 02/26/2015
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.5
 .\"  Language: English
 .\"
-.TH "\FBRESOLVE_STACK_DUM" "1" "11/04/2013" "MySQL 5\&.5" "MySQL Database System"
+.TH "\FBRESOLVE_STACK_DUM" "1" "02/26/2015" "MySQL 5\&.5" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * Define some portability stuff
 .\" -----------------------------------------------------------------
@@ -125,11 +125,11 @@
 .RE
 .PP
 For more information, see
-Section\ \&23.4.1.5, \(lqUsing a Stack Trace\(rq\&.
+Section\ \&24.4.1.5, \(lqUsing a Stack Trace\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright \(co 1997, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright \(co 1997, 2015, Oracle and/or its affiliates. All rights reserved.
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/CMakeLists.txt mysql-5.5-5.5.43/mysql-test/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/mysql-test/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2009, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 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 -Nru mysql-5.5-5.5.35+dfsg/mysql-test/collections/default.experimental mysql-5.5-5.5.43/mysql-test/collections/default.experimental
--- mysql-5.5-5.5.35+dfsg/mysql-test/collections/default.experimental	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/collections/default.experimental	2015-02-27 08:30:35.000000000 +0000
@@ -13,7 +13,6 @@
 main.sp @solaris                         # Bug#11753919 2010-01-20 alik Several test cases fail on Solaris with error Thread stack overrun
 main.wait_timeout @solaris               # Bug#11758972 2010-04-26 alik wait_timeout fails on OpenSolaris
 
-rpl.rpl_innodb_bug28430                  # Bug#11754425
 rpl.rpl_row_sp011  @solaris              # Bug#11753919 2011-07-25 sven Several test cases fail on Solaris with error Thread stack overrun
 rpl.rpl_spec_variables @solaris          # Bug #17337114 2013-08-20 Luis Soares failing on pb2 with timeout for 'CHECK WARNINGS'
 
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/collections/default.release.done mysql-5.5-5.5.43/mysql-test/collections/default.release.done
--- mysql-5.5-5.5.35+dfsg/mysql-test/collections/default.release.done	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/collections/default.release.done	2015-02-27 08:30:35.000000000 +0000
@@ -1 +1 @@
-/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/mysql-test/collections/default.release.in
+/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/mysql-test/collections/default.release.in
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/collections/default.weekly mysql-5.5-5.5.43/mysql-test/collections/default.weekly
--- mysql-5.5-5.5.35+dfsg/mysql-test/collections/default.weekly	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/collections/default.weekly	2015-02-27 08:30:35.000000000 +0000
@@ -5,3 +5,6 @@
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-stmt-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --skip-test-list=collections/disabled-weekly.list
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-row-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-row-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=row --skip-test-list=collections/disabled-weekly.list
 perl mysql-test-run.pl --timer --force --debug-server --parallel=auto --comment=eits-rpl-binlog-mixed-tests-innodb-engine --experimental=collections/default.experimental --vardir=var-binlog-mixed-eits-tests-innodb-engine --suite=engines/iuds,engines/funcs --suite-timeout=500 --max-test-fail=0 --retry-failure=0 --mysqld=--default-storage-engine=innodb --mysqld=--innodb --do-test=rpl --mysqld=--binlog-format=mixed --skip-test-list=collections/disabled-weekly.list
+
+# Run innodb compression tests
+perl mysql-test-run.pl --force --debug-server --comment=innodb_compression --vardir=var-innodb-zip --big-test --testcase-timeout=60 --parallel=auto --experimental=collections/default.experimental --suite=innodb_zip
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/extra/binlog_tests/database.test mysql-5.5-5.5.43/mysql-test/extra/binlog_tests/database.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/extra/binlog_tests/database.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/extra/binlog_tests/database.test	2015-02-27 08:30:35.000000000 +0000
@@ -31,12 +31,47 @@
 
 FLUSH STATUS;
 
+--echo
+--echo # 'DROP TABLE IF EXISTS <deleted tables>' is binlogged
+--echo # when 'DROP DATABASE' fails and at least one table is deleted
+--echo # from the database.
+RESET MASTER;
+CREATE DATABASE testing_1;
+USE testing_1;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+
+let $prefix= `SELECT UUID()`;
+--echo # Create a file in the database directory
+--replace_result $prefix FAKE_FILE
+eval SELECT 'hello' INTO OUTFILE 'fake_file.$prefix';
+
+--echo
+--echo # 'DROP DATABASE' will fail if there is any other file in the the
+--echo # database directory
+
+# Use '/' instead of '\' in the error message. On windows platform, dir is
+# formed with '\'.
+--replace_regex /\\testing_1\\*/\/testing_1\//
+--error 1010
+DROP DATABASE testing_1;
+let $wait_binlog_event= DROP TABLE IF EXIST;
+source include/wait_for_binlog_event.inc;
+let $MYSQLD_DATADIR= `SELECT @@datadir`;
+
+--echo
+--echo # Remove the fake file.
+--remove_file $MYSQLD_DATADIR/testing_1/fake_file.$prefix
+--echo # Now we can drop the database.
+DROP DATABASE testing_1;
+
 
 --echo #
 --echo # Bug#11765416 58381: FAILED DROP DATABASE CAN BREAK STATEMENT
 --echo #              BASED REPLICATION
 --echo #
 
+USE test;
 --disable_warnings
 DROP DATABASE IF EXISTS db1;
 DROP TABLE IF EXISTS t3;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/extra/rpl_tests/rpl_stop_slave.test mysql-5.5-5.5.43/mysql-test/extra/rpl_tests/rpl_stop_slave.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/extra/rpl_tests/rpl_stop_slave.test	2015-02-27 08:30:35.000000000 +0000
@@ -42,6 +42,10 @@
 connection slave1;
 --echo # To resume slave SQL thread
 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+# wait for the sql thread to come out of the
+# waiting phase before resetting the signals
+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and info LIKE '%INSERT INTO t1 VALUES (1)%'
+--source include/wait_condition.inc
 SET DEBUG_SYNC= 'RESET';
 
 --echo
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/include/ctype_filesort2.inc mysql-5.5-5.5.43/mysql-test/include/ctype_filesort2.inc
--- mysql-5.5-5.5.35+dfsg/mysql-test/include/ctype_filesort2.inc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/include/ctype_filesort2.inc	2015-02-27 08:30:35.000000000 +0000
@@ -14,3 +14,12 @@
 ALTER TABLE t1 ADD KEY(a);
 SELECT HEX(a), HEX(CONVERT(a USING utf8mb4)) FROM t1 ORDER BY a;
 DROP TABLE IF EXISTS t1;
+--echo #
+--echo # BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+--echo #                OUT-OF-ORDER RESULTS
+--echo #
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/include/default_my.cnf mysql-5.5-5.5.43/mysql-test/include/default_my.cnf
--- mysql-5.5-5.5.35+dfsg/mysql-test/include/default_my.cnf	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/include/default_my.cnf	2015-02-27 08:30:35.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (c) 2007 MySQL AB, 2009, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/mysql-test/include/have_perfschema.inc mysql-5.5-5.5.43/mysql-test/include/have_perfschema.inc
--- mysql-5.5-5.5.35+dfsg/mysql-test/include/have_perfschema.inc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/include/have_perfschema.inc	2015-02-27 08:30:35.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2010 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 -Nru mysql-5.5-5.5.35+dfsg/mysql-test/include/mtr_check.sql mysql-5.5-5.5.43/mysql-test/include/mtr_check.sql
--- mysql-5.5-5.5.35+dfsg/mysql-test/include/mtr_check.sql	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/include/mtr_check.sql	2015-02-27 08:30:35.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2008, 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
@@ -52,6 +52,16 @@
       WHERE table_schema='mysql' AND table_name != 'ndb_apply_status'
         ORDER BY columns_in_mysql;
 
+  -- Dump all events, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.EVENTS;
+  -- Dump all triggers	 except mtr internals, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.TRIGGERS
+         WHERE TRIGGER_NAME NOT IN ('gs_insert', 'ts_insert');
+  -- Dump all created procedures, there should be none
+  SELECT * FROM INFORMATION_SCHEMA.ROUTINES;
+
+  SHOW STATUS LIKE 'slave_open_temp_tables';
+
   -- Checksum system tables to make sure they have been properly
   -- restored after test
   checksum table
@@ -72,8 +82,6 @@
     mysql.time_zone_transition_type,
     mysql.user;
 
- show status like 'slave_open_temp_tables';
-
 END||
 
 --
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/include/stop_dump_threads.inc mysql-5.5-5.5.43/mysql-test/include/stop_dump_threads.inc
--- mysql-5.5-5.5.35+dfsg/mysql-test/include/stop_dump_threads.inc	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/include/stop_dump_threads.inc	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,32 @@
+# ==== Purpose ====
+#
+# Stop all dump threads on the server of the current connection.
+#
+# ==== Usage ====
+#
+# --source include/stop_dump_threads.inc
+
+--let $include_filename= stop_dump_threads.inc
+--source include/begin_include_file.inc
+
+
+--let $_sdt_show_rpl_debug_info_old= $show_rpl_debug_info
+--let $show_rpl_debug_info= 1
+--disable_query_log
+--disable_result_log
+
+--let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+
+while ($_sdt_dump_thread_id != '')
+{
+  eval KILL $_sdt_dump_thread_id;
+  --let $wait_condition= SELECT COUNT(*) = 0 FROM INFORMATION_SCHEMA.PROCESSLIST WHERE ID = $_sdt_dump_thread_id
+  --source include/wait_condition.inc
+
+  --let $_sdt_dump_thread_id= `SELECT ID FROM INFORMATION_SCHEMA.PROCESSLIST WHERE COMMAND = 'Binlog dump'`
+}
+
+--let $show_rpl_debug_info= $_sdt_show_rpl_debug_info_old
+
+--let $include_filename= stop_dump_threads.inc
+--source include/end_include_file.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/include/uninstall_semisync.inc mysql-5.5-5.5.43/mysql-test/include/uninstall_semisync.inc
--- mysql-5.5-5.5.35+dfsg/mysql-test/include/uninstall_semisync.inc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/include/uninstall_semisync.inc	2015-02-27 08:30:35.000000000 +0000
@@ -13,6 +13,11 @@
 UNINSTALL PLUGIN rpl_semi_sync_slave;
 
 --connection master
+# After BUG#17638477 fix, uninstallation of rpl_semi_sync_master
+#  is not allowed when there are semi sync slaves. Hence kill
+#  all dump threads before uninstalling it.
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+--source include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 --enable_warnings
 
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/lib/mtr_match.pm mysql-5.5-5.5.43/mysql-test/lib/mtr_match.pm
--- mysql-5.5-5.5.35+dfsg/mysql-test/lib/mtr_match.pm	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/lib/mtr_match.pm	2015-02-27 08:30:35.000000000 +0000
@@ -1,5 +1,6 @@
 # -*- cperl -*-
 # Copyright (C) 2004-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/lib/My/SafeProcess/safe_process.cc mysql-5.5-5.5.43/mysql-test/lib/My/SafeProcess/safe_process.cc
--- mysql-5.5-5.5.35+dfsg/mysql-test/lib/My/SafeProcess/safe_process.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/lib/My/SafeProcess/safe_process.cc	2015-02-27 08:30:35.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/mysql-test/lib/My/SysInfo.pm mysql-5.5-5.5.43/mysql-test/lib/My/SysInfo.pm
--- mysql-5.5-5.5.35+dfsg/mysql-test/lib/My/SysInfo.pm	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/lib/My/SysInfo.pm	2015-02-27 08:30:35.000000000 +0000
@@ -1,6 +1,5 @@
 # -*- cperl -*-
-# Copyright (c) 2013 MySQL AB, 2008 Sun Microsystems, Inc.
-# Use is subject to license terms.
+# Copyright (c) 2008, 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 -Nru mysql-5.5-5.5.35+dfsg/mysql-test/mysql-test-run.pl mysql-5.5-5.5.43/mysql-test/mysql-test-run.pl
--- mysql-5.5-5.5.35+dfsg/mysql-test/mysql-test-run.pl	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/mysql-test-run.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 
-# Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2004, 2014, 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
@@ -163,7 +163,7 @@
 
 # If you add a new suite, please check TEST_DIRS in Makefile.am.
 #
-my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,perfschema";
+my $DEFAULT_SUITES= "main,sys_vars,binlog,federated,rpl,innodb,innodb_zip,perfschema";
 my $opt_suites;
 
 our $opt_verbose= 0;  # Verbose output, enable with --verbose
@@ -232,6 +232,7 @@
 our $opt_client_ddd;
 my $opt_boot_ddd;
 our $opt_manual_gdb;
+our $opt_manual_lldb;
 our $opt_manual_dbx;
 our $opt_manual_ddd;
 our $opt_manual_debug;
@@ -417,7 +418,6 @@
     );
   mtr_error("Could not create testcase server port: $!") unless $server;
   my $server_port = $server->sockport();
-  mtr_report("Using server port $server_port");
 
   if ($opt_resfile) {
     resfile_init("$opt_vardir/mtr-results.txt");
@@ -475,15 +475,17 @@
   # Send Ctrl-C to any children still running
   kill("INT", keys(%children));
 
-  # Wait for childs to exit
-  foreach my $pid (keys %children)
-  {
-    my $ret_pid= waitpid($pid, 0);
-    if ($ret_pid != $pid){
-      mtr_report("Unknown process $ret_pid exited");
-    }
-    else {
-      delete $children{$ret_pid};
+  if (!IS_WINDOWS) { 
+    # Wait for children to exit
+    foreach my $pid (keys %children)
+    {
+      my $ret_pid= waitpid($pid, 0);
+      if ($ret_pid != $pid){
+        mtr_report("Unknown process $ret_pid exited");
+      }
+      else {
+        delete $children{$ret_pid};
+      }
     }
   }
 
@@ -1085,6 +1087,7 @@
              'gdb'                      => \$opt_gdb,
              'client-gdb'               => \$opt_client_gdb,
              'manual-gdb'               => \$opt_manual_gdb,
+             'manual-lldb'              => \$opt_manual_lldb,
 	     'boot-gdb'                 => \$opt_boot_gdb,
              'manual-debug'             => \$opt_manual_debug,
              'ddd'                      => \$opt_ddd,
@@ -1535,8 +1538,9 @@
       $opt_debugger= undef;
     }
 
-    if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_ddd ||
-	 $opt_manual_debug || $opt_debugger || $opt_dbx || $opt_manual_dbx)
+    if ( $opt_gdb || $opt_ddd || $opt_manual_gdb || $opt_manual_lldb || 
+         $opt_manual_ddd || $opt_manual_debug || $opt_debugger || $opt_dbx || 
+         $opt_manual_dbx)
     {
       mtr_error("You need to use the client debug options for the",
 		"embedded server. Ex: --client-gdb");
@@ -1562,9 +1566,9 @@
   # --------------------------------------------------------------------------
   # Check debug related options
   # --------------------------------------------------------------------------
-  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd ||
-       $opt_manual_gdb || $opt_manual_ddd || $opt_manual_debug ||
-       $opt_dbx || $opt_client_dbx || $opt_manual_dbx ||
+  if ( $opt_gdb || $opt_client_gdb || $opt_ddd || $opt_client_ddd || 
+       $opt_manual_gdb || $opt_manual_lldb || $opt_manual_ddd || 
+       $opt_manual_debug || $opt_dbx || $opt_client_dbx || $opt_manual_dbx || 
        $opt_debugger || $opt_client_debugger )
   {
     # Indicate that we are using debugger
@@ -2457,6 +2461,14 @@
 				 "$path_client_bindir/perror");
   $ENV{'MY_PERROR'}= native_path($exe_perror);
 
+  # ----------------------------------------------------
+  # replace
+  # ----------------------------------------------------
+  my $exe_replace= mtr_exe_exists(vs_config_dirs('extra', 'replace'),
+                                 "$basedir/extra/replace",
+                                 "$path_client_bindir/replace");
+  $ENV{'REPLACE'}= native_path($exe_replace);
+
   # Create an environment variable to make it possible
   # to detect that valgrind is being used from test cases
   $ENV{'VALGRIND_TEST'}= $opt_valgrind;
@@ -4984,6 +4996,10 @@
   {
     gdb_arguments(\$args, \$exe, $mysqld->name());
   }
+  elsif ( $opt_manual_lldb )
+  {
+    lldb_arguments(\$args, \$exe, $mysqld->name());
+  }
   elsif ( $opt_ddd || $opt_manual_ddd )
   {
     ddd_arguments(\$args, \$exe, $mysqld->name());
@@ -5676,6 +5692,24 @@
   return $proc;
 }
 
+sub create_debug_statement {
+  my $args= shift;
+  my $input= shift;
+
+  # Put $args into a single string
+  my $str= join(" ", @$$args);
+  my $runline= $input ? "run $str < $input" : "run $str";
+
+  # add quotes to escape ; in plugin_load option
+  my $pos1 = index($runline, "--plugin_load=");
+  if ( $pos1 != -1 ) {
+    my $pos2 = index($runline, " ",$pos1);
+    substr($runline,$pos1+14,0) = "\"";
+    substr($runline,$pos2+1,0) = "\"";
+  }
+
+  return $runline;
+}
 
 #
 # Modify the exe and args so that program is run in gdb in xterm
@@ -5691,9 +5725,7 @@
   # Remove the old gdbinit file
   unlink($gdb_init_file);
 
-  # Put $args into a single string
-  my $str= join(" ", @$$args);
-  my $runline= $input ? "run $str < $input" : "run $str";
+  my $runline=create_debug_statement($args,$input);
 
   # write init file for mysqld or client
   mtr_tofile($gdb_init_file,
@@ -5729,6 +5761,32 @@
   $$exe= "xterm";
 }
 
+ #
+# Modify the exe and args so that program is run in lldb
+#
+sub lldb_arguments {
+  my $args= shift;
+  my $exe= shift;
+  my $type= shift;
+  my $input= shift;
+
+  my $lldb_init_file= "$opt_vardir/tmp/lldbinit.$type";
+  unlink($lldb_init_file);
+
+  my $runline=create_debug_statement($args,$input);
+
+  # write init file for mysqld or client
+  mtr_tofile($lldb_init_file,
+	     "b main\n" .
+	     $runline);
+
+    print "\nTo start lldb for $type, type in another window:\n";
+    print "cd $glob_mysql_test_dir && lldb -s $lldb_init_file $$exe\n";
+
+    # Indicate the exe should not be started
+    $$exe= undef;
+    return;
+}
 
 #
 # Modify the exe and args so that program is run in ddd
@@ -5744,9 +5802,7 @@
   # Remove the old gdbinit file
   unlink($gdb_init_file);
 
-  # Put $args into a single string
-  my $str= join(" ", @$$args);
-  my $runline= $input ? "run $str < $input" : "run $str";
+  my $runline=create_debug_statement($args,$input);
 
   # write init file for mysqld or client
   mtr_tofile($gdb_init_file,
@@ -6189,6 +6245,8 @@
                         test(s)
   manual-dbx            Let user manually start mysqld in dbx, before running
                         test(s)
+  manual-lldb           Let user manually start mysqld in lldb, before running 
+                        test(s)
   strace-client         Create strace output for mysqltest client, 
   strace-server         Create strace output for mysqltest server, 
   max-save-core         Limit the number of core files saved (to avoid filling
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/purify.supp mysql-5.5-5.5.43/mysql-test/purify.supp
--- mysql-5.5-5.5.35+dfsg/mysql-test/purify.supp	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/purify.supp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/create.result mysql-5.5-5.5.43/mysql-test/r/create.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/create.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/create.result	2015-02-27 08:30:35.000000000 +0000
@@ -291,7 +291,7 @@
 Note	1050	Table 't1' already exists
 show status like "Opened_tables";
 Variable_name	Value
-Opened_tables	2
+Opened_tables	1
 select * from t1;
 a	b
 1	1
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_cp932.result mysql-5.5-5.5.43/mysql-test/r/ctype_cp932.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_cp932.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/ctype_cp932.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,35 @@
+#
+# Bug #11755818 LIKE DOESN'T MATCH WHEN CP932_BIN/SJIS_BIN COLLATIONS ARE 
+#               USED.
+#
+SET @old_character_set_client= @@character_set_client;
+SET @old_character_set_connection= @@character_set_connection;
+SET @old_character_set_results= @@character_set_results;
+SET character_set_client= 'utf8';
+SET character_set_connection= 'utf8';
+SET character_set_results= 'utf8';
+CREATE TABLE t1 (a VARCHAR(10) COLLATE cp932_bin);
+INSERT INTO t1 VALUES('ｶｶ');
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+a
+ｶｶ
+ALTER TABLE t1 MODIFY a VARCHAR(100) COLLATE sjis_bin;
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+a
+ｶｶ
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+a
+ｶｶ
+DROP TABLE t1;
+SET @@character_set_client= @old_character_set_client;
+SET @@character_set_connection= @old_character_set_connection;
+SET @@character_set_results= @old_character_set_results;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_utf16.result mysql-5.5-5.5.43/mysql-test/r/ctype_utf16.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_utf16.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/ctype_utf16.result	2015-02-27 08:30:35.000000000 +0000
@@ -636,6 +636,21 @@
 D800DF84	F0908E84
 DBC0DC00	F4808080
 DROP TABLE IF EXISTS t1;
+#
+# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+#                OUT-OF-ORDER RESULTS
+#
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+n
+a a
+a b
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+n
+a b
+a a
+DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
 utf16_bin
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_utf32.result mysql-5.5-5.5.43/mysql-test/r/ctype_utf32.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_utf32.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/ctype_utf32.result	2015-02-27 08:30:35.000000000 +0000
@@ -635,6 +635,21 @@
 00010384	F0908E84
 00100000	F4808080
 DROP TABLE IF EXISTS t1;
+#
+# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+#                OUT-OF-ORDER RESULTS
+#
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+n
+a a
+a b
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+n
+a b
+a a
+DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
 utf32_bin
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_utf8mb4.result mysql-5.5-5.5.43/mysql-test/r/ctype_utf8mb4.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/ctype_utf8mb4.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/ctype_utf8mb4.result	2015-02-27 08:30:35.000000000 +0000
@@ -1012,6 +1012,21 @@
 F0908E84	F0908E84
 F4808080	F4808080
 DROP TABLE IF EXISTS t1;
+#
+# BUG#16691598 - ORDER BY LOWER(COLUMN) PRODUCES
+#                OUT-OF-ORDER RESULTS
+#
+CREATE TABLE  t1 SELECT ('a a') as n;
+INSERT INTO t1 VALUES('a b');
+SELECT * FROM t1 ORDER BY LOWER(n) ASC;
+n
+a a
+a b
+SELECT * FROM t1 ORDER BY LOWER(n) DESC;
+n
+a b
+a a
+DROP TABLE t1;
 select @@collation_connection;
 @@collation_connection
 utf8mb4_bin
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/distinct.result mysql-5.5-5.5.43/mysql-test/r/distinct.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/distinct.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/distinct.result	2015-02-27 08:30:35.000000000 +0000
@@ -804,4 +804,44 @@
 11112222
 33334444
 DROP TABLE t1;
+#
+# Bug#16539979 BASIC SELECT COUNT(DISTINCT ID) IS BROKEN.
+# Bug#17867117 ERROR RESULT WHEN "COUNT + DISTINCT + CASE WHEN" NEED MERGE_WALK 
+#
+SET @tmp_table_size_save= @@tmp_table_size;
+SET @@tmp_table_size= 1024;
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a+8 FROM t1;
+INSERT INTO t1 SELECT a+16 FROM t1;
+INSERT INTO t1 SELECT a+32 FROM t1;
+INSERT INTO t1 SELECT a+64 FROM t1;
+INSERT INTO t1 VALUE(NULL);
+SELECT COUNT(DISTINCT a) FROM t1;
+COUNT(DISTINCT a)
+128
+SELECT COUNT(DISTINCT (a+0)) FROM t1;
+COUNT(DISTINCT (a+0))
+128
+DROP TABLE t1;
+create table tb(
+id int auto_increment primary key,
+v varchar(32))
+engine=myisam charset=gbk;
+insert into tb(v) values("aaa");
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+update tb set v=concat(v, id);
+select count(distinct case when id<=64 then id end) from tb;
+count(distinct case when id<=64 then id end)
+64
+select count(distinct case when id<=63 then id end) from tb;
+count(distinct case when id<=63 then id end)
+63
+drop table tb;
+SET @@tmp_table_size= @tmp_table_size_save;
 End of 5.5 tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/error_simulation.result mysql-5.5-5.5.43/mysql-test/r/error_simulation.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/error_simulation.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/error_simulation.result	2015-02-27 08:30:35.000000000 +0000
@@ -98,3 +98,22 @@
 #
 # End of 5.1 tests
 #
+#
+# BUG#11747548:DETECT ORPHAN TEMP-POOL FILES, AND HANDLE GRACEFULLY.
+#
+#Set up.
+CREATE TABLE pid_table(pid_no INT);
+CREATE TABLE t1 (a BLOB);
+INSERT INTO t1 VALUES (1), (2);
+#Create MYD and MYI files for intrinsic temp table.
+LOAD DATA LOCAL INFILE 'pid_file' INTO TABLE pid_table;
+#Reports an error since the temp file already exists.
+SELECT a FROM t1 ORDER BY rand(1);
+ERROR HY000: Can't create or write to file
+#With patch, the query executes successfully.
+SELECT a FROM t1 ORDER BY rand(1);
+a
+1
+2
+#cleanup
+DROP TABLE t1, pid_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/events_trans.result mysql-5.5-5.5.43/mysql-test/r/events_trans.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/events_trans.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/events_trans.result	2015-02-27 08:30:35.000000000 +0000
@@ -135,3 +135,4 @@
 a
 ROLLBACK WORK TO SAVEPOINT A;
 DROP TABLE t1, t2;
+DROP EVENT e1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/file_contents.result mysql-5.5-5.5.43/mysql-test/r/file_contents.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/file_contents.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/file_contents.result	2015-02-27 08:30:35.000000000 +0000
@@ -1,6 +1,6 @@
 
 Checking 'INFO_SRC' and 'INFO_BIN'
-INFO_SRC: Found MySQL version number / Found BZR revision id
+INFO_SRC: Found MySQL version number / Found GIT revision id
 INFO_BIN: Found 'Compiler ... used' line / Found 'Feature flags' line
 
 End of tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/gis.result mysql-5.5-5.5.43/mysql-test/r/gis.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/gis.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/gis.result	2015-02-27 08:30:35.000000000 +0000
@@ -1113,4 +1113,25 @@
 (SELECT 1 FROM g1 WHERE a = geomfromtext('') OR a) ;
 1
 DROP TABLE g1;
+#
+# Bug#16451878 GEOMETRY QUERY CRASHES SERVER
+#
+# should not crash
+SELECT ASTEXT(0x0100000000030000000100000000000010);
+ASTEXT(0x0100000000030000000100000000000010)
+NULL
+#should not crash
+SELECT ENVELOPE(0x0100000000030000000100000000000010);
+ENVELOPE(0x0100000000030000000100000000000010)
+NULL
+#should not crash
+SELECT
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1)
+NULL
+#should not crash
+SELECT
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
+GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1)
+NULL
 End of 5.5 tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/group_min_max_innodb.result mysql-5.5-5.5.43/mysql-test/r/group_min_max_innodb.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/group_min_max_innodb.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/group_min_max_innodb.result	2015-02-27 08:30:35.000000000 +0000
@@ -118,3 +118,171 @@
 1
 DROP TABLE t1;
 End of 5.5 tests
+#
+# Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
+#
+CREATE TABLE t0 (
+i1 INTEGER NOT NULL
+);
+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
+(11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
+(21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
+CREATE TABLE t1 (
+c1 CHAR(1) NOT NULL,
+i1 INTEGER NOT NULL,
+i2 INTEGER NOT NULL,
+UNIQUE KEY k1 (c1,i2)
+) ENGINE=InnoDB;
+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
+CREATE TABLE t2 (
+c1 CHAR(1) NOT NULL,
+i1 INTEGER NOT NULL,
+i2 INTEGER NOT NULL,
+UNIQUE KEY k2 (c1,i1,i2)
+) ENGINE=InnoDB;
+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	31	Using where; Using index
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+c1	max(i2)
+C	17
+F	30
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	31	Using where; Using index
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+c1	max(i2)
+C	30
+F	17
+EXPLAIN SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	1	Using where; Using index for group-by
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+c1	max(i2)
+C	17
+F	17
+EXPLAIN SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	k1	k1	5	NULL	3	Using where; Using index
+SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+c1	max(i2)
+C	30
+EXPLAIN SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	9	NULL	59	Using where; Using index for group-by
+SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+c1	i1	max(i2)
+C	17	17
+F	17	17
+EXPLAIN SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	9	NULL	58	Using where; Using index for group-by
+SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+c1	i1	max(i2)
+C	17	17
+F	17	17
+EXPLAIN SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t2	range	k2	k2	5	NULL	181	Using where; Using index for group-by
+SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+c1	i1	max(i2)
+A	17	17
+B	17	17
+C	1	1
+C	2	2
+C	3	3
+C	4	4
+C	5	5
+C	6	6
+C	7	7
+C	8	8
+C	9	9
+C	10	10
+C	11	11
+C	12	12
+C	13	13
+C	14	14
+C	15	15
+C	16	16
+C	17	17
+C	18	18
+C	19	19
+C	20	20
+C	21	21
+C	22	22
+C	23	23
+C	24	24
+C	25	25
+C	26	26
+C	27	27
+C	28	28
+C	29	29
+C	30	30
+D	17	17
+E	17	17
+F	1	1
+F	2	2
+F	3	3
+F	4	4
+F	5	5
+F	6	6
+F	7	7
+F	8	8
+F	9	9
+F	10	10
+F	11	11
+F	12	12
+F	13	13
+F	14	14
+F	15	15
+F	16	16
+F	17	17
+F	18	18
+F	19	19
+F	20	20
+F	21	21
+F	22	22
+F	23	23
+F	24	24
+F	25	25
+F	26	26
+F	27	27
+F	28	28
+F	29	29
+F	30	30
+DROP TABLE t0,t1,t2;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/group_min_max.result mysql-5.5-5.5.43/mysql-test/r/group_min_max.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/group_min_max.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/group_min_max.result	2015-02-27 08:30:35.000000000 +0000
@@ -3001,7 +3001,7 @@
 0	NULL
 EXPLAIN SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	NULL	a	5	NULL	9	Using index for group-by
+1	SIMPLE	t2	index	NULL	a	15	NULL	16	Using index
 SELECT SUM(DISTINCT a), MAX(b) FROM t2 GROUP BY a;
 SUM(DISTINCT a)	MAX(b)
 1	8
@@ -3029,7 +3029,7 @@
 168
 EXPLAIN SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t2	range	NULL	a	5	NULL	9	Using index for group-by
+1	SIMPLE	t2	index	NULL	a	15	NULL	16	Using index
 SELECT (SUM(DISTINCT a) + MAX(b)) FROM t2 GROUP BY a;
 (SUM(DISTINCT a) + MAX(b))
 9
@@ -3057,3 +3057,55 @@
 1	SIMPLE	t1	range	NULL	PRIMARY	5	NULL	9	Using index for group-by (scanning)
 drop table t1;
 # End of test#50539.
+#
+# Bug#17217128 -  BAD INTERACTION BETWEEN MIN/MAX AND
+#                 "HAVING SUM(DISTINCT)": WRONG RESULTS.
+#
+CREATE TABLE t (a INT, b INT, KEY(a,b));
+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
+ANALYZE TABLE t;
+Table	Op	Msg_type	Msg_text
+test.t	analyze	status	OK
+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MIN(b)
+1	1	0
+2	2	2
+3	3	2
+4	4	4
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MAX(b)
+1	1	1
+2	2	2
+3	3	3
+4	4	5
+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+a	MAX(b)
+1	1
+2	2
+3	3
+4	5
+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+SUM(DISTINCT a)	MIN(b)	MAX(b)
+10	0	5
+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+a	SUM(DISTINCT a)	MIN(b)	MAX(b)
+1	1	0	1
+2	2	2	2
+3	3	2	3
+4	4	4	5
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t	index	NULL	a	10	NULL	7	Using index
+DROP TABLE t;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/have_cp1251.require mysql-5.5-5.5.43/mysql-test/r/have_cp1251.require
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/have_cp1251.require	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/have_cp1251.require	2015-02-27 08:30:35.000000000 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-cp1251_general_ci	cp1251	51	Yes		0
+cp1251_general_ci	cp1251	51	Yes	Yes	1
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/have_cp866.require mysql-5.5-5.5.43/mysql-test/r/have_cp866.require
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/have_cp866.require	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/have_cp866.require	2015-02-27 08:30:35.000000000 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-cp866_general_ci	cp866	36	Yes		0
+cp866_general_ci	cp866	36	Yes	Yes	1
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/have_koi8r.require mysql-5.5-5.5.43/mysql-test/r/have_koi8r.require
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/have_koi8r.require	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/have_koi8r.require	2015-02-27 08:30:35.000000000 +0000
@@ -1,2 +1,2 @@
 Collation	Charset	Id	Default	Compiled	Sortlen
-koi8r_general_ci	koi8r	7	Yes		0
+koi8r_general_ci	koi8r	7	Yes	Yes	1
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/information_schema.result mysql-5.5-5.5.43/mysql-test/r/information_schema.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/information_schema.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/information_schema.result	2015-02-27 08:30:35.000000000 +0000
@@ -1965,5 +1965,20 @@
 # Clean-up.
 drop database mysqltest;
 #
+# Test for bug #16869534 - "QUERYING SUBSET OF COLUMNS DOESN'T USE TABLE
+#                           CACHE; OPENED_TABLES INCREASES"
+#
+SELECT * FROM INFORMATION_SCHEMA.TABLES;
+SELECT VARIABLE_VALUE INTO @val1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+VARIABLE_NAME LIKE 'Opened_tables';
+SELECT ENGINE FROM INFORMATION_SCHEMA.TABLES;
+# The below SELECT query should give same output as above SELECT query.
+SELECT VARIABLE_VALUE INTO @val2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+VARIABLE_NAME LIKE 'Opened_tables';
+# The below select should return '1'
+SELECT @val1 = @val2;
+@val1 = @val2
+1
+#
 # End of 5.5 tests
 #
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/loaddata.result mysql-5.5-5.5.43/mysql-test/r/loaddata.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/loaddata.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/loaddata.result	2015-02-27 08:30:35.000000000 +0000
@@ -520,3 +520,15 @@
 ERROR 22003: Cannot get geometry object from data you send to the GEOMETRY field
 drop table t1;
 End of 5.1 tests
+#
+# Bug#11759519 INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATA LOCAL AND IMPORT ERRORS
+#
+SET @old_mode= @@sql_mode;
+CREATE TABLE t1 (fld1 INT);
+SET sql_mode='strict_all_tables';
+# Without fix, load data hangs forever.
+LOAD DATA LOCAL INFILE 'MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
+FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
+Got one of the listed errors
+SET @@sql_mode= @old_mode;
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/lock_sync.result mysql-5.5-5.5.43/mysql-test/r/lock_sync.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/lock_sync.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/lock_sync.result	2015-02-27 08:30:35.000000000 +0000
@@ -773,3 +773,54 @@
 SET DEBUG_SYNC= 'RESET';
 DROP VIEW v1;
 DROP TABLE t1;
+#
+# Bug#19070633 - POSSIBLE ACCESS TO FREED MEMORY IN IS_FREE_LOCK() AND IS_USED_LOCK().
+#
+# Verifying issue for IS_FREE_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+GET_LOCK("lock_19070633", 600)
+1
+connect  con1, localhost, root,,;
+# Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+# Sending: SELECT IS_FREE_LOCK("lock_19070633");
+SELECT IS_FREE_LOCK("lock_19070633");
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+RELEASE_LOCK("lock_19070633")
+1
+# Signaling connection con1 after releasing the lock.
+# Without fix, accessing user level lock info in con1 would result in
+# crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+connection con1;
+# Reaping: SELECT IS_FREE_LOCK("lock_19070633");
+IS_FREE_LOCK("lock_19070633")
+0
+connection default;
+# Verifying issue for IS_USED_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+GET_LOCK("lock_19070633", 600)
+1
+connection con1;
+# Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+# Sending: SELECT IS_USED_LOCK("lock_19070633");
+SELECT IS_USED_LOCK("lock_19070633");
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+RELEASE_LOCK("lock_19070633")
+1
+# Signaling connection con1 after releasing the lock.
+# Without fix, accessing user level lock info in con1 would result in
+# crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+connection con1;
+# Reaping: SELECT IS_USED_LOCK("lock_19070633");
+IS_USED_LOCK("lock_19070633")
+#
+connection default;
+SET DEBUG_SYNC= 'RESET';
+disconnect con1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/log_errchk.result mysql-5.5-5.5.43/mysql-test/r/log_errchk.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/log_errchk.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/log_errchk.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,10 @@
+call mtr.add_suppression("Could not use");
+# Case 1: Setting fife file to general_log_file and slow_query_log_file
+#         system variable.
+SET GLOBAL general_log_file="MYSQLTEST_VARDIR/tmp/general_log.fifo";;
+ERROR 42000: Variable 'general_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/general_log.fifo'
+SET GLOBAL slow_query_log_file="MYSQLTEST_VARDIR/tmp/slow_log.fifo";;
+ERROR 42000: Variable 'slow_query_log_file' can't be set to the value of 'MYSQLTEST_VARDIR/tmp/slow_log.fifo'
+# Case 2: Starting server with fifo file as general log file
+#         and slow query log file.
+Setting fifo file as general log file and slow query log failed.
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/mysqld--help-notwin.result mysql-5.5-5.5.43/mysql-test/r/mysqld--help-notwin.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/mysqld--help-notwin.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/mysqld--help-notwin.result	2015-02-27 08:30:35.000000000 +0000
@@ -712,8 +712,8 @@
  one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
- --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
- currently supported)
+ --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
+ effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
  size, MySQL will automatically convert it to an on-disk
  MyISAM table
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/mysqld--help-win.result mysql-5.5-5.5.43/mysql-test/r/mysqld--help-win.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/mysqld--help-win.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/mysqld--help-win.result	2015-02-27 08:30:35.000000000 +0000
@@ -720,8 +720,8 @@
  one-thread-per-connection, no-threads, loaded-dynamically
  --thread-stack=#    The stack size for each thread
  --time-format=name  The TIME format (ignored)
- --timed-mutexes     Specify whether to time mutexes (only InnoDB mutexes are
- currently supported)
+ --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
+ effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
  size, MySQL will automatically convert it to an on-disk
  MyISAM table
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/openssl_1.result mysql-5.5-5.5.43/mysql-test/r/openssl_1.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/openssl_1.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/openssl_1.result	2015-02-27 08:30:35.000000000 +0000
@@ -3,8 +3,8 @@
 insert into t1 values (5);
 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;
 connect(localhost,ssl_user5,,test,MASTER_PORT,MASTER_SOCKET);
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/outfile_loaddata.result mysql-5.5-5.5.43/mysql-test/r/outfile_loaddata.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/outfile_loaddata.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/outfile_loaddata.result	2015-02-27 08:30:35.000000000 +0000
@@ -143,15 +143,16 @@
 LOAD DATA INFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ';
 Warnings:
 Warning	1638	Non-ASCII separator arguments are not fully supported
-Warning	1265	Data truncated for column 'a' at row 1
-Warning	1261	Row 1 doesn't contain data for all columns
-Warning	1261	Row 1 doesn't contain data for all columns
-Warning	1265	Data truncated for column 'a' at row 2
-Warning	1261	Row 2 doesn't contain data for all columns
-Warning	1261	Row 2 doesn't contain data for all columns
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
 a	b	c
-1	NULL	NULL
+1	ABC-АБВ	DEF-ÂÃÄ
+2	NULL	NULL
+SELECT * FROM t1;
+a	b	c
+1	ABC-АБВ	DEF-ÂÃÄ
+2	NULL	NULL
+SELECT * FROM t2;
+a	b	c
 1	ABC-АБВ	DEF-ÂÃÄ
 2	NULL	NULL
 SELECT * FROM t1 INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' LINES STARTING BY 'ъ';
@@ -181,7 +182,14 @@
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
 a	b	c
 1	ABC-АБВ	DEF-ÂÃÄ
-1	ABC-АБВ	DEF-ÂÃÄÑŠ2
+2	NULL	NULL
+SELECT * FROM t1;
+a	b	c
+1	ABC-АБВ	DEF-ÂÃÄ
+2	NULL	NULL
+SELECT * FROM t2;
+a	b	c
+1	ABC-АБВ	DEF-ÂÃÄ
 2	NULL	NULL
 # Default (binary) charset:
 SELECT * INTO OUTFILE 'MYSQLTEST_VARDIR/tmp/t1.txt' FROM t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/parser.result mysql-5.5-5.5.43/mysql-test/r/parser.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/parser.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/parser.result	2015-02-27 08:30:35.000000000 +0000
@@ -622,3 +622,28 @@
 #
 # End of 5.1 tests
 #
+#
+# Bug#17075846 : unquoted file names for variable values are
+#                accepted but parsed incorrectly
+#
+SET default_storage_engine=a.myisam;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET default_storage_engine = .a.MyISAM;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET default_storage_engine = a.b.MyISAM;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET default_storage_engine = `a`.MyISAM;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+SET default_storage_engine = `a`.`MyISAM`;
+ERROR 42000: Incorrect argument type to variable 'default_storage_engine'
+set default_storage_engine = "a.MYISAM";
+ERROR 42000: Unknown storage engine 'a.MYISAM'
+set default_storage_engine = 'a.MYISAM';
+ERROR 42000: Unknown storage engine 'a.MYISAM'
+set default_storage_engine = `a.MYISAM`;
+ERROR 42000: Unknown storage engine 'a.MYISAM'
+CREATE TABLE t1 (s VARCHAR(100));
+CREATE TRIGGER trigger1 BEFORE INSERT ON t1 FOR EACH ROW
+SET default_storage_engine = NEW.INNODB;
+ERROR 42S22: Unknown column 'INNODB' in 'NEW'
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/partition_archive.result mysql-5.5-5.5.43/mysql-test/r/partition_archive.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/partition_archive.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/partition_archive.result	2015-02-27 08:30:35.000000000 +0000
@@ -126,3 +126,29 @@
 count(*)
 100
 drop table t1;
+#
+#BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
+#              CORRUPTS FRM
+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL,
+  PRIMARY KEY (`fld1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (fld1)
+PARTITIONS 5 */
+ALTER TABLE t1 ENGINE= ARCHIVE;
+ERROR HY000: Can't create table 'test.#sql-temporary' (errno: 1)
+#After the patch, the ENGINE is correctly displayed as MyISAM
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `fld1` int(11) NOT NULL,
+  PRIMARY KEY (`fld1`)
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+/*!50100 PARTITION BY HASH (fld1)
+PARTITIONS 5 */
+#Cleanup.
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/partition_pruning.result mysql-5.5-5.5.43/mysql-test/r/partition_pruning.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/partition_pruning.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/partition_pruning.result	2015-02-27 08:30:35.000000000 +0000
@@ -3294,3 +3294,117 @@
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p0,p1,p2	ALL	NULL	NULL	NULL	NULL	100	Using where
 drop table t0, t1;
+#
+# Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
+#
+CREATE TABLE t1
+(c1 int,
+c2 int,
+c3 int,
+c4 int,
+PRIMARY KEY (c1,c2))
+PARTITION BY LIST COLUMNS (c2)
+(PARTITION p1 VALUES IN (1,2),
+PARTITION p2 VALUES IN (3,4));
+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+c1	c2	c3	c4
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+c1	c2	c3	c4
+1	1	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+c1	c2	c3	c4
+1	1	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+c1	c2	c3	c4
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+c1	c2	c3	c4
+1	1	1	1
+1	2	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+c1	c2	c3	c4
+2	3	1	1
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+c1	c2	c3	c4
+2	3	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+c1	c2	c3	c4
+2	3	1	1
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+c1	c2	c3	c4
+2	4	1	1
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+c1	c2	c3	c4
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	const	PRIMARY	PRIMARY	8	const,const	1	
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	const	PRIMARY	PRIMARY	8	const,const	1	
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p1,p2	range	PRIMARY	PRIMARY	8	NULL	2	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	const	PRIMARY	PRIMARY	8	const,const	1	
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p2	range	PRIMARY	PRIMARY	8	NULL	1	Using where
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/plugin_auth_qa_3.result mysql-5.5-5.5.43/mysql-test/r/plugin_auth_qa_3.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/plugin_auth_qa_3.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/plugin_auth_qa_3.result	2015-02-27 08:30:35.000000000 +0000
@@ -6,6 +6,6 @@
 current_user()	user()	@@local.proxy_user	@@local.external_user
 qa_test_11_dest@%	qa_test_11_user@localhost	'qa_test_11_user'@'%'	'qa_test_11_user'@'%'
 exec MYSQL PLUGIN_AUTH_OPT --default_auth=qa_auth_client -h localhost -P MASTER_MYPORT -u qa_test_2_user --password=qa_test_11_dest test_user_db -e "SELECT current_user(),user(),@@local.proxy_user,@@local.external_user;" 2>&1
-ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: NO)
+ERROR 1045 (28000): Access denied for user 'qa_test_2_user'@'localhost' (using password: YES)
 DROP USER qa_test_11_user, qa_test_11_dest;
 DROP DATABASE test_user_db;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/plugin.result mysql-5.5-5.5.43/mysql-test/r/plugin.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/plugin.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/plugin.result	2015-02-27 08:30:35.000000000 +0000
@@ -143,3 +143,73 @@
 @@SESSION.example_double_thdvar
 1000.500000
 UNINSTALL PLUGIN example;
+#
+# BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
+#
+CREATE PROCEDURE p_install()
+BEGIN
+INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
+END
+|
+CREATE PROCEDURE p_show_vars()
+BEGIN
+SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
+END|
+connect con1, localhost, root,,;
+# Case 18008907_1: Deadlock situation cause by
+#                  con1: has LOCK_system_variables_hash and waits on LOCK_plugin  AND
+#                  default: has LOCK_plugin and waits on LOCK_system_variables_hash.
+#
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
+call p_show_vars();;
+connection default;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
+call p_install();;
+connection con1;
+COUNT(*)
+#
+SET DEBUG_SYNC='RESET';
+connection default;
+ERROR HY000: Can't open shared library
+SET DEBUG_SYNC='RESET';
+# Case 18008907_2: Deadlock situation caused by
+#                  default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
+#                  con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
+#                  con2: has LOCK_global_system_variables and waits on LOCK_plugin.
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
+call p_show_vars();;
+connection con1;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
+call p_install();;
+connect con2, localhost, root,,;
+SET DEBUG_SYNC='now WAIT_FOR create_connection';
+connection con1;
+ERROR HY000: Can't open shared library
+connection default;
+COUNT(*)
+#
+Warnings:
+#	1639	debug sync point wait timed out
+disconnect con2;
+# Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
+INSTALL PLUGIN example SONAME 'ha_example.so';
+connection con1;
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
+call p_show_vars();;
+connect con2, localhost, root,,;
+SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
+UNINSTALL PLUGIN example;;
+connection default;
+SET DEBUG_SYNC='now SIGNAL go';
+connection con1;
+COUNT(*)
+#
+connection con2;
+connection default;
+DROP PROCEDURE p_show_vars;
+DROP PROCEDURE p_install;
+SET DEBUG_SYNC='RESET';
+disconnect con1;
+disconnect con2;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/show_processlist.result mysql-5.5-5.5.43/mysql-test/r/show_processlist.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/show_processlist.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/show_processlist.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,47 @@
+Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+SHOW BINLOGS
+connect connection1,localhost,root,,test,$MASTER_MYPORT,;
+connection default;
+SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
+SHOW PROCESSLIST;
+connection connection1;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect connection2,localhost,root,,test,$MASTER_MYPORT,;
+connect connection3,localhost,root,,test,$MASTER_MYPORT,;
+SET DEBUG_SYNC='now SIGNAL go';
+connection default;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+SET DEBUG_SYNC='after_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
+SHOW PROCESSLIST;
+connection connection1;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect connection4,localhost,root,,test,$MASTER_MYPORT,;
+connect connection5,localhost,root,,test,$MASTER_MYPORT,;
+SET DEBUG_SYNC='now SIGNAL go';
+connection default;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+SHOW PROCESSLIST;
+Id	User	Host	db	Command	Time	State	Info
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+<Id>	root	<Host>	test	<Command>	<Time>	<State>	<Info>
+"Cleanup"
+SET DEBUG_SYNC='RESET';
+disconnect connection1;
+disconnect connection2;
+disconnect connection3;
+disconnect connection4;
+disconnect connection5;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/sp.result mysql-5.5-5.5.43/mysql-test/r/sp.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/sp.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/sp.result	2015-02-27 08:30:35.000000000 +0000
@@ -7809,3 +7809,111 @@
 Error	1424	Recursive stored functions and triggers are not allowed.
 Error	1305	FUNCTION test.f1 does not exist
 DROP FUNCTION f1;
+
+#
+# BUG 16041903: CONTINUE HANDLER NOT INVOKED
+# IN A STORED FUNCTION AFTER A LOCK WAIT TIMEOUT
+#
+
+# Save and set lock wait timeout
+SET @lock_wait_timeout_saved= @@lock_wait_timeout;
+SET @innodb_lock_wait_timeout_saved= @@innodb_lock_wait_timeout;
+SET @@lock_wait_timeout= 1;
+SET @@innodb_lock_wait_timeout= 1;
+
+# Create a function with exit handler:
+CREATE FUNCTION f1() RETURNS VARCHAR(20)
+BEGIN
+DECLARE EXIT HANDLER FOR SQLSTATE '42S02' RETURN 'No such table';
+INSERT INTO no_such_table VALUES (1);
+END//
+
+# Create a function calling f1():
+CREATE FUNCTION f2() RETURNS VARCHAR(20)
+BEGIN
+RETURN f1();
+END//
+
+# Create a function provoking deadlock:
+CREATE FUNCTION f3() RETURNS VARCHAR(20)
+BEGIN
+UPDATE t1 SET i= 1 WHERE i= 1;
+RETURN 'Will never get here';
+END//
+
+# Create a function calling f3, to create
+# a deadlock indirectly:
+CREATE FUNCTION f4() RETURNS VARCHAR(20)
+BEGIN
+RETURN f3();
+END//
+
+# Open another connection, create and initialize a table
+# to be used for provoking deadlock, put a lock on the table:
+CREATE TABLE t1 (i INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+SET AUTOCOMMIT= 0;
+UPDATE t1 SET i=1 WHERE i=1;
+
+# On the default connection, do an update to provoke a
+# deadlock, then call the function with handler. This case
+# fails without the patch (with error ER_NO_SUCH_TABLE):
+SET AUTOCOMMIT= 0;
+UPDATE t1 SET i=1 WHERE i=1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f1() AS 'f1():';
+f1():
+No such table
+Warnings:
+Error	1146	Table 'test.no_such_table' doesn't exist
+
+# Provoke another deadlock, then call the function with
+# handler indirectly. This case fails without the patch
+# (with error ER_NO_SUCH_TABLE):
+UPDATE t1 SET i= 1 WHERE i= 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f2() AS 'f2():';
+f2():
+No such table
+Warnings:
+Error	1146	Table 'test.no_such_table' doesn't exist
+
+# Provoke yet another deadlock, but now from within a function,
+# then call the function with handler. This succeeds even
+# without the patch because is_fatal_sub_stmt_error is reset
+# in restore_sub_stmt after the failing function has been
+# executed. The test case is included anyway for better coverage:
+SELECT f3() AS 'f3():';
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f1() AS 'f1():';
+f1():
+No such table
+Warnings:
+Error	1146	Table 'test.no_such_table' doesn't exist
+# Provoke yet another deadlock, but now from within a function,
+# calling another function, then call the function with handler.
+# This succeeds even without the patch because
+# is_fatal_sub_stmt_error is reset in restore_sub_stmt after
+# the failing function has been executed. The test case is
+# included anyway for better coverage:
+SELECT f4() AS 'f4():';
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+SELECT f1() AS 'f1():';
+f1():
+No such table
+Warnings:
+Error	1146	Table 'test.no_such_table' doesn't exist
+
+# Disconnect, drop functions and table:
+DROP FUNCTION f4;
+DROP FUNCTION f3;
+DROP FUNCTION f2;
+DROP FUNCTION f1;
+DROP TABLE t1;
+
+# Reset lock wait timeouts
+SET @@lock_wait_timeout= @lock_wait_timeout_saved;
+SET @@innodb_lock_wait_timeout= @innodb_lock_wait_timeout_saved;
+#
+# BUG 16041903: End of test case
+#
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/trigger-trans.result mysql-5.5-5.5.43/mysql-test/r/trigger-trans.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/trigger-trans.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/trigger-trans.result	2015-02-27 08:30:35.000000000 +0000
@@ -195,3 +195,28 @@
 14	g
 drop trigger t1_after_insert;
 drop table t1,t2;
+#
+#Bug#19683834 SOME INNODB ERRORS CAUSES STORED FUNCTION
+#             AND TRIGGER HANDLERS TO BE IGNORED
+#Code fixed in Bug#16041903
+CREATE TABLE t1 (id int unsigned PRIMARY KEY, val int DEFAULT 0)
+ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (1), (2);
+CREATE TABLE t2 (id int PRIMARY KEY);
+CREATE TABLE t3 LIKE t2;
+CREATE TRIGGER bef_insert BEFORE INSERT ON t2 FOR EACH ROW
+BEGIN
+DECLARE CONTINUE HANDLER FOR 1062 BEGIN END;
+INSERT INTO t3 (id) VALUES (NEW.id);
+INSERT INTO t3 (id) VALUES (NEW.id);
+END//
+START TRANSACTION;
+UPDATE t1 SET val = val + 1;
+connect  con2,localhost,root,,test,,;
+SET SESSION innodb_lock_wait_timeout = 2;
+UPDATE t1 SET val = val + 1;
+ERROR HY000: Lock wait timeout exceeded; try restarting transaction
+INSERT INTO t2 (id) VALUES (1);
+disconnect con2;
+connection default;
+DROP TABLE t3, t2, t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/union.result mysql-5.5-5.5.43/mysql-test/r/union.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/union.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/union.result	2015-02-27 08:30:35.000000000 +0000
@@ -1826,3 +1826,37 @@
 SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
 dev
 1
+#
+# Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
+#
+SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output= @@global.log_output;
+SET @old_long_query_time= @@long_query_time;
+SET GLOBAL log_output= "TABLE";
+SET GLOBAL slow_query_log= ON;
+SET SESSION long_query_time= 0;
+CREATE TABLE t17059925 (a INT);
+CREATE TABLE t2 (b INT);
+CREATE TABLE t3 (c INT);
+INSERT INTO t17059925 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+INSERT INTO t3 VALUES (7), (8), (9);
+TRUNCATE table mysql.slow_log;
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
+a
+1
+2
+3
+4
+5
+6
+7
+8
+9
+SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
+sql_text	rows_examined
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3	18
+DROP TABLE t17059925, t2, t3;
+SET @@long_query_time= @old_long_query_time;
+SET @@global.log_output= @old_log_output;
+SET @@global.slow_query_log= @old_slow_query_log;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/variables.result mysql-5.5-5.5.43/mysql-test/r/variables.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/variables.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/variables.result	2015-02-27 08:30:35.000000000 +0000
@@ -188,6 +188,8 @@
 @@concurrent_insert
 AUTO
 set global timed_mutexes=ON;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	ON
@@ -195,6 +197,8 @@
 VARIABLE_NAME	VARIABLE_VALUE
 TIMED_MUTEXES	ON
 set global timed_mutexes=0;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 show variables like 'timed_mutexes';
 Variable_name	Value
 timed_mutexes	OFF
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/view.result mysql-5.5-5.5.43/mysql-test/r/view.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/view.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/view.result	2015-02-27 08:30:35.000000000 +0000
@@ -4109,3 +4109,40 @@
 DROP DATABASE IF EXISTS nodb;
 CREATE VIEW nodb.a AS SELECT 1;
 ERROR 42000: Unknown database 'nodb'
+#
+# BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
+# BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
+#
+CREATE VIEW v1 AS (SELECT '' FROM DUAL);
+CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+(SELECT '' AS col2 FROM DUAL) UNION ALL
+(SELECT '' FROM DUAL);
+# Name for the column in select1 is set properly with or
+# without this fix.
+SHOW CREATE VIEW v1;
+View	Create View	character_set_client	collation_connection
+v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS (select '' AS `Name_exp_1`)	latin1	latin1_swedish_ci
+# Name for the column in select2 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select2.
+SHOW CREATE VIEW v2;
+View	Create View	character_set_client	collation_connection
+v2	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v2` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`)	latin1	latin1_swedish_ci
+# Name for the field item in select2 & select3 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select2 & select3.
+SHOW CREATE VIEW v3;
+View	Create View	character_set_client	collation_connection
+v3	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v3` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `Name_exp_2`) union all (select '' AS `Name_exp_3`)	latin1	latin1_swedish_ci
+# Name for the field item in select3 is set with this fix.
+# Without this fix, name would not have set for the
+# columns in select3.
+SHOW CREATE VIEW v4;
+View	Create View	character_set_client	collation_connection
+v4	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v4` AS (select 'BUG#14117018' AS `col1`) union all (select '' AS `col2`) union all (select '' AS `Name_exp_3`)	latin1	latin1_swedish_ci
+DROP VIEW v1, v2, v3, v4;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/r/windows.result mysql-5.5-5.5.43/mysql-test/r/windows.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/r/windows.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/r/windows.result	2015-02-27 08:30:35.000000000 +0000
@@ -60,3 +60,8 @@
 WHERE VARIABLE_NAME = 'socket';
 VARIABLE_NAME
 SOCKET
+#
+# Bug#16581605: REPLACE.EXE UTILITY IS BROKEN IN 5.5
+#
+xyz
+def
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/README mysql-5.5-5.5.43/mysql-test/README
--- mysql-5.5-5.5.35+dfsg/mysql-test/README	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/README	2015-02-27 08:30:35.000000000 +0000
@@ -68,6 +68,5 @@
    that the bug is corrected in future releases.
 
 To submit your test case, put your .test file and .result file(s) into
-a tar.gz archive, add a README that explains the problem, ftp the 
-archive to ftp://support.mysql.com/pub/mysql/secret/ and send a mail
-to bugs@lists.mysql.com
+a tar.gz or zip archive, create a bug report at http://bugs.mysql.com/
+and attach the archive to the bug report.
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/cacert.pem mysql-5.5-5.5.43/mysql-test/std_data/cacert.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/cacert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/cacert.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,17 +1,79 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 16263805969935345171 (0xe1b4a55c3ddfa613)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
+        Validity
+            Not Before: Dec  5 04:48:11 2014 GMT
+            Not After : Dec  1 04:48:11 2030 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (2048 bit)
+                Modulus:
+                    00:b4:95:bd:24:92:73:06:22:01:13:28:0e:09:a3:
+                    94:05:96:54:9d:dc:8f:83:39:f3:64:7a:31:70:f6:
+                    d9:c4:14:19:75:87:a6:b1:ea:52:ed:40:54:5a:f6:
+                    9c:13:8e:d8:76:8f:5a:65:a5:20:19:19:bd:51:9d:
+                    ba:35:ce:9a:a9:58:0a:fc:11:6e:1d:cb:a8:f1:92:
+                    79:ee:aa:fc:e3:32:5e:aa:0d:0b:23:34:95:e9:d3:
+                    8e:3f:72:93:90:bc:2c:b0:04:75:4f:a4:4a:a0:32:
+                    db:ac:89:ac:34:9b:d0:07:e3:81:e9:ca:5b:26:f0:
+                    f5:de:fe:d5:5e:a0:54:26:dd:ec:58:07:6e:b9:e5:
+                    97:f6:20:6d:d8:4a:c0:50:cc:81:e6:d2:3f:c7:47:
+                    70:8b:15:89:65:71:2e:47:c3:42:76:b5:ee:16:0e:
+                    26:97:6a:a3:1c:ad:90:53:50:b0:b1:6d:1d:b0:b8:
+                    6d:df:3c:ee:bd:3b:87:e8:db:4d:3a:72:78:dd:db:
+                    40:3d:c9:20:46:b8:4e:33:bb:76:b7:4f:b2:79:da:
+                    03:cc:f9:75:c0:1d:4c:51:0a:b9:9b:25:34:50:11:
+                    97:df:82:46:02:a9:bc:98:51:3e:c3:df:57:ad:b7:
+                    28:be:de:65:ce:2b:f3:2c:22:f5:af:31:28:1c:ef:
+                    10:09
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Subject Key Identifier: 
+                94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+            X509v3 Authority Key Identifier: 
+                keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+
+            X509v3 Basic Constraints: 
+                CA:TRUE
+    Signature Algorithm: sha256WithRSAEncryption
+         32:97:4c:af:bf:ca:e0:10:66:b7:cc:8b:0d:05:d1:d2:ca:b8:
+         0c:c2:78:57:1f:f6:55:9c:74:fc:bd:31:58:05:18:bc:6d:b5:
+         79:9a:22:8c:1f:da:33:ea:ef:db:e3:cb:46:bc:36:91:8b:d8:
+         36:8d:06:40:c2:e9:fe:79:1b:4a:c5:70:74:6d:9d:92:2c:90:
+         be:3c:a7:88:03:e4:b7:ef:f4:b0:00:34:ec:8f:d1:c3:23:2b:
+         ef:bc:ff:ab:a2:0e:bc:ba:11:a5:8e:44:80:fa:d6:f4:26:66:
+         84:64:2c:e3:23:62:0c:e2:ba:01:ab:5f:24:d6:9d:7e:9c:7b:
+         f4:5d:0e:ba:64:35:6e:a5:fa:98:0c:57:f3:72:e8:3e:2e:ce:
+         b3:f9:e3:fa:ee:aa:79:f9:06:01:19:b2:b3:28:ff:f4:d6:bb:
+         17:bb:a6:a0:e0:45:23:f3:61:40:31:5c:a3:ee:88:1c:00:31:
+         54:96:f9:71:37:b5:7f:66:6a:af:04:94:09:39:99:b3:88:86:
+         9e:bb:d6:36:24:24:f4:37:2c:a6:6c:0b:35:2e:bb:40:af:a7:
+         64:8a:7f:f2:74:e3:94:0c:32:bd:31:3d:d9:79:68:0f:1e:4b:
+         17:c0:4e:df:85:3c:f0:84:df:58:f1:d2:4d:2f:ad:ff:1b:d7:
+         c8:9b:fe:dc
 -----BEGIN CERTIFICATE-----
-MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
-BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
-VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
-CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
-MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
-wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
-yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
-rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
-HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
-bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
-BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
-IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
-JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
-AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
-7F4WeS07J8LKardSvM0+hOA=
+MIIDmTCCAoGgAwIBAgIJAOG0pVw936YTMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ0ODExWhcNMzAxMjAxMDQ0ODExWjBjMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxCzAJBgNVBAMMAkNBMIIBIjANBgkqhkiG9w0B
+AQEFAAOCAQ8AMIIBCgKCAQEAtJW9JJJzBiIBEygOCaOUBZZUndyPgznzZHoxcPbZ
+xBQZdYemsepS7UBUWvacE47Ydo9aZaUgGRm9UZ26Nc6aqVgK/BFuHcuo8ZJ57qr8
+4zJeqg0LIzSV6dOOP3KTkLwssAR1T6RKoDLbrImsNJvQB+OB6cpbJvD13v7VXqBU
+Jt3sWAduueWX9iBt2ErAUMyB5tI/x0dwixWJZXEuR8NCdrXuFg4ml2qjHK2QU1Cw
+sW0dsLht3zzuvTuH6NtNOnJ43dtAPckgRrhOM7t2t0+yedoDzPl1wB1MUQq5myU0
+UBGX34JGAqm8mFE+w99Xrbcovt5lzivzLCL1rzEoHO8QCQIDAQABo1AwTjAdBgNV
+HQ4EFgQUlGWho4fPv8F0u9iEl7Zr7rKQc7IwHwYDVR0jBBgwFoAUlGWho4fPv8F0
+u9iEl7Zr7rKQc7IwDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAMpdM
+r7/K4BBmt8yLDQXR0sq4DMJ4Vx/2VZx0/L0xWAUYvG21eZoijB/aM+rv2+PLRrw2
+kYvYNo0GQMLp/nkbSsVwdG2dkiyQvjyniAPkt+/0sAA07I/RwyMr77z/q6IOvLoR
+pY5EgPrW9CZmhGQs4yNiDOK6AatfJNadfpx79F0OumQ1bqX6mAxX83LoPi7Os/nj
++u6qefkGARmysyj/9Na7F7umoOBFI/NhQDFco+6IHAAxVJb5cTe1f2ZqrwSUCTmZ
+s4iGnrvWNiQk9DcspmwLNS67QK+nZIp/8nTjlAwyvTE92XloDx5LF8BO34U88ITf
+WPHSTS+t/xvXyJv+3A==
 -----END CERTIFICATE-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/client-cert.pem mysql-5.5-5.5.43/mysql-test/std_data/client-cert.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/client-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/client-cert.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,46 +1,82 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
-        Serial Number: 1048577 (0x100001)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+        Version: 3 (0x2)
+        Serial Number: 16263805969935345173 (0xe1b4a55c3ddfa615)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
         Validity
-            Not Before: Jan 29 11:50:22 2010 GMT
-            Not After : Jan 28 11:50:22 2015 GMT
-        Subject: C=SE, ST=Uppsala, O=MySQL AB
+            Not Before: Dec  5 04:49:23 2014 GMT
+            Not After : Dec  1 04:49:23 2029 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Client
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (1024 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
-                    78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
-                    a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
-                    9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
-                    15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
-                    87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
-                    8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
-                    a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
-                    fc:3d:78:9b:49:6e:86:83:77
+                    00:c8:d1:a1:fe:a4:8c:f3:1b:17:71:1b:74:35:11:
+                    e0:0e:6c:40:0a:fb:c0:f7:f0:eb:bb:c9:1d:a1:c7:
+                    d7:b0:8a:f6:f1:cf:fa:6b:d0:79:64:eb:bb:69:a5:
+                    0d:80:06:df:52:14:d2:85:32:cf:bf:ce:2a:47:28:
+                    5b:cd:0b:28:ab:bb:07:33:d5:8b:d3:b4:72:c4:a6:
+                    b5:cc:37:b9:03:a8:78:56:25:58:1f:17:30:7c:d1:
+                    0a:bb:ec:3c:a3:03:90:97:99:92:49:ae:b3:57:96:
+                    5c:1a:e9:e8:02:23:ae:c8:c9:05:50:63:e5:77:a1:
+                    9a:73:06:74:0e:46:50:28:d8:c9:4f:c4:1c:37:b8:
+                    52:18:0b:af:19:2b:d4:e5:66:74:a4:f3:f0:da:09:
+                    30:f7:bc:0c:c9:9b:ce:57:06:04:27:e5:a1:2f:2b:
+                    a0:ba:b7:99:69:9d:46:fc:21:b6:45:81:9d:b2:3d:
+                    2f:76:15:78:b5:33:62:ac:1e:6b:66:dd:27:61:0a:
+                    47:02:20:2b:57:bb:32:20:dd:06:4c:76:a4:9b:72:
+                    42:4c:9c:2c:76:72:12:1f:4b:df:1e:11:1f:a9:06:
+                    54:dc:88:12:b0:49:d5:40:83:ef:7e:48:43:86:7a:
+                    37:a6:c1:d7:9b:fe:08:34:98:e0:54:3c:30:4f:79:
+                    15:29
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
-        34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
-        c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
-        01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
-        89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
-        02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
-        02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
-        32:0b
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                26:0C:90:BC:97:12:9E:43:BB:5E:FE:EB:A9:66:B3:C3:EE:B2:18:CB
+            X509v3 Authority Key Identifier: 
+                keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+
+    Signature Algorithm: sha256WithRSAEncryption
+         3e:3c:1f:6c:5b:83:d1:71:15:f5:45:52:fc:7f:67:bc:af:c5:
+         92:f5:74:78:13:43:3c:fe:b5:61:bf:00:47:43:45:a0:b9:dd:
+         a1:10:0c:29:69:2a:6f:7d:67:3d:1e:09:b5:15:74:bf:73:11:
+         e6:e9:09:b6:6b:b5:cc:1e:06:fd:bd:3a:11:d3:44:bd:ca:7a:
+         a1:f1:09:43:fc:bf:83:89:3a:b1:18:40:f3:cf:6d:12:ef:6e:
+         0c:b7:a4:99:03:8a:4f:0c:3c:2c:23:78:35:2a:99:ea:de:9c:
+         1b:e8:8d:19:fb:44:80:13:89:81:c5:05:4b:a7:66:6b:c0:31:
+         41:f0:6c:60:aa:ec:d3:4c:ff:c1:3b:d5:bb:0d:42:7d:37:5e:
+         80:e7:9c:7e:60:90:0f:a4:4e:70:20:9c:b1:e4:1b:70:65:b0:
+         ef:bb:41:16:ed:ad:46:ce:34:d3:02:3d:dd:e2:50:fa:3c:5d:
+         f0:e2:71:f8:9a:ef:a3:32:25:c5:8e:64:f4:46:e1:f4:c0:69:
+         d2:34:56:8d:d9:c2:6e:b6:55:3b:6a:4d:b6:d2:84:ab:85:7b:
+         cb:fd:b4:73:40:ba:5d:49:e2:0d:39:77:17:01:49:bb:72:8b:
+         3a:c9:b1:e2:cd:13:d2:9c:ce:7d:6c:a8:f0:32:c9:a4:af:56:
+         6f:8a:e6:88
 -----BEGIN CERTIFICATE-----
-MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
-hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
-oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
-atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
-hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
-A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
-dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
-RrLFnG84kYo1Mgs=
+MIIDyDCCArCgAwIBAgIJAOG0pVw936YVMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ0OTIzWhcNMjkxMjAxMDQ0OTIzWjBnMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBkNsaWVudDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAMjRof6kjPMbF3EbdDUR4A5sQAr7wPfw67vJ
+HaHH17CK9vHP+mvQeWTru2mlDYAG31IU0oUyz7/OKkcoW80LKKu7BzPVi9O0csSm
+tcw3uQOoeFYlWB8XMHzRCrvsPKMDkJeZkkmus1eWXBrp6AIjrsjJBVBj5XehmnMG
+dA5GUCjYyU/EHDe4UhgLrxkr1OVmdKTz8NoJMPe8DMmbzlcGBCfloS8roLq3mWmd
+RvwhtkWBnbI9L3YVeLUzYqwea2bdJ2EKRwIgK1e7MiDdBkx2pJtyQkycLHZyEh9L
+3x4RH6kGVNyIErBJ1UCD735IQ4Z6N6bB15v+CDSY4FQ8ME95FSkCAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFCYMkLyXEp5Du17+66lms8PushjLMB8GA1UdIwQY
+MBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQA+PB9s
+W4PRcRX1RVL8f2e8r8WS9XR4E0M8/rVhvwBHQ0Wgud2hEAwpaSpvfWc9Hgm1FXS/
+cxHm6Qm2a7XMHgb9vToR00S9ynqh8QlD/L+DiTqxGEDzz20S724Mt6SZA4pPDDws
+I3g1Kpnq3pwb6I0Z+0SAE4mBxQVLp2ZrwDFB8GxgquzTTP/BO9W7DUJ9N16A55x+
+YJAPpE5wIJyx5BtwZbDvu0EW7a1GzjTTAj3d4lD6PF3w4nH4mu+jMiXFjmT0RuH0
+wGnSNFaN2cJutlU7ak220oSrhXvL/bRzQLpdSeINOXcXAUm7cos6ybHizRPSnM59
+bKjwMsmkr1ZviuaI
 -----END CERTIFICATE-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/client-key.pem mysql-5.5-5.5.43/mysql-test/std_data/client-key.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/client-key.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/client-key.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,15 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIICXQIBAAKBgQDMmjdJE2bcz+MLE6Ej7XjbTr0R9owNdvmjMlaa+KEhalVOTT/m
-Z50mmbLNpJrSK1lc14rTYGj4GL3FvhXhKjyj1GHL9RGUF4GB94eM9mrS7tjmd/Zi
-Zk0uFo0IgUrJxksx5bnHioSWSKdHjA0mkFZO5qVujLPyn/w9eJtJboaDdwIDAQAB
-AoGASqk/4We2En+93y3jkIO4pXafIe3w/3zZ7caRue1ehx4RUQh5d+95djuB9u7J
-HEZ7TpjM7QNyao5EueL6gvbxt0LXFvqAMni7yM9tt/HUYtHHPqYiRtUny9bKYFTm
-l8szCCMal/wD9GZU9ByHDNHm7tHUMyMhARNTYSgx+SERFmECQQD/6jJocC4SXf6f
-T3LqimWR02lbJ7qCoDgRglsUXh0zjrG+IIiAyE+QOCCx1GMe3Uw6bsIuYwdHT6as
-WcdPs04xAkEAzKulvEvLVvN5zfa/DTYRTV7jh6aDleOxjsD5oN/oJXoACnPzVuUL
-qQQMNtuAXm6Q1QItrRxpQsSKbY0UQka6JwJBAOSgoNoG5lIIYTKIMvzwGV+XBLeo
-HYsXgh+6Wo4uql3mLErUG78ZtWL9kc/tE4R+ZdyKGLaCR/1gXmH5bwN4B/ECQEBb
-uUH8k3REG4kojesZlVc+/00ojzgS4UKCa/yqa9VdB6ZBz8MDQydinnShkTwgiGpy
-xOoqhO753o2UT0qH8wECQQC99IEJWUnwvExVMkLaZH5NjAFJkb22sjkmuT11tAgU
-RQgOMoDOm6driojnOnDWOkx1r1Gy9NgMLooduja4v6cx
+MIIEowIBAAKCAQEAyNGh/qSM8xsXcRt0NRHgDmxACvvA9/Dru8kdocfXsIr28c/6
+a9B5ZOu7aaUNgAbfUhTShTLPv84qRyhbzQsoq7sHM9WL07RyxKa1zDe5A6h4ViVY
+HxcwfNEKu+w8owOQl5mSSa6zV5ZcGunoAiOuyMkFUGPld6GacwZ0DkZQKNjJT8Qc
+N7hSGAuvGSvU5WZ0pPPw2gkw97wMyZvOVwYEJ+WhLyugureZaZ1G/CG2RYGdsj0v
+dhV4tTNirB5rZt0nYQpHAiArV7syIN0GTHakm3JCTJwsdnISH0vfHhEfqQZU3IgS
+sEnVQIPvfkhDhno3psHXm/4INJjgVDwwT3kVKQIDAQABAoIBAFrliE2abbIcMSAh
+LRhYXvIoTVSrX0za39i/z4nKyvY98EjDurXSRyBHEy1eaB3q/mpIwoFH3oES8FAF
+FIha5K3Wmgv8PK42nzwjuWYWUsg1GULk5F4uQOQ+On2VEF0439m+yVhQmxyqEkac
+WUeenx6C3sTkcpkTrLUj1qQfb2kM6JmeGsXfJNFLP/U36x8Q6kp2089DxBFgVcFu
+W3ge24W08umDBKuZWIF5B9GX8JFzmbAwPT2KATppGeroX0+bo4KAts4F1dBKmbrm
+3815kqYnz+VqyWbw6AHUA7aw2TY6QIT1oHrm+EdfnOQZaf8d/2CHWlIZPmxB46Lz
+6zQTVgECgYEA/L9awju31alISm0WYOPZBBndIHsOve4iKcMmy85GTKSvV+cAvgAZ
+uQwabZi4ZYHYaa4LPF0hbTb5IdV6krQzGYXpAjlwaarW0Zx4VoQIErWyji79OnFD
+QpbzIPGQiUAc0D7Gk7kJpwNmpgjyYcSkjEibF4cFEhDpTVlccbgxboUCgYEAy2c0
+tIfKiu1hwo/8UdcO4LQ6LWJdbIDdNU45HCk/IhIe4FrB0pXnk1yIBBn0ezY7Mgzy
+USYlfPTjFmnQOFF/6bHyGmeB4YTYamlTDuHlUUdH76brCZ3ywUlqpToiAPJFjx36
+nTNjo8JLF7eyjMOy4uN6eJzzS7OP9GwsHllux1UCgYBeFLCo+me8va2uHpsk58th
+TmtUatoa8uh+mSj41kiuwOKQGunYz9rDWfEAeMey6TlwZRvDlXsa10q3QGrG7xLS
+XllUvaLNgo1CKzdUJQOIS2AysuUJ+x0pTV0lFyZRIK9ZCPUMCeXA6HAuP8hRgkwp
+9+DbSiQmDGt7olbZ8dFcrQKBgQCOFzzUWH//aTD/z8H+EfQMuRpjFfIZmDPvxwNS
+TuYRkQMMy5nW2G17ngpOgyss34eewTiNw84waoow4B5bGWP4Bx0PoPs0Za8hNw6U
+uO2PR/JS0hIjF7m7mOPtJJ0YeCZrgg/OvVV/0nzOxr7uYs+WfD7T/yBe48NOhjqT
+wPoIOQKBgGRLd3G8b0AbPTv4NVwzIl3xKHCKYd1EcBbfyPWjAZ8+BagEPK8mJfOt
+MXkMrSKOq6ShEfzRsdJna7eI0te3zNXXFu/G3IHQZUdC0RtksW5T9tXvASRN3wnX
++aaoIM1q/KUgfH0TF/1pQPHFSUfFrGyLDiCDUu1sJ2ijULr5rZES
 -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server8k-cert.pem mysql-5.5-5.5.43/mysql-test/std_data/server8k-cert.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server8k-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/server8k-cert.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,51 +1,207 @@
+Certificate:
+    Data:
+        Version: 3 (0x2)
+        Serial Number: 10754692786786449447 (0x9540581bd8dcb827)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
+        Validity
+            Not Before: Dec  5 04:50:48 2014 GMT
+            Not After : Dec  1 04:50:48 2029 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=Server
+        Subject Public Key Info:
+            Public Key Algorithm: rsaEncryption
+                Public-Key: (8192 bit)
+                Modulus:
+                    00:d8:8f:9d:66:66:9c:12:ca:0a:ad:9e:9f:05:66:
+                    6c:6c:8a:db:19:9f:a2:d0:fa:38:dc:de:c5:a6:94:
+                    60:0d:4b:72:c9:85:e2:ff:27:c8:d4:ce:b1:29:66:
+                    31:e7:2b:4e:08:b3:a2:71:cf:1e:36:7c:8e:4d:08:
+                    6e:fd:7a:ea:c1:0d:5c:97:09:66:fa:ed:0b:36:64:
+                    8f:cc:39:35:a9:43:6c:a9:17:48:0f:2e:0a:4b:d3:
+                    94:bb:b0:5b:43:f1:4e:f7:e5:30:e1:ae:a2:a8:5d:
+                    3c:db:39:df:d6:4b:70:a6:c9:68:c3:f3:9d:19:d7:
+                    2f:2a:38:31:11:ab:f1:60:66:c3:38:4f:d9:6f:b5:
+                    49:df:ce:14:b5:fa:c8:95:04:50:69:90:9d:26:c2:
+                    e9:07:69:7b:a2:d8:91:e7:cd:de:c4:ed:9c:e4:c8:
+                    8c:e3:a0:cd:dd:2b:37:21:8f:ee:54:38:91:2b:2b:
+                    01:86:90:f0:2e:9a:06:8a:e1:f2:a2:3f:d1:d4:21:
+                    9f:b0:81:eb:d0:e9:d3:e9:a9:28:6e:c2:06:4b:94:
+                    6e:96:70:f5:31:33:dd:97:2f:cc:5d:80:c5:74:ce:
+                    c0:3d:b2:6a:81:b7:ce:65:4f:6a:49:3e:c9:5d:00:
+                    3c:06:4a:57:c9:a7:f9:bb:46:50:df:64:dc:13:1f:
+                    22:ad:21:0b:aa:4b:5d:94:60:9f:20:ff:28:aa:56:
+                    5f:f6:cd:23:34:fe:44:a2:d6:80:bd:a9:67:00:d6:
+                    a1:82:82:9f:c9:e8:0c:97:26:1e:a9:b1:e2:ee:01:
+                    ef:9d:c6:82:fc:72:33:02:40:35:cc:ae:51:23:f4:
+                    f8:92:29:d3:2f:5c:1f:03:c6:81:7d:fb:4f:e9:de:
+                    ed:68:3c:a1:be:7c:fa:11:96:2b:5a:10:c5:c5:cb:
+                    2e:7a:54:4c:7b:12:b8:07:01:d9:b5:38:0f:a6:43:
+                    70:28:81:8d:d7:95:ad:d6:e8:88:b4:19:62:05:7b:
+                    75:c0:2d:24:72:1c:4d:04:a3:f7:1d:6b:8b:fa:16:
+                    a3:5a:6c:51:ba:5c:62:fa:3e:82:7f:4e:10:db:d0:
+                    52:d4:81:df:0e:5b:33:7e:20:77:1d:51:ca:4e:13:
+                    ee:cd:72:36:28:b4:31:88:3d:61:0f:1a:80:19:f6:
+                    7d:71:5d:21:1f:dd:0b:d9:73:88:a9:72:4b:8d:a3:
+                    d6:f1:4f:5d:01:6e:9e:c2:28:97:80:de:5b:2d:ac:
+                    a3:c9:24:db:e9:0f:2b:36:ee:a7:f2:94:c1:41:7a:
+                    70:9f:fd:d0:31:a9:de:55:38:65:89:20:f4:02:f1:
+                    83:73:40:77:db:35:d2:66:ff:26:5f:f4:d2:e6:f9:
+                    ba:fc:6a:66:b1:02:24:04:a3:32:4b:21:85:83:b4:
+                    6a:97:3c:25:7f:65:cc:a6:dd:cc:ac:e5:22:09:58:
+                    dc:a1:0d:7d:b4:ac:98:98:81:1d:a7:83:d4:3a:e4:
+                    39:a7:04:6a:b6:b7:5d:a8:fe:0e:47:08:1d:95:61:
+                    eb:a8:97:53:91:1e:ca:1f:3f:19:5a:01:73:da:33:
+                    32:d7:33:ca:39:1e:00:37:6b:f8:18:47:30:3a:2e:
+                    99:39:d0:d0:49:6d:87:c1:98:59:d0:21:ca:12:6d:
+                    89:33:0f:f2:52:6e:d6:c5:78:dd:15:b6:11:d6:5e:
+                    72:e8:c7:12:00:c3:8d:57:34:e5:d8:6d:a2:e8:47:
+                    79:83:8c:49:17:3b:75:24:0d:de:e1:3b:dd:bc:b7:
+                    df:89:a6:31:e6:49:37:80:f8:8f:86:e3:42:f4:2e:
+                    dc:de:58:45:c4:41:a9:2d:a6:5d:f0:7d:81:3d:54:
+                    f4:8a:a3:5f:18:7c:02:c9:7f:1c:f5:9f:dd:0a:29:
+                    49:40:92:24:b3:b7:65:37:91:9a:a8:00:c4:4e:7f:
+                    7e:f7:97:de:24:2a:d7:3b:f2:a2:63:ec:38:b7:1f:
+                    9e:b5:72:99:bd:b1:c0:41:6a:57:97:e2:fb:11:32:
+                    ba:a3:5d:82:48:c5:0a:cc:2c:f5:21:7a:f1:99:56:
+                    1b:54:9d:c7:64:50:62:80:94:50:5a:40:32:61:f3:
+                    2c:f8:09:dc:f0:6d:2b:60:29:c2:86:70:5a:57:12:
+                    7d:09:73:ca:41:6d:22:61:18:1a:48:cb:80:95:be:
+                    08:e8:15:99:de:36:3a:bf:09:67:35:e8:53:d9:40:
+                    1b:27:e5:14:32:09:73:e0:f6:a9:19:ee:81:90:dc:
+                    b7:9d:b6:91:51:33:1e:1f:22:e0:bd:df:a8:d1:33:
+                    a7:ab:9b:9c:27:7a:3c:ef:aa:9e:4d:f8:a8:97:63:
+                    24:20:c8:36:ab:05:8a:c0:80:9b:64:0c:1f:ec:4f:
+                    de:ec:f0:9c:9c:54:db:02:ab:12:aa:ab:58:a3:49:
+                    25:bf:6a:0a:04:7f:2f:1d:41:11:23:4e:e2:83:51:
+                    e3:f5:12:95:22:72:13:f4:be:6f:e2:00:29:4f:fe:
+                    9b:ae:b9:e2:7d:72:d3:1b:e8:12:3b:6d:b6:d2:62:
+                    a4:91:31:46:e7:16:7f:9d:8d:74:5e:97:51:d1:cb:
+                    82:57:bb:bd:46:e4:9c:c5:bd:08:8b:68:20:f8:5e:
+                    d6:aa:ed:6e:4d:ba:a4:29:fd:ac:5c:2f:25:14:d3:
+                    19:63:0c:01:75:6c:87:a5:0b:29:09:7f:13:7f:00:
+                    d4:63:72:e2:a0:39:88:80:68:2c:3f:49:b1:9b:94:
+                    77:63:08:05:55
+                Exponent: 65537 (0x10001)
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                3E:96:BB:23:C2:FD:41:11:7F:EB:63:9B:39:5F:58:2D:92:A0:F0:9F
+            X509v3 Authority Key Identifier: 
+                keyid:60:57:8F:09:CF:83:86:4B:35:32:BF:73:EB:81:4C:DB:36:27:12:8F
+
+    Signature Algorithm: sha256WithRSAEncryption
+         19:b8:4d:94:a3:41:1b:78:e8:fa:da:7c:c3:0c:f5:42:6a:2e:
+         04:8c:f4:6e:90:e0:d1:55:28:7c:97:85:18:12:c4:ff:d3:ba:
+         74:f1:7f:af:b0:ab:4d:64:f4:45:58:6e:b1:2e:06:cc:a7:5b:
+         cd:25:8f:60:68:14:e1:f9:56:21:40:43:e4:c4:ee:91:72:01:
+         7d:86:41:2f:ac:6d:be:c6:1a:2a:ae:dd:13:ca:51:01:37:33:
+         7e:b9:1a:9a:28:16:8c:bc:d1:e7:d4:46:55:87:1f:05:93:4c:
+         b5:75:ff:ed:ca:29:b2:5d:15:05:4c:02:a9:53:3c:d9:11:01:
+         04:db:82:ad:01:ad:4e:d4:7d:9e:6a:00:5e:cc:88:83:42:98:
+         6e:4b:cd:7c:55:c6:4c:98:39:db:d1:e3:aa:f3:27:83:6a:3c:
+         01:ad:c5:ee:ef:01:aa:b7:4d:f7:a1:86:34:9d:61:20:7c:a0:
+         c0:75:26:24:6f:a3:68:0e:03:4d:cf:f3:bf:d9:40:4f:1a:04:
+         4d:9c:5e:62:49:37:5b:78:ee:c5:11:78:ee:e5:87:f7:f4:f1:
+         6d:0d:bd:a2:fb:a2:6c:27:91:d4:84:43:03:f5:9b:11:50:ab:
+         45:ca:7c:3d:fe:5c:6b:e1:03:20:c8:c9:ac:66:ff:74:6e:0d:
+         87:47:75:77:41:ca:5e:e9:77:5f:2b:09:bb:a5:7d:fc:cf:ed:
+         75:dd:b0:ee:b8:da:3e:59:d0:e2:7f:38:16:fe:04:c9:99:d1:
+         06:84:11:b1:07:8a:4d:59:d6:70:c3:9b:f7:f8:b9:ae:99:86:
+         b6:31:a4:13:de:7e:23:27:33:96:d1:9b:15:65:98:04:e5:f8:
+         73:3c:f3:72:ef:a1:28:06:1d:7e:88:52:c1:f7:eb:2a:e1:f7:
+         57:e5:ed:08:e9:ee:f8:95:3d:ec:4c:98:93:e7:e1:ea:a5:02:
+         37:c1:66:18:ba:01:78:05:6d:c4:6b:2c:61:ee:bf:a9:e1:4d:
+         bf:95:31:f5:28:2a:f8:c9:ce:72:a5:c7:a3:38:2c:f6:69:34:
+         eb:cb:e9:b3:4f:78:de:87:61:8a:34:bd:5a:64:27:f0:42:1a:
+         22:e9:2b:ac:97:f1:ed:7a:50:3b:3e:18:ae:b7:d9:20:9b:d6:
+         12:3b:18:b1:47:71:39:0a:31:54:9f:fe:f2:90:d7:b8:27:6b:
+         49:e5:82:cd:82:99:95:b1:ab:aa:1f:7a:e4:4e:6e:46:91:a7:
+         16:b8:09:a3:5b:ec:6f:57:ca:b4:4f:69:e7:f5:f3:b9:03:93:
+         08:90:9d:8d:57:82:77:bc:69:f8:e4:46:d9:4d:d1:25:ea:b8:
+         60:b0:e2:cd:0c:ff:c2:63:65:20:f4:2c:34:36:34:a3:cf:67:
+         6a:01:3e:51:5f:4a:49:26:9d:30:3f:03:05:70:22:b1:e3:46:
+         d1:ff:23:23:45:08:4b:0e:77:db:91:d9:a2:5c:15:48:49:ee:
+         08:48:90:c3:25:44:b7:7b:9f:82:96:7e:8e:91:91:e5:a0:4d:
+         af:04:b8:72:df:07:a0:4b:02:79:0e:38:05:47:61:c3:9e:b4:
+         bf:01:00:10:c3:12:44:64:12:7a:bc:e1:c8:41:e5:cb:0d:7c:
+         52:32:7f:71:c1:3f:6e:d3:81:d3:12:ec:85:4c:16:72:d2:79:
+         f8:bf:c0:fe:31:14:47:53:20:87:73:bb:34:8f:60:4a:9e:91:
+         35:6e:20:96:da:bd:4b:7e:bd:c7:c4:f9:25:54:40:2c:9d:b0:
+         8b:b5:fb:1e:74:59:a5:f7:b9:b7:23:56:3b:eb:2e:0a:eb:f5:
+         10:9b:88:5b:49:8e:0f:05:61:7b:e5:a9:a0:24:f2:16:3f:cb:
+         5b:06:d6:a5:bb:94:3a:46:2e:43:c5:02:67:b1:7d:5d:b6:c0:
+         f9:93:2a:d6:18:95:89:73:ff:3b:a1:f3:a6:bd:5b:6a:f0:e0:
+         11:e8:95:09:83:5d:69:c3:91:e8:88:ea:b2:7c:32:73:a8:b0:
+         a4:24:d8:e5:6f:c7:97:8b:3e:c7:1e:69:6a:2a:b7:db:d1:26:
+         7b:94:83:27:6d:d2:82:58:dd:a7:c2:74:0d:43:13:e2:c5:96:
+         9f:3c:00:40:1a:10:b1:da:62:23:2e:b7:5c:33:61:56:3b:8b:
+         b4:b9:01:64:71:67:82:7c:18:2c:e8:d9:cf:e7:da:4b:16:7a:
+         91:67:af:82:0e:ac:7a:c9:cc:47:9b:84:b9:49:e8:3d:33:a4:
+         66:3f:c3:c1:20:ba:d1:0e:1e:11:80:82:78:90:25:a4:bc:80:
+         a2:25:8a:5c:de:3c:59:52:2f:b3:50:bb:0b:5a:f1:96:8d:d2:
+         eb:b9:f1:e9:72:a8:ae:f2:15:fd:5a:9c:a3:e8:ca:26:e9:67:
+         80:13:38:1f:38:9f:85:8a:82:3c:4f:d3:04:ff:3a:13:f7:b5:
+         13:f7:e3:50:1d:d6:e1:e6:1e:d0:b4:c8:5e:21:d7:22:cc:01:
+         de:db:d1:c4:a2:5c:0b:dc:dc:2f:08:e4:2e:12:c5:4a:bc:a1:
+         b3:92:32:1e:05:5c:7e:ca:43:6e:2e:06:3f:27:fd:1b:75:f0:
+         01:42:8d:ff:aa:f8:f1:47:5b:56:67:74:66:1b:aa:b5:75:41:
+         69:ba:91:66:ce:c3:3a:00:7a:93:59:1c:0c:49:c2:d2:d8:8d:
+         7a:57:a4:7d:ba:61:26:1e:e9:aa:ab:e6:cb:2c:16:0a
 -----BEGIN CERTIFICATE-----
-MIIJFDCCBPwCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV
-BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw
-CQYDVQQDEwJDQTAeFw0xMDA3MjgxNDA3MjhaFw0xODEwMTQxNDA3MjhaMFIxCzAJ
-BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjEN
-MAsGA1UECxMEVGVzdDEPMA0GA1UEAxMGc2VydmVyMIIEIjANBgkqhkiG9w0BAQEF
-AAOCBA8AMIIECgKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSEC
-PgxNNcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+Lr
-hXIqCz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2
-DA7kvMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5
-hACbfU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09
-Gh/GwmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33
-aGsZ5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4
-PRd31qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2
-OaIwFjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83
-psQ6R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCc
-HSFu07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs
-+LFdt4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS
-9+LB+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1P
-sZi4UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUd
-NhXxi/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfV
-JTt8Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwx
-UADgR0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1
-kOE7GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQ
-uw4qVKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRY
-nTIywUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PT
-trohFSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFT
-d33ZDke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABMA0GCSqGSIb3DQEB
-BAUAA4IEAQCc9RBhRbuWlmRZPZkqIdi5/+enyjoMmOa6ryJPxFSP8D2jrlHgQsk1
-+GsJmPFT3rwWfoGAQu/aeSX4sp8OhKVJtqNA6MJrGYnZIMolgYa1wZPbkjJsdEfi
-UsZdIB0n2+KA0xwEdGPdkGCfNPBtOg557DkcyEvsIZ9ELp4Pp2XzWRhyFGasJZc4
-YwgD/3K2rpOPZoMkBKeKqV19j41OfLKGBVyuaqzitbu9+KT4RU1ibr2a+UuFCwdT
-oqyN7bfWXjcjXOMkxCsOmLfKmqQxs7TEOVrYPTdYjamDxLy/e5g5FgoCxGY8iil0
-+YFLZyH6eEx/Os9DlG/M3O1MeRD9U97CdsphbDVZIDyWw5xeX8qQHJe0KSprAgiG
-TLhTZHeyrKujQCQS1oFFmNy4gSqXt0j1/6/9T80j6HeyjiiYEaEQK9YLTAjRoA7W
-VN8wtHI5F3RlNOVQEJks/bjdlpLL3VhaWtfewGh/mXRGcow84cgcsejMexmhreHm
-JfTUl9+X1IFFxGq2/606A9ROQ7kN/s4rXu7/TiMODXI/kZijoWd2SCc7Z0YWoNo7
-IRKkmZtrsflJbObEuK2Jk59uqzSxyQOBId8qtbPo8qJJyHGV5GCp34g4x67BxJBo
-h1iyVMamBAS5Ip1ejghuROrB8Hit8NhAZApXju62btJeXLX+mQayXb/wC/IXNJJD
-83tXiLfZgs6GzLAq7+KW/64sZSvj87CPiNtxkvjchAvyr+fhbBXCrf4rlOjJE6SH
-Je2/Jon7uqijncARGLBeYUT0Aa6k1slpXuSKxDNt7EIkP21kDZ5/OJ0Y1u587KVB
-dEhuDgNf2/8ij7gAQBwBoZMe1DrwddrxgLLBlyHpAZetNYFZNT+Cs/OlpqI0Jm59
-kK9pX0BY4AGOd23XM3K/uLawdmf67kkftim7aVaqXFHPiWsJVtlzmidKvNSmbmZe
-dOmMXp6PBoqcdusFVUS7vjd3KAes5wUX/CaTyOOPRu0LMSnpwEnaL76IC9x4Jd6d
-7QqY/OFTjpPH8nP57LwouiT6MgSUCWGaOkPuBJ9w9sENSbbINpgJJ42iAe2kE+R7
-qEIvf/2ETCTseeQUqm2nWiSPLkNagEh6kojmEoKrGyrv3YjrSXSOY1a70tDVy43+
-ueQDQzNZm3Q7inpke2ZKvWyY0LQmLzP2te+tnNBcdLyKJx7emPRTuMUlEdK7cLbt
-V3Sy9IKtyAXqqd66fPFj4NhJygyncj8M6CSqhG5L0GhDbkA8UJ8yK/gfKm3h5xe2
-utULK5VMtAhQt6cVahO59A9t/OI17y45bmlIgdlEQISzVFe9ZbIUJW44zBfPx74k
-/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
+MIIJyDCCBbCgAwIBAgIJAJVAWBvY3LgnMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ1MDQ4WhcNMjkxMjAxMDQ1MDQ4WjBnMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxDzANBgNVBAMMBlNlcnZlcjCCBCIwDQYJKoZI
+hvcNAQEBBQADggQPADCCBAoCggQBANiPnWZmnBLKCq2enwVmbGyK2xmfotD6ONze
+xaaUYA1LcsmF4v8nyNTOsSlmMecrTgizonHPHjZ8jk0Ibv166sENXJcJZvrtCzZk
+j8w5NalDbKkXSA8uCkvTlLuwW0PxTvflMOGuoqhdPNs539ZLcKbJaMPznRnXLyo4
+MRGr8WBmwzhP2W+1Sd/OFLX6yJUEUGmQnSbC6Qdpe6LYkefN3sTtnOTIjOOgzd0r
+NyGP7lQ4kSsrAYaQ8C6aBorh8qI/0dQhn7CB69Dp0+mpKG7CBkuUbpZw9TEz3Zcv
+zF2AxXTOwD2yaoG3zmVPakk+yV0APAZKV8mn+btGUN9k3BMfIq0hC6pLXZRgnyD/
+KKpWX/bNIzT+RKLWgL2pZwDWoYKCn8noDJcmHqmx4u4B753GgvxyMwJANcyuUSP0
++JIp0y9cHwPGgX37T+ne7Wg8ob58+hGWK1oQxcXLLnpUTHsSuAcB2bU4D6ZDcCiB
+jdeVrdboiLQZYgV7dcAtJHIcTQSj9x1ri/oWo1psUbpcYvo+gn9OENvQUtSB3w5b
+M34gdx1Ryk4T7s1yNii0MYg9YQ8agBn2fXFdIR/dC9lziKlyS42j1vFPXQFunsIo
+l4DeWy2so8kk2+kPKzbup/KUwUF6cJ/90DGp3lU4ZYkg9ALxg3NAd9s10mb/Jl/0
+0ub5uvxqZrECJASjMkshhYO0apc8JX9lzKbdzKzlIglY3KENfbSsmJiBHaeD1Drk
+OacEara3Xaj+DkcIHZVh66iXU5Eeyh8/GVoBc9ozMtczyjkeADdr+BhHMDoumTnQ
+0Elth8GYWdAhyhJtiTMP8lJu1sV43RW2EdZecujHEgDDjVc05dhtouhHeYOMSRc7
+dSQN3uE73by334mmMeZJN4D4j4bjQvQu3N5YRcRBqS2mXfB9gT1U9IqjXxh8Asl/
+HPWf3QopSUCSJLO3ZTeRmqgAxE5/fveX3iQq1zvyomPsOLcfnrVymb2xwEFqV5fi
++xEyuqNdgkjFCsws9SF68ZlWG1Sdx2RQYoCUUFpAMmHzLPgJ3PBtK2ApwoZwWlcS
+fQlzykFtImEYGkjLgJW+COgVmd42Or8JZzXoU9lAGyflFDIJc+D2qRnugZDct522
+kVEzHh8i4L3fqNEzp6ubnCd6PO+qnk34qJdjJCDINqsFisCAm2QMH+xP3uzwnJxU
+2wKrEqqrWKNJJb9qCgR/Lx1BESNO4oNR4/USlSJyE/S+b+IAKU/+m6654n1y0xvo
+EjttttJipJExRucWf52NdF6XUdHLgle7vUbknMW9CItoIPhe1qrtbk26pCn9rFwv
+JRTTGWMMAXVsh6ULKQl/E38A1GNy4qA5iIBoLD9JsZuUd2MIBVUCAwEAAaN7MHkw
+CQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQgQ2Vy
+dGlmaWNhdGUwHQYDVR0OBBYEFD6WuyPC/UERf+tjmzlfWC2SoPCfMB8GA1UdIwQY
+MBaAFGBXjwnPg4ZLNTK/c+uBTNs2JxKPMA0GCSqGSIb3DQEBCwUAA4IEAQAZuE2U
+o0EbeOj62nzDDPVCai4EjPRukODRVSh8l4UYEsT/07p08X+vsKtNZPRFWG6xLgbM
+p1vNJY9gaBTh+VYhQEPkxO6RcgF9hkEvrG2+xhoqrt0TylEBNzN+uRqaKBaMvNHn
+1EZVhx8Fk0y1df/tyimyXRUFTAKpUzzZEQEE24KtAa1O1H2eagBezIiDQphuS818
+VcZMmDnb0eOq8yeDajwBrcXu7wGqt033oYY0nWEgfKDAdSYkb6NoDgNNz/O/2UBP
+GgRNnF5iSTdbeO7FEXju5Yf39PFtDb2i+6JsJ5HUhEMD9ZsRUKtFynw9/lxr4QMg
+yMmsZv90bg2HR3V3Qcpe6XdfKwm7pX38z+113bDuuNo+WdDifzgW/gTJmdEGhBGx
+B4pNWdZww5v3+LmumYa2MaQT3n4jJzOW0ZsVZZgE5fhzPPNy76EoBh1+iFLB9+sq
+4fdX5e0I6e74lT3sTJiT5+HqpQI3wWYYugF4BW3Eayxh7r+p4U2/lTH1KCr4yc5y
+pcejOCz2aTTry+mzT3jeh2GKNL1aZCfwQhoi6Susl/HtelA7Phiut9kgm9YSOxix
+R3E5CjFUn/7ykNe4J2tJ5YLNgpmVsauqH3rkTm5GkacWuAmjW+xvV8q0T2nn9fO5
+A5MIkJ2NV4J3vGn45EbZTdEl6rhgsOLNDP/CY2Ug9Cw0NjSjz2dqAT5RX0pJJp0w
+PwMFcCKx40bR/yMjRQhLDnfbkdmiXBVISe4ISJDDJUS3e5+Cln6OkZHloE2vBLhy
+3wegSwJ5DjgFR2HDnrS/AQAQwxJEZBJ6vOHIQeXLDXxSMn9xwT9u04HTEuyFTBZy
+0nn4v8D+MRRHUyCHc7s0j2BKnpE1biCW2r1Lfr3HxPklVEAsnbCLtfsedFml97m3
+I1Y76y4K6/UQm4hbSY4PBWF75amgJPIWP8tbBtalu5Q6Ri5DxQJnsX1dtsD5kyrW
+GJWJc/87ofOmvVtq8OAR6JUJg11pw5HoiOqyfDJzqLCkJNjlb8eXiz7HHmlqKrfb
+0SZ7lIMnbdKCWN2nwnQNQxPixZafPABAGhCx2mIjLrdcM2FWO4u0uQFkcWeCfBgs
+6NnP59pLFnqRZ6+CDqx6ycxHm4S5Seg9M6RmP8PBILrRDh4RgIJ4kCWkvICiJYpc
+3jxZUi+zULsLWvGWjdLrufHpcqiu8hX9Wpyj6Mom6WeAEzgfOJ+FioI8T9ME/zoT
+97UT9+NQHdbh5h7QtMheIdcizAHe29HEolwL3NwvCOQuEsVKvKGzkjIeBVx+ykNu
+LgY/J/0bdfABQo3/qvjxR1tWZ3RmG6q1dUFpupFmzsM6AHqTWRwMScLS2I16V6R9
+umEmHumqq+bLLBYK
 -----END CERTIFICATE-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server8k-key.pem mysql-5.5-5.5.43/mysql-test/std_data/server8k-key.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server8k-key.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/server8k-key.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,99 +1,99 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIISKQIBAAKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSECPgxN
-NcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+LrhXIq
-Cz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2DA7k
-vMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5hACb
-fU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09Gh/G
-wmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33aGsZ
-5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4PRd3
-1qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2OaIw
-FjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83psQ6
-R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCcHSFu
-07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs+LFd
-t4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS9+LB
-+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1PsZi4
-UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUdNhXx
-i/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfVJTt8
-Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwxUADg
-R0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1kOE7
-GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQuw4q
-VKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRYnTIy
-wUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PTtroh
-FSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFTd33Z
-Dke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABAoIEAQCSt6YoZqigz/50
-XvYT6Uf6T6S1lBDFXNmY1qOuDkLBJTWRiwYMDViQEaWCaZgGTKDYeT3M8uR/Phyu
-lRFi5vCEMufmcAeZ3hxptw7KU+R8ILJ207/zgit6YglTys9h5txTIack39+6FJmx
-wbZ64HpETJZnpMO6+fuZaMXyLjuT8mmXjvHcOgXOvjWeFkZOveDhjJkAesUXuqyX
-EI+ajoXuQiPXeKonkD2qd7NTjzfy4gw/ZF4NXs0ZVJeviqtIPo2xp33udOw2vRFh
-bMvlF4cNLAbIKYVyOG0ruOfd2I7Unsc/CvD1u5vlRVuUd8OO0JZLIZR7hlRX+A58
-8O1g2H/wJZAsF1BnLnFzDGYCX2WjCCK3Zn85FkKGRa0lTdYDduad/C/N3Y2/pHFE
-e7U/2D7IkEei59tD2HcsDBB3MJnckkn/hyiL9qWcxqWZ61vurE+XjU6tc6fnfhk9
-pJQ6yU3epPU7Vfsk0UGA7bbgKpsyzyH8Zl76YC2mN2ZVJjZekfhY+ibT9odEPdOl
-yLB5iXA6/WhKkDWaOqZGOH+7MblWgT9wHINlcn+nKzOr00JHl26ac6aMlXXi9vbe
-4jgJbFK1HYlFIndyX/BdqRTsFemDoDrVqrEYsaONoVYDd9c5qrqYOeh34DhOksQW
-hNwWBfmMlfzgOGtCYhMeK+AajqTtUbMYQA6qp47KJd/Oa5Dvi3ZCpvZh3Ll5iIau
-rqCtmojsWCqmpWSu7P+Wu4+O3XkUMPdQUuQ5rJFESEBB3yEJcxqk/RItTcKNElNC
-PASrPrMD9cli7S/pJ+frbhu1Gna1ArXzXQE9pMozPaBpjCig7+15R0lL3pmOKO6e
-WK3dgSwrnW6TQdLPlSD4lbRoiIdTHVBczztDeUqVvFiV3/cuaEi1nvaVdAYLqjuL
-ogK4HwE/FQ54S0ijAsP52n25usoH6OTU3bSd/7NTp0vZCy3yf10x7HUdsh2DvhRO
-3+TSK5t0yz0Nt7hNwcI6pLmWUIYcZgpFc/WsiiGscTfhy8rh3kRHI8ylGq53KNF+
-yCVmjqnBRWs91ArxmeF1ctX2t3w5p7gf65hJWqoX/2DiSi5FBsr6HLxa5sUi4wRZ
-136aCNt5Wu7w+AzPDbQW6qKUGSyfHJAw4JZasZcaZLise5IWb1ks0DtFbWWdT3ux
-8r2AM7IO1WopnekrYCnx/aBvBAv4NjWozVA517ztVttPERt3AGb4nm387nYt5R2U
-NO2GBWcDyT8JQLKmffE1AkWolCR1GsvcNLQfLCbnNppgsnsLE/viTG4mq1wjnd8O
-2Q8nH1SVTuyGFREMp/zsiAEaGfdd0hI2r1J7OdNPBBCtmhITsy9ZYHqm5vrGvy3s
-vi2GuB2RAoICAQD/oWUsg4eTJxHifTJLz/tVSTXnw7DhfbFVa1K1rUV63/MRQAFW
-pabN4T6Yfp3CpdRkljCA8KPJZj7euwhm4OEg1ulpOouA+cfWlE9RFE8wyOK5SYwM
-k+nk31P9MUC866pZg/ghzBGDub91OW1+ZGEtqnLI/n/LhiAIWt0hJvgZclTc1cAL
-xffHVlFwoSyNl/nc3ueZCC95nOLst2XcuxZLLbOFtZCmDYsp49q/Jn6EFjn4Ge2o
-qp38z6eZgDMP1F4lb9nDqXPHfUSt2jxKlmpfXS+IPKdba67+EjhbtmUYzaR4EoPI
-zh+o6SrVWT6Yve7KGiYv06fuRz1m/lLQO/Arbd9ntSjgn+ZEXGOkbhnHUX3DJ4ny
-/6XEGB9NLQjern4uNTn0AaV+uvhncapFMaIBnVfq0Cw8eog0136PBYRaVX7T44j5
-HwIyGXWtYGA/SzDEQoksD0Y/T61BEGnLZaKeavNd82WwFvcYHZtE0J4aQGjCEE7N
-+nijzCy+j5ETmme9KJvQHpEyXP3N4RBko1eWvyTwFZDdIXtoa6TTEI51lm+FXJ/b
-Y+BzMr6KRo29FB+7//1ptUoMvn5hzL0PwOv2ZSTQuoG5hLDEbxWXLNhd1VHcfznF
-3EZHwfD2F8aGQ3kz+fkMTNfK955KorDrmLgvmV9eZZ5yQxGZrs5H5YfKpwKCAgEA
-6nSUbzfSdVFUH89NM5FmEJgkD06vqCgHl2mpyF+VmDGcay4K06eA4QbRO5kns13+
-n6PcBl/YVW/rNE8iFi+WxfqUpAjdR1HlShvTuTRVqtFTfuN8XhbYU6VMjKyuE0kd
-LKe3KRdwubjVNhXRZLBknU+3Y/4hnIR7mcE3/M5Zv5hjb7XnwWg/SzxV9WojCKiu
-vQ7cXhH5/o7EuKcl1d6vueGhWsRylCG9RimwgViR2H7zD9kpkOc0nNym9cSpb0Gv
-Lui4cf/fVwIt2HfNEGBjbM/83e2MH6b8Xp1fFAy0aXCdRtOo4LVOzJVAxn5dERMX
-4JJ4d5cSFbssDN1bITOKzuytfBqRIQGNkOfizgQNWUiaFI0MhEN/icymjm1ybOIh
-Gc9tzqKI4wP2X9g+u3+Oof1QaBcZ4UbZEU9ITN87Pa6XVJmpNx7A81BafWoEPFeE
-ahoO4XDwlHZazDuSlOseEShxXcVwaIiqySy7OBEPBVuYdEd2Qw/z3JTx9Kw8MKnf
-hu+ar5tz5dPnJIsvLeYCcJDe/K6loiZuHTtPbWEy9p6It7qubQNPBvTSBN5eVDKc
-Q2bTQNCx8SAAA9C5gJiwWoQKsXJzbRFRY77P9JjuGpua3YJ2nYBHEJmF+fp1R33c
-uHIyMphPMkKC4GC3/43kkMr6tck8kZbXGSYsLsBr2GkCggIBAJvvrjILQianzKcm
-zAmnI6AQ+ssYesvyyrxaraeZvSqJdlLtgmOCxVANuQt5IW9djUSWwZvGL4Np1aw0
-15k6UNqhftzsE7FnrVneOsww4WXXBUcV8FKz4Bf3i9qFswILmGzmrfSf8YczRfGS
-SJKzVPxwX3jwlrBmbx/pnb7dcLbFIbNcyLvl1ZJJu4BDMVRmgssTRp/5eExtQZg4
-//A4SA8wH7TO3yAMXvn8vrGgH8kfbdlEp88d1SYk3g4rP/rGB3A63NIYikIEzmJn
-ICQ3wUfPJnGq3kRMWgEuyCZaCy2oNE3yrWVPJ8z3/2MJ/79ZDVNHxEeki2o1FuW+
-+nGAPq+fZIp03iy4HdVRro7dgugtc9QaSHJtNId8V4vSjviX5Oz3FxUb9AJst58S
-nVV8Q2FMxBa/SlzSOkhRtCg2q1gXkzhaMnIVUleRZFGQ2uWBToxKMjcoUifIyN1J
-z999bkfI4hBLq5pRSAXz+YVu5SMKa10GaawIwJLat+i+1zboF6QyI2o/Wz8nrsNq
-KX/ajFGu5C94WFgsVoWKNI90KBLe48Ssje9c68waBlV/WHMg1YLvU3yqVDOV+K5c
-IHB9tPMnG+AgBYZPxSzuvnLrrkj/GeKx0WI7TrvzOLRGKJo6irMEJ8IzFegASRUq
-TVZKYQDYRG7m+lKlSxU+pyMAh2c9AoICAE4kavCip1eIssQjYLTGSkFPo/0iGbOv
-G9CgXAE3snFWX67tWphupKrbjdMSWcQTmPD2OTg6q6zWL4twsIi6dcMooHAHsFC7
-//LyUV/SDJdxSyXohiQJ8zH1zwy35RDydnHSuF5OvLh53T44iWDI1dAEqLgAFI3J
-LjTxzEpLMGiGTuYFt+ejai0WQAQayvBw4ESM9m+4CB2K0hBFTXv5y5HlnNTW0uWC
-VUZUUMrbjUieDz8B/zOXi9aYSGFzmZFGUDAPSqJcSMEELemPDF7f8WNr8vi42tIV
-4tlaFD1nep4F9bWMiCXU6B2RxVQi+7vcJEIqL1KUnGd3ydfD00K+ng4Xnj7Vz/cz
-QE7CqrpFaXmPlCMzW6+dm51/AyhHXDLkL2od05hiXcNkJ7KMLWRqwExHVIxM3shR
-x7lYNl3ArUsCrNd6m4aOjnrKFk7kjeLavHxskPccoGKrC9o0JMfTkWLgmuBJFQ0S
-N/HzIbcvIFWF0Ms4ojb50yp6ziXhXfJOO/0KUQEki71XIhvw89mVZszDzD5lqzjf
-HCZMBU4MbmL6NdEevFIDH0zPPkx3HPNtJt3kIJbit9wI8VhUMe+ldGnGxpWb8tKw
-SfM3vrHkYr+lizk26XfXMFhdAuVtT7dzQKSNEyP/1a2Hs307Xzgiv8JulJ8QIkrX
-/nsYWPOAGLG5AoICABmdW9Ppkvuhb1AEcjTWb+XCyopoBc6vit/uQWD9uO+CeX7a
-cfzq+iH01CAjyVMc4E1JDc5Lpi106U+GRGcAAaPJB2Sp5NznoxaOVrb71blu4Q4x
-bNjtKM/P/DXpO+yJYoOPdKtaSDhtnfNDM7H/jztJ3XIrOltKA7CcRDohbBWIx8Q0
-0uEpvfFpZZBco3yVmjP0RLgIVYn/ZDj9wGhSvFWIJ5vv6GXmtDrcHGMLxcfv7t76
-UVcMW/Yy4mYJRCzGOrWagyVijJ6MTVNciqadWcH1KcbB3EGoMFYMn61or2qJABPM
-xz89IlhnROU1Re3X/QRx5t86cw6oa+FqrWMOhSs31I0dNWSuS/xDympG27YIYSDd
-mv5seT78GjFmMJC5pPOLoXsbTPB0HpsX2/UL/w/eRAfilTOef/Cf9VE5MP/C2YR7
-NBxUU7/+21D6WvdtBTcZbrXWGroAo8zPP+PwX0+c6WoAvqDJvCPndp8xZhSgEJN/
-0kScptezi8n3ZHI95EA9U5mAHxHz0IhDDVzWw/z1f1SBPxKVX3+By3zaa3lrD2ch
-cHq7nBkX72veEevnHUY8Z2rHE2G2jdmRfOtwm4sjL0VBV9fRRoxzJWRduKyeOtDL
-EhhBhUoTrT48UnfW9hxnbNLB9P/hh+UJu9HrS2uAwHoGE1+8gcyundupGDBn
+MIISKQIBAAKCBAEA2I+dZmacEsoKrZ6fBWZsbIrbGZ+i0Po43N7FppRgDUtyyYXi
+/yfI1M6xKWYx5ytOCLOicc8eNnyOTQhu/XrqwQ1clwlm+u0LNmSPzDk1qUNsqRdI
+Dy4KS9OUu7BbQ/FO9+Uw4a6iqF082znf1ktwpslow/OdGdcvKjgxEavxYGbDOE/Z
+b7VJ384UtfrIlQRQaZCdJsLpB2l7otiR583exO2c5MiM46DN3Ss3IY/uVDiRKysB
+hpDwLpoGiuHyoj/R1CGfsIHr0OnT6akobsIGS5RulnD1MTPdly/MXYDFdM7APbJq
+gbfOZU9qST7JXQA8BkpXyaf5u0ZQ32TcEx8irSELqktdlGCfIP8oqlZf9s0jNP5E
+otaAvalnANahgoKfyegMlyYeqbHi7gHvncaC/HIzAkA1zK5RI/T4kinTL1wfA8aB
+fftP6d7taDyhvnz6EZYrWhDFxcsuelRMexK4BwHZtTgPpkNwKIGN15Wt1uiItBli
+BXt1wC0kchxNBKP3HWuL+hajWmxRulxi+j6Cf04Q29BS1IHfDlszfiB3HVHKThPu
+zXI2KLQxiD1hDxqAGfZ9cV0hH90L2XOIqXJLjaPW8U9dAW6ewiiXgN5bLayjySTb
+6Q8rNu6n8pTBQXpwn/3QManeVThliSD0AvGDc0B32zXSZv8mX/TS5vm6/GpmsQIk
+BKMySyGFg7Rqlzwlf2XMpt3MrOUiCVjcoQ19tKyYmIEdp4PUOuQ5pwRqtrddqP4O
+RwgdlWHrqJdTkR7KHz8ZWgFz2jMy1zPKOR4AN2v4GEcwOi6ZOdDQSW2HwZhZ0CHK
+Em2JMw/yUm7WxXjdFbYR1l5y6McSAMONVzTl2G2i6Ed5g4xJFzt1JA3e4TvdvLff
+iaYx5kk3gPiPhuNC9C7c3lhFxEGpLaZd8H2BPVT0iqNfGHwCyX8c9Z/dCilJQJIk
+s7dlN5GaqADETn9+95feJCrXO/KiY+w4tx+etXKZvbHAQWpXl+L7ETK6o12CSMUK
+zCz1IXrxmVYbVJ3HZFBigJRQWkAyYfMs+Anc8G0rYCnChnBaVxJ9CXPKQW0iYRga
+SMuAlb4I6BWZ3jY6vwlnNehT2UAbJ+UUMglz4PapGe6BkNy3nbaRUTMeHyLgvd+o
+0TOnq5ucJ3o876qeTfiol2MkIMg2qwWKwICbZAwf7E/e7PCcnFTbAqsSqqtYo0kl
+v2oKBH8vHUERI07ig1Hj9RKVInIT9L5v4gApT/6brrnifXLTG+gSO2220mKkkTFG
+5xZ/nY10XpdR0cuCV7u9RuScxb0Ii2gg+F7Wqu1uTbqkKf2sXC8lFNMZYwwBdWyH
+pQspCX8TfwDUY3LioDmIgGgsP0mxm5R3YwgFVQIDAQABAoIEAAYjvDClBBO8SqU1
+dAixKK3DGgcV8YW/MlGAt1XLqxV1aCGyfAcD17vAyGEGFrAZGDNC9H4Jgy/ERDyG
+2q6xB2rFuDRH/fVrNwApxbHihVTxJml80Xwsr/oKW5MeotfARZ7djo83ZkEjs4/7
+ig8HQIBaAXBcvb13zkyCH1IC7+rtvucfzGhQWXHQ4+Fs5Lbk0mrLwMjSicy9/tVV
+En3h5kjq+6G41dW2P1/f08ZN0FHu8J6qr3ZjMYwAreLOGRTkfkxnT6GvbUIU/v8G
+3rCVK5yE7sWxGiJ09/lLT53vAqoXGnglUMOwtFdG8xp0fzz1vr3m6ao76uaWTcCn
+mV2palBCOZRwYozMWHaVBVAe9sWGd1MPSl7befbmkJcDfry2e1U8EO9QE1p4QpjA
+0UxFznzdt/h+XYgaAQ7l6Q4rxWL4V6DBxfYOY+ubeFuWLHe8D1LkUQJSq2i6I+0v
+6qMqmrEIKmXq2va5vrpHQgA0rCMFoKqKda72GxaBsSDTEJPrGhxpaiSC88qie4av
+C9dQYl69ldjFhTOlIu/DQih3PylDolqoUgLdFA//W9Ai/VdyRuN1i4TlQQUoPSfD
+EMLNDLtNQ9C/kUFzI2kZwYHTy/31gQc41ks7NNxv068a7IewsvS2O2rNCBKecLJ8
+jq5urm1cDInYcsicvzfFNx15QwXY6QqJ7qIIsvx2yBdhmEgMBX+eImyic9o30kMr
+aYd0bKilOlV/Vi0nYq9ArT3Iwd2RsQHad2ujOTMZyxfHVFIyEgShpQM5XXTN9w8g
+QwVI/0ydYdLWktJdjexvJmtJBFeUiCTz5JqCCGz/7mUfJW9XnljVLEd4J53f1PtY
+fIgEGkiG1ekUejbPA+Zm1eq2oeOsTkBqqEI3e5hL+R8PL7GKWgaJEY1Io6kcbboX
+RPwZeRZo6EjIJPQET3ER5x3Fey0kupercmpKaJ2aN1aZuq2TNUNRFC6n6lPknclJ
+VwZsjKoazHdj6usiVNLxC5aI8MJRCuaLDgq+eLz2Au4A7a4MTtXiRG5CxtcYEOwe
++xp4Sov7+aLtn5ECdBvtQigl0E1Qew/xvQIjULSjRNnyPthX/m5FdVfD0Ni3IcT+
+nPnmDK2NYAY5PLGA7ykEMcqlAnjpRWwvsVMiC6zHCVPLhi6dYTyuK7MAvHqfEphJ
+OMzF5C9SmsMmZXp5/8lCF6/dIH5vjWphxo7M1Y+5S0cL/3qPqIetVWNJBgGgMec6
+SmNg6tpmeFdTbLDpixOWclGLIb5XUPsEGBy6mrM8rPnGHfCq2hWJTlUBPXGakZAd
+gQOURFJSWHa34B2PHaeJSIRWHJBy4aa2mQI8OkBsTLWh/i51gKQlWjeKNiHphsH3
+rGQMYoECggIBAOz+cYvL2uyJIZXQzzUgZAlCSbaQ/DEEiyji7L1hFGLSwy5wEO0S
+rC1oCkRbo2/Ios3QDK49JYCk+QvWzIqyFnasQnTj9XCktFSBcKYRPGJnvutkf1X/
+ysO0hHbACIClfUN+mwbDfgVHHswbjSwgHPOuNxljg1TAcRnxQG8lqj3njku0RwUU
+fFfTTDmMJawhAAxd7dUxgcb0zI7ge6430/TuTnc8J96Gg7ZsRoGMrFAYTVbtvkj/
+mryLK2aMz2P/cxejMOcSVMQVd5tOBLhsRhETtkjgMar1pT9z8I0E/4iEs6gqcIqr
+ll+L6lghBdL+1SwW7MEFekypllMwypzlRD5uws838akoY4Ko03jm0YbA9Zf1Zn2S
+gT/q+uhvhZ7IWy9OuMeBIVGhv4EltC7SWuAfHWf7SUyKcEA2yfktPlDSqeywvts6
+CxKCz9xL8P8XSsKz8jMkC7FS5Zs0rn8G3d2sPFjEY9uWABPw8jcMq/w0regwmwt8
+gkGbKnKWKmUMgGBWoQM2gjTAB0Ss1MsOJ1m260d5Wd8pNLzXjcCrHqNh6xQx8DoN
+nOTCPRQu9cke/wjzW23ez9Ks9fRa4s9zJMtzc+tq2JH7WHmnehuyPYUPa6ALAcsB
+5B5QMXKbTSv/hTGydeYfSBiP1yCG3DyN0miuPS1VREfzaJr6V2Fv/3DFAoICAQDp
+7a1eFQ0F8SdD/9I9x9GPMvbhEi2Yz0BHjLOsOEN98EG8c7aA+pYW5AZBj/6m1nFZ
+EpvGQkmPHb24v4vxK09kcACMpJC9vkFvrt0GLn4OkiGNouqe2ip6CN7VNJkpMpTs
+x3aQ0x6CIEALVukHuDpV6i4TpB9O7bdmrO7hf/2GgsSM8zDGpo6a0Xk/POUVf7l8
+ZY2ZPf/LJVpLEW1YQLljZRJDI62nwgA+dtWnkX92DVT0LuKkisozlyY3+E0sWULE
+tizfJdGOqzfnilZBcG5/dDrvaW/OVVQLUjRk6Hhkoudff+mJfNrdJD0t4X9lZxvf
+NShlos28HJPkrOeThNhy4za6neTpn7AK6M9YYTelPBI4WyhVZkpvy4ZYnCORRs81
++byb0l4C3oDxaKu2McTtMFVQ5z2reLNnvPip92zQcPHbmuO+NhP29Gk2sjPp24N5
+DM4c1KYPTz5k3S85V+m1DLyI+uTmh4lqL8Rdn556pKZncJfOFUp+7isauHJMrd5i
+ICBtaL+M/hTZlSxFLcxykblo3gqmumIOKzegYSNZ7v8JB/r7VeZ3bQXxGThfB9dw
+Tpmef8XKK+ye0Nm//P33C36s5BjukRLUg5xMOHNza74L1zR2ToJgw6nrBJjRNDSt
+7EONSp7l8tQotry7C2fVezfUBMcSTHo11qOL7fdrUQKCAgEA5fttWMo04wGYc/g0
+fEu4iDupqN89vJu6J60/K/A/hj8dZb0ez9ElANNL01ZSXjIHu05AX/26nQJ7JAAI
+cjesEPHNc/2buvo6fR83oBBt1tjyrx/RajVWIWDWgx6Lobv2uT7tVjzz2E9SFaRO
+9Rkcv2S614p4chBmMVSqwLF+aaCBt/l0Sfu9RsUn3VihXk6P63BjUlY+qEH7GFPD
+8ib/K1rvDkp0Lj+/JZIhQaqvtPJAazE/TTuuf3VWYqgWweWtXKzi0fo6BCcI8M9f
+SVDZFc1ZQZM+37aN6+uo7lCBYYvVhEXa/NbSkFoIygkRy9W8LJL6ob2dFzQjSwu4
+M1VRSnzV051oiE1HdA49WcA0aF5sdlCQax93Cf4QCuvecV3hDyGHsyMeoEckvkFG
+f4Fm6sOHF9cFJJ/bmpUQnxxGsswcVjKWo8vJ3ubOq+uOLR3/UL6rNPGv3x6g7mLL
+Sz3wpCN2VHYQqZEA9lkF1GIZrB+6++3fJ+BlzyCyqowLDBB7rAGlMqb86A/Jfd1y
+irJrgWY/IBclHaixIujTCLuGeeqV4/0qMEvxixTrjOCdZ9UKjTcL7K0iZEGwVLa2
+D7afaEfboAMJs3CERVo+5w2rIar7OE42KTjmlHwh4CPRWfcW3ElgnDaTEjLUAx6c
+Lq86FpevioSKRIBzbKGvlkDHVDkCggIAbNL9C/+PB2ygb6nbDJKgkpWK9DmYrLX9
+mUuDamLiQvw6GIlcJbRtjkiWAHoUZVjtchqODTVZMxMK5590YsVbMcZI+ySzkRGp
+L2ORvwZx7iVdJp7btvqXOB5YS6ckeV3mmiBQsB8G2lJWeO/9iHHT8ZP3y3tWdUlx
+QHrCxnTcZG8BMPERh9iEDtHULe8OQ2ofyBcWQGvvS3oc/z8kNyIlHHAwhrtaVeiS
+ZHyz+Dhfq3OYSeBl31YRqt5uESuZ+z+rKAf35/eX/V75quVYKyk6vmA76pSKRtq7
+NmkPpsHfADIooOzIoAVNbAMn0uhMc8f712LLYDzUqOZChudI8/+hEhFRrI83ptd6
+9hhIHT1cvamscDs4EEJ97nQoE6DPiw3954Y+j97VjVAlfCjNePy+N/l8Nx7cOaD1
+FRV8ONW58V4ZpafwutQ9hW0+ZQuRywErsGyclhz3A7hBtnqPNYYIWwmJy8+sHPKA
+or2GBGf1OejO4OAoPt74wQPbWZrk0XcxNUTs0Pkh411wJaiX57benY3dS0PAgL/E
+TgMc5adK4tOkIXds8u+LP5OgaADrkIn9V2m5XVrjkKHOejN+mSoAm6TlUVjroFAt
+CmAPngXE77T3vFppNYBgdtOPgJ2q2egHecGny1sjgKXuvOIF+p3buBySZDe0xHZ/
+g/xOKRKTP4ECggIBAJkMUEiE8iiHdfbB46mGob8sFTFIJitpGLzTXL0BmFBJauI7
+lcz+qKcAd2htF45c3M/IEyFEID4Qywze4qgimFi7pA5Ns9v1gDOZw2lui3vm58o8
+BgStk+MQBYK6/JloxU9FE6UfdZRh0mXf/BY+dAvIbs3ehpgxq7VxULjv7/P+5sOZ
+ObMGlE0widtniFv+Nx/L1xX6BSYnpjA4BZjLZzxhvBqQEPotSf0dj/7NGfRuj/r9
+HX5tpekG9vi3WBpWdiCBC+4MRbpXhIb9nhWJch4gjgOFQ15ySzUeBkbAdKhNWNLv
+RcF1GyaM2zEHE9XpbAoYBXyik5dsEQM1JVYJP09yXQ4VAB3qwHdWI9z/yrUu48qh
+JR+6PqBwVFpy9l7XJlbjPDo2mwiN4v35ngjhxyrYcJAvNe20gilAbTDCrDfFYAV6
+FS4oSDiRASVUcl+zeTcdNKrjVAtBE/qxkx3u9gJ/qowP6dvG+i42Bb4Cndv9sLEn
+EX/23kIIt+SIJizrwGpjHpVeWrCkFBB+1IdvbTl1C3DHRXf78XGUeS90EoL4XupP
+6fv45eHDMCccUoTj3r/eqFTxXrHl4LJ7Dj+H+kX6AJhr2eL78RiJIud0xOifPIOy
+/g2eOU1OXnlz7Y0X7Vw74ECqKGtB1Pg7kh7KbCGDHscC+fD8zhc/Pa3mxRh0
 -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server-cert.pem mysql-5.5-5.5.43/mysql-test/std_data/server-cert.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server-cert.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/server-cert.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,41 +1,82 @@
 Certificate:
     Data:
-        Version: 1 (0x0)
-        Serial Number: 1048578 (0x100002)
-        Signature Algorithm: md5WithRSAEncryption
-        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
+        Version: 3 (0x2)
+        Serial Number: 16263805969935345172 (0xe1b4a55c3ddfa614)
+    Signature Algorithm: sha256WithRSAEncryption
+        Issuer: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=CA
         Validity
-            Not Before: Jan 29 11:56:49 2010 GMT
-            Not After : Jan 28 11:56:49 2015 GMT
-        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
+            Not Before: Dec  5 04:48:40 2014 GMT
+            Not After : Dec  1 04:48:40 2029 GMT
+        Subject: C=SE, ST=Stockholm, L=Stockholm, O=Oracle, OU=MySQL, CN=localhost
         Subject Public Key Info:
             Public Key Algorithm: rsaEncryption
-                Public-Key: (512 bit)
+                Public-Key: (2048 bit)
                 Modulus:
-                    00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
-                    1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
-                    c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
-                    5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
-                    d8:88:2b:c2:ed
+                    00:e9:20:e7:05:51:07:3a:48:b9:e2:62:a2:24:45:
+                    1f:f1:54:34:22:5c:62:86:9b:01:e8:c2:45:90:00:
+                    8d:4e:e4:a2:ea:e9:d7:b5:95:25:ce:18:ac:1a:4f:
+                    b3:e6:30:46:af:20:13:40:84:df:21:dc:df:09:e5:
+                    a0:7f:81:12:6e:1e:84:58:5c:a1:11:db:aa:b6:04:
+                    e0:fc:1e:0c:11:2e:f3:30:62:1a:f9:ee:df:fe:a3:
+                    d3:d6:83:6e:ad:e8:8d:98:89:b1:69:63:b8:72:f4:
+                    5a:e6:22:5e:73:64:95:ef:56:92:92:0b:e1:93:a5:
+                    d7:4c:41:47:e7:31:ed:09:68:b3:c5:6e:c1:1b:01:
+                    39:bb:f1:8f:bf:ba:f4:02:e2:e5:e5:9e:b7:d6:9a:
+                    b2:94:76:9b:48:d8:27:18:0e:9f:30:98:f5:9a:3e:
+                    23:e6:3b:4a:48:ee:a5:26:e8:80:94:37:e4:4a:ba:
+                    ff:9f:42:b9:32:dd:7a:9d:63:11:a8:25:99:b1:1f:
+                    86:e5:7c:b1:31:e3:12:11:0c:eb:f6:1d:02:4b:1d:
+                    34:cb:74:1d:7f:2f:40:c0:81:e2:04:d4:8e:ea:96:
+                    f8:22:35:8e:ab:b6:99:33:36:ef:b5:83:11:88:6d:
+                    06:0f:76:4d:bf:db:a8:df:6c:3c:91:e2:ba:73:a0:
+                    73:45
                 Exponent: 65537 (0x10001)
-    Signature Algorithm: md5WithRSAEncryption
-        73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
-        d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
-        a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
-        6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
-        c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
-        f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
-        ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
-        fb:3c
+        X509v3 extensions:
+            X509v3 Basic Constraints: 
+                CA:FALSE
+            Netscape Comment: 
+                OpenSSL Generated Certificate
+            X509v3 Subject Key Identifier: 
+                E4:31:D8:D5:06:EA:C6:B3:A2:F6:01:39:8F:58:08:36:2C:7B:3F:DB
+            X509v3 Authority Key Identifier: 
+                keyid:94:65:A1:A3:87:CF:BF:C1:74:BB:D8:84:97:B6:6B:EE:B2:90:73:B2
+
+    Signature Algorithm: sha256WithRSAEncryption
+         46:ef:cd:bf:c1:ef:36:a9:cb:99:b5:be:e2:a7:ba:69:0d:f5:
+         9b:63:39:78:32:35:01:a8:b9:f1:70:0e:b5:d1:8f:94:2e:7a:
+         cb:65:d4:d0:b4:ad:52:b8:51:5f:64:2e:a8:08:a5:71:fe:c2:
+         35:8a:0d:28:26:e5:be:ca:d7:f4:79:54:e1:27:8f:87:92:d3:
+         04:72:1b:cc:c4:7f:8b:26:09:92:2d:c8:6f:27:da:97:31:80:
+         0f:83:84:9c:e0:a4:88:c9:e3:8f:35:e7:de:bd:31:e2:fa:52:
+         83:de:ee:5c:60:6e:8f:a5:8d:5e:53:41:18:42:f3:03:0b:05:
+         0b:59:09:42:2e:1b:0b:29:b3:fe:11:3b:d5:ad:3f:4d:24:e8:
+         c0:da:4c:0d:93:94:ec:cd:18:0f:66:cd:03:d3:ee:a0:b2:7f:
+         64:d7:39:66:19:72:9f:64:43:38:b4:b6:b3:ea:6f:39:e7:09:
+         98:90:9f:6c:f5:e8:b3:2e:09:8d:7b:76:65:30:f4:c4:9b:8e:
+         10:4e:9b:8c:93:63:44:9d:2b:8a:f3:f0:cf:f8:7b:65:95:38:
+         fb:b4:92:e8:6c:11:03:a2:a2:2f:ea:e0:22:b7:cd:cf:0d:a5:
+         91:23:14:47:0c:34:8f:f1:11:cc:e8:1e:37:53:ec:a1:01:81:
+         20:c0:2c:f5
 -----BEGIN CERTIFICATE-----
-MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
-A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
-QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
-RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
-CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
-Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
-K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
-cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
-xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
-UYHigzBuPTib+zw=
+MIIDyzCCArOgAwIBAgIJAOG0pVw936YUMA0GCSqGSIb3DQEBCwUAMGMxCzAJBgNV
+BAYTAlNFMRIwEAYDVQQIDAlTdG9ja2hvbG0xEjAQBgNVBAcMCVN0b2NraG9sbTEP
+MA0GA1UECgwGT3JhY2xlMQ4wDAYDVQQLDAVNeVNRTDELMAkGA1UEAwwCQ0EwHhcN
+MTQxMjA1MDQ0ODQwWhcNMjkxMjAxMDQ0ODQwWjBqMQswCQYDVQQGEwJTRTESMBAG
+A1UECAwJU3RvY2tob2xtMRIwEAYDVQQHDAlTdG9ja2hvbG0xDzANBgNVBAoMBk9y
+YWNsZTEOMAwGA1UECwwFTXlTUUwxEjAQBgNVBAMMCWxvY2FsaG9zdDCCASIwDQYJ
+KoZIhvcNAQEBBQADggEPADCCAQoCggEBAOkg5wVRBzpIueJioiRFH/FUNCJcYoab
+AejCRZAAjU7kourp17WVJc4YrBpPs+YwRq8gE0CE3yHc3wnloH+BEm4ehFhcoRHb
+qrYE4PweDBEu8zBiGvnu3/6j09aDbq3ojZiJsWljuHL0WuYiXnNkle9WkpIL4ZOl
+10xBR+cx7Qlos8VuwRsBObvxj7+69ALi5eWet9aaspR2m0jYJxgOnzCY9Zo+I+Y7
+SkjupSbogJQ35Eq6/59CuTLdep1jEaglmbEfhuV8sTHjEhEM6/YdAksdNMt0HX8v
+QMCB4gTUjuqW+CI1jqu2mTM277WDEYhtBg92Tb/bqN9sPJHiunOgc0UCAwEAAaN7
+MHkwCQYDVR0TBAIwADAsBglghkgBhvhCAQ0EHxYdT3BlblNTTCBHZW5lcmF0ZWQg
+Q2VydGlmaWNhdGUwHQYDVR0OBBYEFOQx2NUG6sazovYBOY9YCDYsez/bMB8GA1Ud
+IwQYMBaAFJRloaOHz7/BdLvYhJe2a+6ykHOyMA0GCSqGSIb3DQEBCwUAA4IBAQBG
+782/we82qcuZtb7ip7ppDfWbYzl4MjUBqLnxcA610Y+ULnrLZdTQtK1SuFFfZC6o
+CKVx/sI1ig0oJuW+ytf0eVThJ4+HktMEchvMxH+LJgmSLchvJ9qXMYAPg4Sc4KSI
+yeOPNefevTHi+lKD3u5cYG6PpY1eU0EYQvMDCwULWQlCLhsLKbP+ETvVrT9NJOjA
+2kwNk5TszRgPZs0D0+6gsn9k1zlmGXKfZEM4tLaz6m855wmYkJ9s9eizLgmNe3Zl
+MPTEm44QTpuMk2NEnSuK8/DP+HtllTj7tJLobBEDoqIv6uAit83PDaWRIxRHDDSP
+8RHM6B43U+yhAYEgwCz1
 -----END CERTIFICATE-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server-key.pem mysql-5.5-5.5.43/mysql-test/std_data/server-key.pem
--- mysql-5.5-5.5.35+dfsg/mysql-test/std_data/server-key.pem	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/std_data/server-key.pem	2015-02-27 08:30:35.000000000 +0000
@@ -1,9 +1,27 @@
 -----BEGIN RSA PRIVATE KEY-----
-MIIBOwIBAAJBAM3kh1GdchGg0frzkosTHOv34povcqjWZUjRaa8bwEwT5WBgUUHp
-q6a8E7sMXjJ82WyezQUkhHjbgJEu2Igrwu0CAwEAAQJBAJuwhFbF3NzRpBbEmnqJ
-4GPa1UJMQMLFJF+04tqj/HxJcAIVhOJhGmmtYNw1yjz/ZsPnfJCMz4eFOtdjvGtf
-peECIQDmFFg2WLvYo+2m9w9V7z4ZIkg7ixYkI/ObUUctfZkPOQIhAOUWnrvjFrAX
-bIvYT/YR50+3ZDLEc51XxNgJnWqWYl1VAiEAnTOFWgyivFC1DgF8PvDp8u5TgCt2
-A1d1GMgd490O+TECIC/WMl0/hTxOF9930vKqOGf//o9PUGkZq8QE9fcM4gtlAiAE
-iOcFpnLjtWj57jrhuw214ucnB5rklkQQe+AtcARNkg==
+MIIEpQIBAAKCAQEA6SDnBVEHOki54mKiJEUf8VQ0IlxihpsB6MJFkACNTuSi6unX
+tZUlzhisGk+z5jBGryATQITfIdzfCeWgf4ESbh6EWFyhEduqtgTg/B4MES7zMGIa
++e7f/qPT1oNureiNmImxaWO4cvRa5iJec2SV71aSkgvhk6XXTEFH5zHtCWizxW7B
+GwE5u/GPv7r0AuLl5Z631pqylHabSNgnGA6fMJj1mj4j5jtKSO6lJuiAlDfkSrr/
+n0K5Mt16nWMRqCWZsR+G5XyxMeMSEQzr9h0CSx00y3Qdfy9AwIHiBNSO6pb4IjWO
+q7aZMzbvtYMRiG0GD3ZNv9uo32w8keK6c6BzRQIDAQABAoIBAQDUbdzVJV6Wp4pq
+VUI2Fp7iwr22ycQlr71voQbODxK0XvZtZKPgnIWUZTr9xr7A9CCUl3+zfN/t9Vtv
+o0Q6qxxmJ3ylH9LNeQL3VT7FvYN1bPjAj8TRFfAaEqKHh8AkzBGqe12kEPAUH8Fs
+jsjOEUvmiVaJqjXk2mty2tFwRDggJwCrN5bXkhkzwhDcMfH2Wgc4c4XkyUrciJQU
+ua4d0L354B3UmRYtrzwPr6WHLXCGPGhyWvXYpDjjdUGMVf2YcBSQdABF+mhCEb2b
+NP4dYUqKHjKn6p4B1/qfJtf0c9Lz229nz0WTzanmpXaNxQVce0sTbktp5A3itT+m
+NlQfDNoBAoGBAPvqSK7NqCrvFYEo+Cvl6fOhq9li2zAeaYO7D+AKiWSJzG9KK/Ts
+F+28nnWkBEdzAnmgWZ7UZlUwHqF6DNIGn+RLHDJ2MVRrZug2irCR8g2mxcHk2dss
+DcmUtsatjCbjLqVCcyuuQylP2GWK60JmRbdKEOfpHLntzGStpOhn5FPBAoGBAOzo
+okk2FWZlymJTkN2HYTqvUCYINDciTDm/ms7YGC6YKdDJ8PUVq6qJ2GO/M+zGPQtV
+A+qFWqx1kk3K5uLPnZLCPLORXPIm0X1ZGreG+rHsrJTnP6uh9OxrTyLNkvt6xcm7
+yA51QOWTuRbYhPwy05IqT3Z88HkHByMKr4xafPCFAoGADff1w8ufkZHkTV8qM7Tx
+/hJu5wT2RnrJOwa6YJ/08mA5t8oTGeelhAc7eiZ4HkYgUwIzNf1tFzgt2qJb56F6
+aDxJ+fpXzeiOsj2j/xp4o40l1hSMh/yvXwgiAm5JITbjtUI0BK4LB1VoGGlVlj75
+iqpOua1RbHXlKYf/Zuur24ECgYEAqXDFSWmGKsOY2XR9QwQltUxYHat2dQxxykfR
+GCmUOhcYqT0VuqSyL/oBK25AXBN465b1gxG3xWsdpcf+FLB7OdD0i1XnTUYYRPeq
+1SKUQRdOY/11G3Ntcn5ZjkHL41NvDRbiQfz42noqQj2/94T+rybVyKAZeeZd42Es
+J0082OUCgYEAnguGJxhfSryD3a2kAQ/6s+L303rgXkRt+/luoopdm7vu2AcnaP7L
+aK4dCDusp/DZyGn8/ebDCGNIaVEMJVHAPLFbhJA9E9HCjfC33RdklCO/aGDtXsiq
+kzg3mqPHTCPCpmpr5YAtuLONczP1qgB04/vqb2S5eANC+5k6mEifu2U=
 -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/r/binlog_database.result mysql-5.5-5.5.43/mysql-test/suite/binlog/r/binlog_database.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/r/binlog_database.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/r/binlog_database.result	2015-02-27 08:30:35.000000000 +0000
@@ -39,10 +39,31 @@
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 FLUSH STATUS;
+
+# 'DROP TABLE IF EXISTS <deleted tables>' is binlogged
+# when 'DROP DATABASE' fails and at least one table is deleted
+# from the database.
+RESET MASTER;
+CREATE DATABASE testing_1;
+USE testing_1;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+# Create a file in the database directory
+SELECT 'hello' INTO OUTFILE 'fake_file.FAKE_FILE';
+
+# 'DROP DATABASE' will fail if there is any other file in the the
+# database directory
+DROP DATABASE testing_1;
+ERROR HY000: Error dropping database (can't rmdir './testing_1/', errno: 17)
+
+# Remove the fake file.
+# Now we can drop the database.
+DROP DATABASE testing_1;
 #
 # Bug#11765416 58381: FAILED DROP DATABASE CAN BREAK STATEMENT
 #              BASED REPLICATION
 #
+USE test;
 DROP DATABASE IF EXISTS db1;
 DROP TABLE IF EXISTS t3;
 CREATE DATABASE db1;
@@ -58,7 +79,7 @@
 t2
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `db1`; DROP TABLE `t1`
+master-bin.000001	#	Query	#	#	use `db1`; DROP TABLE IF EXISTS `t1`
 DROP TABLE t3;
 DROP DATABASE db1;
 set binlog_format=mixed;
@@ -102,10 +123,31 @@
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 FLUSH STATUS;
+
+# 'DROP TABLE IF EXISTS <deleted tables>' is binlogged
+# when 'DROP DATABASE' fails and at least one table is deleted
+# from the database.
+RESET MASTER;
+CREATE DATABASE testing_1;
+USE testing_1;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+# Create a file in the database directory
+SELECT 'hello' INTO OUTFILE 'fake_file.FAKE_FILE';
+
+# 'DROP DATABASE' will fail if there is any other file in the the
+# database directory
+DROP DATABASE testing_1;
+ERROR HY000: Error dropping database (can't rmdir './testing_1/', errno: 17)
+
+# Remove the fake file.
+# Now we can drop the database.
+DROP DATABASE testing_1;
 #
 # Bug#11765416 58381: FAILED DROP DATABASE CAN BREAK STATEMENT
 #              BASED REPLICATION
 #
+USE test;
 DROP DATABASE IF EXISTS db1;
 DROP TABLE IF EXISTS t3;
 CREATE DATABASE db1;
@@ -121,7 +163,7 @@
 t2
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `db1`; DROP TABLE `t1`
+master-bin.000001	#	Query	#	#	use `db1`; DROP TABLE IF EXISTS `t1`
 DROP TABLE t3;
 DROP DATABASE db1;
 set binlog_format=row;
@@ -166,10 +208,31 @@
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 FLUSH STATUS;
+
+# 'DROP TABLE IF EXISTS <deleted tables>' is binlogged
+# when 'DROP DATABASE' fails and at least one table is deleted
+# from the database.
+RESET MASTER;
+CREATE DATABASE testing_1;
+USE testing_1;
+CREATE TABLE t1(c1 INT);
+CREATE TABLE t2(c1 INT);
+# Create a file in the database directory
+SELECT 'hello' INTO OUTFILE 'fake_file.FAKE_FILE';
+
+# 'DROP DATABASE' will fail if there is any other file in the the
+# database directory
+DROP DATABASE testing_1;
+ERROR HY000: Error dropping database (can't rmdir './testing_1/', errno: 17)
+
+# Remove the fake file.
+# Now we can drop the database.
+DROP DATABASE testing_1;
 #
 # Bug#11765416 58381: FAILED DROP DATABASE CAN BREAK STATEMENT
 #              BASED REPLICATION
 #
+USE test;
 DROP DATABASE IF EXISTS db1;
 DROP TABLE IF EXISTS t3;
 CREATE DATABASE db1;
@@ -185,7 +248,7 @@
 t2
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `db1`; DROP TABLE `t1`
+master-bin.000001	#	Query	#	#	use `db1`; DROP TABLE IF EXISTS `t1`
 DROP TABLE t3;
 DROP DATABASE db1;
 show databases;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result mysql-5.5-5.5.43/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/r/binlog_switch_inside_trans.result	2015-02-27 08:30:35.000000000 +0000
@@ -1,6 +1,5 @@
 set @save_binlog_format= @@global.binlog_format;
 set @save_binlog_dirct= @@global.binlog_direct_non_transactional_updates;
-set @save_sql_log_bin= @@global.sql_log_bin;
 create table t1 (a int) engine= myisam;
 create table t2 (a int) engine= innodb;
 SELECT @@session.binlog_format;
@@ -129,7 +128,7 @@
 begin;
 insert into t2 values (5);
 # Test that the global variable 'binlog_format' and
-# 'binlog_direct_non_transactional_updates' and 'sql_log_bin' are
+# 'binlog_direct_non_transactional_updates' are
 # writable inside a transaction.
 # Current session values are ROW, FALSE, TRUE respectively.
 SELECT @@global.binlog_format;
@@ -137,20 +136,15 @@
 ROW
 set @@global.binlog_format= statement;
 set @@global.binlog_direct_non_transactional_updates= TRUE;
-set @@global.sql_log_bin= FALSE;
 SELECT @@global.binlog_format;
 @@global.binlog_format
 STATEMENT
 SELECT @@global.binlog_direct_non_transactional_updates;
 @@global.binlog_direct_non_transactional_updates
 1
-SELECT @@global.sql_log_bin;
-@@global.sql_log_bin
-0
 commit;
 set @@global.binlog_format= @save_binlog_format;
 set @@global.binlog_direct_non_transactional_updates= @save_binlog_dirct;
-set @@global.sql_log_bin= @save_sql_log_bin;
 create table t3(a int, b int) engine= innodb;
 create table t4(a int) engine= innodb;
 create table t5(a int) engine= innodb;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/r/binlog_truncate_kill.result mysql-5.5-5.5.43/mysql-test/suite/binlog/r/binlog_truncate_kill.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/r/binlog_truncate_kill.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/r/binlog_truncate_kill.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,33 @@
+RESET MASTER;
+connection default;
+CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
+INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
+SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
+TRUNCATE t1;
+connect con1,localhost,root,,;
+SET DEBUG_SYNC = "now wait_for truncate_before_lock";
+SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
+((@id := id) - id)
+0
+KILL QUERY @id;
+connection default;
+ERROR 70100: Query execution was interrupted
+connection con1;
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Intvar	#	#	INSERT_ID=1
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10)
+master-bin.000001	#	Xid	#	#	COMMIT /* XID */
+disconnect con1;
+connection default;
+SELECT * FROM t1;
+id	a	b
+1	1	2
+2	2	4
+3	3	6
+4	4	8
+5	5	10
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_grant.test mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_grant.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_grant.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_grant.test	2015-02-27 08:30:35.000000000 +0000
@@ -15,7 +15,7 @@
 connect (plain,localhost,mysqltest_1,,test);
 connect (root,localhost,root,,test);
 
-# Testing setting both session and global SQL_LOG_BIN variable both as
+# Testing setting session SQL_LOG_BIN variable both as
 # root and as plain user.
 
 --echo **** Variable SQL_LOG_BIN ****
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_killed.test mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_killed.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_killed.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_killed.test	2015-02-27 08:30:35.000000000 +0000
@@ -340,6 +340,14 @@
 # common cleanup 
 #
 
+connection con1;
+disconnect con1;
+--source include/wait_until_disconnected.inc
+connection con2;
+disconnect con2;
+--source include/wait_until_disconnected.inc
+connection default;
+
 drop table t1,t2,t3;
 
 --echo end of the tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_switch_inside_trans.test	2015-02-27 08:30:35.000000000 +0000
@@ -10,7 +10,6 @@
 
 set @save_binlog_format= @@global.binlog_format;
 set @save_binlog_dirct= @@global.binlog_direct_non_transactional_updates;
-set @save_sql_log_bin= @@global.sql_log_bin;
 create table t1 (a int) engine= myisam;
 create table t2 (a int) engine= innodb;
 
@@ -117,21 +116,18 @@
 begin;
   insert into t2 values (5);
 --echo # Test that the global variable 'binlog_format' and
---echo # 'binlog_direct_non_transactional_updates' and 'sql_log_bin' are
+--echo # 'binlog_direct_non_transactional_updates' are
 --echo # writable inside a transaction.
 --echo # Current session values are ROW, FALSE, TRUE respectively.
   SELECT @@global.binlog_format;
   set @@global.binlog_format= statement;
   set @@global.binlog_direct_non_transactional_updates= TRUE;
-  set @@global.sql_log_bin= FALSE;
   SELECT @@global.binlog_format;
   SELECT @@global.binlog_direct_non_transactional_updates;
-  SELECT @@global.sql_log_bin;
 commit;
 
 set @@global.binlog_format= @save_binlog_format;
 set @@global.binlog_direct_non_transactional_updates= @save_binlog_dirct;
-set @@global.sql_log_bin= @save_sql_log_bin;
 
 create table t3(a int, b int) engine= innodb;
 create table t4(a int) engine= innodb;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_truncate_kill.test mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_truncate_kill.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/binlog/t/binlog_truncate_kill.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/binlog/t/binlog_truncate_kill.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,56 @@
+###############################################################################
+# Bug#17942050:KILL OF TRUNCATE TABLE WILL LEAD TO BINARY LOG WRITTEN WHILE
+# ROWS REMAINS
+#
+# Problem:
+# ========
+# When truncate table fails while using transactional based engines even
+# though the operation errors out we still continue and log it to binlog.
+# Because of this master has data but the truncate will be written to binary
+# log which will cause inconsistency.
+#
+# Test:
+# =====
+# Make master to wait in "open_table" call during the execution of truncate
+# table command and kill the truncate table from other connection. This causes
+# open table to return an error saying truncate failed during open table. This
+# statement should not be binlogged.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_statement.inc
+RESET MASTER;
+--enable_connect_log
+--connection default
+CREATE TABLE t1(id INT AUTO_INCREMENT PRIMARY KEY, a INT, b INT) ENGINE=INNODB;
+INSERT INTO t1(a, b) VALUES(1,2),(2,4),(3,6),(4,8),(5,10);
+SET DEBUG_SYNC = "open_and_process_table signal truncate_before_lock wait_for forever";
+--send TRUNCATE t1
+
+connect(con1,localhost,root,,);
+SET DEBUG_SYNC = "now wait_for truncate_before_lock";
+# Wait for one connection to reach open_and_process_table.
+--let $show_statement= SHOW PROCESSLIST
+--let $field= State
+--let $condition= 'debug sync point: open_and_process_table';
+--source include/wait_show_condition.inc
+
+SELECT ((@id := id) - id) FROM information_schema.processlist WHERE processlist.info LIKE '%TRUNCATE t1%' AND state LIKE '%open_and_process_table%';
+# Test killing from mysql server
+KILL QUERY @id;
+
+connection default;
+--ERROR ER_QUERY_INTERRUPTED
+--reap
+
+connection con1;
+--source include/show_binlog_events.inc
+
+disconnect con1;
+--source include/wait_until_disconnected.inc
+connection default;
+
+SELECT * FROM t1;
+
+DROP TABLE t1;
+SET DEBUG_SYNC= 'RESET';
+--disable_connect_log
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/blob-update-debug.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/blob-update-debug.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/blob-update-debug.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/blob-update-debug.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,15 @@
+#
+# Bug#18185930 UPD_NODE_INSERT_BLOB CAUSES BTR_EXTERN_OWNER_FLAG
+# ASSERTION
+#
+create table t1 (f1 int primary key, f2 blob) engine = innodb;
+insert into t1 values (1, repeat('*', 50000));
+select f1, substring(f2, 1, 40) from t1;
+f1	substring(f2, 1, 40)
+1	****************************************
+set debug = 'd,row_ins_index_entry_timeout';
+update t1 set f1 = 3;
+select f1, substring(f2, 1, 40) from t1;
+f1	substring(f2, 1, 40)
+3	****************************************
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/create-index.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/create-index.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/create-index.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/create-index.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,9 @@
+#
+# Bug #18010711	UNIQUE PREFIX INDEX ON BINARY COLUMN: FAILING
+# ASSERTION: FLEN == LEN
+#
+create table t1 (f1 binary(5)) engine=innodb;
+insert into t1 values ('w'), ('w');
+create unique index index_t1 on t1(f1(4));
+ERROR 23000: Duplicate entry 'w' for key 'index_t1'
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/foreign-keys.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/foreign-keys.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/foreign-keys.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/foreign-keys.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,16 @@
+#
+# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
+# ADD FOREIGN KEY
+#
+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
+PRIMARY KEY (`department_id`)) engine=innodb;
+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
+`people` (`people_id`);
+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
+(`people_id`);
+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
+(`people_id`);
+drop table title, department, people;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/foreign-keys.result.moved mysql-5.5-5.5.43/mysql-test/suite/innodb/r/foreign-keys.result.moved
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/foreign-keys.result.moved	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/foreign-keys.result.moved	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,16 @@
+#
+# Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
+# ADD FOREIGN KEY
+#
+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
+PRIMARY KEY (`department_id`)) engine=innodb;
+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
+`people` (`people_id`);
+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
+(`people_id`);
+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
+(`people_id`);
+drop table title, department, people;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-autoinc.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-autoinc.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-autoinc.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-autoinc.result	2015-02-27 08:30:35.000000000 +0000
@@ -1357,3 +1357,30 @@
 INSERT INTO t1 VALUES ();
 ERROR HY000: Failed to read auto-increment value from storage engine
 DROP TABLE t1;
+#
+# Bug #14049391	 INNODB MISCALCULATES AUTO-INCREMENT
+#	AFTER CHANGING AUTO_INCREMENT_INCREMEMENT
+#
+CREATE TABLE t ( i INT AUTO_INCREMENT, KEY(i) ) ENGINE=InnoDB;
+SET auto_increment_increment = 300;
+INSERT INTO t VALUES (NULL), (NULL);
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `i` int(11) NOT NULL AUTO_INCREMENT,
+  KEY `i` (`i`)
+) ENGINE=InnoDB AUTO_INCREMENT=601 DEFAULT CHARSET=latin1
+SET auto_increment_increment = 50;
+INSERT INTO t VALUES (NULL);
+SELECT * FROM t;
+i
+1
+301
+351
+SHOW CREATE TABLE t;
+Table	Create Table
+t	CREATE TABLE `t` (
+  `i` int(11) NOT NULL AUTO_INCREMENT,
+  KEY `i` (`i`)
+) ENGINE=InnoDB AUTO_INCREMENT=401 DEFAULT CHARSET=latin1
+DROP TABLE t;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug36169.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug36169.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug36169.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug36169.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=ON;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug36172.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug36172.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug36172.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug36172.result	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-SET storage_engine=InnoDB;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug52745.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug52745.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug52745.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug52745.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,130 +0,0 @@
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-CREATE TABLE bug52745 (
-a2 int(10) unsigned DEFAULT NULL,
-col37 time DEFAULT NULL,
-col38 char(229) CHARACTER SET utf8 DEFAULT NULL,
-col39 text,
-col40 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-col41 int(10) unsigned DEFAULT NULL,
-col42 varchar(248) CHARACTER SET utf8 DEFAULT NULL,
-col43 smallint(5) unsigned zerofill DEFAULT NULL,
-col44 varchar(150) CHARACTER SET utf8 DEFAULT NULL,
-col45 float unsigned zerofill DEFAULT NULL,
-col46 binary(1) DEFAULT NULL,
-col47 tinyint(4) DEFAULT NULL,
-col48 tinyint(1) DEFAULT NULL,
-col49 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-col50 binary(1) DEFAULT NULL,
-col51 double unsigned zerofill DEFAULT NULL,
-col52 int(10) unsigned DEFAULT NULL,
-col53 time DEFAULT NULL,
-col54 double unsigned DEFAULT NULL,
-col55 time DEFAULT NULL,
-col56 mediumtext CHARACTER SET latin2,
-col57 blob,
-col58 decimal(52,16) unsigned zerofill NOT NULL DEFAULT '000000000000000000000000000000000000.0000000000000000',
-col59 binary(1) DEFAULT NULL,
-col60 longblob,
-col61 time DEFAULT NULL,
-col62 longtext CHARACTER SET utf8 COLLATE utf8_persian_ci,
-col63 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-col64 int(10) unsigned DEFAULT NULL,
-col65 date DEFAULT NULL,
-col66 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-col67 binary(1) DEFAULT NULL,
-col68 tinyblob,
-col69 date DEFAULT NULL,
-col70 tinyint(3) unsigned zerofill DEFAULT NULL,
-col71 varchar(44) CHARACTER SET utf8 DEFAULT NULL,
-col72 datetime DEFAULT NULL,
-col73 smallint(5) unsigned zerofill DEFAULT NULL,
-col74 longblob,
-col75 bit(34) DEFAULT NULL,
-col76 float unsigned zerofill DEFAULT NULL,
-col77 year(2) DEFAULT NULL,
-col78 tinyint(3) unsigned DEFAULT NULL,
-col79 set('msfheowh','tbpxbgf','by','wahnrjw','myqfasxz','rsokyumrt') CHARACTER SET latin2 DEFAULT NULL,
-col80 datetime DEFAULT NULL,
-col81 smallint(6) DEFAULT NULL,
-col82 enum('xtaurnqfqz','rifrse','kuzwpbvb','niisabk','zxavro','rbvasv','','uulrfaove','','') DEFAULT NULL,
-col83 bigint(20) unsigned zerofill DEFAULT NULL,
-col84 float unsigned zerofill DEFAULT NULL,
-col85 double DEFAULT NULL,
-col86 enum('ylannv','','vlkhycqc','snke','cxifustp','xiaxaswzp','oxl') CHARACTER SET latin1 COLLATE latin1_german2_ci DEFAULT NULL,
-col87 varbinary(221) DEFAULT NULL,
-col88 double unsigned DEFAULT NULL,
-col89 float unsigned zerofill DEFAULT NULL,
-col90 tinyblob
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-Warnings:
-Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
-Note	1291	Column 'col82' has duplicated value '' in ENUM
-Note	1291	Column 'col82' has duplicated value '' in ENUM
-INSERT INTO bug52745 SET
-col40='0000-00-00 00:00:00',
-col51=16547,
-col53='7711484',
-col54=-28604,
-col55='7112612',
-col56='wakefulness\'',
-col57=repeat('absorbefacient\'',106),
-col58=11027,
-col59='AM09gW7',
-col60=repeat('Noelani\'',16),
-col61='2520576',
-col62='substitutiv',
-col63='19950106155112',
-col64=-12038,
-col65='86238806',
-col66='19600719080256',
-col68=repeat('Sagittarius\'',54),
-col69='38943902',
-col70=1232,
-col71='Elora\'',
-col74=repeat('zipp',11),
-col75='0',
-col76=23254,
-col78=13247,
-col79='56219',
-col80='20500609035724',
-col81=11632,
-col82=7,
-col84=-23863,
-col85=6341,
-col87='HZdkf.4 s7t,5Rmq	8so fmr,ruGLUG25TrtI.yQ	2SuHq0ML7rw7.4 b2yf2E5TJxOtBBZImezDnzpj,uPYfznnEUDN1e9aQoO 2DsplB7TFWy	oQJ br  HLF :F,eQ p4i1oWsr lL3PG,hjCz6hYqN h1QTjLCjrv:QCdSzpYBibJAtZCxLOk3l6Blsh.W',
-col88=16894,
-col89=6161,
-col90=repeat('gale',48);
-Warnings:
-Warning	1265	Data truncated for column 'col53' at row 1
-Warning	1264	Out of range value for column 'col54' at row 1
-Warning	1265	Data truncated for column 'col59' at row 1
-Warning	1265	Data truncated for column 'col61' at row 1
-Warning	1264	Out of range value for column 'col64' at row 1
-Warning	1265	Data truncated for column 'col65' at row 1
-Warning	1264	Out of range value for column 'col66' at row 1
-Warning	1265	Data truncated for column 'col68' at row 1
-Warning	1265	Data truncated for column 'col69' at row 1
-Warning	1264	Out of range value for column 'col70' at row 1
-Warning	1264	Out of range value for column 'col78' at row 1
-Warning	1265	Data truncated for column 'col79' at row 1
-Warning	1264	Out of range value for column 'col84' at row 1
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1265	Data truncated for column 'col53' at row 1
-Warning	1264	Out of range value for column 'col54' at row 1
-Warning	1265	Data truncated for column 'col59' at row 1
-Warning	1265	Data truncated for column 'col61' at row 1
-Warning	1264	Out of range value for column 'col64' at row 1
-Warning	1265	Data truncated for column 'col65' at row 1
-Warning	1264	Out of range value for column 'col66' at row 1
-Warning	1265	Data truncated for column 'col68' at row 1
-Warning	1265	Data truncated for column 'col69' at row 1
-Warning	1264	Out of range value for column 'col70' at row 1
-Warning	1264	Out of range value for column 'col78' at row 1
-Warning	1265	Data truncated for column 'col79' at row 1
-Warning	1264	Out of range value for column 'col84' at row 1
-DROP TABLE bug52745;
-SET GLOBAL innodb_file_format=Antelope;
-SET GLOBAL innodb_file_per_table=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug53591.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug53591.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug53591.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug53591.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-set old_alter_table=0;
-CREATE TABLE bug53591(a text charset utf8 not null)
-ENGINE=InnoDB KEY_BLOCK_SIZE=1;
-ALTER TABLE bug53591 ADD PRIMARY KEY(a(220));
-ERROR HY000: Too big row
-SHOW WARNINGS;
-Level	Code	Message
-Error	139	Too big row
-Error	1118	Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
-Error	1030	Got error 139 from storage engine
-DROP TABLE bug53591;
-SET GLOBAL innodb_file_format=Antelope;
-SET GLOBAL innodb_file_per_table=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug56680.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug56680.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_bug56680.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_bug56680.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,109 +0,0 @@
-SET GLOBAL tx_isolation='REPEATABLE-READ';
-SET GLOBAL innodb_file_format=Barracuda;
-SET GLOBAL innodb_file_per_table=on;
-CREATE TABLE bug56680(
-a INT AUTO_INCREMENT PRIMARY KEY,
-b CHAR(1),
-c INT,
-INDEX(b))
-ENGINE=InnoDB;
-INSERT INTO bug56680 VALUES(0,'x',1);
-BEGIN;
-SELECT b FROM bug56680;
-b
-x
-BEGIN;
-UPDATE bug56680 SET b='X';
-SELECT b FROM bug56680;
-b
-x
-SELECT * FROM bug56680;
-a	b	c
-1	x	1
-ROLLBACK;
-SELECT b FROM bug56680;
-b
-x
-SET GLOBAL tx_isolation='READ-UNCOMMITTED';
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-BEGIN;
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-BEGIN;
-DELETE FROM bug56680 WHERE a=1;
-INSERT INTO bug56680 VALUES(1,'X',1);
-SELECT b FROM bug56680 LIMIT 3;
-b
-X
-x
-x
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-CHECK TABLE bug56680;
-Table	Op	Msg_type	Msg_text
-test.bug56680	check	status	OK
-ROLLBACK;
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-CHECK TABLE bug56680;
-Table	Op	Msg_type	Msg_text
-test.bug56680	check	status	OK
-SELECT b FROM bug56680 LIMIT 2;
-b
-x
-x
-CREATE TABLE bug56680_2(
-a INT AUTO_INCREMENT PRIMARY KEY,
-b VARCHAR(2) CHARSET latin1 COLLATE latin1_german2_ci,
-c INT,
-INDEX(b))
-ENGINE=InnoDB;
-INSERT INTO bug56680_2 SELECT 0,_latin1 0xdf,c FROM bug56680;
-BEGIN;
-SELECT HEX(b) FROM bug56680_2 LIMIT 2;
-HEX(b)
-DF
-DF
-DELETE FROM bug56680_2 WHERE a=1;
-INSERT INTO bug56680_2 VALUES(1,'SS',1);
-SELECT HEX(b) FROM bug56680_2 LIMIT 3;
-HEX(b)
-5353
-DF
-DF
-CHECK TABLE bug56680_2;
-Table	Op	Msg_type	Msg_text
-test.bug56680_2	check	status	OK
-ALTER TABLE bug56680_2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SELECT HEX(b) FROM bug56680_2 LIMIT 2;
-HEX(b)
-5353
-DF
-DELETE FROM bug56680_2 WHERE a=1;
-INSERT INTO bug56680_2 VALUES(1,_latin1 0xdf,1);
-SELECT HEX(b) FROM bug56680_2 LIMIT 3;
-HEX(b)
-DF
-DF
-DF
-CHECK TABLE bug56680_2;
-Table	Op	Msg_type	Msg_text
-test.bug56680_2	check	status	OK
-DROP TABLE bug56680_2;
-DROP TABLE bug56680;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-change-buffer-recovery.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,39 @@
+#
+# Bug#69122 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE
+#             OPERATION IF IT IS DONE IN-PLACE
+#
+SET GLOBAL innodb_change_buffering_debug = 1;
+CREATE TABLE t1(
+a INT AUTO_INCREMENT PRIMARY KEY,
+b CHAR(1),
+c INT,
+INDEX(b))
+ENGINE=InnoDB;
+INSERT INTO t1 VALUES(0,'x',1);
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+BEGIN;
+SELECT b FROM t1 LIMIT 3;
+b
+x
+x
+x
+BEGIN;
+DELETE FROM t1 WHERE a=1;
+INSERT INTO t1 VALUES(1,'X',1);
+SET DEBUG='+d,crash_after_log_ibuf_upd_inplace';
+SELECT b FROM t1 LIMIT 3;
+ERROR HY000: Lost connection to MySQL server during query
+CHECK TABLE t1;
+Table	Op	Msg_type	Msg_text
+test.t1	check	status	OK
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_cmp_drop_table.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@
-set global innodb_file_per_table=on;
-set global innodb_file_format=`1`;
-create table t1(a text) engine=innodb key_block_size=8;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-8192
-drop table t1;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-8192
-create table t2(a text) engine=innodb;
-SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
-page_size
-drop table t2;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_corrupt_bit.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_corrupt_bit.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_corrupt_bit.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_corrupt_bit.result	2015-02-27 08:30:35.000000000 +0000
@@ -78,4 +78,5 @@
 31
 32
 drop table corrupt_bit_test_ā;
+DROP DATABASE pad;
 SET GLOBAL innodb_change_buffering_debug = 0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-create-options.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-create-options.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-create-options.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-create-options.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,854 +0,0 @@
-SET storage_engine=InnoDB;
-SET GLOBAL innodb_file_format=`Barracuda`;
-SET GLOBAL innodb_file_per_table=ON;
-SET SESSION innodb_strict_mode = ON;
-# Test 1) StrictMode=ON, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
-#         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
-DROP TABLE IF EXISTS t1;
-Warnings:
-Note	1051	Unknown table 't1'
-#         'FIXED' is sent to InnoDB since it is used by MyISAM.
-#         But it is an invalid mode in InnoDB
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	
-# Test 2) StrictMode=ON, CREATE with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
-#         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=16
-# Test 3) StrictMode=ON, ALTER with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
-# Test 4) StrictMode=ON, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid non-zero KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-ALTER TABLE t1 KEY_BLOCK_SIZE=2;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT
-ALTER TABLE t1 KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-ALTER TABLE t1 KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED
-ALTER TABLE t1 KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=16
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=1
-# Test 5) StrictMode=ON, CREATE with a valid KEY_BLOCK_SIZE
-#         ALTER with each ROW_FORMAT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=2;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `i` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `i` int(11) DEFAULT NULL,
-  `f1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-# Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-# Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
-#         and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
-#         and that they can be set to default values during strict mode.
-SET GLOBAL innodb_file_format=Antelope;
-DROP TABLE IF EXISTS t1;
-Warnings:
-Note	1051	Unknown table 't1'
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
-SHOW WARNINGS;
-Level	Code	Message
-ALTER TABLE t1 KEY_BLOCK_SIZE=8;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-SET GLOBAL innodb_file_format=Barracuda;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
-SET GLOBAL innodb_file_format=Antelope;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SET GLOBAL innodb_file_format=Barracuda;
-# Test 8) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
-#         and a valid non-zero KEY_BLOCK_SIZE are rejected with
-#         innodb_file_per_table=OFF and that they can be set to default
-#         values during strict mode.
-SET GLOBAL innodb_file_per_table=OFF;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
-SHOW WARNINGS;
-Level	Code	Message
-ALTER TABLE t1 KEY_BLOCK_SIZE=1;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT
-ALTER TABLE t1 ROW_FORMAT=DEFAULT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	
-SET GLOBAL innodb_file_per_table=ON;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
-SET GLOBAL innodb_file_per_table=OFF;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table '#sql-temporary' (errno: 1478)
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SET GLOBAL innodb_file_per_table=ON;
-##################################################
-SET SESSION innodb_strict_mode = OFF;
-# Test 9) StrictMode=OFF, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
-#         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
-#         'FIXED' is sent to InnoDB since it is used by MyISAM.
-#         It is an invalid mode in InnoDB, use COMPACT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-Warnings:
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=FIXED
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
-Warnings:
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=FIXED
-# Test 10) StrictMode=OFF, CREATE with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
-#          KEY_BLOCK_SIZE is ignored with COMPACT, REDUNDANT, & DYNAMIC
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=1
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=2
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=4
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=16
-# Test 11) StrictMode=OFF, ALTER with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=FIXED KEY_BLOCK_SIZE=1
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=2
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=4
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=8 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=8 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=8
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
-# Test 12) StrictMode=OFF, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-ALTER TABLE t1 KEY_BLOCK_SIZE=2;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=2
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=2
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=2
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
-ALTER TABLE t1 KEY_BLOCK_SIZE=4;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=4
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	KEY_BLOCK_SIZE=8
-# Test 13) StrictMode=OFF, CREATE with a valid KEY_BLOCK_SIZE
-#          ALTER with each ROW_FORMAT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-Level	Code	Message
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `i` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SHOW CREATE TABLE t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `i` int(11) DEFAULT NULL,
-  `f1` int(11) DEFAULT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=16
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPACT
-# Test 14) StrictMode=OFF, CREATE with an invalid KEY_BLOCK_SIZE, it defaults to 8
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=15;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=15.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=15.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	KEY_BLOCK_SIZE=15
-# Test 15) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
-valid KEY_BLOCK_SIZE are remembered but not used when ROW_FORMAT
-is reverted to Antelope and then used again when ROW_FORMAT=Barracuda.
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
-SET GLOBAL innodb_file_format=Antelope;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPRESSED KEY_BLOCK_SIZE=1
-SET GLOBAL innodb_file_format=Barracuda;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-SET GLOBAL innodb_file_format=Antelope;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-Warnings:
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=DYNAMIC
-SET GLOBAL innodb_file_format=Barracuda;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-# Test 16) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
-valid KEY_BLOCK_SIZE are remembered but not used when innodb_file_per_table=OFF
-and then used again when innodb_file_per_table=ON.
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
-SET GLOBAL innodb_file_per_table=OFF;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=COMPRESSED KEY_BLOCK_SIZE=2
-SET GLOBAL innodb_file_per_table=ON;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-SET GLOBAL innodb_file_per_table=OFF;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-Warnings:
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SHOW WARNINGS;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Compact	row_format=DYNAMIC
-SET GLOBAL innodb_file_per_table=ON;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-Level	Code	Message
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
-t1	Dynamic	row_format=DYNAMIC
-# Cleanup
-DROP TABLE IF EXISTS t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-fk.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-fk.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-fk.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-fk.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,35 @@
+#
+# Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY
+# REFERENCES IS SLOW/CRASHES SEMAPHORE
+#
+create table t1 (f1 int primary key) engine=innodb;
+insert into t1 values (5);
+insert into t1 values (2882);
+insert into t1 values (10);
+update t1 set f1 = 28 where f1 = 2882;
+select * from fk_120;
+f1
+5
+10
+28
+select * from fk_1;
+f1
+5
+10
+28
+select * from fk_50;
+f1
+5
+10
+28
+drop table t1;
+#
+# Check if restrict is working fine.
+#
+create table t1 (f1 int primary key) engine=innodb;
+delete from t1 where f1 = 29;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails (`test`.`fk_29`, CONSTRAINT `pc29` FOREIGN KEY (`f1`) REFERENCES `t1` (`f1`))
+select * from fk_29;
+f1
+29
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_index_large_prefix.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_index_large_prefix.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_index_large_prefix.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_index_large_prefix.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,184 +0,0 @@
-set global innodb_file_format="Barracuda";
-set global innodb_file_per_table=1;
-set global innodb_large_prefix=1;
-create table worklog5743(a TEXT not null, primary key (a(1000)))
-ROW_FORMAT=DYNAMIC, engine = innodb;
-insert into worklog5743 values(repeat("a", 20000));
-update worklog5743 set a = (repeat("b", 16000));
-create index idx on worklog5743(a(2000));
-begin;
-update worklog5743 set a = (repeat("x", 17000));
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-select a = repeat("x", 17000) from worklog5743;
-a = repeat("x", 17000)
-0
-select a = repeat("b", 16000) from worklog5743;
-a = repeat("b", 16000)
-1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-select a = repeat("x", 17000) from worklog5743;
-a = repeat("x", 17000)
-1
-rollback;
-drop table worklog5743;
-create table worklog5743(a1 int, a2 TEXT not null)
-ROW_FORMAT=DYNAMIC, engine = innodb;
-create index idx on worklog5743(a1, a2(2000));
-insert into worklog5743 values(9, repeat("a", 10000));
-begin;
-update worklog5743 set a1 = 1000;
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	Using where
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-9	1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-rollback;
-drop table worklog5743;
-create table worklog5743(a1 int, a2 TEXT not null)
-ROW_FORMAT=DYNAMIC, engine = innodb;
-create index idx on worklog5743(a1, a2(50));
-insert into worklog5743 values(9, repeat("a", 10000));
-begin;
-update worklog5743 set a1 = 1000;
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	Using where
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-9	1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-rollback;
-drop table worklog5743;
-create table worklog5743_2(a1 int, a2 TEXT not null)
-ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-create table worklog5743_4(a1 int, a2 TEXT not null)
-ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-create index idx1 on worklog5743_2(a1, a2(942));
-ERROR HY000: Too big row
-create index idx1 on worklog5743_2(a1, a2(940));
-create index idx1 on worklog5743_4(a1, a2(1966));
-ERROR HY000: Too big row
-create index idx1 on worklog5743_4(a1, a2(1964));
-insert into worklog5743_2 values(9, repeat("a", 10000));
-insert into worklog5743_4 values(9, repeat("a", 10000));
-begin;
-update worklog5743_2 set a1 = 1000;
-update worklog5743_4 set a1 = 1000;
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-explain select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743_2	ref	idx1	idx1	5	const	1	Using where
-select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-9	1
-select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-9	1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
-a1	a2 = repeat("a", 10000)
-rollback;
-drop table worklog5743_2;
-drop table worklog5743_4;
-create table worklog5743(a1 int, a2 varchar(3000))
-ROW_FORMAT=DYNAMIC, engine = innodb;
-create index idx on worklog5743(a1, a2);
-insert into worklog5743 values(9, repeat("a", 3000));
-begin;
-update worklog5743 set a1 = 1000;
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-explain select a1 from worklog5743 where a1 = 9;
-id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	Using where; Using index
-select a1 from worklog5743 where a1 = 9;
-a1
-9
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-select a1 from worklog5743 where a1 = 9;
-a1
-rollback;
-drop table worklog5743;
-create table worklog5743(a TEXT not null, primary key (a(1000)))
-engine = innodb;
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
-create table worklog5743(a TEXT) engine = innodb;
-create index idx on worklog5743(a(1000));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
-create index idx on worklog5743(a(725));
-insert into worklog5743 values(repeat("a", 20000));
-begin;
-insert into worklog5743 values(repeat("b", 20000));
-update worklog5743 set a = (repeat("x", 25000));
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-select a = repeat("a", 20000) from worklog5743;
-a = repeat("a", 20000)
-1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-select a = repeat("x", 25000) from worklog5743;
-a = repeat("x", 25000)
-1
-1
-rollback;
-drop table worklog5743;
-create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC, engine = innodb;
-create index idx on worklog5743(a(3073));
-Warnings:
-Warning	1071	Specified key was too long; max key length is 3072 bytes
-Warning	1071	Specified key was too long; max key length is 3072 bytes
-create index idx2 on worklog5743(a(3072));
-show create table worklog5743;
-Table	Create Table
-worklog5743	CREATE TABLE `worklog5743` (
-  `a` text NOT NULL,
-  KEY `idx` (`a`(3072)),
-  KEY `idx2` (`a`(3072))
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
-drop table worklog5743;
-create table worklog5743(a TEXT not null) engine = innodb;
-create index idx on worklog5743(a(768));
-ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
-create index idx2 on worklog5743(a(767));
-drop table worklog5743;
-SET GLOBAL innodb_file_format=Antelope;
-SET GLOBAL innodb_file_per_table=0;
-SET GLOBAL innodb_large_prefix=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb_prefix_index_liftedlimit.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,1353 +0,0 @@
-set global innodb_file_format="Barracuda";
-set global innodb_file_per_table=1;
-set global innodb_large_prefix=1;
-DROP TABLE IF EXISTS worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
-INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
-col_1_varchar	PRIMARY	3072	BTREE
-col_1_varchar	prefix_idx	3072	BTREE
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
-INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
-col_1_text	PRIMARY	3072	BTREE
-col_1_text	prefix_idx	3072	BTREE
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
-col_1_text = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_mediumtext MEDIUMTEXT , col_2_mediumtext MEDIUMTEXT ,
-PRIMARY KEY (col_1_mediumtext(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_mediumtext (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_mediumtext = REPEAT("a", 4000),col_2_mediumtext = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_mediumtext = REPEAT("a", 4000)	col_2_mediumtext = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_mediumtext = REPEAT("c", 4000)
-WHERE col_1_mediumtext = REPEAT("a", 4000)
-AND col_2_mediumtext = REPEAT("o", 4000);
-SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_mediumtext = REPEAT("c", 4000)
-AND col_2_mediumtext = REPEAT("o", 4000);
-col_1_mediumtext = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_mediumtext = REPEAT("b", 4000);
-SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743;
-col_1_mediumtext = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_longtext LONGTEXT , col_2_longtext LONGTEXT ,
-PRIMARY KEY (col_1_longtext(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_longtext (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_longtext = REPEAT("a", 4000) , col_2_longtext = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_longtext = REPEAT("a", 4000)	col_2_longtext = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_longtext = REPEAT("c", 4000)
-WHERE col_1_longtext = REPEAT("a", 4000)
-AND col_2_longtext = REPEAT("o", 4000);
-SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_longtext = REPEAT("c", 4000)
-AND col_2_longtext = REPEAT("o", 4000);
-col_1_longtext = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_longtext = REPEAT("b", 4000);
-SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743;
-col_1_longtext = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_blob (3072));
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
-INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
-col_1_blob	PRIMARY	3072	BTREE
-col_1_blob	prefix_idx	3072	BTREE
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_blob = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-col_1_blob = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743;
-col_1_blob = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_mediumblob MEDIUMBLOB  , col_2_mediumblob MEDIUMBLOB  ,
-PRIMARY KEY (col_1_mediumblob(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_mediumblob (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_mediumblob = REPEAT("a", 4000),col_2_mediumblob = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_mediumblob = REPEAT("a", 4000)	col_2_mediumblob = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_mediumblob = REPEAT("c", 4000)
-WHERE col_1_mediumblob = REPEAT("a", 4000)
-AND col_2_mediumblob = REPEAT("o", 4000);
-SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_mediumblob = REPEAT("c", 4000)
-AND col_2_mediumblob = REPEAT("o", 4000);
-col_1_mediumblob = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_mediumblob = REPEAT("b", 4000);
-SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743;
-col_1_mediumblob = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_longblob LONGBLOB  , col_2_longblob LONGBLOB  ,
-PRIMARY KEY (col_1_longblob(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_longblob (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_longblob = REPEAT("a", 4000) , col_2_longblob = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_longblob = REPEAT("a", 4000)	col_2_longblob = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_longblob = REPEAT("c", 4000)
-WHERE col_1_longblob = REPEAT("a", 4000)
-AND col_2_longblob = REPEAT("o", 4000);
-SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_longblob = REPEAT("c", 4000)
-AND col_2_longblob = REPEAT("o", 4000);
-col_1_longblob = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_longblob = REPEAT("b", 4000);
-SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743;
-col_1_longblob = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
-PRIMARY KEY (col_1_varbinary(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varbinary = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-col_1_varbinary = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (col_1_char CHAR (255) , col_2_char CHAR (255),
-col_3_char CHAR (255), col_4_char CHAR (255),col_5_char CHAR (255),
-col_6_char CHAR (255), col_7_char CHAR (255),col_8_char CHAR (255),
-col_9_char CHAR (255), col_10_char CHAR (255),col_11_char CHAR (255),
-col_12_char CHAR (255), col_13_char CHAR (255),col_14_char CHAR (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
-);
-CREATE INDEX prefix_idx ON worklog5743(col_1_char(250),col_2_char(250),
-col_3_char(250),col_4_char(250),col_5_char(250),col_6_char(250),
-col_7_char(250),col_8_char(250),col_9_char(250),col_10_char(250),
-col_11_char(250),col_12_char(250),col_13_char(72)
-);
-INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
-);
-SELECT col_1_char = REPEAT("a", 255) , col_2_char = REPEAT("o", 255) FROM worklog5743;
-col_1_char = REPEAT("a", 255)	col_2_char = REPEAT("o", 255)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_char = REPEAT("c", 255)
-WHERE col_1_char = REPEAT("a", 255) AND col_2_char = REPEAT("o", 255);
-SELECT col_1_char = REPEAT("c", 255) FROM worklog5743
-WHERE col_1_char = REPEAT("c", 255) AND col_2_char = REPEAT("o", 255);
-col_1_char = REPEAT("c", 255)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_char = REPEAT("b", 255);
-SELECT col_1_char = REPEAT("c", 255) FROM worklog5743;
-col_1_char = REPEAT("c", 255)
-1
-0
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (col_1_binary BINARY (255) , col_2_binary BINARY (255),
-col_3_binary BINARY(255),col_4_binary BINARY (255),col_5_binary BINARY (255),
-col_6_binary BINARY(255),col_7_binary BINARY (255),col_8_binary BINARY (255),
-col_9_binary BINARY(255),col_10_binary BINARY (255),col_11_binary BINARY (255),
-col_12_binary BINARY(255),col_13_binary BINARY (255),col_14_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
-);
-CREATE INDEX prefix_idx ON worklog5743(col_1_binary (250),col_2_binary (250),
-col_3_binary (250),col_4_binary (250),col_5_binary (250),
-col_6_binary (250),col_7_binary (250),col_8_binary (250),
-col_9_binary (250),col_10_binary (250),col_11_binary (250),
-col_12_binary (250),col_13_binary (72)
-);
-INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
-);
-SELECT col_1_binary = REPEAT("a", 255) , col_2_binary = REPEAT("o", 255) FROM worklog5743;
-col_1_binary = REPEAT("a", 255)	col_2_binary = REPEAT("o", 255)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_binary = REPEAT("c", 255)
-WHERE col_1_binary = REPEAT("a", 255)
-AND col_2_binary = REPEAT("o", 255);
-SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743
-WHERE col_1_binary = REPEAT("c", 255)
-AND col_2_binary = REPEAT("o", 255);
-col_1_binary = REPEAT("c", 255)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_binary = REPEAT("b", 255);
-SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743;
-col_1_binary = REPEAT("c", 255)
-1
-0
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743_key2 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743_key2;
-col_1_varchar  = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key2 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2
-WHERE col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key2 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key2;
-CREATE TABLE worklog5743_key4 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(1964))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743_key4;
-col_1_varchar  = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key4 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key4
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key4 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key4;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key4;
-CREATE TABLE worklog5743_key8 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743_key8;
-col_1_varchar  = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key8 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key8
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key8 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key8;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key8;
-CREATE TABLE worklog5743_key2 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743_key2;
-col_1_text  = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key2 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key2
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key2 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key2;
-col_1_text = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key2;
-CREATE TABLE worklog5743_key4 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(1964))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743_key4;
-col_1_text  = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key4 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key4
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key4 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key4;
-col_1_text = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key4;
-CREATE TABLE worklog5743_key8 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743_key8;
-col_1_text  = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key8 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key8
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key8 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key8;
-col_1_text = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key8;
-CREATE TABLE worklog5743_key2 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743_key2;
-col_1_blob  = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key2 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key2
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-col_1_blob = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key2 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key2;
-col_1_blob = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key2;
-CREATE TABLE worklog5743_key4 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(1964))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743_key4;
-col_1_blob  = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key4 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key4
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-col_1_blob = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key4 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key4;
-col_1_blob = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key4;
-CREATE TABLE worklog5743_key8 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(3072))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743_key8;
-col_1_blob  = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743_key8 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key8
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-col_1_blob = REPEAT("b", 3500)
-0
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key8 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key8;
-col_1_blob = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743_key8;
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
-col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
-col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-col_1_varbinary = REPEAT("c", 4000)
-1
-0
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
-col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
-col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-CREATE INDEX prefix_idx1 ON worklog5743(col_1_varbinary (3072));
-CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (3072));
-CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
-CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
-CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-ROLLBACK;
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-COMMIT;
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-ROLLBACK;
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-col_1_varbinary = REPEAT("c", 4000)
-0
-0
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) CHARACTER SET 'utf8',
-col_2_text TEXT (4000) CHARACTER SET 'utf8',
-PRIMARY KEY (col_1_text(1024))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
-col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
-col_1_text = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (col_1_varchar VARCHAR (4000) CHARACTER SET 'utf8',
-col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8' ,
-PRIMARY KEY (col_1_varchar(1024))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) ,
-col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8',
-col_3_text TEXT (4000) CHARACTER SET 'utf8',
-col_4_blob BLOB (4000),col_5_text TEXT (4000),
-col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (500));
-CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (500));
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-ROLLBACK;
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-COMMIT;
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-ROLLBACK;
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-col_1_varbinary = REPEAT("c", 4000)
-0
-0
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) CHARACTER SET 'utf8',
-col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(1024))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("स", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("स", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_text = REPEAT("स", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_text = REPEAT("क", 4000)
-WHERE col_1_text = REPEAT("स", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("क", 4000)
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743;
-col_1_text = REPEAT("क", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
-1	1
-"In connection 1"
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-"In connection 2"
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
-1	1
-0	1
-"In connection 1"
-select @@session.tx_isolation;
-@@session.tx_isolation
-REPEATABLE-READ
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
-0	1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
-0	1
-1	1
-SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-START TRANSACTION;
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-"In connection 2"
-COMMIT;
-"In connection 1"
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
-0	1
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-COMMIT;
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
-1	1
-"In connection 1"
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-START TRANSACTION;
-"In connection 2"
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
-0	1
-COMMIT;
-"In connection 1"
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-@@session.tx_isolation
-READ-UNCOMMITTED
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-COMMIT;
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
-1	1
-"In connection 1"
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
-1	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-START TRANSACTION;
-"In connection 2"
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
-0	1
-ROLLBACK;
-"In connection 1"
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
-0	1
-SELECT COUNT(*) FROM worklog5743;
-COUNT(*)
-1
-COMMIT;
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("c", 4000)
-1
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-col_1_varchar = REPEAT("c", 4000)
-0
-0
-1
-SELECT tbl1.col_1_varchar = tbl2.col_1_varchar
-FROM worklog5743 tbl1 , worklog5743 tbl2
-WHERE tbl1.col_1_varchar = tbl2.col_1_varchar ;
-tbl1.col_1_varchar = tbl2.col_1_varchar
-1
-1
-1
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
-tbl1.col_1_varchar = REPEAT("c", 4000)
-0
-0
-1
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar NOT IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
-tbl1.col_1_varchar = REPEAT("c", 4000)
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1 WHERE
-col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2)
-AND col_1_varchar = REPEAT("c", 4000);
-tbl1.col_1_varchar = REPEAT("c", 4000)
-1
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar in (
-SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
-WHERE tbl1.col_1_varchar != tbl2.col_1_varchar
-) ;
-tbl1.col_1_varchar = REPEAT("c", 4000)
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar in (
-SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
-WHERE tbl1.col_1_varchar = tbl2.col_1_varchar
-) ;
-tbl1.col_1_varchar = REPEAT("c", 4000)
-0
-0
-1
-SELECT
-REVERSE(col_1_varchar) = REPEAT("c", 4000) ,
-REVERSE(REVERSE(col_1_varchar)) = REPEAT("c", 4000)
-FROM worklog5743;
-REVERSE(col_1_varchar) = REPEAT("c", 4000)	REVERSE(REVERSE(col_1_varchar)) = REPEAT("c", 4000)
-0	0
-0	0
-1	1
-SELECT
-UPPER(col_1_varchar) = REPEAT("c", 4000) ,
-UPPER(col_1_varchar) = REPEAT("C", 4000) ,
-LOWER(UPPER(col_1_varchar)) = REPEAT("c", 4000)
-FROM worklog5743;
-UPPER(col_1_varchar) = REPEAT("c", 4000)	UPPER(col_1_varchar) = REPEAT("C", 4000)	LOWER(UPPER(col_1_varchar)) = REPEAT("c", 4000)
-0	0	0
-0	0	0
-1	1	1
-SELECT
-col_1_varchar = REPEAT("c", 4000)
-FROM worklog5743 WHERE col_1_varchar like '%c__%';
-col_1_varchar = REPEAT("c", 4000)
-1
-SELECT SUBSTRING(INSERT(col_1_varchar, 1, 4, 'kkkk'),1,10) FROM worklog5743 ;
-SUBSTRING(INSERT(col_1_varchar, 1, 4, 'kkkk'),1,10)
-kkkkaaaaaa
-kkkkbbbbbb
-kkkkcccccc
-SELECT CONCAT(SUBSTRING(col_1_varchar,-5,3),'append') FROM worklog5743 ;
-CONCAT(SUBSTRING(col_1_varchar,-5,3),'append')
-aaaappend
-bbbappend
-cccappend
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) ,
-col_2_varchar VARCHAR (4000) ,
-UNIQUE INDEX (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)), REPEAT("o", 4000));
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
-INSERT INTO worklog5743 VALUES(NULL,NULL);
-INSERT INTO worklog5743 VALUES(NULL,NULL);
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE
-FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
-col_1_varchar	col_1_varchar	3072	BTREE
-SELECT col_1_varchar FROM worklog5743 WHERE col_1_varchar IS NULL;
-col_1_varchar
-NULL
-NULL
-SELECT col_1_varchar = concat(REPEAT("a", 2000),REPEAT("b", 2000))
-FROM worklog5743 WHERE col_1_varchar IS NOT NULL ORDER BY 1;
-col_1_varchar = concat(REPEAT("a", 2000),REPEAT("b", 2000))
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-DROP INDEX prefix_idx ON worklog5743;
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("c", 4000)
-1
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("c", 4000)
-1
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-DROP INDEX prefix_idx ON worklog5743;
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-col_1_varchar = REPEAT("c", 4000)
-1
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-col_1_varchar = REPEAT("c", 4000)
-0
-1
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR(4000) , col_2_varchar VARCHAR(4000) ,
-PRIMARY KEY (col_1_varchar (3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("c", 3500) , REPEAT("o", 3500));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-" Switching to con1 connection For select "
-SELECT col_1_varchar = REPEAT("c", 3500) , col_2_varchar = REPEAT("o", 3500)
-FROM worklog5743;
-col_1_varchar = REPEAT("c", 3500)	col_2_varchar = REPEAT("o", 3500)
-1	1
-" Switching to default connection For DMLs "
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 3500) , REPEAT("o", 3500));
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
-WHERE col_2_varchar = REPEAT("o", 3500);
-col_1_varchar = REPEAT("b", 3500)
-0
-0
-COMMIT;
-" Switching to con1 connection For Dropping index and some DMLs "
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("k", 3500),REPEAT("p", 3500));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-UPDATE worklog5743 SET col_1_varchar  = REPEAT("b", 3500)
-WHERE col_1_varchar = REPEAT("a", 3500)
-AND col_2_varchar = REPEAT("o", 3500);
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
-WHERE col_2_varchar = REPEAT("o", 3500);
-col_1_varchar = REPEAT("b", 3500)
-1
-0
-" Switching to default connection For DELETE "
-DELETE FROM worklog5743 WHERE col_1_varchar  = REPEAT("b", 3500);
-SELECT col_1_varchar = REPEAT("a", 3500) FROM worklog5743
-WHERE col_2_varchar = REPEAT("p", 3500);
-col_1_varchar = REPEAT("a", 3500)
-0
-" Switching to con1 connection to commit changes "
-COMMIT;
-" Switching to default connection to drop and end sub-test "
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
-PRIMARY KEY (col_1_varbinary(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)	col_2_varbinary = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-1
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-DROP INDEX prefix_idx ON worklog5743;
-SELECT col_1_varbinary = REPEAT("b", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("b", 4000)
-AND col_2_varbinary = REPEAT("p", 4000);
-col_1_varbinary = REPEAT("b", 4000)
-1
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (2000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)
-1
-0
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-DROP INDEX prefix_idx ON worklog5743;
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (4000));
-Warnings:
-Warning	1071	Specified key was too long; max key length is 3072 bytes
-Warning	1071	Specified key was too long; max key length is 3072 bytes
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
-col_1_varbinary = REPEAT("a", 4000)
-1
-0
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-col_1_varbinary = REPEAT("c", 4000)
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(500))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743;
-col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-1
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-DROP INDEX prefix_idx ON worklog5743;
-SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("b", 4000) AND col_2_text = REPEAT("p", 4000);
-col_1_text = REPEAT("b", 4000)
-1
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (1000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-col_1_text = REPEAT("a", 4000)
-1
-0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-DROP INDEX prefix_idx ON worklog5743;
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (4000));
-Warnings:
-Warning	1071	Specified key was too long; max key length is 3072 bytes
-Warning	1071	Specified key was too long; max key length is 3072 bytes
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-col_1_text = REPEAT("a", 4000)
-1
-0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
-col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
-1	1
-0	0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-1
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("b", 4000)
-AND col_2_text = REPEAT("p", 4000);
-col_1_text = REPEAT("b", 4000)
-1
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (700));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-col_1_text = REPEAT("a", 4000)
-1
-0
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (950));
-ERROR HY000: Too big row
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-col_1_text = REPEAT("a", 4000)
-0
-1
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-col_1_text = REPEAT("c", 4000)
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (900));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (3073));
-ERROR 42000: Specified key was too long; max key length is 3072 bytes
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_BLOB BLOB (4000) , PRIMARY KEY (col_1_BLOB(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (500));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (3073));
-ERROR 42000: Specified key was too long; max key length is 3072 bytes
-DROP TABLE worklog5743;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)),
-REPEAT("o", 4000));
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
-ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000));
-ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
-DROP TABLE worklog5743;
-set global innodb_large_prefix=0;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-ERROR 42000: Specified key was too long; max key length is 767 bytes
-set global innodb_large_prefix=0;
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(767))
-) engine = innodb;
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (1000));
-Warnings:
-Warning	1071	Specified key was too long; max key length is 767 bytes
-Warning	1071	Specified key was too long; max key length is 767 bytes
-DROP TABLE worklog5743;
-SET GLOBAL innodb_file_format=Antelope;
-SET GLOBAL innodb_file_per_table=0;
-SET GLOBAL innodb_large_prefix=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-update-insert.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-update-insert.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-update-insert.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-update-insert.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,43 @@
+#
+# Bug#14668683 ASSERT REC_GET_DELETED_FLAG(REC, PAGE_IS_COMP(PAGE))
+#
+create table t1(f1 char(1) primary key, f2 int not null, f3 blob)
+engine=innodb;
+show create table t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `f1` char(1) NOT NULL,
+  `f2` int(11) NOT NULL,
+  `f3` blob,
+  PRIMARY KEY (`f1`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1
+insert into t1 values ('a', 0, repeat('b',8102));
+select f1 from t1;
+f1
+a
+update t1 set f1='A';
+select f1 from t1;
+f1
+A
+drop table t1;
+#
+# Another test case
+#
+create table t1 (f1 char(1), f2 longblob, f3 blob, primary key(f1))
+charset=utf8 engine=innodb;
+replace into t1 set f1=0xa3;
+Warnings:
+Warning	1366	Incorrect string value: '\xA3' for column 'f1' at row 1
+select f1 from t1;
+f1
+
+update t1 set f1=0x6a;
+update t1 set f3=repeat(0xb1,8103);
+update t1 set f1=0x4a;
+update t1 set f1=0x82;
+Warnings:
+Warning	1366	Incorrect string value: '\x82' for column 'f1' at row 1
+select f1 from t1;
+f1
+
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-zip.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-zip.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/innodb-zip.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/innodb-zip.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,410 +0,0 @@
-set session innodb_strict_mode=0;
-set global innodb_file_per_table=off;
-set global innodb_file_format=`0`;
-create table t0(a int primary key) engine=innodb row_format=compressed;
-Warnings:
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-create table t00(a int primary key) engine=innodb
-key_block_size=4 row_format=compressed;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4.
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-create table t1(a int primary key) engine=innodb row_format=dynamic;
-Warnings:
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-create table t2(a int primary key) engine=innodb row_format=redundant;
-create table t3(a int primary key) engine=innodb row_format=compact;
-create table t4(a int primary key) engine=innodb key_block_size=9;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=9.
-create table t5(a int primary key) engine=innodb
-key_block_size=1 row_format=redundant;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
-set global innodb_file_per_table=on;
-create table t6(a int primary key) engine=innodb
-key_block_size=1 row_format=redundant;
-Warnings:
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
-set global innodb_file_format=`1`;
-create table t7(a int primary key) engine=innodb
-key_block_size=1 row_format=redundant;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-create table t8(a int primary key) engine=innodb
-key_block_size=1 row_format=fixed;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
-create table t9(a int primary key) engine=innodb
-key_block_size=1 row_format=compact;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-create table t10(a int primary key) engine=innodb
-key_block_size=1 row_format=dynamic;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
-create table t11(a int primary key) engine=innodb
-key_block_size=1 row_format=compressed;
-create table t12(a int primary key) engine=innodb
-key_block_size=1;
-create table t13(a int primary key) engine=innodb
-row_format=compressed;
-create table t14(a int primary key) engine=innodb key_block_size=9;
-Warnings:
-Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=9.
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t0	Compact	16384	0
-test	t00	Compact	16384	0
-test	t1	Compact	16384	0
-test	t10	Dynamic	16384	0
-test	t11	Compressed	1024	0
-test	t12	Compressed	1024	0
-test	t13	Compressed	8192	0
-test	t14	Compact	16384	0
-test	t2	Redundant	16384	0
-test	t3	Compact	16384	0
-test	t4	Compact	16384	0
-test	t5	Redundant	16384	0
-test	t6	Redundant	16384	0
-test	t7	Redundant	16384	0
-test	t8	Compact	16384	0
-test	t9	Compact	16384	0
-drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14;
-alter table t1 key_block_size=0;
-alter table t1 row_format=dynamic;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t1	Dynamic	16384	0
-alter table t1 row_format=compact;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t1	Compact	16384	0
-alter table t1 row_format=redundant;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t1	Redundant	16384	0
-drop table t1;
-create table t1(a int not null, b text, index(b(10))) engine=innodb
-key_block_size=1;
-create table t2(b text)engine=innodb;
-insert into t2 values(concat('1abcdefghijklmnopqrstuvwxyz', repeat('A',5000)));
-insert into t1 select 1, b from t2;
-commit;
-begin;
-update t1 set b=repeat('B',100);
-select a,left(b,40) from t1 natural join t2;
-a	left(b,40)
-1	1abcdefghijklmnopqrstuvwxyzAAAAAAAAAAAAA
-rollback;
-select a,left(b,40) from t1 natural join t2;
-a	left(b,40)
-1	1abcdefghijklmnopqrstuvwxyzAAAAAAAAAAAAA
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t1	Compressed	2048	1024
-test	t2	Compact	16384	0
-drop table t1,t2;
-SET SESSION innodb_strict_mode = off;
-CREATE TABLE t1(
-c TEXT NOT NULL, d TEXT NOT NULL,
-PRIMARY KEY (c(767),d(767)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
-CREATE TABLE t1(
-c TEXT NOT NULL, d TEXT NOT NULL,
-PRIMARY KEY (c(767),d(767)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 CHARSET=ASCII;
-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
-CREATE TABLE t1(
-c TEXT NOT NULL, d TEXT NOT NULL,
-PRIMARY KEY (c(767),d(767)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4 CHARSET=ASCII;
-drop table t1;
-CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
-CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
-DROP TABLE t1;
-create table t1( c1 int not null, c2 blob, c3 blob, c4 blob,
-primary key(c1, c2(22), c3(22)))
-engine = innodb row_format = dynamic;
-begin;
-insert into t1 values(1, repeat('A', 20000), repeat('B', 20000),
-repeat('C', 20000));
-update t1 set c3 = repeat('D', 20000) where c1 = 1;
-commit;
-select count(*) from t1 where c2 = repeat('A', 20000);
-count(*)
-1
-select count(*) from t1 where c3 = repeat('D', 20000);
-count(*)
-1
-select count(*) from t1 where c4 = repeat('C', 20000);
-count(*)
-1
-update t1 set c3 = repeat('E', 20000) where c1 = 1;
-drop table t1;
-set global innodb_file_format=`0`;
-select @@innodb_file_format;
-@@innodb_file_format
-Antelope
-set global innodb_file_format=`1`;
-select @@innodb_file_format;
-@@innodb_file_format
-Barracuda
-set global innodb_file_format=`2`;
-ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '2'
-set global innodb_file_format=`-1`;
-ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '-1'
-set global innodb_file_format=`Antelope`;
-set global innodb_file_format=`Barracuda`;
-set global innodb_file_format=`Cheetah`;
-ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Cheetah'
-set global innodb_file_format=`abc`;
-ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'abc'
-set global innodb_file_format=`1a`;
-ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '1a'
-set global innodb_file_format=``;
-ERROR 42000: Variable 'innodb_file_format' can't be set to the value of ''
-set global innodb_file_per_table = on;
-set global innodb_file_format = `1`;
-set innodb_strict_mode = off;
-create table t1 (id int primary key) engine = innodb key_block_size = 0;
-drop table t1;
-set innodb_strict_mode = on;
-create table t1 (id int primary key) engine = innodb key_block_size = 0;
-create table t2 (id int primary key) engine = innodb key_block_size = 9;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Error	1005	Can't create table 'test.t2' (errno: 1478)
-create table t3 (id int primary key) engine = innodb key_block_size = 1;
-create table t4 (id int primary key) engine = innodb key_block_size = 2;
-create table t5 (id int primary key) engine = innodb key_block_size = 4;
-create table t6 (id int primary key) engine = innodb key_block_size = 8;
-create table t7 (id int primary key) engine = innodb key_block_size = 16;
-create table t8 (id int primary key) engine = innodb row_format = compressed;
-create table t9 (id int primary key) engine = innodb row_format = dynamic;
-create table t10(id int primary key) engine = innodb row_format = compact;
-create table t11(id int primary key) engine = innodb row_format = redundant;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t1	Compact	16384	0
-test	t10	Compact	16384	0
-test	t11	Redundant	16384	0
-test	t3	Compressed	1024	0
-test	t4	Compressed	2048	0
-test	t5	Compressed	4096	0
-test	t6	Compressed	8192	0
-test	t7	Compressed	16384	0
-test	t8	Compressed	8192	0
-test	t9	Dynamic	16384	0
-drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11;
-create table t1 (id int primary key) engine = innodb
-key_block_size = 8 row_format = compressed;
-create table t2 (id int primary key) engine = innodb
-key_block_size = 8 row_format = redundant;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
-create table t3 (id int primary key) engine = innodb
-key_block_size = 8 row_format = compact;
-ERROR HY000: Can't create table 'test.t3' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t3' (errno: 1478)
-create table t4 (id int primary key) engine = innodb
-key_block_size = 8 row_format = dynamic;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
-create table t5 (id int primary key) engine = innodb
-key_block_size = 8 row_format = default;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t1	Compressed	8192	0
-test	t5	Compressed	8192	0
-drop table t1, t5;
-create table t1 (id int primary key) engine = innodb
-key_block_size = 9 row_format = redundant;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-create table t2 (id int primary key) engine = innodb
-key_block_size = 9 row_format = compact;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
-create table t2 (id int primary key) engine = innodb
-key_block_size = 9 row_format = dynamic;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
-Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-set global innodb_file_per_table = off;
-create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
-create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Can't create table 'test.t3' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t3' (errno: 1478)
-create table t4 (id int primary key) engine = innodb key_block_size = 8;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
-create table t5 (id int primary key) engine = innodb key_block_size = 16;
-ERROR HY000: Can't create table 'test.t5' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t5' (errno: 1478)
-create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Can't create table 'test.t6' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t6' (errno: 1478)
-create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Can't create table 'test.t7' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
-Error	1005	Can't create table 'test.t7' (errno: 1478)
-create table t8 (id int primary key) engine = innodb row_format = compact;
-create table t9 (id int primary key) engine = innodb row_format = redundant;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t8	Compact	16384	0
-test	t9	Redundant	16384	0
-drop table t8, t9;
-set global innodb_file_per_table = on;
-set global innodb_file_format = `0`;
-create table t1 (id int primary key) engine = innodb key_block_size = 1;
-ERROR HY000: Can't create table 'test.t1' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t1' (errno: 1478)
-create table t2 (id int primary key) engine = innodb key_block_size = 2;
-ERROR HY000: Can't create table 'test.t2' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t2' (errno: 1478)
-create table t3 (id int primary key) engine = innodb key_block_size = 4;
-ERROR HY000: Can't create table 'test.t3' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t3' (errno: 1478)
-create table t4 (id int primary key) engine = innodb key_block_size = 8;
-ERROR HY000: Can't create table 'test.t4' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t4' (errno: 1478)
-create table t5 (id int primary key) engine = innodb key_block_size = 16;
-ERROR HY000: Can't create table 'test.t5' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t5' (errno: 1478)
-create table t6 (id int primary key) engine = innodb row_format = compressed;
-ERROR HY000: Can't create table 'test.t6' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t6' (errno: 1478)
-create table t7 (id int primary key) engine = innodb row_format = dynamic;
-ERROR HY000: Can't create table 'test.t7' (errno: 1478)
-show warnings;
-Level	Code	Message
-Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
-Error	1005	Can't create table 'test.t7' (errno: 1478)
-create table t8 (id int primary key) engine = innodb row_format = compact;
-create table t9 (id int primary key) engine = innodb row_format = redundant;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-table_schema	table_name	row_format	data_length	index_length
-test	t8	Compact	16384	0
-test	t9	Redundant	16384	0
-drop table t8, t9;
-set global innodb_file_per_table=0;
-set global innodb_file_format=Antelope;
-set global innodb_file_per_table=on;
-set global innodb_file_format=`Barracuda`;
-set global innodb_file_format_max=`Antelope`;
-create table normal_table (
-c1 int
-) engine = innodb;
-select @@innodb_file_format_max;
-@@innodb_file_format_max
-Antelope
-create table zip_table (
-c1 int
-) engine = innodb key_block_size = 8;
-select @@innodb_file_format_max;
-@@innodb_file_format_max
-Barracuda
-set global innodb_file_format_max=`Antelope`;
-select @@innodb_file_format_max;
-@@innodb_file_format_max
-Antelope
-show table status;
-select @@innodb_file_format_max;
-@@innodb_file_format_max
-Barracuda
-drop table normal_table, zip_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/insert_debug.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/insert_debug.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/insert_debug.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/insert_debug.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,11 @@
+#
+# Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
+# CAUSES INFINITE PAGE SPLIT
+#
+SET GLOBAL innodb_change_buffering_debug=1;
+SET GLOBAL innodb_limit_optimistic_insert_debug=1;
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB
+PARTITION BY HASH (c1) PARTITIONS 15;
+DROP TABLE t1;
+SET GLOBAL innodb_change_buffering_debug=0;
+SET GLOBAL innodb_limit_optimistic_insert_debug=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/sp_temp_table.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/sp_temp_table.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/sp_temp_table.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/sp_temp_table.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,253 @@
+#
+# Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
+# CALLED FROM A FUNCTION
+#
+call mtr.add_suppression("MySQL is trying to drop table");
+CREATE PROCEDURE cachedata(
+IN obj_id BIGINT UNSIGNED,
+IN start  DATETIME,
+IN end    DATETIME
+)
+cachedata:BEGIN
+DECLARE cache_count BIGINT;
+SET @timestamp := NOW();
+CREATE TEMPORARY TABLE IF NOT EXISTS cachedata (
+timestamp    DATETIME,
+object_id    BIGINT UNSIGNED NOT NULL,
+start        DATETIME,
+end          DATETIME,
+seqno        BIGINT AUTO_INCREMENT,
+value        FLOAT,
+PRIMARY KEY (seqno),
+INDEX (timestamp),
+INDEX (object_id, start, end)
+) ENGINE=INNODB;
+DELETE FROM cachedata WHERE
+timestamp < DATE_SUB(@timestamp, INTERVAL 15 SECOND);
+SELECT count(*) INTO cache_count FROM cachedata WHERE
+object_id = obj_id
+AND start = start
+AND end = end;
+IF cache_count > 0 THEN LEAVE cachedata;
+END IF;
+INSERT INTO cachedata (timestamp, object_id, start, end, value) VALUES
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 2345),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 2345),
+(@timestamp, obj_id, start, end, 1234),
+(@timestamp, obj_id, start, end, 4567),
+(@timestamp, obj_id, start, end, 8901),
+(@timestamp, obj_id, start, end, 2345);
+END$$
+CREATE FUNCTION get_cache(
+obj_id   BIGINT UNSIGNED,
+start    DATETIME,
+end      DATETIME
+)
+RETURNS FLOAT
+READS SQL DATA
+BEGIN
+DECLARE result FLOAT;
+CALL cachedata(obj_id, start, end);
+SELECT SUM(value) INTO result FROM cachedata WHERE
+object_id = obj_id
+AND start = start
+AND end = end;
+RETURN result;
+END$$
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+SELECT get_cache(1, '2014-01-01', '2014-02-01');
+get_cache(1, '2014-01-01', '2014-02-01')
+95247
+select sleep(1);
+sleep(1)
+0
+DROP FUNCTION get_cache;
+DROP PROCEDURE cachedata;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/strict_mode.result mysql-5.5-5.5.43/mysql-test/suite/innodb/r/strict_mode.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/r/strict_mode.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/r/strict_mode.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,242 @@
+#
+# Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
+# INNODB_STRICT_MODE = 1
+#
+set innodb_strict_mode = 0;
+create table t1 (id int auto_increment primary key,
+v varchar(32),
+col1 text,
+col2 text,
+col3 text,
+col4 text,
+col5 text,
+col6 text,
+col7 text,
+col8 text,
+col9 text,
+col10 text,
+col11 text,
+col12 text,
+col13 text,
+col14 text,
+col15 text,
+col16 text,
+col17 text,
+col18 text,
+col19 text,
+col20 text,
+col21 text,
+col22 text,
+col23 text,
+col24 text,
+col25 text,
+col26 text,
+col27 text,
+col28 text,
+col29 text,
+col30 text,
+col31 text,
+col32 text,
+col33 text,
+col34 text,
+col35 text,
+col36 text,
+col37 text,
+col38 text,
+col39 text,
+col40 text,
+col41 text,
+col42 text,
+col43 text,
+col44 text,
+col45 text ,
+col46 text,
+col47 text,
+col48 text,
+col49 text,
+col50 text,
+col51 text,
+col52 text,
+col53 text,
+col54 text,
+col55 text,
+col56 text,
+col57 text,
+col58 text,
+col59 text,
+col60 text,
+col61 text,
+col62 text,
+col63 text,
+col64 text,
+col65 text,
+col66 text,
+col67 text,
+col68 text ,
+col69 text,
+col70 text,
+col71 text,
+col72 text,
+col73 text,
+col74 text,
+col75 text,
+col76 text,
+col77 text,
+col78 text,
+col79 text,
+col80 text,
+col81 text,
+col82 text,
+col83 text,
+col84 text,
+col85 text,
+col86 text,
+col87 text,
+col88 text,
+col89 text,
+col90 text,
+col91 text,
+col92 text,
+col93 text,
+col94 text,
+col95 text,
+col96 text,
+col97 text,
+col98 text,
+col99 text,
+col100 text,
+col101 text,
+col102 text,
+col103 text,
+col104 text,
+col105 text,
+col106 text,
+col107 text,
+col108 text,
+col109 text,
+col110 text,
+col111 text,
+col112 text,
+col113 text,
+col114 text,
+col115 text,
+col116 text,
+col117 text,
+col118 text,
+col119 text,
+col120 text,
+col121 text,
+col122 text,
+col123 text,
+col124 text,
+col125 text,
+col126 text ,
+col127 text,
+col128 text,
+col129 text,
+col130 text,
+col131 text,
+col132 text,
+col133 text,
+col134 text,
+col135 text,
+col136 text,
+col137 text,
+col138 text,
+col139 text,
+col140 text,
+col141 text,
+col142 text,
+col143 text,
+col144 text,
+col145 text,
+col146 text,
+col147 text ,
+col148 text,
+col149 text,
+col150 text,
+col151 text,
+col152 text,
+col153 text,
+col154 text,
+col155 text,
+col156 text,
+col157 text,
+col158 text,
+col159 text,
+col160 text,
+col161 text,
+col162 text,
+col163 text,
+col164 text,
+col165 text,
+col166 text,
+col167 text,
+col168 text,
+col169 text,
+col170 text,
+col171 text,
+col172 text ,
+col173 text,
+col174 text,
+col175 text,
+col176 text,
+col177 text,
+col178 text,
+col179 text,
+col180 text,
+col181 text,
+col182 text,
+col183 text,
+col184 text,
+col185 text,
+col186 text,
+col187 text,
+col188 text,
+col189 text,
+col190 text,
+col191 text,
+col192 text,
+col193 text,
+col194 text,
+col195 text,
+col196 text,
+col197 text,
+col198 text,
+col199 text,
+col200 text,
+col201 text,
+col202 text,
+col203 text,
+col204 text,
+col205 text,
+col206 text,
+col207 text,
+col208 text,
+col209 text,
+col210 text,
+col211 text,
+col212 text,
+col213 text,
+col214 text,
+col215 text,
+col216 text,
+col217 text,
+col218 text,
+col219 text,
+col220 text,
+col221 text,
+col222 text,
+col223 text,
+col224 text,
+col225 text,
+col226 text,
+col227 text,
+col228 text
+) ENGINE=InnoDB;
+Warnings:
+Warning	139	Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+set innodb_strict_mode = 1;
+alter table t1 engine=InnoDB;
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB or using ROW_FORMAT=DYNAMIC or ROW_FORMAT=COMPRESSED may help. In current row format, BLOB prefix of 768 bytes is stored inline.
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/blob-update-debug.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/blob-update-debug.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/blob-update-debug.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/blob-update-debug.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,17 @@
+# This file contains tests involving update operations on blob data type.
+
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug#18185930 UPD_NODE_INSERT_BLOB CAUSES BTR_EXTERN_OWNER_FLAG
+--echo # ASSERTION
+--echo #
+
+create table t1 (f1 int primary key, f2 blob) engine = innodb;
+insert into t1 values (1, repeat('*', 50000));
+select f1, substring(f2, 1, 40) from t1;
+set debug = 'd,row_ins_index_entry_timeout';
+update t1 set f1 = 3;
+select f1, substring(f2, 1, 40) from t1;
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/create-index.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/create-index.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/create-index.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/create-index.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,11 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug #18010711	UNIQUE PREFIX INDEX ON BINARY COLUMN: FAILING
+--echo # ASSERTION: FLEN == LEN
+--echo #
+create table t1 (f1 binary(5)) engine=innodb;
+insert into t1 values ('w'), ('w');
+--error ER_DUP_ENTRY
+create unique index index_t1 on t1(f1(4));
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/foreign-keys.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/foreign-keys.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/foreign-keys.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/foreign-keys.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,26 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
+--echo # ADD FOREIGN KEY
+--echo #
+
+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
+PRIMARY KEY (`department_id`)) engine=innodb;
+
+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`)) engine=innodb;
+
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`)) engine=innodb;
+
+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
+`people` (`people_id`);
+
+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
+(`people_id`);
+
+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
+(`people_id`);
+
+drop table title, department, people;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/foreign-keys.test.moved mysql-5.5-5.5.43/mysql-test/suite/innodb/t/foreign-keys.test.moved
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/foreign-keys.test.moved	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/foreign-keys.test.moved	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,26 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug #19471516 SERVER CRASHES WHEN EXECUTING ALTER TABLE
+--echo # ADD FOREIGN KEY
+--echo #
+
+CREATE TABLE `department` (`department_id` INT, `department_people_fk` INT,
+PRIMARY KEY (`department_id`)) engine=innodb;
+
+CREATE TABLE `title` (`title_id` INT, `title_manager_fk` INT,
+`title_reporter_fk` INT, PRIMARY KEY (`title_id`));
+
+CREATE TABLE `people` (`people_id` INT, PRIMARY KEY (`people_id`));
+
+ALTER TABLE `department` ADD FOREIGN KEY (`department_people_fk`) REFERENCES
+`people` (`people_id`);
+
+ALTER TABLE `title` ADD FOREIGN KEY (`title_manager_fk`) REFERENCES `people`
+(`people_id`);
+
+ALTER TABLE `title` ADD FOREIGN KEY (`title_reporter_fk`) REFERENCES `people`
+(`people_id`);
+
+drop table title, department, people;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-autoinc.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-autoinc.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-autoinc.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-autoinc.test	2015-02-27 08:30:35.000000000 +0000
@@ -685,3 +685,17 @@
 --error 1467
 INSERT INTO t1 VALUES ();
 DROP TABLE t1;
+
+--echo #
+--echo # Bug #14049391	 INNODB MISCALCULATES AUTO-INCREMENT
+--echo #	AFTER CHANGING AUTO_INCREMENT_INCREMEMENT
+--echo #
+CREATE TABLE t ( i INT AUTO_INCREMENT, KEY(i) ) ENGINE=InnoDB;
+SET auto_increment_increment = 300;
+INSERT INTO t VALUES (NULL), (NULL);
+SHOW CREATE TABLE t;
+SET auto_increment_increment = 50;
+INSERT INTO t VALUES (NULL);
+SELECT * FROM t;
+SHOW CREATE TABLE t;
+DROP TABLE t;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug36169.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug36169.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug36169.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug36169.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,1160 +0,0 @@
-#
-# Bug#36169 create innodb compressed table with too large row size crashed
-# http://bugs.mysql.com/36169
-#
-
--- source include/have_innodb.inc
-
-let $file_format=`select @@innodb_file_format`;
-let $file_per_table=`select @@innodb_file_per_table`;
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=ON;
-
-#
-# The following is copied from http://bugs.mysql.com/36169
-# (http://bugs.mysql.com/file.php?id=9121)
-# Probably it can be simplified but that is not obvious.
-#
-
-# we care only that the following SQL commands do produce errors
-# as expected and do not crash the server
--- disable_query_log
--- disable_result_log
-
-# Generating 10 tables
-# Creating a table with 94 columns and 24 indexes
-DROP TABLE IF EXISTS `table0`;
-set innodb_strict_mode=on;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table0`
-(`col0` BOOL,
-`col1` BOOL,
-`col2` TINYINT,
-`col3` DATE,
-`col4` TIME,
-`col5` SET ('test1','test2','test3'),
-`col6` TIME,
-`col7` TEXT,
-`col8` DECIMAL,
-`col9` SET ('test1','test2','test3'),
-`col10` FLOAT,
-`col11` DOUBLE PRECISION,
-`col12` ENUM ('test1','test2','test3'),
-`col13` TINYBLOB,
-`col14` YEAR,
-`col15` SET ('test1','test2','test3'),
-`col16` NUMERIC,
-`col17` NUMERIC,
-`col18` BLOB,
-`col19` DATETIME,
-`col20` DOUBLE PRECISION,
-`col21` DECIMAL,
-`col22` DATETIME,
-`col23` NUMERIC,
-`col24` NUMERIC,
-`col25` LONGTEXT,
-`col26` TINYBLOB,
-`col27` TIME,
-`col28` TINYBLOB,
-`col29` ENUM ('test1','test2','test3'),
-`col30` SMALLINT,
-`col31` REAL,
-`col32` FLOAT,
-`col33` CHAR (175),
-`col34` TINYTEXT,
-`col35` TINYTEXT,
-`col36` TINYBLOB,
-`col37` TINYBLOB,
-`col38` TINYTEXT,
-`col39` MEDIUMBLOB,
-`col40` TIMESTAMP,
-`col41` DOUBLE,
-`col42` SMALLINT,
-`col43` LONGBLOB,
-`col44` VARCHAR (80),
-`col45` MEDIUMTEXT,
-`col46` NUMERIC,
-`col47` BIGINT,
-`col48` DATE,
-`col49` TINYBLOB,
-`col50` DATE,
-`col51` BOOL,
-`col52` MEDIUMINT,
-`col53` FLOAT,
-`col54` TINYBLOB,
-`col55` LONGTEXT,
-`col56` SMALLINT,
-`col57` ENUM ('test1','test2','test3'),
-`col58` DATETIME,
-`col59` MEDIUMTEXT,
-`col60` VARCHAR (232),
-`col61` NUMERIC,
-`col62` YEAR,
-`col63` SMALLINT,
-`col64` TIMESTAMP,
-`col65` BLOB,
-`col66` LONGBLOB,
-`col67` INT,
-`col68` LONGTEXT,
-`col69` ENUM ('test1','test2','test3'),
-`col70` INT,
-`col71` TIME,
-`col72` TIMESTAMP,
-`col73` TIMESTAMP,
-`col74` VARCHAR (170),
-`col75` SET ('test1','test2','test3'),
-`col76` TINYBLOB,
-`col77` BIGINT,
-`col78` NUMERIC,
-`col79` DATETIME,
-`col80` YEAR,
-`col81` NUMERIC,
-`col82` LONGBLOB,
-`col83` TEXT,
-`col84` CHAR (83),
-`col85` DECIMAL,
-`col86` FLOAT,
-`col87` INT,
-`col88` VARCHAR (145),
-`col89` DATE,
-`col90` DECIMAL,
-`col91` DECIMAL,
-`col92` MEDIUMBLOB,
-`col93` TIME,
-KEY `idx0` (`col69`,`col90`,`col8`),
-KEY `idx1` (`col60`),
-KEY `idx2` (`col60`,`col70`,`col74`),
-KEY `idx3` (`col22`,`col32`,`col72`,`col30`),
-KEY `idx4` (`col29`),
-KEY `idx5` (`col19`,`col45`(143)),
-KEY `idx6` (`col46`,`col48`,`col5`,`col39`(118)),
-KEY `idx7` (`col48`,`col61`),
-KEY `idx8` (`col93`),
-KEY `idx9` (`col31`),
-KEY `idx10` (`col30`,`col21`),
-KEY `idx11` (`col67`),
-KEY `idx12` (`col44`,`col6`,`col8`,`col38`(226)),
-KEY `idx13` (`col71`,`col41`,`col15`,`col49`(88)),
-KEY `idx14` (`col78`),
-KEY `idx15` (`col63`,`col67`,`col64`),
-KEY `idx16` (`col17`,`col86`),
-KEY `idx17` (`col77`,`col56`,`col10`,`col55`(24)),
-KEY `idx18` (`col62`),
-KEY `idx19` (`col31`,`col57`,`col56`,`col53`),
-KEY `idx20` (`col46`),
-KEY `idx21` (`col83`(54)),
-KEY `idx22` (`col51`,`col7`(120)),
-KEY `idx23` (`col7`(163),`col31`,`col71`,`col14`)
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-# Creating a table with 10 columns and 32 indexes
-DROP TABLE IF EXISTS `table1`;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table1`
-(`col0` CHAR (113),
-`col1` FLOAT,
-`col2` BIGINT,
-`col3` DECIMAL,
-`col4` BLOB,
-`col5` LONGTEXT,
-`col6` SET ('test1','test2','test3'),
-`col7` BIGINT,
-`col8` BIGINT,
-`col9` TINYBLOB,
-KEY `idx0` (`col5`(101),`col7`,`col8`),
-KEY `idx1` (`col8`),
-KEY `idx2` (`col4`(177),`col9`(126),`col6`,`col3`),
-KEY `idx3` (`col5`(160)),
-KEY `idx4` (`col9`(242)),
-KEY `idx5` (`col4`(139),`col2`,`col3`),
-KEY `idx6` (`col7`),
-KEY `idx7` (`col6`,`col2`,`col0`,`col3`),
-KEY `idx8` (`col9`(66)),
-KEY `idx9` (`col5`(253)),
-KEY `idx10` (`col1`,`col7`,`col2`),
-KEY `idx11` (`col9`(242),`col0`,`col8`,`col5`(163)),
-KEY `idx12` (`col8`),
-KEY `idx13` (`col0`,`col9`(37)),
-KEY `idx14` (`col0`),
-KEY `idx15` (`col5`(111)),
-KEY `idx16` (`col8`,`col0`,`col5`(13)),
-KEY `idx17` (`col4`(139)),
-KEY `idx18` (`col5`(189),`col2`,`col3`,`col9`(136)),
-KEY `idx19` (`col0`,`col3`,`col1`,`col8`),
-KEY `idx20` (`col8`),
-KEY `idx21` (`col0`,`col7`,`col9`(227),`col3`),
-KEY `idx22` (`col0`),
-KEY `idx23` (`col2`),
-KEY `idx24` (`col3`),
-KEY `idx25` (`col2`,`col3`),
-KEY `idx26` (`col0`),
-KEY `idx27` (`col5`(254)),
-KEY `idx28` (`col3`),
-KEY `idx29` (`col3`),
-KEY `idx30` (`col7`,`col3`,`col0`,`col4`(220)),
-KEY `idx31` (`col4`(1),`col0`)
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-# Creating a table with 141 columns and 18 indexes
-DROP TABLE IF EXISTS `table2`;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table2`
-(`col0` BOOL,
-`col1` MEDIUMINT,
-`col2` VARCHAR (209),
-`col3` MEDIUMBLOB,
-`col4` CHAR (13),
-`col5` DOUBLE,
-`col6` TINYTEXT,
-`col7` REAL,
-`col8` SMALLINT,
-`col9` BLOB,
-`col10` TINYINT,
-`col11` DECIMAL,
-`col12` BLOB,
-`col13` DECIMAL,
-`col14` LONGBLOB,
-`col15` SMALLINT,
-`col16` LONGBLOB,
-`col17` TINYTEXT,
-`col18` FLOAT,
-`col19` CHAR (78),
-`col20` MEDIUMTEXT,
-`col21` SET ('test1','test2','test3'),
-`col22` MEDIUMINT,
-`col23` INT,
-`col24` MEDIUMBLOB,
-`col25` ENUM ('test1','test2','test3'),
-`col26` TINYBLOB,
-`col27` VARCHAR (116),
-`col28` TIMESTAMP,
-`col29` BLOB,
-`col30` SMALLINT,
-`col31` DOUBLE PRECISION,
-`col32` DECIMAL,
-`col33` DECIMAL,
-`col34` TEXT,
-`col35` MEDIUMINT,
-`col36` MEDIUMINT,
-`col37` BIGINT,
-`col38` VARCHAR (253),
-`col39` TINYBLOB,
-`col40` MEDIUMBLOB,
-`col41` BIGINT,
-`col42` DOUBLE,
-`col43` TEXT,
-`col44` BLOB,
-`col45` TIME,
-`col46` MEDIUMINT,
-`col47` DOUBLE PRECISION,
-`col48` SET ('test1','test2','test3'),
-`col49` DOUBLE PRECISION,
-`col50` VARCHAR (97),
-`col51` TEXT,
-`col52` NUMERIC,
-`col53` ENUM ('test1','test2','test3'),
-`col54` MEDIUMTEXT,
-`col55` MEDIUMINT,
-`col56` DATETIME,
-`col57` DATETIME,
-`col58` MEDIUMTEXT,
-`col59` CHAR (244),
-`col60` LONGBLOB,
-`col61` MEDIUMBLOB,
-`col62` DOUBLE,
-`col63` SMALLINT,
-`col64` BOOL,
-`col65` SMALLINT,
-`col66` VARCHAR (212),
-`col67` TIME,
-`col68` REAL,
-`col69` BOOL,
-`col70` BIGINT,
-`col71` DATE,
-`col72` TINYINT,
-`col73` ENUM ('test1','test2','test3'),
-`col74` DATE,
-`col75` TIME,
-`col76` DATETIME,
-`col77` BOOL,
-`col78` TINYTEXT,
-`col79` MEDIUMINT,
-`col80` NUMERIC,
-`col81` LONGTEXT,
-`col82` SET ('test1','test2','test3'),
-`col83` DOUBLE PRECISION,
-`col84` NUMERIC,
-`col85` VARCHAR (184),
-`col86` DOUBLE PRECISION,
-`col87` MEDIUMTEXT,
-`col88` MEDIUMBLOB,
-`col89` BOOL,
-`col90` SMALLINT,
-`col91` TINYINT,
-`col92` ENUM ('test1','test2','test3'),
-`col93` BOOL,
-`col94` TIMESTAMP,
-`col95` BOOL,
-`col96` MEDIUMTEXT,
-`col97` DECIMAL,
-`col98` BOOL,
-`col99` DECIMAL,
-`col100` MEDIUMINT,
-`col101` DOUBLE PRECISION,
-`col102` TINYINT,
-`col103` BOOL,
-`col104` MEDIUMINT,
-`col105` DECIMAL,
-`col106` NUMERIC,
-`col107` TIMESTAMP,
-`col108` MEDIUMBLOB,
-`col109` TINYBLOB,
-`col110` SET ('test1','test2','test3'),
-`col111` YEAR,
-`col112` TIMESTAMP,
-`col113` CHAR (201),
-`col114` BOOL,
-`col115` TINYINT,
-`col116` DOUBLE,
-`col117` TINYINT,
-`col118` TIMESTAMP,
-`col119` SET ('test1','test2','test3'),
-`col120` SMALLINT,
-`col121` TINYBLOB,
-`col122` TIMESTAMP,
-`col123` BLOB,
-`col124` DATE,
-`col125` SMALLINT,
-`col126` ENUM ('test1','test2','test3'),
-`col127` MEDIUMBLOB,
-`col128` DOUBLE PRECISION,
-`col129` REAL,
-`col130` VARCHAR (159),
-`col131` MEDIUMBLOB,
-`col132` BIGINT,
-`col133` INT,
-`col134` SET ('test1','test2','test3'),
-`col135` CHAR (198),
-`col136` SET ('test1','test2','test3'),
-`col137` MEDIUMTEXT,
-`col138` SMALLINT,
-`col139` BLOB,
-`col140` LONGBLOB,
-KEY `idx0` (`col14`(139),`col24`(208),`col38`,`col35`),
-KEY `idx1` (`col48`,`col118`,`col29`(131),`col100`),
-KEY `idx2` (`col86`,`col67`,`col43`(175)),
-KEY `idx3` (`col19`),
-KEY `idx4` (`col40`(220),`col67`),
-KEY `idx5` (`col99`,`col56`),
-KEY `idx6` (`col68`,`col28`,`col137`(157)),
-KEY `idx7` (`col51`(160),`col99`,`col45`,`col39`(9)),
-KEY `idx8` (`col15`,`col52`,`col90`,`col94`),
-KEY `idx9` (`col24`(3),`col139`(248),`col108`(118),`col41`),
-KEY `idx10` (`col36`,`col92`,`col114`),
-KEY `idx11` (`col115`,`col9`(116)),
-KEY `idx12` (`col130`,`col93`,`col134`),
-KEY `idx13` (`col123`(65)),
-KEY `idx14` (`col44`(90),`col86`,`col119`),
-KEY `idx15` (`col69`),
-KEY `idx16` (`col132`,`col81`(118),`col18`),
-KEY `idx17` (`col24`(250),`col7`,`col92`,`col45`)
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-# Creating a table with 199 columns and 1 indexes
-DROP TABLE IF EXISTS `table3`;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table3`
-(`col0` SMALLINT,
-`col1` SET ('test1','test2','test3'),
-`col2` TINYTEXT,
-`col3` DOUBLE,
-`col4` NUMERIC,
-`col5` DATE,
-`col6` BIGINT,
-`col7` DOUBLE,
-`col8` TEXT,
-`col9` INT,
-`col10` REAL,
-`col11` TINYINT,
-`col12` NUMERIC,
-`col13` NUMERIC,
-`col14` TIME,
-`col15` DOUBLE,
-`col16` REAL,
-`col17` MEDIUMBLOB,
-`col18` YEAR,
-`col19` TINYTEXT,
-`col20` YEAR,
-`col21` CHAR (250),
-`col22` TINYINT,
-`col23` TINYINT,
-`col24` SMALLINT,
-`col25` DATETIME,
-`col26` MEDIUMINT,
-`col27` LONGBLOB,
-`col28` VARCHAR (106),
-`col29` FLOAT,
-`col30` MEDIUMTEXT,
-`col31` TINYBLOB,
-`col32` BIGINT,
-`col33` YEAR,
-`col34` REAL,
-`col35` MEDIUMBLOB,
-`col36` LONGTEXT,
-`col37` LONGBLOB,
-`col38` BIGINT,
-`col39` FLOAT,
-`col40` TIME,
-`col41` DATETIME,
-`col42` BOOL,
-`col43` BIGINT,
-`col44` SMALLINT,
-`col45` TIME,
-`col46` DOUBLE PRECISION,
-`col47` TIME,
-`col48` TINYTEXT,
-`col49` DOUBLE PRECISION,
-`col50` BIGINT,
-`col51` NUMERIC,
-`col52` TINYBLOB,
-`col53` DATE,
-`col54` DECIMAL,
-`col55` SMALLINT,
-`col56` TINYTEXT,
-`col57` ENUM ('test1','test2','test3'),
-`col58` YEAR,
-`col59` TIME,
-`col60` TINYINT,
-`col61` DECIMAL,
-`col62` DOUBLE,
-`col63` DATE,
-`col64` LONGTEXT,
-`col65` DOUBLE,
-`col66` VARCHAR (88),
-`col67` MEDIUMTEXT,
-`col68` DATE,
-`col69` MEDIUMINT,
-`col70` DECIMAL,
-`col71` MEDIUMTEXT,
-`col72` LONGTEXT,
-`col73` REAL,
-`col74` DOUBLE,
-`col75` TIME,
-`col76` DATE,
-`col77` DECIMAL,
-`col78` MEDIUMBLOB,
-`col79` NUMERIC,
-`col80` BIGINT,
-`col81` YEAR,
-`col82` SMALLINT,
-`col83` MEDIUMINT,
-`col84` TINYINT,
-`col85` MEDIUMBLOB,
-`col86` TIME,
-`col87` MEDIUMBLOB,
-`col88` LONGTEXT,
-`col89` BOOL,
-`col90` BLOB,
-`col91` LONGBLOB,
-`col92` YEAR,
-`col93` BLOB,
-`col94` INT,
-`col95` TINYTEXT,
-`col96` TINYINT,
-`col97` DECIMAL,
-`col98` ENUM ('test1','test2','test3'),
-`col99` MEDIUMINT,
-`col100` TINYINT,
-`col101` MEDIUMBLOB,
-`col102` TINYINT,
-`col103` SET ('test1','test2','test3'),
-`col104` TIMESTAMP,
-`col105` TEXT,
-`col106` DATETIME,
-`col107` MEDIUMTEXT,
-`col108` CHAR (220),
-`col109` TIME,
-`col110` VARCHAR (131),
-`col111` DECIMAL,
-`col112` FLOAT,
-`col113` SMALLINT,
-`col114` BIGINT,
-`col115` LONGBLOB,
-`col116` SET ('test1','test2','test3'),
-`col117` ENUM ('test1','test2','test3'),
-`col118` BLOB,
-`col119` MEDIUMTEXT,
-`col120` SET ('test1','test2','test3'),
-`col121` DATETIME,
-`col122` FLOAT,
-`col123` VARCHAR (242),
-`col124` YEAR,
-`col125` MEDIUMBLOB,
-`col126` TIME,
-`col127` BOOL,
-`col128` TINYBLOB,
-`col129` DOUBLE,
-`col130` TINYINT,
-`col131` BIGINT,
-`col132` SMALLINT,
-`col133` INT,
-`col134` DOUBLE PRECISION,
-`col135` MEDIUMBLOB,
-`col136` SET ('test1','test2','test3'),
-`col137` TINYTEXT,
-`col138` DOUBLE PRECISION,
-`col139` NUMERIC,
-`col140` BLOB,
-`col141` SET ('test1','test2','test3'),
-`col142` INT,
-`col143` VARCHAR (26),
-`col144` BLOB,
-`col145` REAL,
-`col146` SET ('test1','test2','test3'),
-`col147` LONGBLOB,
-`col148` TEXT,
-`col149` BLOB,
-`col150` CHAR (189),
-`col151` LONGTEXT,
-`col152` INT,
-`col153` FLOAT,
-`col154` LONGTEXT,
-`col155` DATE,
-`col156` LONGBLOB,
-`col157` TINYBLOB,
-`col158` REAL,
-`col159` DATE,
-`col160` TIME,
-`col161` YEAR,
-`col162` DOUBLE,
-`col163` VARCHAR (90),
-`col164` FLOAT,
-`col165` NUMERIC,
-`col166` ENUM ('test1','test2','test3'),
-`col167` DOUBLE PRECISION,
-`col168` DOUBLE PRECISION,
-`col169` TINYBLOB,
-`col170` TIME,
-`col171` SMALLINT,
-`col172` TINYTEXT,
-`col173` SMALLINT,
-`col174` DOUBLE,
-`col175` VARCHAR (14),
-`col176` VARCHAR (90),
-`col177` REAL,
-`col178` MEDIUMINT,
-`col179` TINYBLOB,
-`col180` FLOAT,
-`col181` TIMESTAMP,
-`col182` REAL,
-`col183` DOUBLE PRECISION,
-`col184` BIGINT,
-`col185` INT,
-`col186` MEDIUMTEXT,
-`col187` TIME,
-`col188` FLOAT,
-`col189` TIME,
-`col190` INT,
-`col191` FLOAT,
-`col192` MEDIUMINT,
-`col193` TINYINT,
-`col194` MEDIUMTEXT,
-`col195` DATE,
-`col196` TIME,
-`col197` YEAR,
-`col198` CHAR (206),
-KEY `idx0` (`col39`,`col23`)
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-# Creating a table with 133 columns and 16 indexes
-DROP TABLE IF EXISTS `table4`;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table4`
-(`col0` VARCHAR (60),
-`col1` NUMERIC,
-`col2` LONGTEXT,
-`col3` MEDIUMTEXT,
-`col4` LONGTEXT,
-`col5` LONGBLOB,
-`col6` LONGBLOB,
-`col7` DATETIME,
-`col8` TINYTEXT,
-`col9` BLOB,
-`col10` BOOL,
-`col11` BIGINT,
-`col12` TEXT,
-`col13` VARCHAR (213),
-`col14` TINYBLOB,
-`col15` BOOL,
-`col16` MEDIUMTEXT,
-`col17` DOUBLE,
-`col18` TEXT,
-`col19` BLOB,
-`col20` SET ('test1','test2','test3'),
-`col21` TINYINT,
-`col22` DATETIME,
-`col23` TINYINT,
-`col24` ENUM ('test1','test2','test3'),
-`col25` REAL,
-`col26` BOOL,
-`col27` FLOAT,
-`col28` LONGBLOB,
-`col29` DATETIME,
-`col30` FLOAT,
-`col31` SET ('test1','test2','test3'),
-`col32` LONGBLOB,
-`col33` NUMERIC,
-`col34` YEAR,
-`col35` VARCHAR (146),
-`col36` BIGINT,
-`col37` DATETIME,
-`col38` DATE,
-`col39` SET ('test1','test2','test3'),
-`col40` CHAR (112),
-`col41` FLOAT,
-`col42` YEAR,
-`col43` TIME,
-`col44` DOUBLE,
-`col45` NUMERIC,
-`col46` FLOAT,
-`col47` DECIMAL,
-`col48` BIGINT,
-`col49` DECIMAL,
-`col50` YEAR,
-`col51` MEDIUMTEXT,
-`col52` LONGBLOB,
-`col53` SET ('test1','test2','test3'),
-`col54` BLOB,
-`col55` FLOAT,
-`col56` REAL,
-`col57` REAL,
-`col58` TEXT,
-`col59` MEDIUMBLOB,
-`col60` INT,
-`col61` INT,
-`col62` DATE,
-`col63` TEXT,
-`col64` DATE,
-`col65` ENUM ('test1','test2','test3'),
-`col66` DOUBLE PRECISION,
-`col67` TINYTEXT,
-`col68` TINYBLOB,
-`col69` FLOAT,
-`col70` BLOB,
-`col71` DATETIME,
-`col72` DOUBLE,
-`col73` LONGTEXT,
-`col74` TIME,
-`col75` DATETIME,
-`col76` VARCHAR (122),
-`col77` MEDIUMTEXT,
-`col78` MEDIUMTEXT,
-`col79` BOOL,
-`col80` LONGTEXT,
-`col81` TINYTEXT,
-`col82` NUMERIC,
-`col83` DOUBLE PRECISION,
-`col84` DATE,
-`col85` YEAR,
-`col86` BLOB,
-`col87` TINYTEXT,
-`col88` DOUBLE PRECISION,
-`col89` MEDIUMINT,
-`col90` MEDIUMTEXT,
-`col91` NUMERIC,
-`col92` DATETIME,
-`col93` NUMERIC,
-`col94` SET ('test1','test2','test3'),
-`col95` TINYTEXT,
-`col96` SET ('test1','test2','test3'),
-`col97` YEAR,
-`col98` MEDIUMINT,
-`col99` TEXT,
-`col100` TEXT,
-`col101` TIME,
-`col102` VARCHAR (225),
-`col103` TINYTEXT,
-`col104` TEXT,
-`col105` MEDIUMTEXT,
-`col106` TINYINT,
-`col107` TEXT,
-`col108` LONGBLOB,
-`col109` LONGTEXT,
-`col110` TINYTEXT,
-`col111` CHAR (56),
-`col112` YEAR,
-`col113` ENUM ('test1','test2','test3'),
-`col114` TINYBLOB,
-`col115` DATETIME,
-`col116` DATE,
-`col117` TIME,
-`col118` MEDIUMTEXT,
-`col119` DOUBLE PRECISION,
-`col120` FLOAT,
-`col121` TIMESTAMP,
-`col122` MEDIUMINT,
-`col123` YEAR,
-`col124` DATE,
-`col125` TEXT,
-`col126` FLOAT,
-`col127` TINYTEXT,
-`col128` BOOL,
-`col129` NUMERIC,
-`col130` TIMESTAMP,
-`col131` INT,
-`col132` MEDIUMBLOB,
-KEY `idx0` (`col130`),
-KEY `idx1` (`col30`,`col55`,`col19`(31)),
-KEY `idx2` (`col104`(186)),
-KEY `idx3` (`col131`),
-KEY `idx4` (`col64`,`col93`,`col2`(11)),
-KEY `idx5` (`col34`,`col121`,`col22`),
-KEY `idx6` (`col33`,`col55`,`col83`),
-KEY `idx7` (`col17`,`col87`(245),`col99`(17)),
-KEY `idx8` (`col65`,`col120`),
-KEY `idx9` (`col82`),
-KEY `idx10` (`col9`(72)),
-KEY `idx11` (`col88`),
-KEY `idx12` (`col128`,`col9`(200),`col71`,`col66`),
-KEY `idx13` (`col77`(126)),
-KEY `idx14` (`col105`(26),`col13`,`col117`),
-KEY `idx15` (`col4`(246),`col130`,`col115`,`col3`(141))
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-# Creating a table with 176 columns and 13 indexes
-DROP TABLE IF EXISTS `table5`;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table5`
-(`col0` MEDIUMTEXT,
-`col1` VARCHAR (90),
-`col2` TINYTEXT,
-`col3` TIME,
-`col4` BOOL,
-`col5` TINYTEXT,
-`col6` BOOL,
-`col7` TIMESTAMP,
-`col8` TINYBLOB,
-`col9` TINYINT,
-`col10` YEAR,
-`col11` SET ('test1','test2','test3'),
-`col12` TEXT,
-`col13` CHAR (248),
-`col14` BIGINT,
-`col15` TEXT,
-`col16` TINYINT,
-`col17` NUMERIC,
-`col18` SET ('test1','test2','test3'),
-`col19` LONGBLOB,
-`col20` FLOAT,
-`col21` INT,
-`col22` TEXT,
-`col23` BOOL,
-`col24` DECIMAL,
-`col25` DOUBLE PRECISION,
-`col26` FLOAT,
-`col27` TINYBLOB,
-`col28` NUMERIC,
-`col29` MEDIUMBLOB,
-`col30` DATE,
-`col31` LONGTEXT,
-`col32` DATE,
-`col33` FLOAT,
-`col34` BIGINT,
-`col35` TINYTEXT,
-`col36` MEDIUMTEXT,
-`col37` TIME,
-`col38` INT,
-`col39` TINYINT,
-`col40` SET ('test1','test2','test3'),
-`col41` CHAR (130),
-`col42` SMALLINT,
-`col43` INT,
-`col44` MEDIUMTEXT,
-`col45` VARCHAR (126),
-`col46` INT,
-`col47` DOUBLE PRECISION,
-`col48` BIGINT,
-`col49` MEDIUMTEXT,
-`col50` TINYBLOB,
-`col51` MEDIUMINT,
-`col52` TEXT,
-`col53` VARCHAR (208),
-`col54` VARCHAR (207),
-`col55` NUMERIC,
-`col56` DATETIME,
-`col57` ENUM ('test1','test2','test3'),
-`col58` NUMERIC,
-`col59` TINYBLOB,
-`col60` VARCHAR (73),
-`col61` MEDIUMTEXT,
-`col62` TINYBLOB,
-`col63` DATETIME,
-`col64` NUMERIC,
-`col65` MEDIUMINT,
-`col66` DATETIME,
-`col67` NUMERIC,
-`col68` TINYINT,
-`col69` VARCHAR (58),
-`col70` DECIMAL,
-`col71` MEDIUMTEXT,
-`col72` DATE,
-`col73` TIME,
-`col74` DOUBLE PRECISION,
-`col75` DECIMAL,
-`col76` MEDIUMBLOB,
-`col77` REAL,
-`col78` YEAR,
-`col79` YEAR,
-`col80` LONGBLOB,
-`col81` BLOB,
-`col82` BIGINT,
-`col83` ENUM ('test1','test2','test3'),
-`col84` NUMERIC,
-`col85` SET ('test1','test2','test3'),
-`col86` MEDIUMTEXT,
-`col87` LONGBLOB,
-`col88` TIME,
-`col89` ENUM ('test1','test2','test3'),
-`col90` DECIMAL,
-`col91` FLOAT,
-`col92` DATETIME,
-`col93` TINYTEXT,
-`col94` TIMESTAMP,
-`col95` TIMESTAMP,
-`col96` TEXT,
-`col97` REAL,
-`col98` VARCHAR (198),
-`col99` TIME,
-`col100` TINYINT,
-`col101` BIGINT,
-`col102` LONGBLOB,
-`col103` LONGBLOB,
-`col104` MEDIUMINT,
-`col105` MEDIUMTEXT,
-`col106` TIMESTAMP,
-`col107` SMALLINT,
-`col108` NUMERIC,
-`col109` DECIMAL,
-`col110` FLOAT,
-`col111` DECIMAL,
-`col112` REAL,
-`col113` TINYTEXT,
-`col114` FLOAT,
-`col115` VARCHAR (7),
-`col116` LONGTEXT,
-`col117` DATE,
-`col118` BIGINT,
-`col119` TEXT,
-`col120` BIGINT,
-`col121` BLOB,
-`col122` CHAR (110),
-`col123` NUMERIC,
-`col124` MEDIUMBLOB,
-`col125` NUMERIC,
-`col126` NUMERIC,
-`col127` BOOL,
-`col128` TIME,
-`col129` TINYBLOB,
-`col130` TINYBLOB,
-`col131` DATE,
-`col132` INT,
-`col133` VARCHAR (123),
-`col134` CHAR (238),
-`col135` VARCHAR (225),
-`col136` LONGTEXT,
-`col137` LONGBLOB,
-`col138` REAL,
-`col139` TINYBLOB,
-`col140` DATETIME,
-`col141` TINYTEXT,
-`col142` LONGBLOB,
-`col143` BIGINT,
-`col144` VARCHAR (236),
-`col145` TEXT,
-`col146` YEAR,
-`col147` DECIMAL,
-`col148` TEXT,
-`col149` MEDIUMBLOB,
-`col150` TINYINT,
-`col151` BOOL,
-`col152` VARCHAR (72),
-`col153` INT,
-`col154` VARCHAR (165),
-`col155` TINYINT,
-`col156` MEDIUMTEXT,
-`col157` DOUBLE PRECISION,
-`col158` TIME,
-`col159` MEDIUMBLOB,
-`col160` LONGBLOB,
-`col161` DATETIME,
-`col162` DOUBLE PRECISION,
-`col163` BLOB,
-`col164` ENUM ('test1','test2','test3'),
-`col165` TIMESTAMP,
-`col166` DATE,
-`col167` TINYBLOB,
-`col168` TINYBLOB,
-`col169` LONGBLOB,
-`col170` DATETIME,
-`col171` BIGINT,
-`col172` VARCHAR (30),
-`col173` LONGTEXT,
-`col174` TIME,
-`col175` FLOAT,
-KEY `idx0` (`col16`,`col156`(139),`col97`,`col120`),
-KEY `idx1` (`col24`,`col0`(108)),
-KEY `idx2` (`col117`,`col173`(34),`col132`,`col82`),
-KEY `idx3` (`col2`(86)),
-KEY `idx4` (`col2`(43)),
-KEY `idx5` (`col83`,`col35`(87),`col111`),
-KEY `idx6` (`col6`,`col134`,`col92`),
-KEY `idx7` (`col56`),
-KEY `idx8` (`col30`,`col53`,`col129`(66)),
-KEY `idx9` (`col53`,`col113`(211),`col32`,`col15`(75)),
-KEY `idx10` (`col34`),
-KEY `idx11` (`col126`),
-KEY `idx12` (`col24`)
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-# Creating a table with 179 columns and 46 indexes
-DROP TABLE IF EXISTS `table6`;
--- error ER_TOO_BIG_ROWSIZE
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE IF NOT EXISTS `table6`
-(`col0` ENUM ('test1','test2','test3'),
-`col1` MEDIUMBLOB,
-`col2` MEDIUMBLOB,
-`col3` DATETIME,
-`col4` DATE,
-`col5` YEAR,
-`col6` REAL,
-`col7` NUMERIC,
-`col8` MEDIUMBLOB,
-`col9` TEXT,
-`col10` TIMESTAMP,
-`col11` DOUBLE,
-`col12` DOUBLE,
-`col13` SMALLINT,
-`col14` TIMESTAMP,
-`col15` DECIMAL,
-`col16` DATE,
-`col17` TEXT,
-`col18` LONGBLOB,
-`col19` BIGINT,
-`col20` FLOAT,
-`col21` DATETIME,
-`col22` TINYINT,
-`col23` MEDIUMBLOB,
-`col24` SET ('test1','test2','test3'),
-`col25` TIME,
-`col26` TEXT,
-`col27` LONGTEXT,
-`col28` BIGINT,
-`col29` REAL,
-`col30` YEAR,
-`col31` MEDIUMBLOB,
-`col32` MEDIUMINT,
-`col33` FLOAT,
-`col34` TEXT,
-`col35` DATE,
-`col36` TIMESTAMP,
-`col37` REAL,
-`col38` BLOB,
-`col39` BLOB,
-`col40` BLOB,
-`col41` TINYBLOB,
-`col42` INT,
-`col43` TINYINT,
-`col44` REAL,
-`col45` BIGINT,
-`col46` TIMESTAMP,
-`col47` BLOB,
-`col48` ENUM ('test1','test2','test3'),
-`col49` BOOL,
-`col50` CHAR (109),
-`col51` DOUBLE,
-`col52` DOUBLE PRECISION,
-`col53` ENUM ('test1','test2','test3'),
-`col54` FLOAT,
-`col55` DOUBLE PRECISION,
-`col56` CHAR (166),
-`col57` TEXT,
-`col58` TIME,
-`col59` DECIMAL,
-`col60` TEXT,
-`col61` ENUM ('test1','test2','test3'),
-`col62` LONGTEXT,
-`col63` YEAR,
-`col64` DOUBLE,
-`col65` CHAR (87),
-`col66` DATE,
-`col67` BOOL,
-`col68` MEDIUMBLOB,
-`col69` DATETIME,
-`col70` DECIMAL,
-`col71` TIME,
-`col72` REAL,
-`col73` LONGTEXT,
-`col74` BLOB,
-`col75` REAL,
-`col76` INT,
-`col77` INT,
-`col78` FLOAT,
-`col79` DOUBLE,
-`col80` MEDIUMINT,
-`col81` ENUM ('test1','test2','test3'),
-`col82` VARCHAR (221),
-`col83` BIGINT,
-`col84` TINYINT,
-`col85` BIGINT,
-`col86` FLOAT,
-`col87` MEDIUMBLOB,
-`col88` CHAR (126),
-`col89` MEDIUMBLOB,
-`col90` DATETIME,
-`col91` TINYINT,
-`col92` DOUBLE,
-`col93` NUMERIC,
-`col94` DATE,
-`col95` BLOB,
-`col96` DATETIME,
-`col97` TIME,
-`col98` LONGBLOB,
-`col99` INT,
-`col100` SET ('test1','test2','test3'),
-`col101` TINYBLOB,
-`col102` INT,
-`col103` MEDIUMBLOB,
-`col104` MEDIUMTEXT,
-`col105` FLOAT,
-`col106` TINYBLOB,
-`col107` VARCHAR (26),
-`col108` TINYINT,
-`col109` TIME,
-`col110` TINYBLOB,
-`col111` LONGBLOB,
-`col112` TINYTEXT,
-`col113` FLOAT,
-`col114` TINYINT,
-`col115` NUMERIC,
-`col116` TIME,
-`col117` SET ('test1','test2','test3'),
-`col118` DATE,
-`col119` SMALLINT,
-`col120` BLOB,
-`col121` TINYTEXT,
-`col122` REAL,
-`col123` YEAR,
-`col124` REAL,
-`col125` BOOL,
-`col126` BLOB,
-`col127` REAL,
-`col128` MEDIUMBLOB,
-`col129` TIMESTAMP,
-`col130` LONGBLOB,
-`col131` MEDIUMBLOB,
-`col132` YEAR,
-`col133` YEAR,
-`col134` INT,
-`col135` MEDIUMINT,
-`col136` MEDIUMINT,
-`col137` TINYTEXT,
-`col138` TINYBLOB,
-`col139` BLOB,
-`col140` SET ('test1','test2','test3'),
-`col141` ENUM ('test1','test2','test3'),
-`col142` ENUM ('test1','test2','test3'),
-`col143` TINYTEXT,
-`col144` DATETIME,
-`col145` TEXT,
-`col146` DOUBLE PRECISION,
-`col147` DECIMAL,
-`col148` MEDIUMTEXT,
-`col149` TINYTEXT,
-`col150` SET ('test1','test2','test3'),
-`col151` MEDIUMTEXT,
-`col152` CHAR (126),
-`col153` DOUBLE,
-`col154` CHAR (243),
-`col155` SET ('test1','test2','test3'),
-`col156` SET ('test1','test2','test3'),
-`col157` DATETIME,
-`col158` DOUBLE,
-`col159` NUMERIC,
-`col160` DECIMAL,
-`col161` FLOAT,
-`col162` LONGBLOB,
-`col163` LONGTEXT,
-`col164` INT,
-`col165` TIME,
-`col166` CHAR (27),
-`col167` VARCHAR (63),
-`col168` TEXT,
-`col169` TINYBLOB,
-`col170` TINYBLOB,
-`col171` ENUM ('test1','test2','test3'),
-`col172` INT,
-`col173` TIME,
-`col174` DECIMAL,
-`col175` DOUBLE,
-`col176` MEDIUMBLOB,
-`col177` LONGBLOB,
-`col178` CHAR (43),
-KEY `idx0` (`col131`(219)),
-KEY `idx1` (`col67`,`col122`,`col59`,`col87`(33)),
-KEY `idx2` (`col83`,`col42`,`col57`(152)),
-KEY `idx3` (`col106`(124)),
-KEY `idx4` (`col173`,`col80`,`col165`,`col89`(78)),
-KEY `idx5` (`col174`,`col145`(108),`col23`(228),`col141`),
-KEY `idx6` (`col157`,`col140`),
-KEY `idx7` (`col130`(188),`col15`),
-KEY `idx8` (`col52`),
-KEY `idx9` (`col144`),
-KEY `idx10` (`col155`),
-KEY `idx11` (`col62`(230),`col1`(109)),
-KEY `idx12` (`col151`(24),`col95`(85)),
-KEY `idx13` (`col114`),
-KEY `idx14` (`col42`,`col98`(56),`col146`),
-KEY `idx15` (`col147`,`col39`(254),`col35`),
-KEY `idx16` (`col79`),
-KEY `idx17` (`col65`),
-KEY `idx18` (`col149`(165),`col168`(119),`col32`,`col117`),
-KEY `idx19` (`col64`),
-KEY `idx20` (`col93`),
-KEY `idx21` (`col64`,`col113`,`col104`(182)),
-KEY `idx22` (`col52`,`col111`(189)),
-KEY `idx23` (`col45`),
-KEY `idx24` (`col154`,`col107`,`col110`(159)),
-KEY `idx25` (`col149`(1),`col87`(131)),
-KEY `idx26` (`col58`,`col115`,`col63`),
-KEY `idx27` (`col95`(9),`col0`,`col87`(113)),
-KEY `idx28` (`col92`,`col130`(1)),
-KEY `idx29` (`col151`(129),`col137`(254),`col13`),
-KEY `idx30` (`col49`),
-KEY `idx31` (`col28`),
-KEY `idx32` (`col83`,`col146`),
-KEY `idx33` (`col155`,`col90`,`col17`(245)),
-KEY `idx34` (`col174`,`col169`(44),`col107`),
-KEY `idx35` (`col113`),
-KEY `idx36` (`col52`),
-KEY `idx37` (`col16`,`col120`(190)),
-KEY `idx38` (`col28`),
-KEY `idx39` (`col131`(165)),
-KEY `idx40` (`col135`,`col26`(86)),
-KEY `idx41` (`col69`,`col94`),
-KEY `idx42` (`col105`,`col151`(38),`col97`),
-KEY `idx43` (`col88`),
-KEY `idx44` (`col176`(100),`col42`,`col73`(189),`col94`),
-KEY `idx45` (`col2`(27),`col27`(116))
-)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-DROP TABLE IF EXISTS table0;
-DROP TABLE IF EXISTS table1;
-DROP TABLE IF EXISTS table2;
-DROP TABLE IF EXISTS table3;
-DROP TABLE IF EXISTS table4;
-DROP TABLE IF EXISTS table5;
-DROP TABLE IF EXISTS table6;
-
-EVAL SET GLOBAL innodb_file_format=$file_format;
-EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug36172.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug36172.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug36172.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug36172.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,30 +0,0 @@
-#
-# Test case for bug 36172
-#
-
--- source include/not_embedded.inc
--- source include/have_innodb.inc
-
-SET storage_engine=InnoDB;
-
-# we do not really care about what gets printed, we are only
-# interested in getting success or failure according to our
-# expectations
-
--- disable_query_log
--- disable_result_log
-
-let $file_format=`select @@innodb_file_format`;
-let $file_per_table=`select @@innodb_file_per_table`;
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-
-DROP TABLE IF EXISTS `table0`;
-CREATE TABLE `table0` (   `col0` tinyint(1) DEFAULT NULL,   `col1` tinyint(1) DEFAULT NULL,   `col2` tinyint(4) DEFAULT NULL,   `col3` date DEFAULT NULL,   `col4` time DEFAULT NULL,   `col5` set('test1','test2','test3') DEFAULT NULL,   `col6` time DEFAULT NULL,   `col7` text,   `col8` decimal(10,0) DEFAULT NULL,   `col9` set('test1','test2','test3') DEFAULT NULL,   `col10` float DEFAULT NULL,   `col11` double DEFAULT NULL,   `col12` enum('test1','test2','test3') DEFAULT NULL,   `col13` tinyblob,   `col14` year(4) DEFAULT NULL,   `col15` set('test1','test2','test3') DEFAULT NULL,   `col16` decimal(10,0) DEFAULT NULL,   `col17` decimal(10,0) DEFAULT NULL,   `col18` blob,   `col19` datetime DEFAULT NULL,   `col20` double DEFAULT NULL,   `col21` decimal(10,0) DEFAULT NULL,   `col22` datetime DEFAULT NULL,   `col23` decimal(10,0) DEFAULT NULL,   `col24` decimal(10,0) DEFAULT NULL,   `col25` longtext,   `col26` tinyblob,   `col27` time DEFAULT NULL,   `col28` tinyblob,   `col29` enum('test1','test2','test3') DEFAULT NULL,   `col30` smallint(6) DEFAULT NULL,   `col31` double DEFAULT NULL,   `col32` float DEFAULT NULL,   `col33` char(175) DEFAULT NULL,   `col34` tinytext,   `col35` tinytext,   `col36` tinyblob,   `col37` tinyblob,   `col38` tinytext,   `col39` mediumblob,   `col40` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,   `col41` double DEFAULT NULL,   `col42` smallint(6) DEFAULT NULL,   `col43` longblob,   `col44` varchar(80) DEFAULT NULL,   `col45` mediumtext,   `col46` decimal(10,0) DEFAULT NULL,   `col47` bigint(20) DEFAULT NULL,   `col48` date DEFAULT NULL,   `col49` tinyblob,   `col50` date DEFAULT NULL,   `col51` tinyint(1) DEFAULT NULL,   `col52` mediumint(9) DEFAULT NULL,   `col53` float DEFAULT NULL,   `col54` tinyblob,   `col55` longtext,   `col56` smallint(6) DEFAULT NULL,   `col57` enum('test1','test2','test3') DEFAULT NULL,   `col58` datetime DEFAULT NULL,   `col59` mediumtext,   `col60` varchar(232) DEFAULT NULL,   `col61` decimal(10,0) DEFAULT NULL,   `col62` year(4) DEFAULT NULL,   `col63` smallint(6) DEFAULT NULL,   `col64` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',   `col65` blob,   `col66` longblob,   `col67` int(11) DEFAULT NULL,   `col68` longtext,   `col69` enum('test1','test2','test3') DEFAULT NULL,   `col70` int(11) DEFAULT NULL,   `col71` time DEFAULT NULL,   `col72` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',   `col73` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',   `col74` varchar(170) DEFAULT NULL,   `col75` set('test1','test2','test3') DEFAULT NULL,   `col76` tinyblob,   `col77` bigint(20) DEFAULT NULL,   `col78` decimal(10,0) DEFAULT NULL,   `col79` datetime DEFAULT NULL,   `col80` year(4) DEFAULT NULL,   `col81` decimal(10,0) DEFAULT NULL,   `col82` longblob,   `col83` text,   `col84` char(83) DEFAULT NULL,   `col85` decimal(10,0) DEFAULT NULL,   `col86` float DEFAULT NULL,   `col87` int(11) DEFAULT NULL,   `col88` varchar(145) DEFAULT NULL,   `col89` date DEFAULT NULL,   `col90` decimal(10,0) DEFAULT NULL,   `col91` decimal(10,0) DEFAULT NULL,   `col92` mediumblob,   `col93` time DEFAULT NULL,   KEY `idx0` (`col69`,`col90`,`col8`),   KEY `idx1` (`col60`),   KEY `idx2` (`col60`,`col70`,`col74`),   KEY `idx3` (`col22`,`col32`,`col72`,`col30`),   KEY `idx4` (`col29`),   KEY `idx5` (`col19`,`col45`(143)),   KEY `idx6` (`col46`,`col48`,`col5`,`col39`(118)),   KEY `idx7` (`col48`,`col61`),   KEY `idx8` (`col93`),   KEY `idx9` (`col31`),   KEY `idx10` (`col30`,`col21`),   KEY `idx11` (`col67`),   KEY `idx12` (`col44`,`col6`,`col8`,`col38`(226)),   KEY `idx13` (`col71`,`col41`,`col15`,`col49`(88)),   KEY `idx14` (`col78`),   KEY `idx15` (`col63`,`col67`,`col64`),   KEY `idx16` (`col17`,`col86`),   KEY `idx17` (`col77`,`col56`,`col10`,`col55`(24)),   KEY `idx18` (`col62`),   KEY `idx19` (`col31`,`col57`,`col56`,`col53`),   KEY `idx20` (`col46`),   KEY `idx21` (`col83`(54)),   KEY `idx22` (`col51`,`col7`(120)),   KEY `idx23` (`col7`(163),`col31`,`col71`,`col14`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
-insert ignore into `table0` set  `col23` = 7887371.5084383683, `col24` = 4293854615.6906948000, `col25` = 'vitalist', `col26` = 'widespread', `col27` = '3570490', `col28` = 'habitual', `col30` = -5471, `col31` = 4286985783.6771750000, `col32` = 6354540.9826654866, `col33` = 'defoliation', `col34` = 'logarithms', `col35` = 'tegument\'s', `col36` = 'scouting\'s', `col37` = 'intermittency', `col38` = 'elongates', `col39` = 'prophecies', `col40` = '20560103035939', `col41` = 4292809130.0544143000, `col42` = 22057, `col43` = 'Hess\'s', `col44` = 'bandstand', `col45` = 'phenylketonuria', `col46` = 6338767.4018677324, `col47` = 5310247, `col48` = '12592418', `col49` = 'churchman\'s', `col50` = '32226125', `col51` = -58, `col52` = -6207968, `col53` = 1244839.3255104220, `col54` = 'robotized', `col55` = 'monotonous', `col56` = -26909, `col58` = '20720107023550', `col59` = 'suggestiveness\'s', `col60` = 'gemology', `col61` = 4287800670.2229986000, `col62` = '1944', `col63` = -16827, `col64` = '20700107212324', `col65` = 'Nicolais', `col66` = 'apteryx', `col67` = 6935317, `col68` = 'stroganoff', `col70` = 3316430, `col71` = '3277608', `col72` = '19300511045918', `col73` = '20421201003327', `col74` = 'attenuant', `col75` = '15173', `col76` = 'upstroke\'s', `col77` = 8118987, `col78` = 6791516.2735374002, `col79` = '20780701144624', `col80` = '2134', `col81` = 4290682351.3127537000, `col82` = 'unexplainably', `col83` = 'Storm', `col84` = 'Greyso\'s', `col85` = 4289119212.4306774000, `col86` = 7617575.8796655172, `col87` = -6325335, `col88` = 'fondue\'s', `col89` = '40608940', `col90` = 1659421.8093508712, `col91` = 8346904.6584368423, `col92` = 'reloads', `col93` = '5188366';
-CHECK TABLE table0 EXTENDED;
-INSERT IGNORE INTO `table0` SET `col19` = '19940127002709', `col20` = 2383927.9055146948, `col21` = 4293243420.5621204000, `col22` = '20511211123705', `col23` = 4289899778.6573381000, `col24` = 4293449279.0540481000, `col25` = 'emphysemic', `col26` = 'dentally', `col27` = '2347406', `col28` = 'eruct', `col30` = 1222, `col31` = 4294372994.9941406000, `col32` = 4291385574.1173744000, `col33` = 'borrowing\'s', `col34` = 'septics', `col35` = 'ratter\'s', `col36` = 'Kaye', `col37` = 'Florentia', `col38` = 'allium', `col39` = 'barkeep', `col40` = '19510407003441', `col41` = 4293559200.4215522000, `col42` = 22482, `col43` = 'decussate', `col44` = 'Brom\'s', `col45` = 'violated', `col46` = 4925506.4635456400, `col47` = 930549, `col48` = '51296066', `col49` = 'voluminously', `col50` = '29306676', `col51` = -88, `col52` = -2153690, `col53` = 4290250202.1464887000, `col54` = 'expropriation', `col55` = 'Aberdeen\'s', `col56` = 20343, `col58` = '19640415171532', `col59` = 'extern', `col60` = 'Ubana', `col61` = 4290487961.8539081000, `col62` = '2147', `col63` = -24271, `col64` = '20750801194548', `col65` = 'Cunaxa\'s', `col66` = 'pasticcio', `col67` = 2795817, `col68` = 'Indore\'s', `col70` = 6864127, `col71` = '1817832', `col72` = '20540506114211', `col73` = '20040101012300', `col74` = 'rationalized', `col75` = '45522', `col76` = 'indene', `col77` = -6964559, `col78` = 4247535.5266884370, `col79` = '20720416124357', `col80` = '2143', `col81` = 4292060102.4466386000, `col82` = 'striving', `col83` = 'boneblack\'s', `col84` = 'redolent', `col85` = 6489697.9009369183, `col86` = 4287473465.9731131000, `col87` = 7726015, `col88` = 'perplexed', `col89` = '17153791', `col90` = 5478587.1108127078, `col91` = 4287091404.7004304000, `col92` = 'Boulez\'s', `col93` = '2931278';
-CHECK TABLE table0 EXTENDED;
-DROP TABLE table0;
-EVAL SET GLOBAL innodb_file_format=$file_format;
-EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug52745.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug52745.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug52745.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug52745.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,107 +0,0 @@
--- source include/have_innodb.inc
-
-let $file_format=`select @@innodb_file_format`;
-let $file_per_table=`select @@innodb_file_per_table`;
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-
-CREATE TABLE bug52745 (
-  a2 int(10) unsigned DEFAULT NULL,
-  col37 time DEFAULT NULL,
-  col38 char(229) CHARACTER SET utf8 DEFAULT NULL,
-  col39 text,
-  col40 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
-  col41 int(10) unsigned DEFAULT NULL,
-  col42 varchar(248) CHARACTER SET utf8 DEFAULT NULL,
-  col43 smallint(5) unsigned zerofill DEFAULT NULL,
-  col44 varchar(150) CHARACTER SET utf8 DEFAULT NULL,
-  col45 float unsigned zerofill DEFAULT NULL,
-  col46 binary(1) DEFAULT NULL,
-  col47 tinyint(4) DEFAULT NULL,
-  col48 tinyint(1) DEFAULT NULL,
-  col49 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  col50 binary(1) DEFAULT NULL,
-  col51 double unsigned zerofill DEFAULT NULL,
-  col52 int(10) unsigned DEFAULT NULL,
-  col53 time DEFAULT NULL,
-  col54 double unsigned DEFAULT NULL,
-  col55 time DEFAULT NULL,
-  col56 mediumtext CHARACTER SET latin2,
-  col57 blob,
-  col58 decimal(52,16) unsigned zerofill NOT NULL DEFAULT '000000000000000000000000000000000000.0000000000000000',
-  col59 binary(1) DEFAULT NULL,
-  col60 longblob,
-  col61 time DEFAULT NULL,
-  col62 longtext CHARACTER SET utf8 COLLATE utf8_persian_ci,
-  col63 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  col64 int(10) unsigned DEFAULT NULL,
-  col65 date DEFAULT NULL,
-  col66 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
-  col67 binary(1) DEFAULT NULL,
-  col68 tinyblob,
-  col69 date DEFAULT NULL,
-  col70 tinyint(3) unsigned zerofill DEFAULT NULL,
-  col71 varchar(44) CHARACTER SET utf8 DEFAULT NULL,
-  col72 datetime DEFAULT NULL,
-  col73 smallint(5) unsigned zerofill DEFAULT NULL,
-  col74 longblob,
-  col75 bit(34) DEFAULT NULL,
-  col76 float unsigned zerofill DEFAULT NULL,
-  col77 year(2) DEFAULT NULL,
-  col78 tinyint(3) unsigned DEFAULT NULL,
-  col79 set('msfheowh','tbpxbgf','by','wahnrjw','myqfasxz','rsokyumrt') CHARACTER SET latin2 DEFAULT NULL,
-  col80 datetime DEFAULT NULL,
-  col81 smallint(6) DEFAULT NULL,
-  col82 enum('xtaurnqfqz','rifrse','kuzwpbvb','niisabk','zxavro','rbvasv','','uulrfaove','','') DEFAULT NULL,
-  col83 bigint(20) unsigned zerofill DEFAULT NULL,
-  col84 float unsigned zerofill DEFAULT NULL,
-  col85 double DEFAULT NULL,
-  col86 enum('ylannv','','vlkhycqc','snke','cxifustp','xiaxaswzp','oxl') CHARACTER SET latin1 COLLATE latin1_german2_ci DEFAULT NULL,
-  col87 varbinary(221) DEFAULT NULL,
-  col88 double unsigned DEFAULT NULL,
-  col89 float unsigned zerofill DEFAULT NULL,
-  col90 tinyblob
-) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-INSERT INTO bug52745 SET
-col40='0000-00-00 00:00:00',
-col51=16547,
-col53='7711484',
-col54=-28604,
-col55='7112612',
-col56='wakefulness\'',
-col57=repeat('absorbefacient\'',106),
-col58=11027,
-col59='AM09gW7',
-col60=repeat('Noelani\'',16),
-col61='2520576',
-col62='substitutiv',
-col63='19950106155112',
-col64=-12038,
-col65='86238806',
-col66='19600719080256',
-col68=repeat('Sagittarius\'',54),
-col69='38943902',
-col70=1232,
-col71='Elora\'',
-col74=repeat('zipp',11),
-col75='0',
-col76=23254,
-col78=13247,
-col79='56219',
-col80='20500609035724',
-col81=11632,
-col82=7,
-col84=-23863,
-col85=6341,
-col87='HZdkf.4 s7t,5Rmq	8so fmr,ruGLUG25TrtI.yQ	2SuHq0ML7rw7.4 b2yf2E5TJxOtBBZImezDnzpj,uPYfznnEUDN1e9aQoO 2DsplB7TFWy	oQJ br  HLF :F,eQ p4i1oWsr lL3PG,hjCz6hYqN h1QTjLCjrv:QCdSzpYBibJAtZCxLOk3l6Blsh.W',
-col88=16894,
-col89=6161,
-col90=repeat('gale',48);
-
-SHOW WARNINGS;
-
-DROP TABLE bug52745;
-
-EVAL SET GLOBAL innodb_file_format=$file_format;
-EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug53591.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug53591.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug53591.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug53591.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,20 +0,0 @@
--- source include/have_innodb.inc
-
-let $file_format=`select @@innodb_file_format`;
-let $file_per_table=`select @@innodb_file_per_table`;
-
-SET GLOBAL innodb_file_format='Barracuda';
-SET GLOBAL innodb_file_per_table=on;
-
-set old_alter_table=0;
-
-CREATE TABLE bug53591(a text charset utf8 not null)
-ENGINE=InnoDB KEY_BLOCK_SIZE=1;
--- error 139
-ALTER TABLE bug53591 ADD PRIMARY KEY(a(220));
-SHOW WARNINGS;
-
-DROP TABLE bug53591;
-
-EVAL SET GLOBAL innodb_file_format=$file_format;
-EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug56680.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug56680.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug56680.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug56680.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-#
-# Bug #56680 InnoDB may return wrong results from a case-insensitive index
-#
--- source include/have_innodb.inc
-
--- disable_query_log
-SET @tx_isolation_orig = @@tx_isolation;
-SET @innodb_file_per_table_orig = @@innodb_file_per_table;
-SET @innodb_file_format_orig = @@innodb_file_format;
-# The flag innodb_change_buffering_debug is only available in debug builds.
-# It instructs InnoDB to try to evict pages from the buffer pool when
-# change buffering is possible, so that the change buffer will be used
-# whenever possible.
--- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
-SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug;
--- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
-SET GLOBAL innodb_change_buffering_debug = 1;
--- enable_query_log
-SET GLOBAL tx_isolation='REPEATABLE-READ';
-SET GLOBAL innodb_file_format=Barracuda;
-SET GLOBAL innodb_file_per_table=on;
-
-CREATE TABLE bug56680(
-       a INT AUTO_INCREMENT PRIMARY KEY,
-       b CHAR(1),
-       c INT,
-       INDEX(b))
-ENGINE=InnoDB;
-
-INSERT INTO bug56680 VALUES(0,'x',1);
-BEGIN;
-SELECT b FROM bug56680;
-
-connect (con1,localhost,root,,);
-connection con1;
-BEGIN;
-UPDATE bug56680 SET b='X';
-
-connection default;
-# This should return the last committed value 'x', but would return 'X'
-# due to a bug in row_search_for_mysql().
-SELECT b FROM bug56680;
-# This would always return the last committed value 'x'.
-SELECT * FROM bug56680;
-
-connection con1;
-ROLLBACK;
-disconnect con1;
-
-connection default;
-
-SELECT b FROM bug56680;
-
-# For the rest of this test, use the READ UNCOMMITTED isolation level
-# to see what exists in the secondary index.
-SET GLOBAL tx_isolation='READ-UNCOMMITTED';
-
-# Create enough rows for the table, so that the insert buffer will be
-# used for modifying the secondary index page. There must be multiple
-# index pages, because changes to the root page are never buffered.
-
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
-
-BEGIN;
-SELECT b FROM bug56680 LIMIT 2;
-
-connect (con1,localhost,root,,);
-connection con1;
-BEGIN;
-DELETE FROM bug56680 WHERE a=1;
-# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
-INSERT INTO bug56680 VALUES(1,'X',1);
-
-# This should force an insert buffer merge, and return 'X' in the first row.
-SELECT b FROM bug56680 LIMIT 3;
-
-connection default;
-SELECT b FROM bug56680 LIMIT 2;
-CHECK TABLE bug56680;
-
-connection con1;
-ROLLBACK;
-SELECT b FROM bug56680 LIMIT 2;
-CHECK TABLE bug56680;
-
-connection default;
-disconnect con1;
-
-SELECT b FROM bug56680 LIMIT 2;
-
-CREATE TABLE bug56680_2(
-       a INT AUTO_INCREMENT PRIMARY KEY,
-       b VARCHAR(2) CHARSET latin1 COLLATE latin1_german2_ci,
-       c INT,
-       INDEX(b))
-ENGINE=InnoDB;
-
-INSERT INTO bug56680_2 SELECT 0,_latin1 0xdf,c FROM bug56680;
-
-BEGIN;
-SELECT HEX(b) FROM bug56680_2 LIMIT 2;
-DELETE FROM bug56680_2 WHERE a=1;
-# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
-INSERT INTO bug56680_2 VALUES(1,'SS',1);
-
-# This should force an insert buffer merge, and return 'SS' in the first row.
-SELECT HEX(b) FROM bug56680_2 LIMIT 3;
-CHECK TABLE bug56680_2;
-
-# Test this with compressed tables.
-ALTER TABLE bug56680_2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-
-SELECT HEX(b) FROM bug56680_2 LIMIT 2;
-DELETE FROM bug56680_2 WHERE a=1;
-# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
-INSERT INTO bug56680_2 VALUES(1,_latin1 0xdf,1);
-
-# This should force an insert buffer merge, and return 0xdf in the first row.
-SELECT HEX(b) FROM bug56680_2 LIMIT 3;
-CHECK TABLE bug56680_2;
-
-DROP TABLE bug56680_2;
-DROP TABLE bug56680;
-
--- disable_query_log
-SET GLOBAL tx_isolation = @tx_isolation_orig;
-SET GLOBAL innodb_file_per_table = @innodb_file_per_table_orig;
-SET GLOBAL innodb_file_format = @innodb_file_format_orig;
--- error 0, ER_UNKNOWN_SYSTEM_VARIABLE
-SET GLOBAL innodb_change_buffering_debug = @innodb_change_buffering_debug_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug60196-master.opt mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug60196-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_bug60196-master.opt	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_bug60196-master.opt	2015-02-27 08:30:35.000000000 +0000
@@ -1 +1 @@
---lower-case-table-names=2
+--lower-case-table-names=2
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-change-buffer-recovery-master.opt	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1 @@
+--log-error=$MYSQLTEST_VARDIR/tmp/my_restart.err
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-change-buffer-recovery.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,70 @@
+--echo #
+--echo # Bug#69122 - INNODB DOESN'T REDO-LOG INSERT BUFFER MERGE
+--echo #             OPERATION IF IT IS DONE IN-PLACE
+--echo #
+--source include/have_innodb.inc
+# innodb_change_buffering_debug option is debug only
+--source include/have_debug.inc
+# Embedded server does not support crashing
+--source include/not_embedded.inc
+# DBUG_SUICIDE() hangs under valgrind
+--source include/not_valgrind.inc
+
+# The flag innodb_change_buffering_debug is only available in debug builds.
+# It instructs InnoDB to try to evict pages from the buffer pool when
+# change buffering is possible, so that the change buffer will be used
+# whenever possible.
+SET GLOBAL innodb_change_buffering_debug = 1;
+let SEARCH_FILE = $MYSQLTEST_VARDIR/tmp/my_restart.err;
+
+CREATE TABLE t1(
+	a INT AUTO_INCREMENT PRIMARY KEY,
+	b CHAR(1),
+	c INT,
+	INDEX(b))
+ENGINE=InnoDB;
+
+# Create enough rows for the table, so that the change buffer will be
+# used for modifying the secondary index page. There must be multiple
+# index pages, because changes to the root page are never buffered.
+INSERT INTO t1 VALUES(0,'x',1);
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+INSERT INTO t1 SELECT 0,b,c FROM t1;
+
+BEGIN;
+SELECT b FROM t1 LIMIT 3;
+
+connect (con1,localhost,root,,);
+connection con1;
+BEGIN;
+DELETE FROM t1 WHERE a=1;
+# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
+INSERT INTO t1 VALUES(1,'X',1);
+
+SET DEBUG='+d,crash_after_log_ibuf_upd_inplace';
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--error 2013
+# This should force a change buffer merge
+SELECT b FROM t1 LIMIT 3;
+
+let SEARCH_PATTERN=Wrote log record for ibuf update in place operation;
+--source include/search_pattern_in_file.inc
+
+# Write file to make mysql-test-run.pl start up the server again
+--exec echo "restart" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--enable_reconnect
+--source include/wait_until_connected_again.inc
+
+CHECK TABLE t1;
+
+# Cleanup
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_cmp_drop_table-master.opt	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
---innodb-buffer-pool-size=8M
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_cmp_drop_table.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,59 +0,0 @@
--- source include/have_innodb.inc
-
-let $per_table=`select @@innodb_file_per_table`;
-let $format=`select @@innodb_file_format`;
-
--- let $query_i_s = SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0
-
-set global innodb_file_per_table=on;
-set global innodb_file_format=`1`;
- 
-create table t1(a text) engine=innodb key_block_size=8;
-
--- disable_query_log
-
-# insert some rows so we are using compressed pages
--- let $i = 10
-while ($i)
-{
-  insert into t1 values(repeat('abcdefghijklmnopqrstuvwxyz',100));
-  dec $i;
-}
--- enable_query_log
-
-# we should be using some 8K pages
--- eval $query_i_s
-
-drop table t1;
-
-# because of lazy eviction at drop table in 5.5 there should be some
-# used 8K pages
--- eval $query_i_s
-
-# create a non-compressed table and insert enough into it to evict
-# compressed pages
-create table t2(a text) engine=innodb;
-
--- disable_query_log
-
--- let $i = 400
-while ($i)
-{
-  insert into t2 values(repeat('abcdefghijklmnopqrstuvwxyz',1000));
-  dec $i;
-}
-
--- enable_query_log
-
-# now there should be no 8K pages in the buffer pool
--- eval $query_i_s
-
-drop table t2;
-
-#
-# restore environment to the state it was before this test execution
-#
-
--- disable_query_log
-eval set global innodb_file_format=$format;
-eval set global innodb_file_per_table=$per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_corrupt_bit.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_corrupt_bit.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_corrupt_bit.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_corrupt_bit.test	2015-02-27 08:30:35.000000000 +0000
@@ -16,14 +16,20 @@
 # It instructs InnoDB to try to evict pages from the buffer pool when
 # change buffering is possible, so that the change buffer will be used
 # whenever possible.
--- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
 SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug;
--- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
 SET GLOBAL innodb_change_buffering_debug = 1;
 
 # Turn off Unique Check to create corrupted index with dup key
 SET UNIQUE_CHECKS=0;
 
+CREATE DATABASE pad;
+let $i=345;
+while ($i)
+{
+  --eval CREATE TABLE pad.t$i (a INT PRIMARY KEY) ENGINE=InnoDB;
+  dec $i;
+}
+
 -- enable_query_log
 
 set names utf8;
@@ -119,6 +125,6 @@
 
 # Drop table
 drop table corrupt_bit_test_ā;
+DROP DATABASE pad;
 
--- error 0, ER_UNKNOWN_SYSTEM_VARIABLE
 SET GLOBAL innodb_change_buffering_debug = 0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-create-options.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-create-options.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-create-options.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-create-options.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,573 +0,0 @@
-# Tests for various combinations of ROW_FORMAT and KEY_BLOCK_SIZE
-# Related bugs; 
-# Bug#54679: ALTER TABLE causes compressed row_format to revert to compact
-# Bug#56628: ALTER TABLE .. KEY_BLOCK_SIZE=0 produces untrue warning or unnecessary error
-# Bug#56632: ALTER TABLE implicitly changes ROW_FORMAT to COMPRESSED
-# Rules for interpreting CREATE_OPTIONS
-# 1) Create options on an ALTER are added to the options on the
-#    previous CREATE or ALTER statements.
-# 2) KEY_BLOCK_SIZE=0 is considered a unspecified value.
-#    If the current ROW_FORMAT has explicitly been set to COMPRESSED,
-#    InnoDB will use a default value of 8.  Otherwise KEY_BLOCK_SIZE
-#    will not be used.
-# 3) ROW_FORMAT=DEFAULT allows InnoDB to choose its own default, COMPACT.
-# 4) ROW_FORMAT=DEFAULT and KEY_BLOCK_SIZE=0 can be used at any time to
-#    unset or erase the values persisted in the MySQL dictionary and
-#    by SHOW CTREATE TABLE.
-# 5) When incompatible values for ROW_FORMAT and KEY_BLOCK_SIZE are
-#    both explicitly given, the ROW_FORMAT is always used in non-strict
-#    mode.
-# 6) InnoDB will automatically convert a table to COMPRESSED only if a
-#    valid non-zero KEY_BLOCK_SIZE has been given and ROW_FORMAT=DEFAULT
-#    or has not been used on a previous CREATE TABLE or ALTER TABLE.
-# 7) InnoDB strict mode is designed to prevent incompatible create
-#    options from being used together.
-# 8) The non-strict behavior is intended to permit you to import a
-#    mysqldump file into a database that does not support compressed
-#    tables, even if the source database contained compressed tables.
-#    All invalid values and/or incompatible combinations of ROW_FORMAT
-#    and KEY_BLOCK_SIZE are automatically corrected
-#
-# *** innodb_strict_mode=ON ***
-# 1) Valid ROW_FORMATs are COMPRESSED, COMPACT, DEFAULT, DYNAMIC
-#    & REDUNDANT. All others are rejected.
-# 2) Valid KEY_BLOCK_SIZEs are 0,1,2,4,8,16.  All others are rejected.
-# 3) KEY_BLOCK_SIZE=0 can be used to set it to 'unspecified'.
-# 4) KEY_BLOCK_SIZE=1,2,4,8 & 16 are incompatible with COMPACT, DYNAMIC &
-#    REDUNDANT.
-# 5) KEY_BLOCK_SIZE=1,2,4,8 & 16 as well as ROW_FORMAT=COMPRESSED and
-#    ROW_FORMAT=DYNAMIC are incompatible with innodb_file_format=Antelope
-#    and innodb_file_per_table=OFF
-# 6) KEY_BLOCK_SIZE on an ALTER must occur with ROW_FORMAT=COMPRESSED
-#    or ROW_FORMAT=DEFAULT if the ROW_FORMAT was previously specified
-#    as COMPACT, DYNAMIC or REDUNDANT.
-# 7) KEY_BLOCK_SIZE on an ALTER can occur without a ROW_FORMAT if the
-#    previous ROW_FORMAT was DEFAULT, COMPRESSED, or unspecified.
-#
-# *** innodb_strict_mode=OFF ***
-# 1. Ignore a bad KEY_BLOCK_SIZE, defaulting it to 8.
-# 2. Ignore a bad ROW_FORMAT, defaulting to COMPACT.
-# 3. Ignore a valid KEY_BLOCK_SIZE when an incompatible but valid
-#    ROW_FORMAT is specified.
-# 4. If innodb_file_format=Antelope or innodb_file_per_table=OFF
-#    it will ignore ROW_FORMAT=COMPRESSED or DYNAMIC and it will
-#    ignore all non-zero KEY_BLOCK_SIZEs.
-#
-# See InnoDB documentation page "SQL Compression Syntax Warnings and Errors"
-
--- source include/have_innodb.inc
-SET storage_engine=InnoDB;
-
---disable_query_log
-# These values can change during the test
-LET $innodb_file_format_orig=`select @@innodb_file_format`;
-LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-LET $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
---enable_query_log
-
-SET GLOBAL innodb_file_format=`Barracuda`;
-SET GLOBAL innodb_file_per_table=ON;
-
-# The first half of these tests are with strict mode ON.
-SET SESSION innodb_strict_mode = ON;
-
---echo # Test 1) StrictMode=ON, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
---echo #         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
-DROP TABLE IF EXISTS t1;
---echo #         'FIXED' is sent to InnoDB since it is used by MyISAM.
---echo #         But it is an invalid mode in InnoDB
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-SHOW WARNINGS;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
-
-
---echo # Test 2) StrictMode=ON, CREATE with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
---echo #         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
-DROP TABLE IF EXISTS t1;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-SHOW WARNINGS;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
-
---echo # Test 3) StrictMode=ON, ALTER with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
-
---echo # Test 4) StrictMode=ON, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid non-zero KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 KEY_BLOCK_SIZE=2;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 KEY_BLOCK_SIZE=4;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 KEY_BLOCK_SIZE=8;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 5) StrictMode=ON, CREATE with a valid KEY_BLOCK_SIZE
---echo #         ALTER with each ROW_FORMAT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=2;
-SHOW CREATE TABLE t1;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW CREATE TABLE t1;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
-DROP TABLE IF EXISTS t1;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
-SHOW WARNINGS;
-
---echo # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
---echo #         and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
---echo #         and that they can be set to default values during strict mode.
-SET GLOBAL innodb_file_format=Antelope;
-DROP TABLE IF EXISTS t1;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
-SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 KEY_BLOCK_SIZE=8;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-SET GLOBAL innodb_file_format=Barracuda;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
-SET GLOBAL innodb_file_format=Antelope;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ADD COLUMN f1 INT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-SET GLOBAL innodb_file_format=Barracuda;
-
---echo # Test 8) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
---echo #         and a valid non-zero KEY_BLOCK_SIZE are rejected with
---echo #         innodb_file_per_table=OFF and that they can be set to default
---echo #         values during strict mode.
-SET GLOBAL innodb_file_per_table=OFF;
-DROP TABLE IF EXISTS t1;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
---error ER_CANT_CREATE_TABLE
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 KEY_BLOCK_SIZE=1;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DEFAULT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_per_table=ON;
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
-SET GLOBAL innodb_file_per_table=OFF;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
---error ER_CANT_CREATE_TABLE
-ALTER TABLE t1 ADD COLUMN f1 INT;
---replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
-SHOW WARNINGS;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-SET GLOBAL innodb_file_per_table=ON;
-
---echo ##################################################
-SET SESSION innodb_strict_mode = OFF;
-
---echo # Test 9) StrictMode=OFF, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
---echo #         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
---echo #         'FIXED' is sent to InnoDB since it is used by MyISAM.
---echo #         It is an invalid mode in InnoDB, use COMPACT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 10) StrictMode=OFF, CREATE with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
---echo #          KEY_BLOCK_SIZE is ignored with COMPACT, REDUNDANT, & DYNAMIC
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
-
---echo # Test 11) StrictMode=OFF, ALTER with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT );
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
-
---echo # Test 12) StrictMode=OFF, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid KEY_BLOCK_SIZE
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 KEY_BLOCK_SIZE=2;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 KEY_BLOCK_SIZE=4;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=8;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 13) StrictMode=OFF, CREATE with a valid KEY_BLOCK_SIZE
---echo #          ALTER with each ROW_FORMAT
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
-SHOW WARNINGS;
-SHOW CREATE TABLE t1;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SHOW CREATE TABLE t1;
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-ALTER TABLE t1 ROW_FORMAT=COMPACT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 14) StrictMode=OFF, CREATE with an invalid KEY_BLOCK_SIZE, it defaults to 8
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=15;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 15) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
---echo            valid KEY_BLOCK_SIZE are remembered but not used when ROW_FORMAT
---echo            is reverted to Antelope and then used again when ROW_FORMAT=Barracuda.
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_format=Antelope;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_format=Barracuda;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_format=Antelope;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_format=Barracuda;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
---echo # Test 16) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
---echo            valid KEY_BLOCK_SIZE are remembered but not used when innodb_file_per_table=OFF
---echo            and then used again when innodb_file_per_table=ON.
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_per_table=OFF;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_per_table=ON;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-DROP TABLE IF EXISTS t1;
-CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_per_table=OFF;
-ALTER TABLE t1 ADD COLUMN f1 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-SET GLOBAL innodb_file_per_table=ON;
-ALTER TABLE t1 ADD COLUMN f2 INT;
-SHOW WARNINGS;
-SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
-
-
---echo # Cleanup
-DROP TABLE IF EXISTS t1;
-
---disable_query_log
-EVAL SET GLOBAL innodb_file_format=$innodb_file_format_orig;
-EVAL SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
-EVAL SET SESSION innodb_strict_mode=$innodb_strict_mode_orig;
---enable_query_log
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-fk.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-fk.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-fk.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-fk.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,86 @@
+--source include/have_innodb.inc
+--source include/not_embedded.inc
+
+--echo #
+--echo # Bug #18806829 OPENING INNODB TABLES WITH MANY FOREIGN KEY
+--echo # REFERENCES IS SLOW/CRASHES SEMAPHORE
+--echo #
+
+create table t1 (f1 int primary key) engine=innodb;
+insert into t1 values (5);
+insert into t1 values (2882);
+insert into t1 values (10);
+
+let $fk_tables = 120;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval create table fk_$i (f1 int primary key,
+          constraint pc$i foreign key (f1) references t1(f1)
+          on delete cascade on update cascade);
+  eval insert into fk_$i values (5);
+  eval insert into fk_$i values (2882);
+  eval insert into fk_$i values (10);
+  dec $i;
+}
+--enable_query_log
+
+--source include/restart_mysqld.inc
+
+update t1 set f1 = 28 where f1 = 2882;
+
+select * from fk_120;
+select * from fk_1;
+select * from fk_50;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval drop table fk_$i;
+  dec $i;
+}
+--enable_query_log
+
+drop table t1;
+
+--echo #
+--echo # Check if restrict is working fine.
+--echo #
+
+create table t1 (f1 int primary key) engine=innodb;
+
+let $fk_tables = 30;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval create table fk_$i (f1 int primary key,
+          constraint pc$i foreign key (f1) references t1(f1)
+          on delete restrict on update restrict);
+  eval insert into t1 values ($i);
+  eval insert into fk_$i values ($i);
+  dec $i;
+}
+--enable_query_log
+
+--source include/restart_mysqld.inc
+
+--error ER_ROW_IS_REFERENCED_2
+delete from t1 where f1 = 29;
+select * from fk_29;
+
+--disable_query_log
+let $i = $fk_tables;
+while ($i)
+{
+  eval drop table fk_$i;
+  dec $i;
+}
+--enable_query_log
+
+drop table t1;
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_index_large_prefix.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_index_large_prefix.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_index_large_prefix.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_index_large_prefix.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,269 +0,0 @@
-# Testcase for worklog #5743: Lift the limit of index key prefixes
-
---source include/have_innodb.inc
-
-let $innodb_file_format_orig=`select @@innodb_file_format`;
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
-
-set global innodb_file_format="Barracuda";
-set global innodb_file_per_table=1;
-set global innodb_large_prefix=1;
-
-# Create a table of DYNAMIC format, with a primary index of 1000 bytes in
-# size
-create table worklog5743(a TEXT not null, primary key (a(1000)))
-ROW_FORMAT=DYNAMIC, engine = innodb;
-
-# Do some insertion and update to excercise the external cache
-# code path
-insert into worklog5743 values(repeat("a", 20000));
-
-# default session, update the table
-update worklog5743 set a = (repeat("b", 16000));
-
-# Create a secondary index
-create index idx on worklog5743(a(2000));
-
-# Start a few sessions to do selections on table being updated in default
-# session, so it would rebuild the previous version from undo log.
-# 1) Default session:	Initiate an update on the externally stored column
-# 2) Session con1:	Select from table with repeated read
-# 3) Session con2:	Select from table with read uncommitted
-# 4) Default session:	rollback updates
-
-begin;
-update worklog5743 set a = (repeat("x", 17000));
-
-# Start a new session to select the column to force it build
-# an earlier version of the clustered index through undo log. So it should
-# just see the result of repeat("b", 16000)
-select @@session.tx_isolation;
---connect (con1,localhost,root,,)
-select a = repeat("x", 17000) from worklog5743;
-select a = repeat("b", 16000) from worklog5743;
-
-# Start another session doing "read uncommitted" query, it
-# should see the uncommitted update
---connect (con2,localhost,root,,)
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-select a = repeat("x", 17000) from worklog5743;
-
-# Roll back the transaction
---connection default
-rollback;
-
-drop table worklog5743;
-
-# Create a table with only a secondary index has large prefix column
-create table worklog5743(a1 int, a2 TEXT not null)
-ROW_FORMAT=DYNAMIC, engine = innodb;
-
-create index idx on worklog5743(a1, a2(2000));
-
-insert into worklog5743 values(9, repeat("a", 10000));
-
-begin;
-
-update worklog5743 set a1 = 1000;
-
-# Do a select from another connection that would use the secondary index
---connection con1
-select @@session.tx_isolation;
-explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-
-# Do read uncommitted in another session, it would show there is no
-# row with a1 = 9
---connection con2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-
---connection default
-rollback;
-
-drop table worklog5743;
-
-# Create a table with a secondary index has small (50 bytes) prefix column
-create table worklog5743(a1 int, a2 TEXT not null)
-ROW_FORMAT=DYNAMIC, engine = innodb;
-
-create index idx on worklog5743(a1, a2(50));
-
-insert into worklog5743 values(9, repeat("a", 10000));
-
-begin;
-
-update worklog5743 set a1 = 1000;
-
-# Do a select from another connection that would use the secondary index
---connection con1
-select @@session.tx_isolation;
-explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-
-# Do read uncommitted in another session, it would show there is no
-# row with a1 = 9
---connection con2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
-
---connection default
-rollback;
-
-drop table worklog5743;
-
-# Create a table of ROW_FORMAT=COMPRESSED format
-create table worklog5743_2(a1 int, a2 TEXT not null)
-ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-
-create table worklog5743_4(a1 int, a2 TEXT not null)
-ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-
-# The maximum overall index record (not prefix) length for this table
-# is page_zip_empty_size() / 2, which is 960. "Too big row" error (
-# HA_ERR_TO_BIG_ROW) will be printed if this limit is exceeded.
-# Considering other fields and their overhead, the maximum length
-# for column a2 is 940 or 941 depending on the zlib version used and
-# compressBound() value used in page_zip_empty_size() (please refer
-# to Bug #47495 for more detail).
--- error 139
-create index idx1 on worklog5743_2(a1, a2(942));
-
-create index idx1 on worklog5743_2(a1, a2(940));
-
-# similarly, the maximum index record length for the table is
-# 1984. Considering other fields and their overhead, the
-# maximum length for column a2 is 1964 or 1965 (please refer
-# to Bug #47495 for more detail).
--- error 139
-create index idx1 on worklog5743_4(a1, a2(1966));
-
-create index idx1 on worklog5743_4(a1, a2(1964));
-
-insert into worklog5743_2 values(9, repeat("a", 10000));
-insert into worklog5743_4 values(9, repeat("a", 10000));
-
-begin;
-
-update worklog5743_2 set a1 = 1000;
-update worklog5743_4 set a1 = 1000;
-
-# Do a select from another connection that would use the secondary index
---connection con1
-select @@session.tx_isolation;
-explain select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
-select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
-select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
-
-# Do read uncommitted in another session, it would show there is no
-# row with a1 = 9
---connection con2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
-select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
-
---connection default
-rollback;
-
-drop table worklog5743_2;
-drop table worklog5743_4;
-
-# Create a table with varchar column, and create index directly on this
-# large column (without prefix)
-create table worklog5743(a1 int, a2 varchar(3000))
-ROW_FORMAT=DYNAMIC, engine = innodb;
-
-# Create an index with large column without prefix
-create index idx on worklog5743(a1, a2);
-
-insert into worklog5743 values(9, repeat("a", 3000));
-
-begin;
-
-update worklog5743 set a1 = 1000;
-
-# Do a select from another connection that would use the secondary index
---connection con1
-select @@session.tx_isolation;
-explain select a1 from worklog5743 where a1 = 9;
-select a1 from worklog5743 where a1 = 9;
-
-# Do read uncommitted, it would show there is no row with a1 = 9
---connection con2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-select a1 from worklog5743 where a1 = 9;
-
---connection default
-rollback;
-
-drop table worklog5743;
-
-# Create a table with old format, and the limit is 768 bytes.
--- error ER_INDEX_COLUMN_TOO_LONG
-create table worklog5743(a TEXT not null, primary key (a(1000)))
-engine = innodb;
-
-create table worklog5743(a TEXT) engine = innodb;
-
-# Excercise the column length check in ha_innobase::add_index()
--- error ER_INDEX_COLUMN_TOO_LONG
-create index idx on worklog5743(a(1000));
-
-# This should be successful
-create index idx on worklog5743(a(725));
-
-# Perform some DMLs
-insert into worklog5743 values(repeat("a", 20000));
-
-begin;
-insert into worklog5743 values(repeat("b", 20000));
-update worklog5743 set a = (repeat("x", 25000));
-
-# Start a new session to select the table to force it build
-# an earlier version of the cluster index through undo log
-select @@session.tx_isolation;
---connection con1
-select a = repeat("a", 20000) from worklog5743;
-
---connection con2
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-select a = repeat("x", 25000) from worklog5743;
-
---connection default
-rollback;
-
-drop table worklog5743;
-
-# Some border line test on the column length.
-# We have a limit of 3072 bytes for Barracuda table
-create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC, engine = innodb;
-
-# Length exceeds maximum supported key length, will auto-truncated to 3072
-create index idx on worklog5743(a(3073));
-
-create index idx2 on worklog5743(a(3072));
-
-show create table worklog5743;
-
-drop table worklog5743;
-
-# We have a limit of 767 bytes for Antelope table
-create table worklog5743(a TEXT not null) engine = innodb;
-
--- error ER_INDEX_COLUMN_TOO_LONG
-create index idx on worklog5743(a(768));
-
-create index idx2 on worklog5743(a(767));
-
-drop table worklog5743;
-
-eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
-eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
-eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb_prefix_index_liftedlimit.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,1338 +0,0 @@
-######## suite/innodb/t/innodb_prefix_index_liftedlimit.test ##########
-#                                                                    #
-# Testcase for worklog WL#5743: Lift the limit of index key prefixes #
-# Accorrding to WL#5743 - prefix index limit is increased from 767   #
-# to 3072 for innodb. This change is applicable with Barracuda file  #
-# format.                                                            #
-# All sub-test in this file focus on prefix index along with other   #
-# operations                                                         #
-#                                                                    #
-#                                                                    #
-# Creation:                                                          #
-# 2011-05-19 Implemented this test as part of WL#5743                #
-#                                                                    #
-######################################################################
-
-
---source include/have_innodb.inc
-# Save innodb variables
-let $innodb_file_format_orig=`select @@innodb_file_format`;
-let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
-let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
-
-# Set Innodb file format as feature works for Barracuda file format
-set global innodb_file_format="Barracuda";
-set global innodb_file_per_table=1;
-set global innodb_large_prefix=1;
-
--- disable_warnings
-DROP TABLE IF EXISTS worklog5743;
--- enable_warnings
-#------------------------------------------------------------------------------
-# Prefix index with VARCHAR data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-# check IS
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
-INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with TEXT data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
-# check IS
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
-INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with MEDIUMTEXT data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_mediumtext MEDIUMTEXT , col_2_mediumtext MEDIUMTEXT ,
-PRIMARY KEY (col_1_mediumtext(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_mediumtext (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_mediumtext = REPEAT("a", 4000),col_2_mediumtext = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_mediumtext = REPEAT("c", 4000)
-WHERE col_1_mediumtext = REPEAT("a", 4000)
-AND col_2_mediumtext = REPEAT("o", 4000);
-SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_mediumtext = REPEAT("c", 4000)
-AND col_2_mediumtext = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_mediumtext = REPEAT("b", 4000);
-SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with LONGTEXT data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_longtext LONGTEXT , col_2_longtext LONGTEXT ,
-PRIMARY KEY (col_1_longtext(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_longtext (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_longtext = REPEAT("a", 4000) , col_2_longtext = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_longtext = REPEAT("c", 4000)
-WHERE col_1_longtext = REPEAT("a", 4000)
-AND col_2_longtext = REPEAT("o", 4000);
-SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_longtext = REPEAT("c", 4000)
-AND col_2_longtext = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_longtext = REPEAT("b", 4000);
-SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with BLOB data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_blob (3072));
-# check IS
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
-INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with MEDIUMBLOB data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_mediumblob MEDIUMBLOB  , col_2_mediumblob MEDIUMBLOB  ,
-PRIMARY KEY (col_1_mediumblob(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_mediumblob (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_mediumblob = REPEAT("a", 4000),col_2_mediumblob = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_mediumblob = REPEAT("c", 4000)
-WHERE col_1_mediumblob = REPEAT("a", 4000)
-AND col_2_mediumblob = REPEAT("o", 4000);
-SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_mediumblob = REPEAT("c", 4000)
-AND col_2_mediumblob = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_mediumblob = REPEAT("b", 4000);
-SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with LONGBLOB data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_longblob LONGBLOB  , col_2_longblob LONGBLOB  ,
-PRIMARY KEY (col_1_longblob(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_longblob (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_longblob = REPEAT("a", 4000) , col_2_longblob = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_longblob = REPEAT("c", 4000)
-WHERE col_1_longblob = REPEAT("a", 4000)
-AND col_2_longblob = REPEAT("o", 4000);
-SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_longblob = REPEAT("c", 4000)
-AND col_2_longblob = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_longblob = REPEAT("b", 4000);
-SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with VARBINARY data type , primary/secondary index and DML ops
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
-PRIMARY KEY (col_1_varbinary(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with CHAR data type , composite index and DML ops
-CREATE TABLE worklog5743 (col_1_char CHAR (255) , col_2_char CHAR (255),
-col_3_char CHAR (255), col_4_char CHAR (255),col_5_char CHAR (255),
-col_6_char CHAR (255), col_7_char CHAR (255),col_8_char CHAR (255),
-col_9_char CHAR (255), col_10_char CHAR (255),col_11_char CHAR (255),
-col_12_char CHAR (255), col_13_char CHAR (255),col_14_char CHAR (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
-);
-# Create index with total prefix index length = 3072
-CREATE INDEX prefix_idx ON worklog5743(col_1_char(250),col_2_char(250),
-col_3_char(250),col_4_char(250),col_5_char(250),col_6_char(250),
-col_7_char(250),col_8_char(250),col_9_char(250),col_10_char(250),
-col_11_char(250),col_12_char(250),col_13_char(72)
-);
-INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
-);
-SELECT col_1_char = REPEAT("a", 255) , col_2_char = REPEAT("o", 255) FROM worklog5743;
-UPDATE worklog5743 SET col_1_char = REPEAT("c", 255)
-WHERE col_1_char = REPEAT("a", 255) AND col_2_char = REPEAT("o", 255);
-SELECT col_1_char = REPEAT("c", 255) FROM worklog5743
-WHERE col_1_char = REPEAT("c", 255) AND col_2_char = REPEAT("o", 255);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_char = REPEAT("b", 255);
-SELECT col_1_char = REPEAT("c", 255) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with BINARY data type , composite index and DML ops
-CREATE TABLE worklog5743 (col_1_binary BINARY (255) , col_2_binary BINARY (255),
-col_3_binary BINARY(255),col_4_binary BINARY (255),col_5_binary BINARY (255),
-col_6_binary BINARY(255),col_7_binary BINARY (255),col_8_binary BINARY (255),
-col_9_binary BINARY(255),col_10_binary BINARY (255),col_11_binary BINARY (255),
-col_12_binary BINARY(255),col_13_binary BINARY (255),col_14_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
-);
-# Create index with total prefix index length = 3072
-CREATE INDEX prefix_idx ON worklog5743(col_1_binary (250),col_2_binary (250),
-col_3_binary (250),col_4_binary (250),col_5_binary (250),
-col_6_binary (250),col_7_binary (250),col_8_binary (250),
-col_9_binary (250),col_10_binary (250),col_11_binary (250),
-col_12_binary (250),col_13_binary (72)
-);
-INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
-);
-SELECT col_1_binary = REPEAT("a", 255) , col_2_binary = REPEAT("o", 255) FROM worklog5743;
-UPDATE worklog5743 SET col_1_binary = REPEAT("c", 255)
-WHERE col_1_binary = REPEAT("a", 255)
-AND col_2_binary = REPEAT("o", 255);
-SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743
-WHERE col_1_binary = REPEAT("c", 255)
-AND col_2_binary = REPEAT("o", 255);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
-REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_binary = REPEAT("b", 255);
-SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with VARCHAR data type , primary/seconday index , DML ops
-# and COMPRESSED row format. KEY_BLOCK_SIZE is varied as 2 , 4 , 8.
-
-# With KEY_BLOCK_SIZE = 2,prefix index limit comes around ~948 for following
-CREATE TABLE worklog5743_key2 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key2 (col_1_varchar (767));
-INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743_key2;
-UPDATE worklog5743_key2 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2
-WHERE col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key2 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2;
-DROP TABLE worklog5743_key2;
-
-# With KEY_BLOCK_SIZE = 4,prefix index limit comes around ~1964 for following
-CREATE TABLE worklog5743_key4 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(1964))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key4 (col_1_varchar (767));
-INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743_key4;
-UPDATE worklog5743_key4 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key4
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key4 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key4;
-DROP TABLE worklog5743_key4;
-
-# With KEY_BLOCK_SIZE = 8,prefix index limit comes around ~3072 for following
-CREATE TABLE worklog5743_key8 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key8 (col_1_varchar (767));
-INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743_key8;
-UPDATE worklog5743_key8 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key8
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key8 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key8;
-DROP TABLE worklog5743_key8;
-
-# Prefix index with TEXT data type , primary/seconday index , DML ops
-# and COMPRESSED row format. KEY_BLOCK_SIZE is varied as 2 , 4 , 8.
-
-# With KEY_BLOCK_SIZE = 2,prefix index limit comes around ~948 for following
-CREATE TABLE worklog5743_key2 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key2 (col_1_text (767));
-INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743_key2;
-UPDATE worklog5743_key2 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key2
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key2 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key2;
-DROP TABLE worklog5743_key2;
-
-# With KEY_BLOCK_SIZE = 4,prefix index limit comes around ~1964 for following
-CREATE TABLE worklog5743_key4 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(1964))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key4 (col_1_text (767));
-INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743_key4;
-UPDATE worklog5743_key4 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key4
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key4 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key4;
-DROP TABLE worklog5743_key4;
-
-# With KEY_BLOCK_SIZE = 8,prefix index limit comes around ~3072 for following
-CREATE TABLE worklog5743_key8 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key8 (col_1_text (767));
-INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743_key8;
-UPDATE worklog5743_key8 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key8
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key8 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key8;
-DROP TABLE worklog5743_key8;
-
-# Prefix index with BLOB data type , primary/seconday index , DML ops
-# and COMPRESSED row format. KEY_BLOCK_SIZE is varied as 2 , 4 , 8.
-
-# With KEY_BLOCK_SIZE = 2,prefix index limit comes around ~948 for following
-CREATE TABLE worklog5743_key2 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key2 (col_1_blob (767));
-INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743_key2;
-UPDATE worklog5743_key2 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key2
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key2 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key2;
-DROP TABLE worklog5743_key2;
-
-# With KEY_BLOCK_SIZE = 4,prefix index limit comes around ~1964 for following
-CREATE TABLE worklog5743_key4 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(1964))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key4 (col_1_blob (767));
-INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743_key4;
-UPDATE worklog5743_key4 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key4
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key4 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key4;
-DROP TABLE worklog5743_key4;
-
-# With KEY_BLOCK_SIZE = 8,prefix index limit comes around ~3072 for following
-CREATE TABLE worklog5743_key8 (
-col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
-PRIMARY KEY (col_1_blob(3072))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-#CREATE INDEX prefix_idx ON worklog5743_key8 (col_1_blob (767));
-INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
-FROM worklog5743_key8;
-UPDATE worklog5743_key8 SET col_1_blob = REPEAT("c", 4000)
-WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
-SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key8
-WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
-INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743_key8 WHERE col_1_blob = REPEAT("b", 4000);
-SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key8;
-DROP TABLE worklog5743_key8;
-
-
-#------------------------------------------------------------------------------
-# Create mutiple prefix index. We can not create prefix index length > 16K
-# as index is written in undo log page which of 16K size.
-# So we can create max 5 prefix index of length 3072 on table
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
-col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
-col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-
-# Update hangs if we create following 5 indexes. Uncomment them once its fix
-# Bug#12547647 - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
-#CREATE INDEX prefix_idx1 ON worklog5743(col_1_varbinary (3072));
-#CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (3072));
-#CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
-#CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
-#CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
-
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Create mutiple prefix index. We can not create prefix index length > 16K as
-# we write in undo log page which of 16K size.
-# so we can create max 5 prefix index of length 3072 on table.
-# Similar to above case but with transactions
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
-col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
-col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-
-
-# Update hangs if we create following 5 indexes. Uncomment them once its fix
-CREATE INDEX prefix_idx1 ON worklog5743(col_1_varbinary (3072));
-CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (3072));
-CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
-CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
-CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
-
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-ROLLBACK;
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-COMMIT;
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-ROLLBACK;
-# Uncomment Update fater Bug#12547647 is fixed - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
-# Bug#12547647 - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
-#UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-#WHERE col_1_varbinary = REPEAT("a", 4000)
-#AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with utf8 charset
-# utf8 charcter takes 3 bytes in mysql so prefix index limit is 3072/3 = 1024
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) CHARACTER SET 'utf8',
-col_2_text TEXT (4000) CHARACTER SET 'utf8',
-PRIMARY KEY (col_1_text(1024))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-# Prefix index with utf8 charset + varchar.
-# For varchar we also log the column itself as oppose of TEXT so it error
-# with limit 1024 due to overhead.
---replace_regex /> [0-9]*/> max_row_size/
--- error 1118
-CREATE TABLE worklog5743 (col_1_varchar VARCHAR (4000) CHARACTER SET 'utf8',
-col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8' ,
-PRIMARY KEY (col_1_varchar(1024))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-
-#------------------------------------------------------------------------------
-# prefinx index on utf8 charset with transaction
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) ,
-col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8',
-col_3_text TEXT (4000) CHARACTER SET 'utf8',
-col_4_blob BLOB (4000),col_5_text TEXT (4000),
-col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-
-
-CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (500));
-CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (500));
-
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-ROLLBACK;
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) ,  REPEAT("a", 255)
-);
-COMMIT;
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-ROLLBACK;
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
-REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
-REPEAT("a", 4000) , REPEAT("a", 255)
-);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with utf8 charset on TEXT data type with actual utf8 character
-# like "स" and "क"
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) CHARACTER SET 'utf8',
-col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(1024))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("स", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("स", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("क", 4000)
-WHERE col_1_text = REPEAT("स", 4000) AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
-SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with transaction when 2 client are ruuning there transaction
-# in different sessions.With ISOLATION LEVEL as REPEATABLE READ and
-# READ UNCOMMITTED.
-CREATE TABLE worklog5743 (
-col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-
---echo "In connection 1"
---connect (con1,localhost,root,,)
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-
-
---echo "In connection 2"
---connect (con2,localhost,root,,)
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
-# Uncomment after Bug#12552164 - TRANSACTION CAN NOT SEE OLD VERSION ROWS THAT
-# BEING UPDATED
-#UPDATE worklog5743 SET col_1_varchar = REPEAT("d", 200) WHERE col_1_varchar =
-#REPEAT("a", 200) AND col_2_varchar = REPEAT("o", 200);
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-
-
---echo "In connection 1"
---connection con1
-select @@session.tx_isolation;
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-
-START TRANSACTION;
-
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-
---echo "In connection 2"
---connection con2
-COMMIT;
-# Wait for commit
-let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist
-WHERE info='COMMIT';
---source include/wait_condition.inc 
-
---echo "In connection 1"
---connection con1
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-COMMIT;
-
---connection default
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Prefix index with transaction when 2 client are ruuning there transaction
-# in different sessions.With ISOLATION LEVEL as REPEATABLE READ and
-# READ UNCOMMITTED. Same as above case but con2 starts tnx before con1
-
-CREATE TABLE worklog5743 (
-col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-
---echo "In connection 1"
---connection con1
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-START TRANSACTION;
-
-
---echo "In connection 2"
---connection con2
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-COMMIT;
-# Wait for commit
-let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist
-WHERE info='COMMIT';
---source include/wait_condition.inc 
-
-
---echo "In connection 1"
---connection con1
-SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
-select @@session.tx_isolation;
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
-
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-COMMIT;
-
---connection default
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-
-# Prefix index with transaction when 2 client are ruuning there transaction
-# in different sessions.With ISOLATION LEVEL as REPEATABLE READ and
-# READ UNCOMMITTED. Same as above cases but with ROLLBACK
-
-CREATE TABLE worklog5743 (
-col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
-PRIMARY KEY (col_1_text(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-
---echo "In connection 1"
---connection con1
-SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-START TRANSACTION;
-
-
---echo "In connection 2"
---connection con2
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
-SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
-worklog5743;
-ROLLBACK;
-# Wait for rollback
-let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist
-WHERE info='COMMIT';
---source include/wait_condition.inc 
-
-
---echo "In connection 1"
---connection con1
-SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
-worklog5743;
-SELECT COUNT(*) FROM worklog5743;
-COMMIT;
-
---disconnect con1
---disconnect con2
-
---connection default
-DROP TABLE worklog5743;
-
-
-#------------------------------------------------------------------------------
-# Select queries on prefix index column as index will be used in queries.
-# Use few select functions , join condition , subqueries.
-
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-
-# Select with Join
-SELECT tbl1.col_1_varchar = tbl2.col_1_varchar
-FROM worklog5743 tbl1 , worklog5743 tbl2
-WHERE tbl1.col_1_varchar = tbl2.col_1_varchar ;
-
-# Select in subquey
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar NOT IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1 WHERE
-col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2)
-AND col_1_varchar = REPEAT("c", 4000);
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar in (
-SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
-WHERE tbl1.col_1_varchar != tbl2.col_1_varchar
-) ;
-SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
-WHERE col_1_varchar in (
-SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
-WHERE tbl1.col_1_varchar = tbl2.col_1_varchar
-) ;
-
-# function
-SELECT
-REVERSE(col_1_varchar) = REPEAT("c", 4000) ,
-REVERSE(REVERSE(col_1_varchar)) = REPEAT("c", 4000)
-FROM worklog5743;
-SELECT
-UPPER(col_1_varchar) = REPEAT("c", 4000) ,
-UPPER(col_1_varchar) = REPEAT("C", 4000) ,
-LOWER(UPPER(col_1_varchar)) = REPEAT("c", 4000)
-FROM worklog5743;
-SELECT
-col_1_varchar = REPEAT("c", 4000)
-FROM worklog5743 WHERE col_1_varchar like '%c__%';
-SELECT SUBSTRING(INSERT(col_1_varchar, 1, 4, 'kkkk'),1,10) FROM worklog5743 ;
-SELECT CONCAT(SUBSTRING(col_1_varchar,-5,3),'append') FROM worklog5743 ;
-
-
-DROP TABLE worklog5743;
-
-#------------------------------------------------------------------------------
-# Prefix index with NULL values
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) ,
-col_2_varchar VARCHAR (4000) ,
-UNIQUE INDEX (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)), REPEAT("o", 4000));
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
-INSERT INTO worklog5743 VALUES(NULL,NULL);
-INSERT INTO worklog5743 VALUES(NULL,NULL);
-# check IS
-SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE
-FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
-SELECT col_1_varchar FROM worklog5743 WHERE col_1_varchar IS NULL;
-SELECT col_1_varchar = concat(REPEAT("a", 2000),REPEAT("b", 2000))
-FROM worklog5743 WHERE col_1_varchar IS NOT NULL ORDER BY 1;
-
-
-DROP TABLE worklog5743;
-
-# -----------------------------------------------------------------------------
-#  Try drop and add secondary prefix index
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-# Create index
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-# Drop index
-DROP INDEX prefix_idx ON worklog5743;
-
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-# Again add index
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-# -----------------------------------------------------------------------------
-
-#  Try drop and add primary prefix index
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-# Create index
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-# Drop index
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000)
-AND col_2_varchar = REPEAT("o", 4000);
-# Again add index
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
-
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
---error 1062
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-# -----------------------------------------------------------------------------
-
-#  Try drop and add both (primary/secondary) prefix index
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-# Create index
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-# Drop primary index
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-# Drop secondary index
-DROP INDEX prefix_idx ON worklog5743;
-
-SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
-WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
-# Again add index
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
---error 1062
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
-SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
-DROP TABLE worklog5743;
-
-
-# -----------------------------------------------------------------------------
-# Drop index from differnt session
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR(4000) , col_2_varchar VARCHAR(4000) ,
-PRIMARY KEY (col_1_varchar (3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("c", 3500) , REPEAT("o", 3500));
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
-
-# Start new session
---connect (con1,localhost,root,,)
-
-
---echo " Switching to con1 connection For select "
---connection con1
-SELECT col_1_varchar = REPEAT("c", 3500) , col_2_varchar = REPEAT("o", 3500)
-FROM worklog5743;
-
---echo " Switching to default connection For DMLs "
---connection default
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 3500) , REPEAT("o", 3500));
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
-WHERE col_2_varchar = REPEAT("o", 3500);
-COMMIT;
-
---echo " Switching to con1 connection For Dropping index and some DMLs "
---connection con1
-START TRANSACTION;
-INSERT INTO worklog5743 VALUES(REPEAT("k", 3500),REPEAT("p", 3500));
-# Drop primary index
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-UPDATE worklog5743 SET col_1_varchar  = REPEAT("b", 3500)
-WHERE col_1_varchar = REPEAT("a", 3500)
-AND col_2_varchar = REPEAT("o", 3500);
-SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
-WHERE col_2_varchar = REPEAT("o", 3500);
-
---echo " Switching to default connection For DELETE "
---connection default
-DELETE FROM worklog5743 WHERE col_1_varchar  = REPEAT("b", 3500);
-SELECT col_1_varchar = REPEAT("a", 3500) FROM worklog5743
-WHERE col_2_varchar = REPEAT("p", 3500);
-
---echo " Switching to con1 connection to commit changes "
---connection con1
-COMMIT;
-
---echo " Switching to default connection to drop and end sub-test "
---connection default
-DROP TABLE worklog5743;
-
-
-
-# -----------------------------------------------------------------------------
-#  Create prefix index with length < 3072 , length = 3072 , length > 3072
-# - varbinary data type + secondary index
-CREATE TABLE worklog5743 (
-col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
-PRIMARY KEY (col_1_varbinary(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-# Create index of 3072
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-# Drop index
-DROP INDEX prefix_idx ON worklog5743;
-SELECT col_1_varbinary = REPEAT("b", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("b", 4000)
-AND col_2_varbinary = REPEAT("p", 4000);
-
-
-# Again add index length < 3072
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (2000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-# Drop index
-DROP INDEX prefix_idx ON worklog5743;
-
-# Again add index length > 3072.
-# If "innodb_large_prefix" is turned on, than the index prefix larger than 3072
-# will be truncated to 3072. If the table is REDUNDANT and COMPACT, which does
-# not support prefix > 767, the create index will be rejected. 
-CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (4000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
-WHERE col_1_varbinary = REPEAT("a", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
-SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_varbinary = REPEAT("c", 4000)
-AND col_2_varbinary = REPEAT("o", 4000);
-
-
-DROP TABLE worklog5743;
-
-# -----------------------------------------------------------------------------
-# Create prefix index with length < 3072 , length = 3072 , length > 3072
-#  text data type + secondary index
-CREATE TABLE worklog5743 (col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(500))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-# Create index of 3072
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
-FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-# Drop index
-DROP INDEX prefix_idx ON worklog5743;
-SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("b", 4000) AND col_2_text = REPEAT("p", 4000);
-
-# Again add index length < 3072
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (1000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-# Drop index
-DROP INDEX prefix_idx ON worklog5743;
-
-# Again add index length > 3072. Expect error.Length exceeds maximum supported
-# key length
-# Again add index length > 3072.
-# If "innodb_large_prefix" is turned on, than the index prefix larger than 3072
-# will be truncated to 3072. If the table is REDUNDANT and COMPACT, which does
-# not support prefix > 767, the create index will be rejected.
-CREATE INDEX prefix_idx ON worklog5743(col_1_text (4000));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
-
-DROP TABLE worklog5743;
-
-
-# -----------------------------------------------------------------------------
-# Create prefix index with length < 948 , length = 948 , length > 948
-# For compressed row type + primary key
-CREATE TABLE worklog5743 (
-col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
-PRIMARY KEY (col_1_text(948))
-) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
-# Create index of 767
-INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
-SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-# Drop index
-#DROP INDEX prefix_idx ON worklog5743;
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("b", 4000)
-AND col_2_text = REPEAT("p", 4000);
-
-# Again add index length < 767
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (700));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-# Drop index
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-
-# Again add index length > 948. Expect error 'to big row ' due to exceed
-# in key length.  
--- error 139
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (950));
-INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
-SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
-UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
-WHERE col_1_text = REPEAT("a", 4000)
-AND col_2_text = REPEAT("o", 4000);
-DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
-SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
-WHERE col_1_text = REPEAT("c", 4000)
-AND col_2_text = REPEAT("o", 4000);
-
-DROP TABLE worklog5743;
-
-# -----------------------------------------------------------------------------
-#  Create prefix index with length < 3072 , length = 3072 , length > 3072
-# data types VARCHAR
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (900));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-# Again add index length > 3072. Expect error.Length exceeds maximum supported
-# key length
-# Again add index length > 3072.
-# If "innodb_large_prefix" is turned on, than the index prefix larger than 3072
-# will be truncated to 3072. If the table is REDUNDANT and COMPACT, which does
-# not support prefix > 767, the create index will be rejected.
-# Index length is truncated only for 'create index' , but error if we add
-# prefix index with length > 3072
---error ER_TOO_LONG_KEY
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (3073));
-DROP TABLE worklog5743;
-
-
-CREATE TABLE worklog5743 (
-col_1_BLOB BLOB (4000) , PRIMARY KEY (col_1_BLOB(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (500));
-ALTER TABLE worklog5743 DROP PRIMARY KEY;
-# Negative case
-# Again add index length > 3072. Expect error.Length exceeds maximum supported
-# key length
-# Index length is truncated only for 'create index' , but error if we add
-# prefix index with length > 3072
---error ER_TOO_LONG_KEY
-ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (3073));
-
-DROP TABLE worklog5743;
-
-# -----------------------------------------------------------------------------
-# Error on adding larger prefix if violates unique index.
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000)
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)),
-REPEAT("o", 4000));
-INSERT INTO worklog5743
-VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
---error 1062
-ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000));
-DROP TABLE worklog5743;
-
-# -----------------------------------------------------------------------------
-set global innodb_large_prefix=0;
-# Prefix index > 767 is allowed if innodb_large_prefix is set to 1
---error ER_TOO_LONG_KEY
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(3072))
-) ROW_FORMAT=DYNAMIC, engine = innodb;
-
-
-# -----------------------------------------------------------------------------
-set global innodb_large_prefix=0;
-# Backward compatibility test - Index lenghth > 767 is truncated for REDUNDANT
-# and COMPACT
-CREATE TABLE worklog5743 (
-col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
-PRIMARY KEY (col_1_varchar(767))
-) engine = innodb;
-# Prefix index > 767 is truncated with REDUNDANT and COMPACT 
-CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (1000));
-DROP TABLE worklog5743;
-#------------------------------------------------------------------------------
-
-eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
-eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
-eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-update-insert.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-update-insert.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-update-insert.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-update-insert.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,38 @@
+#
+# Copyright (c) 2014 Oracle and/or its affiliates. All rights reserved.
+#
+
+# This file contains test cases for checking the functionality "update by
+# delete + insert".
+
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug#14668683 ASSERT REC_GET_DELETED_FLAG(REC, PAGE_IS_COMP(PAGE))
+--echo #
+
+create table t1(f1 char(1) primary key, f2 int not null, f3 blob)
+engine=innodb;
+show create table t1;
+
+insert into t1 values ('a', 0, repeat('b',8102));
+select f1 from t1;
+update t1 set f1='A';
+select f1 from t1;
+drop table t1;
+
+--echo #
+--echo # Another test case
+--echo #
+create table t1 (f1 char(1), f2 longblob, f3 blob, primary key(f1))
+charset=utf8 engine=innodb;
+
+replace into t1 set f1=0xa3;
+select f1 from t1;
+update t1 set f1=0x6a;
+update t1 set f3=repeat(0xb1,8103);
+update t1 set f1=0x4a;
+update t1 set f1=0x82;
+select f1 from t1;
+
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-zip.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-zip.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/innodb-zip.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/innodb-zip.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,342 +0,0 @@
--- source include/have_innodb.inc
-
-let $per_table=`select @@innodb_file_per_table`;
-let $format=`select @@innodb_file_format`;
-let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
-
-set session innodb_strict_mode=0;
-set global innodb_file_per_table=off;
-set global innodb_file_format=`0`;
- 
-create table t0(a int primary key) engine=innodb row_format=compressed;
-create table t00(a int primary key) engine=innodb
-key_block_size=4 row_format=compressed;
-create table t1(a int primary key) engine=innodb row_format=dynamic;
-create table t2(a int primary key) engine=innodb row_format=redundant;
-create table t3(a int primary key) engine=innodb row_format=compact;
-create table t4(a int primary key) engine=innodb key_block_size=9;
-create table t5(a int primary key) engine=innodb
-key_block_size=1 row_format=redundant;
-
-set global innodb_file_per_table=on;
-create table t6(a int primary key) engine=innodb
-key_block_size=1 row_format=redundant;
-set global innodb_file_format=`1`;
-create table t7(a int primary key) engine=innodb
-key_block_size=1 row_format=redundant;
-create table t8(a int primary key) engine=innodb
-key_block_size=1 row_format=fixed;
-create table t9(a int primary key) engine=innodb
-key_block_size=1 row_format=compact;
-create table t10(a int primary key) engine=innodb
-key_block_size=1 row_format=dynamic;
-create table t11(a int primary key) engine=innodb
-key_block_size=1 row_format=compressed;
-create table t12(a int primary key) engine=innodb
-key_block_size=1;
-create table t13(a int primary key) engine=innodb
-row_format=compressed;
-create table t14(a int primary key) engine=innodb key_block_size=9;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-
-drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14;
-alter table t1 key_block_size=0;
-alter table t1 row_format=dynamic;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-alter table t1 row_format=compact;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-alter table t1 row_format=redundant;
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-drop table t1;
-
-create table t1(a int not null, b text, index(b(10))) engine=innodb
-key_block_size=1;
-
-create table t2(b text)engine=innodb;
-insert into t2 values(concat('1abcdefghijklmnopqrstuvwxyz', repeat('A',5000)));
-
-insert into t1 select 1, b from t2;
-commit;
-
-connect (a,localhost,root,,);
-connect (b,localhost,root,,);
-
-connection a;
-begin;
-update t1 set b=repeat('B',100);
-
-connection b;
-select a,left(b,40) from t1 natural join t2;
-
-connection a;
-rollback;
-
-connection b;
-select a,left(b,40) from t1 natural join t2;
-
-connection default;
-disconnect a;
-disconnect b;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-drop table t1,t2;
-
-# The following should fail in non-strict mode too.
-# (The fix of Bug #50945 only affects REDUNDANT and COMPACT tables.)
-SET SESSION innodb_strict_mode = off;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE t1(
-	c TEXT NOT NULL, d TEXT NOT NULL,
-	PRIMARY KEY (c(767),d(767)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE t1(
-	c TEXT NOT NULL, d TEXT NOT NULL,
-	PRIMARY KEY (c(767),d(767)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 CHARSET=ASCII;
-CREATE TABLE t1(
-	c TEXT NOT NULL, d TEXT NOT NULL,
-	PRIMARY KEY (c(767),d(767)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4 CHARSET=ASCII;
-drop table t1;
---error ER_TOO_BIG_ROWSIZE
-CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438)))
-ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
-INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
-DROP TABLE t1;
-
-#
-# Test blob column inheritance (mantis issue#36)
-#
-
-create table t1( c1 int not null, c2 blob, c3 blob, c4 blob,
-		primary key(c1, c2(22), c3(22)))
-		engine = innodb row_format = dynamic;
-begin;
-insert into t1 values(1, repeat('A', 20000), repeat('B', 20000),
-			repeat('C', 20000));
-
-update t1 set c3 = repeat('D', 20000) where c1 = 1;
-commit;
-
-# one blob column which is unchanged in update and part of PK
-# one blob column which is changed and part of of PK
-# one blob column which is not part of PK and is unchanged
-select count(*) from t1 where c2 = repeat('A', 20000);
-select count(*) from t1 where c3 = repeat('D', 20000);
-select count(*) from t1 where c4 = repeat('C', 20000);
-
-update t1 set c3 = repeat('E', 20000) where c1 = 1;
-drop table t1;
-
-#
-#
-# Test innodb_file_format
-#
-set global innodb_file_format=`0`;
-select @@innodb_file_format;
-set global innodb_file_format=`1`;
-select @@innodb_file_format;
--- error ER_WRONG_VALUE_FOR_VAR
-set global innodb_file_format=`2`;
--- error ER_WRONG_VALUE_FOR_VAR
-set global innodb_file_format=`-1`;
-set global innodb_file_format=`Antelope`;
-set global innodb_file_format=`Barracuda`;
--- error ER_WRONG_VALUE_FOR_VAR
-set global innodb_file_format=`Cheetah`;
--- error ER_WRONG_VALUE_FOR_VAR
-set global innodb_file_format=`abc`;
--- error ER_WRONG_VALUE_FOR_VAR
-set global innodb_file_format=`1a`;
--- error ER_WRONG_VALUE_FOR_VAR
-set global innodb_file_format=``;
-
-#test strict mode.
-# this does not work anymore, has been removed from mysqltest
-# -- enable_errors
-set global innodb_file_per_table = on;
-set global innodb_file_format = `1`;
-
-set innodb_strict_mode = off;
-create table t1 (id int primary key) engine = innodb key_block_size = 0;
-drop table t1;
-
-#set strict_mode
-set innodb_strict_mode = on;
-
-#Test different values of KEY_BLOCK_SIZE
-
-create table t1 (id int primary key) engine = innodb key_block_size = 0;
-
---error ER_CANT_CREATE_TABLE
-create table t2 (id int primary key) engine = innodb key_block_size = 9;
-show warnings;
-
-
-create table t3 (id int primary key) engine = innodb key_block_size = 1;
-create table t4 (id int primary key) engine = innodb key_block_size = 2;
-create table t5 (id int primary key) engine = innodb key_block_size = 4;
-create table t6 (id int primary key) engine = innodb key_block_size = 8;
-create table t7 (id int primary key) engine = innodb key_block_size = 16;
-
-#check various ROW_FORMAT values.
-create table t8 (id int primary key) engine = innodb row_format = compressed;
-create table t9 (id int primary key) engine = innodb row_format = dynamic;
-create table t10(id int primary key) engine = innodb row_format = compact;
-create table t11(id int primary key) engine = innodb row_format = redundant;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11;
-
-#test different values of ROW_FORMAT with KEY_BLOCK_SIZE
-create table t1 (id int primary key) engine = innodb
-key_block_size = 8 row_format = compressed;
-
---error ER_CANT_CREATE_TABLE
-create table t2 (id int primary key) engine = innodb
-key_block_size = 8 row_format = redundant;
-show warnings;
-
---error ER_CANT_CREATE_TABLE
-create table t3 (id int primary key) engine = innodb
-key_block_size = 8 row_format = compact;
-show warnings;
-
---error ER_CANT_CREATE_TABLE
-create table t4 (id int primary key) engine = innodb
-key_block_size = 8 row_format = dynamic;
-show warnings;
-
-create table t5 (id int primary key) engine = innodb
-key_block_size = 8 row_format = default;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-drop table t1, t5;
-
-#test multiple errors
---error ER_CANT_CREATE_TABLE
-create table t1 (id int primary key) engine = innodb
-key_block_size = 9 row_format = redundant;
-show warnings;
-
---error ER_CANT_CREATE_TABLE
-create table t2 (id int primary key) engine = innodb
-key_block_size = 9 row_format = compact;
-show warnings;
-
---error ER_CANT_CREATE_TABLE
-create table t2 (id int primary key) engine = innodb
-key_block_size = 9 row_format = dynamic;
-show warnings;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-
-#test valid values with innodb_file_per_table unset
-set global innodb_file_per_table = off;
-
---error ER_CANT_CREATE_TABLE
-create table t1 (id int primary key) engine = innodb key_block_size = 1;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t2 (id int primary key) engine = innodb key_block_size = 2;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t3 (id int primary key) engine = innodb key_block_size = 4;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t4 (id int primary key) engine = innodb key_block_size = 8;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t5 (id int primary key) engine = innodb key_block_size = 16;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t6 (id int primary key) engine = innodb row_format = compressed;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t7 (id int primary key) engine = innodb row_format = dynamic;
-show warnings;
-create table t8 (id int primary key) engine = innodb row_format = compact;
-create table t9 (id int primary key) engine = innodb row_format = redundant;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-drop table t8, t9;
-
-#test valid values with innodb_file_format unset
-set global innodb_file_per_table = on;
-set global innodb_file_format = `0`; 
-
---error ER_CANT_CREATE_TABLE
-create table t1 (id int primary key) engine = innodb key_block_size = 1;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t2 (id int primary key) engine = innodb key_block_size = 2;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t3 (id int primary key) engine = innodb key_block_size = 4;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t4 (id int primary key) engine = innodb key_block_size = 8;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t5 (id int primary key) engine = innodb key_block_size = 16;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t6 (id int primary key) engine = innodb row_format = compressed;
-show warnings;
---error ER_CANT_CREATE_TABLE
-create table t7 (id int primary key) engine = innodb row_format = dynamic;
-show warnings;
-create table t8 (id int primary key) engine = innodb row_format = compact;
-create table t9 (id int primary key) engine = innodb row_format = redundant;
-
-SELECT table_schema, table_name, row_format, data_length, index_length
-FROM information_schema.tables WHERE engine='innodb';
-drop table t8, t9;
-
-eval set global innodb_file_per_table=$per_table;
-eval set global innodb_file_format=$format;
-#
-# Testing of tablespace tagging
-#
--- disable_info
-set global innodb_file_per_table=on;
-set global innodb_file_format=`Barracuda`;
-set global innodb_file_format_max=`Antelope`;
-create table normal_table (
-  c1 int
-) engine = innodb;
-select @@innodb_file_format_max;
-create table zip_table (
-  c1 int
-) engine = innodb key_block_size = 8;
-select @@innodb_file_format_max;
-set global innodb_file_format_max=`Antelope`;
-select @@innodb_file_format_max;
--- disable_result_log
-show table status;
--- enable_result_log
-select @@innodb_file_format_max;
-drop table normal_table, zip_table;
--- disable_result_log
-
-#
-# restore environment to the state it was before this test execution
-#
-
--- disable_query_log
-eval set global innodb_file_format=$format;
-eval set global innodb_file_per_table=$per_table;
-eval set session innodb_strict_mode=$innodb_strict_mode_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/insert_debug.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/insert_debug.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/insert_debug.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/insert_debug.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,16 @@
+--source include/have_innodb.inc
+--source include/have_debug.inc
+
+--echo #
+--echo # Bug#19904003 INNODB_LIMIT_OPTIMISTIC_INSERT_DEBUG=1
+--echo # CAUSES INFINITE PAGE SPLIT
+--echo #
+
+SET GLOBAL innodb_change_buffering_debug=1;
+SET GLOBAL innodb_limit_optimistic_insert_debug=1;
+CREATE TABLE t1(c1 INT PRIMARY KEY) ENGINE=InnoDB
+PARTITION BY HASH (c1) PARTITIONS 15;
+DROP TABLE t1;
+
+SET GLOBAL innodb_change_buffering_debug=0;
+SET GLOBAL innodb_limit_optimistic_insert_debug=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/sp_temp_table.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/sp_temp_table.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/sp_temp_table.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/sp_temp_table.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,103 @@
+--source include/have_innodb.inc
+--source include/big_test.inc
+
+--echo #
+--echo # Bug #19306524 FAILING ASSERTION WITH TEMP TABLE FOR A PROCEDURE
+--echo # CALLED FROM A FUNCTION
+--echo #
+
+call mtr.add_suppression("MySQL is trying to drop table");
+
+DELIMITER $$;
+CREATE PROCEDURE cachedata(
+  IN obj_id BIGINT UNSIGNED,
+  IN start  DATETIME,
+  IN end    DATETIME
+)
+
+cachedata:BEGIN
+  DECLARE cache_count BIGINT;
+
+  SET @timestamp := NOW();
+
+  CREATE TEMPORARY TABLE IF NOT EXISTS cachedata (
+    timestamp    DATETIME,
+    object_id    BIGINT UNSIGNED NOT NULL,
+    start        DATETIME,
+    end          DATETIME,
+    seqno        BIGINT AUTO_INCREMENT,
+    value        FLOAT,
+    PRIMARY KEY (seqno),
+    INDEX (timestamp),
+    INDEX (object_id, start, end)
+  ) ENGINE=INNODB;
+
+  DELETE FROM cachedata WHERE
+    timestamp < DATE_SUB(@timestamp, INTERVAL 15 SECOND);
+
+  SELECT count(*) INTO cache_count FROM cachedata WHERE
+    object_id = obj_id
+    AND start = start
+    AND end = end;
+
+  IF cache_count > 0 THEN LEAVE cachedata;
+  END IF;
+
+  INSERT INTO cachedata (timestamp, object_id, start, end, value) VALUES
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 2345),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 2345),
+    (@timestamp, obj_id, start, end, 1234),
+    (@timestamp, obj_id, start, end, 4567),
+    (@timestamp, obj_id, start, end, 8901),
+    (@timestamp, obj_id, start, end, 2345);
+
+END$$
+
+
+CREATE FUNCTION get_cache(
+  obj_id   BIGINT UNSIGNED,
+  start    DATETIME,
+  end      DATETIME
+)
+  RETURNS FLOAT
+  READS SQL DATA
+BEGIN
+  DECLARE result FLOAT;
+
+  CALL cachedata(obj_id, start, end);
+
+  SELECT SUM(value) INTO result FROM cachedata WHERE
+    object_id = obj_id
+    AND start = start
+    AND end = end;
+
+  RETURN result;
+END$$
+
+DELIMITER ;$$
+
+let $i = 30;
+while ($i)
+{
+ SELECT get_cache(1, '2014-01-01', '2014-02-01');
+ select sleep(1);
+ dec $i;
+}
+
+DROP FUNCTION get_cache;
+DROP PROCEDURE cachedata;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/strict_mode.test mysql-5.5-5.5.43/mysql-test/suite/innodb/t/strict_mode.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb/t/strict_mode.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb/t/strict_mode.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,246 @@
+--source include/have_innodb.inc
+
+--echo #
+--echo # Bug #17852083 PRINT A WARNING WHEN DDL HAS AN ERROR IN
+--echo # INNODB_STRICT_MODE = 1
+--echo #
+
+set innodb_strict_mode = 0;
+
+create table t1 (id int auto_increment primary key,
+v varchar(32),
+col1 text,
+col2 text,
+col3 text,
+col4 text,
+col5 text,
+col6 text,
+col7 text,
+col8 text,
+col9 text,
+col10 text,
+col11 text,
+col12 text,
+col13 text,
+col14 text,
+col15 text,
+col16 text,
+col17 text,
+col18 text,
+col19 text,
+col20 text,
+col21 text,
+col22 text,
+col23 text,
+col24 text,
+col25 text,
+col26 text,
+col27 text,
+col28 text,
+col29 text,
+col30 text,
+col31 text,
+col32 text,
+col33 text,
+col34 text,
+col35 text,
+col36 text,
+col37 text,
+col38 text,
+col39 text,
+col40 text,
+col41 text,
+col42 text,
+col43 text,
+col44 text,
+col45 text ,
+col46 text,
+col47 text,
+col48 text,
+col49 text,
+col50 text,
+col51 text,
+col52 text,
+col53 text,
+col54 text,
+col55 text,
+col56 text,
+col57 text,
+col58 text,
+col59 text,
+col60 text,
+col61 text,
+col62 text,
+col63 text,
+col64 text,
+col65 text,
+col66 text,
+col67 text,
+col68 text ,
+col69 text,
+col70 text,
+col71 text,
+col72 text,
+col73 text,
+col74 text,
+col75 text,
+col76 text,
+col77 text,
+col78 text,
+col79 text,
+col80 text,
+col81 text,
+col82 text,
+col83 text,
+col84 text,
+col85 text,
+col86 text,
+col87 text,
+col88 text,
+col89 text,
+col90 text,
+col91 text,
+col92 text,
+col93 text,
+col94 text,
+col95 text,
+col96 text,
+col97 text,
+col98 text,
+col99 text,
+col100 text,
+col101 text,
+col102 text,
+col103 text,
+col104 text,
+col105 text,
+col106 text,
+col107 text,
+col108 text,
+col109 text,
+col110 text,
+col111 text,
+col112 text,
+col113 text,
+col114 text,
+col115 text,
+col116 text,
+col117 text,
+col118 text,
+col119 text,
+col120 text,
+col121 text,
+col122 text,
+col123 text,
+col124 text,
+col125 text,
+col126 text ,
+col127 text,
+col128 text,
+col129 text,
+col130 text,
+col131 text,
+col132 text,
+col133 text,
+col134 text,
+col135 text,
+col136 text,
+col137 text,
+col138 text,
+col139 text,
+col140 text,
+col141 text,
+col142 text,
+col143 text,
+col144 text,
+col145 text,
+col146 text,
+col147 text ,
+col148 text,
+col149 text,
+col150 text,
+col151 text,
+col152 text,
+col153 text,
+col154 text,
+col155 text,
+col156 text,
+col157 text,
+col158 text,
+col159 text,
+col160 text,
+col161 text,
+col162 text,
+col163 text,
+col164 text,
+col165 text,
+col166 text,
+col167 text,
+col168 text,
+col169 text,
+col170 text,
+col171 text,
+col172 text ,
+col173 text,
+col174 text,
+col175 text,
+col176 text,
+col177 text,
+col178 text,
+col179 text,
+col180 text,
+col181 text,
+col182 text,
+col183 text,
+col184 text,
+col185 text,
+col186 text,
+col187 text,
+col188 text,
+col189 text,
+col190 text,
+col191 text,
+col192 text,
+col193 text,
+col194 text,
+col195 text,
+col196 text,
+col197 text,
+col198 text,
+col199 text,
+col200 text,
+col201 text,
+col202 text,
+col203 text,
+col204 text,
+col205 text,
+col206 text,
+col207 text,
+col208 text,
+col209 text,
+col210 text,
+col211 text,
+col212 text,
+col213 text,
+col214 text,
+col215 text,
+col216 text,
+col217 text,
+col218 text,
+col219 text,
+col220 text,
+col221 text,
+col222 text,
+col223 text,
+col224 text,
+col225 text,
+col226 text,
+col227 text,
+col228 text
+) ENGINE=InnoDB;
+
+set innodb_strict_mode = 1;
+--error ER_TOO_BIG_ROWSIZE
+alter table t1 engine=InnoDB;
+
+drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug36169.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug36169.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug36169.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug36169.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,2 @@
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=ON;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug36172.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug36172.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug36172.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug36172.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1 @@
+SET storage_engine=InnoDB;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug52745.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug52745.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug52745.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug52745.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,130 @@
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=on;
+CREATE TABLE bug52745 (
+a2 int(10) unsigned DEFAULT NULL,
+col37 time DEFAULT NULL,
+col38 char(229) CHARACTER SET utf8 DEFAULT NULL,
+col39 text,
+col40 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+col41 int(10) unsigned DEFAULT NULL,
+col42 varchar(248) CHARACTER SET utf8 DEFAULT NULL,
+col43 smallint(5) unsigned zerofill DEFAULT NULL,
+col44 varchar(150) CHARACTER SET utf8 DEFAULT NULL,
+col45 float unsigned zerofill DEFAULT NULL,
+col46 binary(1) DEFAULT NULL,
+col47 tinyint(4) DEFAULT NULL,
+col48 tinyint(1) DEFAULT NULL,
+col49 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+col50 binary(1) DEFAULT NULL,
+col51 double unsigned zerofill DEFAULT NULL,
+col52 int(10) unsigned DEFAULT NULL,
+col53 time DEFAULT NULL,
+col54 double unsigned DEFAULT NULL,
+col55 time DEFAULT NULL,
+col56 mediumtext CHARACTER SET latin2,
+col57 blob,
+col58 decimal(52,16) unsigned zerofill NOT NULL DEFAULT '000000000000000000000000000000000000.0000000000000000',
+col59 binary(1) DEFAULT NULL,
+col60 longblob,
+col61 time DEFAULT NULL,
+col62 longtext CHARACTER SET utf8 COLLATE utf8_persian_ci,
+col63 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+col64 int(10) unsigned DEFAULT NULL,
+col65 date DEFAULT NULL,
+col66 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+col67 binary(1) DEFAULT NULL,
+col68 tinyblob,
+col69 date DEFAULT NULL,
+col70 tinyint(3) unsigned zerofill DEFAULT NULL,
+col71 varchar(44) CHARACTER SET utf8 DEFAULT NULL,
+col72 datetime DEFAULT NULL,
+col73 smallint(5) unsigned zerofill DEFAULT NULL,
+col74 longblob,
+col75 bit(34) DEFAULT NULL,
+col76 float unsigned zerofill DEFAULT NULL,
+col77 year(2) DEFAULT NULL,
+col78 tinyint(3) unsigned DEFAULT NULL,
+col79 set('msfheowh','tbpxbgf','by','wahnrjw','myqfasxz','rsokyumrt') CHARACTER SET latin2 DEFAULT NULL,
+col80 datetime DEFAULT NULL,
+col81 smallint(6) DEFAULT NULL,
+col82 enum('xtaurnqfqz','rifrse','kuzwpbvb','niisabk','zxavro','rbvasv','','uulrfaove','','') DEFAULT NULL,
+col83 bigint(20) unsigned zerofill DEFAULT NULL,
+col84 float unsigned zerofill DEFAULT NULL,
+col85 double DEFAULT NULL,
+col86 enum('ylannv','','vlkhycqc','snke','cxifustp','xiaxaswzp','oxl') CHARACTER SET latin1 COLLATE latin1_german2_ci DEFAULT NULL,
+col87 varbinary(221) DEFAULT NULL,
+col88 double unsigned DEFAULT NULL,
+col89 float unsigned zerofill DEFAULT NULL,
+col90 tinyblob
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+Warnings:
+Note	1287	'YEAR(2)' is deprecated and will be removed in a future release. Please use YEAR(4) instead
+Note	1291	Column 'col82' has duplicated value '' in ENUM
+Note	1291	Column 'col82' has duplicated value '' in ENUM
+INSERT INTO bug52745 SET
+col40='0000-00-00 00:00:00',
+col51=16547,
+col53='7711484',
+col54=-28604,
+col55='7112612',
+col56='wakefulness\'',
+col57=repeat('absorbefacient\'',106),
+col58=11027,
+col59='AM09gW7',
+col60=repeat('Noelani\'',16),
+col61='2520576',
+col62='substitutiv',
+col63='19950106155112',
+col64=-12038,
+col65='86238806',
+col66='19600719080256',
+col68=repeat('Sagittarius\'',54),
+col69='38943902',
+col70=1232,
+col71='Elora\'',
+col74=repeat('zipp',11),
+col75='0',
+col76=23254,
+col78=13247,
+col79='56219',
+col80='20500609035724',
+col81=11632,
+col82=7,
+col84=-23863,
+col85=6341,
+col87='HZdkf.4 s7t,5Rmq	8so fmr,ruGLUG25TrtI.yQ	2SuHq0ML7rw7.4 b2yf2E5TJxOtBBZImezDnzpj,uPYfznnEUDN1e9aQoO 2DsplB7TFWy	oQJ br  HLF :F,eQ p4i1oWsr lL3PG,hjCz6hYqN h1QTjLCjrv:QCdSzpYBibJAtZCxLOk3l6Blsh.W',
+col88=16894,
+col89=6161,
+col90=repeat('gale',48);
+Warnings:
+Warning	1265	Data truncated for column 'col53' at row 1
+Warning	1264	Out of range value for column 'col54' at row 1
+Warning	1265	Data truncated for column 'col59' at row 1
+Warning	1265	Data truncated for column 'col61' at row 1
+Warning	1264	Out of range value for column 'col64' at row 1
+Warning	1265	Data truncated for column 'col65' at row 1
+Warning	1264	Out of range value for column 'col66' at row 1
+Warning	1265	Data truncated for column 'col68' at row 1
+Warning	1265	Data truncated for column 'col69' at row 1
+Warning	1264	Out of range value for column 'col70' at row 1
+Warning	1264	Out of range value for column 'col78' at row 1
+Warning	1265	Data truncated for column 'col79' at row 1
+Warning	1264	Out of range value for column 'col84' at row 1
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1265	Data truncated for column 'col53' at row 1
+Warning	1264	Out of range value for column 'col54' at row 1
+Warning	1265	Data truncated for column 'col59' at row 1
+Warning	1265	Data truncated for column 'col61' at row 1
+Warning	1264	Out of range value for column 'col64' at row 1
+Warning	1265	Data truncated for column 'col65' at row 1
+Warning	1264	Out of range value for column 'col66' at row 1
+Warning	1265	Data truncated for column 'col68' at row 1
+Warning	1265	Data truncated for column 'col69' at row 1
+Warning	1264	Out of range value for column 'col70' at row 1
+Warning	1264	Out of range value for column 'col78' at row 1
+Warning	1265	Data truncated for column 'col79' at row 1
+Warning	1264	Out of range value for column 'col84' at row 1
+DROP TABLE bug52745;
+SET GLOBAL innodb_file_format=Antelope;
+SET GLOBAL innodb_file_per_table=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug53591.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug53591.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug53591.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug53591.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,15 @@
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=on;
+set old_alter_table=0;
+CREATE TABLE bug53591(a text charset utf8 not null)
+ENGINE=InnoDB KEY_BLOCK_SIZE=1;
+ALTER TABLE bug53591 ADD PRIMARY KEY(a(220));
+ERROR HY000: Too big row
+SHOW WARNINGS;
+Level	Code	Message
+Error	139	Too big row
+Error	1118	Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
+Error	1030	Got error 139 from storage engine
+DROP TABLE bug53591;
+SET GLOBAL innodb_file_format=Antelope;
+SET GLOBAL innodb_file_per_table=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug56680.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug56680.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_bug56680.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_bug56680.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,109 @@
+SET GLOBAL tx_isolation='REPEATABLE-READ';
+SET GLOBAL innodb_file_format=Barracuda;
+SET GLOBAL innodb_file_per_table=on;
+CREATE TABLE bug56680(
+a INT AUTO_INCREMENT PRIMARY KEY,
+b CHAR(1),
+c INT,
+INDEX(b))
+ENGINE=InnoDB;
+INSERT INTO bug56680 VALUES(0,'x',1);
+BEGIN;
+SELECT b FROM bug56680;
+b
+x
+BEGIN;
+UPDATE bug56680 SET b='X';
+SELECT b FROM bug56680;
+b
+x
+SELECT * FROM bug56680;
+a	b	c
+1	x	1
+ROLLBACK;
+SELECT b FROM bug56680;
+b
+x
+SET GLOBAL tx_isolation='READ-UNCOMMITTED';
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+BEGIN;
+SELECT b FROM bug56680 LIMIT 2;
+b
+x
+x
+BEGIN;
+DELETE FROM bug56680 WHERE a=1;
+INSERT INTO bug56680 VALUES(1,'X',1);
+SELECT b FROM bug56680 LIMIT 3;
+b
+X
+x
+x
+SELECT b FROM bug56680 LIMIT 2;
+b
+x
+x
+CHECK TABLE bug56680;
+Table	Op	Msg_type	Msg_text
+test.bug56680	check	status	OK
+ROLLBACK;
+SELECT b FROM bug56680 LIMIT 2;
+b
+x
+x
+CHECK TABLE bug56680;
+Table	Op	Msg_type	Msg_text
+test.bug56680	check	status	OK
+SELECT b FROM bug56680 LIMIT 2;
+b
+x
+x
+CREATE TABLE bug56680_2(
+a INT AUTO_INCREMENT PRIMARY KEY,
+b VARCHAR(2) CHARSET latin1 COLLATE latin1_german2_ci,
+c INT,
+INDEX(b))
+ENGINE=InnoDB;
+INSERT INTO bug56680_2 SELECT 0,_latin1 0xdf,c FROM bug56680;
+BEGIN;
+SELECT HEX(b) FROM bug56680_2 LIMIT 2;
+HEX(b)
+DF
+DF
+DELETE FROM bug56680_2 WHERE a=1;
+INSERT INTO bug56680_2 VALUES(1,'SS',1);
+SELECT HEX(b) FROM bug56680_2 LIMIT 3;
+HEX(b)
+5353
+DF
+DF
+CHECK TABLE bug56680_2;
+Table	Op	Msg_type	Msg_text
+test.bug56680_2	check	status	OK
+ALTER TABLE bug56680_2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SELECT HEX(b) FROM bug56680_2 LIMIT 2;
+HEX(b)
+5353
+DF
+DELETE FROM bug56680_2 WHERE a=1;
+INSERT INTO bug56680_2 VALUES(1,_latin1 0xdf,1);
+SELECT HEX(b) FROM bug56680_2 LIMIT 3;
+HEX(b)
+DF
+DF
+DF
+CHECK TABLE bug56680_2;
+Table	Op	Msg_type	Msg_text
+test.bug56680_2	check	status	OK
+DROP TABLE bug56680_2;
+DROP TABLE bug56680;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_cmp_drop_table.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,14 @@
+set global innodb_file_per_table=on;
+set global innodb_file_format=`1`;
+create table t1(a text) engine=innodb key_block_size=8;
+SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
+page_size
+8192
+drop table t1;
+SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
+page_size
+8192
+create table t2(a text) engine=innodb;
+SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0;
+page_size
+drop table t2;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb-create-options.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb-create-options.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb-create-options.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb-create-options.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,854 @@
+SET storage_engine=InnoDB;
+SET GLOBAL innodb_file_format=`Barracuda`;
+SET GLOBAL innodb_file_per_table=ON;
+SET SESSION innodb_strict_mode = ON;
+# Test 1) StrictMode=ON, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
+#         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
+DROP TABLE IF EXISTS t1;
+Warnings:
+Note	1051	Unknown table 't1'
+#         'FIXED' is sent to InnoDB since it is used by MyISAM.
+#         But it is an invalid mode in InnoDB
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	
+# Test 2) StrictMode=ON, CREATE with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
+#         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=16
+# Test 3) StrictMode=ON, ALTER with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: invalid ROW_FORMAT specifier.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
+# Test 4) StrictMode=ON, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid non-zero KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+ALTER TABLE t1 KEY_BLOCK_SIZE=2;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT
+ALTER TABLE t1 KEY_BLOCK_SIZE=4;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+ALTER TABLE t1 KEY_BLOCK_SIZE=8;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED
+ALTER TABLE t1 KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=16
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=1
+# Test 5) StrictMode=ON, CREATE with a valid KEY_BLOCK_SIZE
+#         ALTER with each ROW_FORMAT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=2;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `i` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `i` int(11) DEFAULT NULL,
+  `f1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=2
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+# Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+# Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
+#         and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
+#         and that they can be set to default values during strict mode.
+SET GLOBAL innodb_file_format=Antelope;
+DROP TABLE IF EXISTS t1;
+Warnings:
+Note	1051	Unknown table 't1'
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
+SHOW WARNINGS;
+Level	Code	Message
+ALTER TABLE t1 KEY_BLOCK_SIZE=8;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+SET GLOBAL innodb_file_format=Barracuda;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
+SET GLOBAL innodb_file_format=Antelope;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SET GLOBAL innodb_file_format=Barracuda;
+# Test 8) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
+#         and a valid non-zero KEY_BLOCK_SIZE are rejected with
+#         innodb_file_per_table=OFF and that they can be set to default
+#         values during strict mode.
+SET GLOBAL innodb_file_per_table=OFF;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
+SHOW WARNINGS;
+Level	Code	Message
+ALTER TABLE t1 KEY_BLOCK_SIZE=1;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT
+ALTER TABLE t1 ROW_FORMAT=DEFAULT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	
+SET GLOBAL innodb_file_per_table=ON;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
+SET GLOBAL innodb_file_per_table=OFF;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+ERROR HY000: Can't create table '#sql-temporary' (errno: 1478)
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Error	1005	Can't create table '#sql-temporary' (errno: 1478)
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SET GLOBAL innodb_file_per_table=ON;
+##################################################
+SET SESSION innodb_strict_mode = OFF;
+# Test 9) StrictMode=OFF, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
+#         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
+#         'FIXED' is sent to InnoDB since it is used by MyISAM.
+#         It is an invalid mode in InnoDB, use COMPACT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
+Warnings:
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=FIXED
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
+Warnings:
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=FIXED
+# Test 10) StrictMode=OFF, CREATE with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
+#          KEY_BLOCK_SIZE is ignored with COMPACT, REDUNDANT, & DYNAMIC
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=1
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=2
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=4
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=8
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=16
+# Test 11) StrictMode=OFF, ALTER with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=FIXED KEY_BLOCK_SIZE=1
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=2
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=4
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=8 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=8 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=8
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
+# Test 12) StrictMode=OFF, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+ALTER TABLE t1 KEY_BLOCK_SIZE=2;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=2
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=2
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=2
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
+ALTER TABLE t1 KEY_BLOCK_SIZE=4;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=4
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	KEY_BLOCK_SIZE=8
+# Test 13) StrictMode=OFF, CREATE with a valid KEY_BLOCK_SIZE
+#          ALTER with each ROW_FORMAT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+Level	Code	Message
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `i` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `i` int(11) DEFAULT NULL,
+  `f1` int(11) DEFAULT NULL
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Redundant	row_format=REDUNDANT KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=16 unless ROW_FORMAT=COMPRESSED.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=16
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPACT
+# Test 14) StrictMode=OFF, CREATE with an invalid KEY_BLOCK_SIZE, it defaults to 8
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=15;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=15.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=15.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	KEY_BLOCK_SIZE=15
+# Test 15) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
+valid KEY_BLOCK_SIZE are remembered but not used when ROW_FORMAT
+is reverted to Antelope and then used again when ROW_FORMAT=Barracuda.
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
+SET GLOBAL innodb_file_format=Antelope;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+Warnings:
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPRESSED KEY_BLOCK_SIZE=1
+SET GLOBAL innodb_file_format=Barracuda;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=1
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+SET GLOBAL innodb_file_format=Antelope;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+Warnings:
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=DYNAMIC
+SET GLOBAL innodb_file_format=Barracuda;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+# Test 16) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
+valid KEY_BLOCK_SIZE are remembered but not used when innodb_file_per_table=OFF
+and then used again when innodb_file_per_table=ON.
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
+SET GLOBAL innodb_file_per_table=OFF;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+Warnings:
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=2.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=COMPRESSED KEY_BLOCK_SIZE=2
+SET GLOBAL innodb_file_per_table=ON;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compressed	row_format=COMPRESSED KEY_BLOCK_SIZE=2
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+SET GLOBAL innodb_file_per_table=OFF;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+Warnings:
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SHOW WARNINGS;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Compact	row_format=DYNAMIC
+SET GLOBAL innodb_file_per_table=ON;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+Level	Code	Message
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+TABLE_NAME	ROW_FORMAT	CREATE_OPTIONS
+t1	Dynamic	row_format=DYNAMIC
+# Cleanup
+DROP TABLE IF EXISTS t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_index_large_prefix.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,184 @@
+set global innodb_file_format="Barracuda";
+set global innodb_file_per_table=1;
+set global innodb_large_prefix=1;
+create table worklog5743(a TEXT not null, primary key (a(1000)))
+ROW_FORMAT=DYNAMIC, engine = innodb;
+insert into worklog5743 values(repeat("a", 20000));
+update worklog5743 set a = (repeat("b", 16000));
+create index idx on worklog5743(a(2000));
+begin;
+update worklog5743 set a = (repeat("x", 17000));
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+select a = repeat("x", 17000) from worklog5743;
+a = repeat("x", 17000)
+0
+select a = repeat("b", 16000) from worklog5743;
+a = repeat("b", 16000)
+1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+select a = repeat("x", 17000) from worklog5743;
+a = repeat("x", 17000)
+1
+rollback;
+drop table worklog5743;
+create table worklog5743(a1 int, a2 TEXT not null)
+ROW_FORMAT=DYNAMIC, engine = innodb;
+create index idx on worklog5743(a1, a2(2000));
+insert into worklog5743 values(9, repeat("a", 10000));
+begin;
+update worklog5743 set a1 = 1000;
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	Using where
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+9	1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+rollback;
+drop table worklog5743;
+create table worklog5743(a1 int, a2 TEXT not null)
+ROW_FORMAT=DYNAMIC, engine = innodb;
+create index idx on worklog5743(a1, a2(50));
+insert into worklog5743 values(9, repeat("a", 10000));
+begin;
+update worklog5743 set a1 = 1000;
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	Using where
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+9	1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+rollback;
+drop table worklog5743;
+create table worklog5743_2(a1 int, a2 TEXT not null)
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+create table worklog5743_4(a1 int, a2 TEXT not null)
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+create index idx1 on worklog5743_2(a1, a2(942));
+ERROR HY000: Too big row
+create index idx1 on worklog5743_2(a1, a2(940));
+create index idx1 on worklog5743_4(a1, a2(1966));
+ERROR HY000: Too big row
+create index idx1 on worklog5743_4(a1, a2(1964));
+insert into worklog5743_2 values(9, repeat("a", 10000));
+insert into worklog5743_4 values(9, repeat("a", 10000));
+begin;
+update worklog5743_2 set a1 = 1000;
+update worklog5743_4 set a1 = 1000;
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+explain select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	worklog5743_2	ref	idx1	idx1	5	const	1	Using where
+select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+9	1
+select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+9	1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
+a1	a2 = repeat("a", 10000)
+rollback;
+drop table worklog5743_2;
+drop table worklog5743_4;
+create table worklog5743(a1 int, a2 varchar(3000))
+ROW_FORMAT=DYNAMIC, engine = innodb;
+create index idx on worklog5743(a1, a2);
+insert into worklog5743 values(9, repeat("a", 3000));
+begin;
+update worklog5743 set a1 = 1000;
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+explain select a1 from worklog5743 where a1 = 9;
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	worklog5743	ref	idx	idx	5	const	1	Using where; Using index
+select a1 from worklog5743 where a1 = 9;
+a1
+9
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+select a1 from worklog5743 where a1 = 9;
+a1
+rollback;
+drop table worklog5743;
+create table worklog5743(a TEXT not null, primary key (a(1000)))
+engine = innodb;
+ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+create table worklog5743(a TEXT) engine = innodb;
+create index idx on worklog5743(a(1000));
+ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+create index idx on worklog5743(a(725));
+insert into worklog5743 values(repeat("a", 20000));
+begin;
+insert into worklog5743 values(repeat("b", 20000));
+update worklog5743 set a = (repeat("x", 25000));
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+select a = repeat("a", 20000) from worklog5743;
+a = repeat("a", 20000)
+1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+select a = repeat("x", 25000) from worklog5743;
+a = repeat("x", 25000)
+1
+1
+rollback;
+drop table worklog5743;
+create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC, engine = innodb;
+create index idx on worklog5743(a(3073));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+create index idx2 on worklog5743(a(3072));
+show create table worklog5743;
+Table	Create Table
+worklog5743	CREATE TABLE `worklog5743` (
+  `a` text NOT NULL,
+  KEY `idx` (`a`(3072)),
+  KEY `idx2` (`a`(3072))
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=DYNAMIC
+drop table worklog5743;
+create table worklog5743(a TEXT not null) engine = innodb;
+create index idx on worklog5743(a(768));
+ERROR HY000: Index column size too large. The maximum column size is 767 bytes.
+create index idx2 on worklog5743(a(767));
+drop table worklog5743;
+SET GLOBAL innodb_file_format=Antelope;
+SET GLOBAL innodb_file_per_table=0;
+SET GLOBAL innodb_large_prefix=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb_prefix_index_liftedlimit.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,1353 @@
+set global innodb_file_format="Barracuda";
+set global innodb_file_per_table=1;
+set global innodb_large_prefix=1;
+DROP TABLE IF EXISTS worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
+INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
+col_1_varchar	PRIMARY	3072	BTREE
+col_1_varchar	prefix_idx	3072	BTREE
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
+INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
+col_1_text	PRIMARY	3072	BTREE
+col_1_text	prefix_idx	3072	BTREE
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
+col_1_text = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_mediumtext MEDIUMTEXT , col_2_mediumtext MEDIUMTEXT ,
+PRIMARY KEY (col_1_mediumtext(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_mediumtext (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_mediumtext = REPEAT("a", 4000),col_2_mediumtext = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_mediumtext = REPEAT("a", 4000)	col_2_mediumtext = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_mediumtext = REPEAT("c", 4000)
+WHERE col_1_mediumtext = REPEAT("a", 4000)
+AND col_2_mediumtext = REPEAT("o", 4000);
+SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_mediumtext = REPEAT("c", 4000)
+AND col_2_mediumtext = REPEAT("o", 4000);
+col_1_mediumtext = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_mediumtext = REPEAT("b", 4000);
+SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743;
+col_1_mediumtext = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_longtext LONGTEXT , col_2_longtext LONGTEXT ,
+PRIMARY KEY (col_1_longtext(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_longtext (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_longtext = REPEAT("a", 4000) , col_2_longtext = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_longtext = REPEAT("a", 4000)	col_2_longtext = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_longtext = REPEAT("c", 4000)
+WHERE col_1_longtext = REPEAT("a", 4000)
+AND col_2_longtext = REPEAT("o", 4000);
+SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_longtext = REPEAT("c", 4000)
+AND col_2_longtext = REPEAT("o", 4000);
+col_1_longtext = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_longtext = REPEAT("b", 4000);
+SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743;
+col_1_longtext = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_blob (3072));
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
+INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
+col_1_blob	PRIMARY	3072	BTREE
+col_1_blob	prefix_idx	3072	BTREE
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_blob = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+col_1_blob = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743;
+col_1_blob = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_mediumblob MEDIUMBLOB  , col_2_mediumblob MEDIUMBLOB  ,
+PRIMARY KEY (col_1_mediumblob(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_mediumblob (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_mediumblob = REPEAT("a", 4000),col_2_mediumblob = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_mediumblob = REPEAT("a", 4000)	col_2_mediumblob = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_mediumblob = REPEAT("c", 4000)
+WHERE col_1_mediumblob = REPEAT("a", 4000)
+AND col_2_mediumblob = REPEAT("o", 4000);
+SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_mediumblob = REPEAT("c", 4000)
+AND col_2_mediumblob = REPEAT("o", 4000);
+col_1_mediumblob = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_mediumblob = REPEAT("b", 4000);
+SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743;
+col_1_mediumblob = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_longblob LONGBLOB  , col_2_longblob LONGBLOB  ,
+PRIMARY KEY (col_1_longblob(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_longblob (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_longblob = REPEAT("a", 4000) , col_2_longblob = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_longblob = REPEAT("a", 4000)	col_2_longblob = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_longblob = REPEAT("c", 4000)
+WHERE col_1_longblob = REPEAT("a", 4000)
+AND col_2_longblob = REPEAT("o", 4000);
+SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_longblob = REPEAT("c", 4000)
+AND col_2_longblob = REPEAT("o", 4000);
+col_1_longblob = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_longblob = REPEAT("b", 4000);
+SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743;
+col_1_longblob = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
+PRIMARY KEY (col_1_varbinary(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varbinary = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+col_1_varbinary = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (col_1_char CHAR (255) , col_2_char CHAR (255),
+col_3_char CHAR (255), col_4_char CHAR (255),col_5_char CHAR (255),
+col_6_char CHAR (255), col_7_char CHAR (255),col_8_char CHAR (255),
+col_9_char CHAR (255), col_10_char CHAR (255),col_11_char CHAR (255),
+col_12_char CHAR (255), col_13_char CHAR (255),col_14_char CHAR (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
+);
+CREATE INDEX prefix_idx ON worklog5743(col_1_char(250),col_2_char(250),
+col_3_char(250),col_4_char(250),col_5_char(250),col_6_char(250),
+col_7_char(250),col_8_char(250),col_9_char(250),col_10_char(250),
+col_11_char(250),col_12_char(250),col_13_char(72)
+);
+INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
+);
+SELECT col_1_char = REPEAT("a", 255) , col_2_char = REPEAT("o", 255) FROM worklog5743;
+col_1_char = REPEAT("a", 255)	col_2_char = REPEAT("o", 255)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_char = REPEAT("c", 255)
+WHERE col_1_char = REPEAT("a", 255) AND col_2_char = REPEAT("o", 255);
+SELECT col_1_char = REPEAT("c", 255) FROM worklog5743
+WHERE col_1_char = REPEAT("c", 255) AND col_2_char = REPEAT("o", 255);
+col_1_char = REPEAT("c", 255)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_char = REPEAT("b", 255);
+SELECT col_1_char = REPEAT("c", 255) FROM worklog5743;
+col_1_char = REPEAT("c", 255)
+1
+0
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (col_1_binary BINARY (255) , col_2_binary BINARY (255),
+col_3_binary BINARY(255),col_4_binary BINARY (255),col_5_binary BINARY (255),
+col_6_binary BINARY(255),col_7_binary BINARY (255),col_8_binary BINARY (255),
+col_9_binary BINARY(255),col_10_binary BINARY (255),col_11_binary BINARY (255),
+col_12_binary BINARY(255),col_13_binary BINARY (255),col_14_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
+);
+CREATE INDEX prefix_idx ON worklog5743(col_1_binary (250),col_2_binary (250),
+col_3_binary (250),col_4_binary (250),col_5_binary (250),
+col_6_binary (250),col_7_binary (250),col_8_binary (250),
+col_9_binary (250),col_10_binary (250),col_11_binary (250),
+col_12_binary (250),col_13_binary (72)
+);
+INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
+);
+SELECT col_1_binary = REPEAT("a", 255) , col_2_binary = REPEAT("o", 255) FROM worklog5743;
+col_1_binary = REPEAT("a", 255)	col_2_binary = REPEAT("o", 255)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_binary = REPEAT("c", 255)
+WHERE col_1_binary = REPEAT("a", 255)
+AND col_2_binary = REPEAT("o", 255);
+SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743
+WHERE col_1_binary = REPEAT("c", 255)
+AND col_2_binary = REPEAT("o", 255);
+col_1_binary = REPEAT("c", 255)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_binary = REPEAT("b", 255);
+SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743;
+col_1_binary = REPEAT("c", 255)
+1
+0
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743_key2 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743_key2;
+col_1_varchar  = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key2 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2
+WHERE col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key2 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key2;
+CREATE TABLE worklog5743_key4 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(1964))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743_key4;
+col_1_varchar  = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key4 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key4
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key4 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key4;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key4;
+CREATE TABLE worklog5743_key8 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743_key8;
+col_1_varchar  = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key8 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key8
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key8 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key8;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key8;
+CREATE TABLE worklog5743_key2 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743_key2;
+col_1_text  = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key2 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key2
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key2 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key2;
+col_1_text = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key2;
+CREATE TABLE worklog5743_key4 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(1964))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743_key4;
+col_1_text  = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key4 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key4
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key4 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key4;
+col_1_text = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key4;
+CREATE TABLE worklog5743_key8 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743_key8;
+col_1_text  = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key8 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key8
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key8 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key8;
+col_1_text = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key8;
+CREATE TABLE worklog5743_key2 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743_key2;
+col_1_blob  = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key2 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key2
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+col_1_blob = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key2 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key2;
+col_1_blob = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key2;
+CREATE TABLE worklog5743_key4 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(1964))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743_key4;
+col_1_blob  = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key4 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key4
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+col_1_blob = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key4 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key4;
+col_1_blob = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key4;
+CREATE TABLE worklog5743_key8 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(3072))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743_key8;
+col_1_blob  = REPEAT("a", 4000)	col_2_blob = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743_key8 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key8
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+col_1_blob = REPEAT("b", 3500)
+0
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key8 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key8;
+col_1_blob = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743_key8;
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
+col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
+col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+col_1_varbinary = REPEAT("c", 4000)
+1
+0
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
+col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
+col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+CREATE INDEX prefix_idx1 ON worklog5743(col_1_varbinary (3072));
+CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (3072));
+CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
+CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
+CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+ROLLBACK;
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+COMMIT;
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+ROLLBACK;
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+col_1_varbinary = REPEAT("c", 4000)
+0
+0
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) CHARACTER SET 'utf8',
+col_2_text TEXT (4000) CHARACTER SET 'utf8',
+PRIMARY KEY (col_1_text(1024))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
+col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
+col_1_text = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (col_1_varchar VARCHAR (4000) CHARACTER SET 'utf8',
+col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8' ,
+PRIMARY KEY (col_1_varchar(1024))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+ERROR 42000: Row size too large (> max_row_size). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) ,
+col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8',
+col_3_text TEXT (4000) CHARACTER SET 'utf8',
+col_4_blob BLOB (4000),col_5_text TEXT (4000),
+col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (500));
+CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (500));
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+ROLLBACK;
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+COMMIT;
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+ROLLBACK;
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+col_1_varbinary = REPEAT("c", 4000)
+0
+0
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) CHARACTER SET 'utf8',
+col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(1024))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("स", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("स", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_text = REPEAT("स", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_text = REPEAT("क", 4000)
+WHERE col_1_text = REPEAT("स", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("क", 4000)
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743;
+col_1_text = REPEAT("क", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
+1	1
+"In connection 1"
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+"In connection 2"
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
+1	1
+0	1
+"In connection 1"
+select @@session.tx_isolation;
+@@session.tx_isolation
+REPEATABLE-READ
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
+0	1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
+0	1
+1	1
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+START TRANSACTION;
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+"In connection 2"
+COMMIT;
+"In connection 1"
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
+0	1
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+COMMIT;
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
+1	1
+"In connection 1"
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+START TRANSACTION;
+"In connection 2"
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
+0	1
+COMMIT;
+"In connection 1"
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+@@session.tx_isolation
+READ-UNCOMMITTED
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+COMMIT;
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
+1	1
+"In connection 1"
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text = REPEAT("o", 200)
+1	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+START TRANSACTION;
+"In connection 2"
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("a", 200)	col_2_text  = REPEAT("o", 200)
+0	1
+ROLLBACK;
+"In connection 1"
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+col_1_text = REPEAT("b", 200)	col_2_text = REPEAT("o", 200)
+0	1
+SELECT COUNT(*) FROM worklog5743;
+COUNT(*)
+1
+COMMIT;
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("c", 4000)
+1
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+col_1_varchar = REPEAT("c", 4000)
+0
+0
+1
+SELECT tbl1.col_1_varchar = tbl2.col_1_varchar
+FROM worklog5743 tbl1 , worklog5743 tbl2
+WHERE tbl1.col_1_varchar = tbl2.col_1_varchar ;
+tbl1.col_1_varchar = tbl2.col_1_varchar
+1
+1
+1
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
+tbl1.col_1_varchar = REPEAT("c", 4000)
+0
+0
+1
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar NOT IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
+tbl1.col_1_varchar = REPEAT("c", 4000)
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1 WHERE
+col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2)
+AND col_1_varchar = REPEAT("c", 4000);
+tbl1.col_1_varchar = REPEAT("c", 4000)
+1
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar in (
+SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
+WHERE tbl1.col_1_varchar != tbl2.col_1_varchar
+) ;
+tbl1.col_1_varchar = REPEAT("c", 4000)
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar in (
+SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
+WHERE tbl1.col_1_varchar = tbl2.col_1_varchar
+) ;
+tbl1.col_1_varchar = REPEAT("c", 4000)
+0
+0
+1
+SELECT
+REVERSE(col_1_varchar) = REPEAT("c", 4000) ,
+REVERSE(REVERSE(col_1_varchar)) = REPEAT("c", 4000)
+FROM worklog5743;
+REVERSE(col_1_varchar) = REPEAT("c", 4000)	REVERSE(REVERSE(col_1_varchar)) = REPEAT("c", 4000)
+0	0
+0	0
+1	1
+SELECT
+UPPER(col_1_varchar) = REPEAT("c", 4000) ,
+UPPER(col_1_varchar) = REPEAT("C", 4000) ,
+LOWER(UPPER(col_1_varchar)) = REPEAT("c", 4000)
+FROM worklog5743;
+UPPER(col_1_varchar) = REPEAT("c", 4000)	UPPER(col_1_varchar) = REPEAT("C", 4000)	LOWER(UPPER(col_1_varchar)) = REPEAT("c", 4000)
+0	0	0
+0	0	0
+1	1	1
+SELECT
+col_1_varchar = REPEAT("c", 4000)
+FROM worklog5743 WHERE col_1_varchar like '%c__%';
+col_1_varchar = REPEAT("c", 4000)
+1
+SELECT SUBSTRING(INSERT(col_1_varchar, 1, 4, 'kkkk'),1,10) FROM worklog5743 ;
+SUBSTRING(INSERT(col_1_varchar, 1, 4, 'kkkk'),1,10)
+kkkkaaaaaa
+kkkkbbbbbb
+kkkkcccccc
+SELECT CONCAT(SUBSTRING(col_1_varchar,-5,3),'append') FROM worklog5743 ;
+CONCAT(SUBSTRING(col_1_varchar,-5,3),'append')
+aaaappend
+bbbappend
+cccappend
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) ,
+col_2_varchar VARCHAR (4000) ,
+UNIQUE INDEX (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)), REPEAT("o", 4000));
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
+INSERT INTO worklog5743 VALUES(NULL,NULL);
+INSERT INTO worklog5743 VALUES(NULL,NULL);
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE
+FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+COLUMN_NAME	INDEX_NAME	SUB_PART	INDEX_TYPE
+col_1_varchar	col_1_varchar	3072	BTREE
+SELECT col_1_varchar FROM worklog5743 WHERE col_1_varchar IS NULL;
+col_1_varchar
+NULL
+NULL
+SELECT col_1_varchar = concat(REPEAT("a", 2000),REPEAT("b", 2000))
+FROM worklog5743 WHERE col_1_varchar IS NOT NULL ORDER BY 1;
+col_1_varchar = concat(REPEAT("a", 2000),REPEAT("b", 2000))
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+DROP INDEX prefix_idx ON worklog5743;
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("c", 4000)
+1
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("c", 4000)
+1
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+DROP INDEX prefix_idx ON worklog5743;
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varchar = REPEAT("a", 4000)	col_2_varchar = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+col_1_varchar = REPEAT("c", 4000)
+1
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+col_1_varchar = REPEAT("c", 4000)
+0
+1
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR(4000) , col_2_varchar VARCHAR(4000) ,
+PRIMARY KEY (col_1_varchar (3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("c", 3500) , REPEAT("o", 3500));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+" Switching to con1 connection For select "
+SELECT col_1_varchar = REPEAT("c", 3500) , col_2_varchar = REPEAT("o", 3500)
+FROM worklog5743;
+col_1_varchar = REPEAT("c", 3500)	col_2_varchar = REPEAT("o", 3500)
+1	1
+" Switching to default connection For DMLs "
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 3500) , REPEAT("o", 3500));
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
+WHERE col_2_varchar = REPEAT("o", 3500);
+col_1_varchar = REPEAT("b", 3500)
+0
+0
+COMMIT;
+" Switching to con1 connection For Dropping index and some DMLs "
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("k", 3500),REPEAT("p", 3500));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+UPDATE worklog5743 SET col_1_varchar  = REPEAT("b", 3500)
+WHERE col_1_varchar = REPEAT("a", 3500)
+AND col_2_varchar = REPEAT("o", 3500);
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
+WHERE col_2_varchar = REPEAT("o", 3500);
+col_1_varchar = REPEAT("b", 3500)
+1
+0
+" Switching to default connection For DELETE "
+DELETE FROM worklog5743 WHERE col_1_varchar  = REPEAT("b", 3500);
+SELECT col_1_varchar = REPEAT("a", 3500) FROM worklog5743
+WHERE col_2_varchar = REPEAT("p", 3500);
+col_1_varchar = REPEAT("a", 3500)
+0
+" Switching to con1 connection to commit changes "
+COMMIT;
+" Switching to default connection to drop and end sub-test "
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
+PRIMARY KEY (col_1_varbinary(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)	col_2_varbinary = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+1
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+DROP INDEX prefix_idx ON worklog5743;
+SELECT col_1_varbinary = REPEAT("b", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("b", 4000)
+AND col_2_varbinary = REPEAT("p", 4000);
+col_1_varbinary = REPEAT("b", 4000)
+1
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (2000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)
+1
+0
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+DROP INDEX prefix_idx ON worklog5743;
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (4000));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
+col_1_varbinary = REPEAT("a", 4000)
+1
+0
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+col_1_varbinary = REPEAT("c", 4000)
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(500))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743;
+col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+1
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+DROP INDEX prefix_idx ON worklog5743;
+SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("b", 4000) AND col_2_text = REPEAT("p", 4000);
+col_1_text = REPEAT("b", 4000)
+1
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (1000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+col_1_text = REPEAT("a", 4000)
+1
+0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+DROP INDEX prefix_idx ON worklog5743;
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (4000));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+Warning	1071	Specified key was too long; max key length is 3072 bytes
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+col_1_text = REPEAT("a", 4000)
+1
+0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
+col_1_text = REPEAT("a", 4000)	col_2_text = REPEAT("o", 4000)
+1	1
+0	0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+1
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("b", 4000)
+AND col_2_text = REPEAT("p", 4000);
+col_1_text = REPEAT("b", 4000)
+1
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (700));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+col_1_text = REPEAT("a", 4000)
+1
+0
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (950));
+ERROR HY000: Too big row
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+col_1_text = REPEAT("a", 4000)
+0
+1
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+col_1_text = REPEAT("c", 4000)
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (900));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (3073));
+ERROR 42000: Specified key was too long; max key length is 3072 bytes
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_BLOB BLOB (4000) , PRIMARY KEY (col_1_BLOB(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (500));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (3073));
+ERROR 42000: Specified key was too long; max key length is 3072 bytes
+DROP TABLE worklog5743;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)),
+REPEAT("o", 4000));
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
+ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000));
+ERROR 23000: Duplicate entry 'aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa' for key 'PRIMARY'
+DROP TABLE worklog5743;
+set global innodb_large_prefix=0;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+ERROR 42000: Specified key was too long; max key length is 767 bytes
+set global innodb_large_prefix=0;
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(767))
+) engine = innodb;
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (1000));
+Warnings:
+Warning	1071	Specified key was too long; max key length is 767 bytes
+Warning	1071	Specified key was too long; max key length is 767 bytes
+DROP TABLE worklog5743;
+SET GLOBAL innodb_file_format=Antelope;
+SET GLOBAL innodb_file_per_table=0;
+SET GLOBAL innodb_large_prefix=0;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb-zip.result mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb-zip.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/r/innodb-zip.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/r/innodb-zip.result	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,410 @@
+set session innodb_strict_mode=0;
+set global innodb_file_per_table=off;
+set global innodb_file_format=`0`;
+create table t0(a int primary key) engine=innodb row_format=compressed;
+Warnings:
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+create table t00(a int primary key) engine=innodb
+key_block_size=4 row_format=compressed;
+Warnings:
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=4.
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+create table t1(a int primary key) engine=innodb row_format=dynamic;
+Warnings:
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+create table t2(a int primary key) engine=innodb row_format=redundant;
+create table t3(a int primary key) engine=innodb row_format=compact;
+create table t4(a int primary key) engine=innodb key_block_size=9;
+Warnings:
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=9.
+create table t5(a int primary key) engine=innodb
+key_block_size=1 row_format=redundant;
+Warnings:
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
+set global innodb_file_per_table=on;
+create table t6(a int primary key) engine=innodb
+key_block_size=1 row_format=redundant;
+Warnings:
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1.
+set global innodb_file_format=`1`;
+create table t7(a int primary key) engine=innodb
+key_block_size=1 row_format=redundant;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+create table t8(a int primary key) engine=innodb
+key_block_size=1 row_format=fixed;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+Warning	1478	InnoDB: assuming ROW_FORMAT=COMPACT.
+create table t9(a int primary key) engine=innodb
+key_block_size=1 row_format=compact;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+create table t10(a int primary key) engine=innodb
+key_block_size=1 row_format=dynamic;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=1 unless ROW_FORMAT=COMPRESSED.
+create table t11(a int primary key) engine=innodb
+key_block_size=1 row_format=compressed;
+create table t12(a int primary key) engine=innodb
+key_block_size=1;
+create table t13(a int primary key) engine=innodb
+row_format=compressed;
+create table t14(a int primary key) engine=innodb key_block_size=9;
+Warnings:
+Warning	1478	InnoDB: ignoring KEY_BLOCK_SIZE=9.
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t0	Compact	16384	0
+test	t00	Compact	16384	0
+test	t1	Compact	16384	0
+test	t10	Dynamic	16384	0
+test	t11	Compressed	1024	0
+test	t12	Compressed	1024	0
+test	t13	Compressed	8192	0
+test	t14	Compact	16384	0
+test	t2	Redundant	16384	0
+test	t3	Compact	16384	0
+test	t4	Compact	16384	0
+test	t5	Redundant	16384	0
+test	t6	Redundant	16384	0
+test	t7	Redundant	16384	0
+test	t8	Compact	16384	0
+test	t9	Compact	16384	0
+drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14;
+alter table t1 key_block_size=0;
+alter table t1 row_format=dynamic;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t1	Dynamic	16384	0
+alter table t1 row_format=compact;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t1	Compact	16384	0
+alter table t1 row_format=redundant;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t1	Redundant	16384	0
+drop table t1;
+create table t1(a int not null, b text, index(b(10))) engine=innodb
+key_block_size=1;
+create table t2(b text)engine=innodb;
+insert into t2 values(concat('1abcdefghijklmnopqrstuvwxyz', repeat('A',5000)));
+insert into t1 select 1, b from t2;
+commit;
+begin;
+update t1 set b=repeat('B',100);
+select a,left(b,40) from t1 natural join t2;
+a	left(b,40)
+1	1abcdefghijklmnopqrstuvwxyzAAAAAAAAAAAAA
+rollback;
+select a,left(b,40) from t1 natural join t2;
+a	left(b,40)
+1	1abcdefghijklmnopqrstuvwxyzAAAAAAAAAAAAA
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t1	Compressed	2048	1024
+test	t2	Compact	16384	0
+drop table t1,t2;
+SET SESSION innodb_strict_mode = off;
+CREATE TABLE t1(
+c TEXT NOT NULL, d TEXT NOT NULL,
+PRIMARY KEY (c(767),d(767)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
+CREATE TABLE t1(
+c TEXT NOT NULL, d TEXT NOT NULL,
+PRIMARY KEY (c(767),d(767)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 CHARSET=ASCII;
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
+CREATE TABLE t1(
+c TEXT NOT NULL, d TEXT NOT NULL,
+PRIMARY KEY (c(767),d(767)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4 CHARSET=ASCII;
+drop table t1;
+CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+ERROR 42000: Row size too large (> 8126). Changing some columns to TEXT or BLOB may help. In current row format, BLOB prefix of 0 bytes is stored inline.
+CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
+DROP TABLE t1;
+create table t1( c1 int not null, c2 blob, c3 blob, c4 blob,
+primary key(c1, c2(22), c3(22)))
+engine = innodb row_format = dynamic;
+begin;
+insert into t1 values(1, repeat('A', 20000), repeat('B', 20000),
+repeat('C', 20000));
+update t1 set c3 = repeat('D', 20000) where c1 = 1;
+commit;
+select count(*) from t1 where c2 = repeat('A', 20000);
+count(*)
+1
+select count(*) from t1 where c3 = repeat('D', 20000);
+count(*)
+1
+select count(*) from t1 where c4 = repeat('C', 20000);
+count(*)
+1
+update t1 set c3 = repeat('E', 20000) where c1 = 1;
+drop table t1;
+set global innodb_file_format=`0`;
+select @@innodb_file_format;
+@@innodb_file_format
+Antelope
+set global innodb_file_format=`1`;
+select @@innodb_file_format;
+@@innodb_file_format
+Barracuda
+set global innodb_file_format=`2`;
+ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '2'
+set global innodb_file_format=`-1`;
+ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '-1'
+set global innodb_file_format=`Antelope`;
+set global innodb_file_format=`Barracuda`;
+set global innodb_file_format=`Cheetah`;
+ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'Cheetah'
+set global innodb_file_format=`abc`;
+ERROR 42000: Variable 'innodb_file_format' can't be set to the value of 'abc'
+set global innodb_file_format=`1a`;
+ERROR 42000: Variable 'innodb_file_format' can't be set to the value of '1a'
+set global innodb_file_format=``;
+ERROR 42000: Variable 'innodb_file_format' can't be set to the value of ''
+set global innodb_file_per_table = on;
+set global innodb_file_format = `1`;
+set innodb_strict_mode = off;
+create table t1 (id int primary key) engine = innodb key_block_size = 0;
+drop table t1;
+set innodb_strict_mode = on;
+create table t1 (id int primary key) engine = innodb key_block_size = 0;
+create table t2 (id int primary key) engine = innodb key_block_size = 9;
+ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
+Error	1005	Can't create table 'test.t2' (errno: 1478)
+create table t3 (id int primary key) engine = innodb key_block_size = 1;
+create table t4 (id int primary key) engine = innodb key_block_size = 2;
+create table t5 (id int primary key) engine = innodb key_block_size = 4;
+create table t6 (id int primary key) engine = innodb key_block_size = 8;
+create table t7 (id int primary key) engine = innodb key_block_size = 16;
+create table t8 (id int primary key) engine = innodb row_format = compressed;
+create table t9 (id int primary key) engine = innodb row_format = dynamic;
+create table t10(id int primary key) engine = innodb row_format = compact;
+create table t11(id int primary key) engine = innodb row_format = redundant;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t1	Compact	16384	0
+test	t10	Compact	16384	0
+test	t11	Redundant	16384	0
+test	t3	Compressed	1024	0
+test	t4	Compressed	2048	0
+test	t5	Compressed	4096	0
+test	t6	Compressed	8192	0
+test	t7	Compressed	16384	0
+test	t8	Compressed	8192	0
+test	t9	Dynamic	16384	0
+drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11;
+create table t1 (id int primary key) engine = innodb
+key_block_size = 8 row_format = compressed;
+create table t2 (id int primary key) engine = innodb
+key_block_size = 8 row_format = redundant;
+ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t2' (errno: 1478)
+create table t3 (id int primary key) engine = innodb
+key_block_size = 8 row_format = compact;
+ERROR HY000: Can't create table 'test.t3' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t3' (errno: 1478)
+create table t4 (id int primary key) engine = innodb
+key_block_size = 8 row_format = dynamic;
+ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t4' (errno: 1478)
+create table t5 (id int primary key) engine = innodb
+key_block_size = 8 row_format = default;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t1	Compressed	8192	0
+test	t5	Compressed	8192	0
+drop table t1, t5;
+create table t1 (id int primary key) engine = innodb
+key_block_size = 9 row_format = redundant;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = REDUNDANT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+create table t2 (id int primary key) engine = innodb
+key_block_size = 9 row_format = compact;
+ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = COMPACT with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t2' (errno: 1478)
+create table t2 (id int primary key) engine = innodb
+key_block_size = 9 row_format = dynamic;
+ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: invalid KEY_BLOCK_SIZE = 9. Valid values are [1, 2, 4, 8, 16]
+Warning	1478	InnoDB: cannot specify ROW_FORMAT = DYNAMIC with KEY_BLOCK_SIZE.
+Error	1005	Can't create table 'test.t2' (errno: 1478)
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+set global innodb_file_per_table = off;
+create table t1 (id int primary key) engine = innodb key_block_size = 1;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+create table t2 (id int primary key) engine = innodb key_block_size = 2;
+ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t2' (errno: 1478)
+create table t3 (id int primary key) engine = innodb key_block_size = 4;
+ERROR HY000: Can't create table 'test.t3' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t3' (errno: 1478)
+create table t4 (id int primary key) engine = innodb key_block_size = 8;
+ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t4' (errno: 1478)
+create table t5 (id int primary key) engine = innodb key_block_size = 16;
+ERROR HY000: Can't create table 'test.t5' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t5' (errno: 1478)
+create table t6 (id int primary key) engine = innodb row_format = compressed;
+ERROR HY000: Can't create table 'test.t6' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t6' (errno: 1478)
+create table t7 (id int primary key) engine = innodb row_format = dynamic;
+ERROR HY000: Can't create table 'test.t7' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_per_table.
+Error	1005	Can't create table 'test.t7' (errno: 1478)
+create table t8 (id int primary key) engine = innodb row_format = compact;
+create table t9 (id int primary key) engine = innodb row_format = redundant;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t8	Compact	16384	0
+test	t9	Redundant	16384	0
+drop table t8, t9;
+set global innodb_file_per_table = on;
+set global innodb_file_format = `0`;
+create table t1 (id int primary key) engine = innodb key_block_size = 1;
+ERROR HY000: Can't create table 'test.t1' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t1' (errno: 1478)
+create table t2 (id int primary key) engine = innodb key_block_size = 2;
+ERROR HY000: Can't create table 'test.t2' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t2' (errno: 1478)
+create table t3 (id int primary key) engine = innodb key_block_size = 4;
+ERROR HY000: Can't create table 'test.t3' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t3' (errno: 1478)
+create table t4 (id int primary key) engine = innodb key_block_size = 8;
+ERROR HY000: Can't create table 'test.t4' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t4' (errno: 1478)
+create table t5 (id int primary key) engine = innodb key_block_size = 16;
+ERROR HY000: Can't create table 'test.t5' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: KEY_BLOCK_SIZE requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t5' (errno: 1478)
+create table t6 (id int primary key) engine = innodb row_format = compressed;
+ERROR HY000: Can't create table 'test.t6' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=COMPRESSED requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t6' (errno: 1478)
+create table t7 (id int primary key) engine = innodb row_format = dynamic;
+ERROR HY000: Can't create table 'test.t7' (errno: 1478)
+show warnings;
+Level	Code	Message
+Warning	1478	InnoDB: ROW_FORMAT=DYNAMIC requires innodb_file_format > Antelope.
+Error	1005	Can't create table 'test.t7' (errno: 1478)
+create table t8 (id int primary key) engine = innodb row_format = compact;
+create table t9 (id int primary key) engine = innodb row_format = redundant;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+table_schema	table_name	row_format	data_length	index_length
+test	t8	Compact	16384	0
+test	t9	Redundant	16384	0
+drop table t8, t9;
+set global innodb_file_per_table=0;
+set global innodb_file_format=Antelope;
+set global innodb_file_per_table=on;
+set global innodb_file_format=`Barracuda`;
+set global innodb_file_format_max=`Antelope`;
+create table normal_table (
+c1 int
+) engine = innodb;
+select @@innodb_file_format_max;
+@@innodb_file_format_max
+Antelope
+create table zip_table (
+c1 int
+) engine = innodb key_block_size = 8;
+select @@innodb_file_format_max;
+@@innodb_file_format_max
+Barracuda
+set global innodb_file_format_max=`Antelope`;
+select @@innodb_file_format_max;
+@@innodb_file_format_max
+Antelope
+show table status;
+select @@innodb_file_format_max;
+@@innodb_file_format_max
+Barracuda
+drop table normal_table, zip_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug36169.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug36169.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug36169.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug36169.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,1160 @@
+#
+# Bug#36169 create innodb compressed table with too large row size crashed
+# http://bugs.mysql.com/36169
+#
+
+-- source include/have_innodb.inc
+
+let $file_format=`select @@innodb_file_format`;
+let $file_per_table=`select @@innodb_file_per_table`;
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=ON;
+
+#
+# The following is copied from http://bugs.mysql.com/36169
+# (http://bugs.mysql.com/file.php?id=9121)
+# Probably it can be simplified but that is not obvious.
+#
+
+# we care only that the following SQL commands do produce errors
+# as expected and do not crash the server
+-- disable_query_log
+-- disable_result_log
+
+# Generating 10 tables
+# Creating a table with 94 columns and 24 indexes
+DROP TABLE IF EXISTS `table0`;
+set innodb_strict_mode=on;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table0`
+(`col0` BOOL,
+`col1` BOOL,
+`col2` TINYINT,
+`col3` DATE,
+`col4` TIME,
+`col5` SET ('test1','test2','test3'),
+`col6` TIME,
+`col7` TEXT,
+`col8` DECIMAL,
+`col9` SET ('test1','test2','test3'),
+`col10` FLOAT,
+`col11` DOUBLE PRECISION,
+`col12` ENUM ('test1','test2','test3'),
+`col13` TINYBLOB,
+`col14` YEAR,
+`col15` SET ('test1','test2','test3'),
+`col16` NUMERIC,
+`col17` NUMERIC,
+`col18` BLOB,
+`col19` DATETIME,
+`col20` DOUBLE PRECISION,
+`col21` DECIMAL,
+`col22` DATETIME,
+`col23` NUMERIC,
+`col24` NUMERIC,
+`col25` LONGTEXT,
+`col26` TINYBLOB,
+`col27` TIME,
+`col28` TINYBLOB,
+`col29` ENUM ('test1','test2','test3'),
+`col30` SMALLINT,
+`col31` REAL,
+`col32` FLOAT,
+`col33` CHAR (175),
+`col34` TINYTEXT,
+`col35` TINYTEXT,
+`col36` TINYBLOB,
+`col37` TINYBLOB,
+`col38` TINYTEXT,
+`col39` MEDIUMBLOB,
+`col40` TIMESTAMP,
+`col41` DOUBLE,
+`col42` SMALLINT,
+`col43` LONGBLOB,
+`col44` VARCHAR (80),
+`col45` MEDIUMTEXT,
+`col46` NUMERIC,
+`col47` BIGINT,
+`col48` DATE,
+`col49` TINYBLOB,
+`col50` DATE,
+`col51` BOOL,
+`col52` MEDIUMINT,
+`col53` FLOAT,
+`col54` TINYBLOB,
+`col55` LONGTEXT,
+`col56` SMALLINT,
+`col57` ENUM ('test1','test2','test3'),
+`col58` DATETIME,
+`col59` MEDIUMTEXT,
+`col60` VARCHAR (232),
+`col61` NUMERIC,
+`col62` YEAR,
+`col63` SMALLINT,
+`col64` TIMESTAMP,
+`col65` BLOB,
+`col66` LONGBLOB,
+`col67` INT,
+`col68` LONGTEXT,
+`col69` ENUM ('test1','test2','test3'),
+`col70` INT,
+`col71` TIME,
+`col72` TIMESTAMP,
+`col73` TIMESTAMP,
+`col74` VARCHAR (170),
+`col75` SET ('test1','test2','test3'),
+`col76` TINYBLOB,
+`col77` BIGINT,
+`col78` NUMERIC,
+`col79` DATETIME,
+`col80` YEAR,
+`col81` NUMERIC,
+`col82` LONGBLOB,
+`col83` TEXT,
+`col84` CHAR (83),
+`col85` DECIMAL,
+`col86` FLOAT,
+`col87` INT,
+`col88` VARCHAR (145),
+`col89` DATE,
+`col90` DECIMAL,
+`col91` DECIMAL,
+`col92` MEDIUMBLOB,
+`col93` TIME,
+KEY `idx0` (`col69`,`col90`,`col8`),
+KEY `idx1` (`col60`),
+KEY `idx2` (`col60`,`col70`,`col74`),
+KEY `idx3` (`col22`,`col32`,`col72`,`col30`),
+KEY `idx4` (`col29`),
+KEY `idx5` (`col19`,`col45`(143)),
+KEY `idx6` (`col46`,`col48`,`col5`,`col39`(118)),
+KEY `idx7` (`col48`,`col61`),
+KEY `idx8` (`col93`),
+KEY `idx9` (`col31`),
+KEY `idx10` (`col30`,`col21`),
+KEY `idx11` (`col67`),
+KEY `idx12` (`col44`,`col6`,`col8`,`col38`(226)),
+KEY `idx13` (`col71`,`col41`,`col15`,`col49`(88)),
+KEY `idx14` (`col78`),
+KEY `idx15` (`col63`,`col67`,`col64`),
+KEY `idx16` (`col17`,`col86`),
+KEY `idx17` (`col77`,`col56`,`col10`,`col55`(24)),
+KEY `idx18` (`col62`),
+KEY `idx19` (`col31`,`col57`,`col56`,`col53`),
+KEY `idx20` (`col46`),
+KEY `idx21` (`col83`(54)),
+KEY `idx22` (`col51`,`col7`(120)),
+KEY `idx23` (`col7`(163),`col31`,`col71`,`col14`)
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+# Creating a table with 10 columns and 32 indexes
+DROP TABLE IF EXISTS `table1`;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table1`
+(`col0` CHAR (113),
+`col1` FLOAT,
+`col2` BIGINT,
+`col3` DECIMAL,
+`col4` BLOB,
+`col5` LONGTEXT,
+`col6` SET ('test1','test2','test3'),
+`col7` BIGINT,
+`col8` BIGINT,
+`col9` TINYBLOB,
+KEY `idx0` (`col5`(101),`col7`,`col8`),
+KEY `idx1` (`col8`),
+KEY `idx2` (`col4`(177),`col9`(126),`col6`,`col3`),
+KEY `idx3` (`col5`(160)),
+KEY `idx4` (`col9`(242)),
+KEY `idx5` (`col4`(139),`col2`,`col3`),
+KEY `idx6` (`col7`),
+KEY `idx7` (`col6`,`col2`,`col0`,`col3`),
+KEY `idx8` (`col9`(66)),
+KEY `idx9` (`col5`(253)),
+KEY `idx10` (`col1`,`col7`,`col2`),
+KEY `idx11` (`col9`(242),`col0`,`col8`,`col5`(163)),
+KEY `idx12` (`col8`),
+KEY `idx13` (`col0`,`col9`(37)),
+KEY `idx14` (`col0`),
+KEY `idx15` (`col5`(111)),
+KEY `idx16` (`col8`,`col0`,`col5`(13)),
+KEY `idx17` (`col4`(139)),
+KEY `idx18` (`col5`(189),`col2`,`col3`,`col9`(136)),
+KEY `idx19` (`col0`,`col3`,`col1`,`col8`),
+KEY `idx20` (`col8`),
+KEY `idx21` (`col0`,`col7`,`col9`(227),`col3`),
+KEY `idx22` (`col0`),
+KEY `idx23` (`col2`),
+KEY `idx24` (`col3`),
+KEY `idx25` (`col2`,`col3`),
+KEY `idx26` (`col0`),
+KEY `idx27` (`col5`(254)),
+KEY `idx28` (`col3`),
+KEY `idx29` (`col3`),
+KEY `idx30` (`col7`,`col3`,`col0`,`col4`(220)),
+KEY `idx31` (`col4`(1),`col0`)
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+# Creating a table with 141 columns and 18 indexes
+DROP TABLE IF EXISTS `table2`;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table2`
+(`col0` BOOL,
+`col1` MEDIUMINT,
+`col2` VARCHAR (209),
+`col3` MEDIUMBLOB,
+`col4` CHAR (13),
+`col5` DOUBLE,
+`col6` TINYTEXT,
+`col7` REAL,
+`col8` SMALLINT,
+`col9` BLOB,
+`col10` TINYINT,
+`col11` DECIMAL,
+`col12` BLOB,
+`col13` DECIMAL,
+`col14` LONGBLOB,
+`col15` SMALLINT,
+`col16` LONGBLOB,
+`col17` TINYTEXT,
+`col18` FLOAT,
+`col19` CHAR (78),
+`col20` MEDIUMTEXT,
+`col21` SET ('test1','test2','test3'),
+`col22` MEDIUMINT,
+`col23` INT,
+`col24` MEDIUMBLOB,
+`col25` ENUM ('test1','test2','test3'),
+`col26` TINYBLOB,
+`col27` VARCHAR (116),
+`col28` TIMESTAMP,
+`col29` BLOB,
+`col30` SMALLINT,
+`col31` DOUBLE PRECISION,
+`col32` DECIMAL,
+`col33` DECIMAL,
+`col34` TEXT,
+`col35` MEDIUMINT,
+`col36` MEDIUMINT,
+`col37` BIGINT,
+`col38` VARCHAR (253),
+`col39` TINYBLOB,
+`col40` MEDIUMBLOB,
+`col41` BIGINT,
+`col42` DOUBLE,
+`col43` TEXT,
+`col44` BLOB,
+`col45` TIME,
+`col46` MEDIUMINT,
+`col47` DOUBLE PRECISION,
+`col48` SET ('test1','test2','test3'),
+`col49` DOUBLE PRECISION,
+`col50` VARCHAR (97),
+`col51` TEXT,
+`col52` NUMERIC,
+`col53` ENUM ('test1','test2','test3'),
+`col54` MEDIUMTEXT,
+`col55` MEDIUMINT,
+`col56` DATETIME,
+`col57` DATETIME,
+`col58` MEDIUMTEXT,
+`col59` CHAR (244),
+`col60` LONGBLOB,
+`col61` MEDIUMBLOB,
+`col62` DOUBLE,
+`col63` SMALLINT,
+`col64` BOOL,
+`col65` SMALLINT,
+`col66` VARCHAR (212),
+`col67` TIME,
+`col68` REAL,
+`col69` BOOL,
+`col70` BIGINT,
+`col71` DATE,
+`col72` TINYINT,
+`col73` ENUM ('test1','test2','test3'),
+`col74` DATE,
+`col75` TIME,
+`col76` DATETIME,
+`col77` BOOL,
+`col78` TINYTEXT,
+`col79` MEDIUMINT,
+`col80` NUMERIC,
+`col81` LONGTEXT,
+`col82` SET ('test1','test2','test3'),
+`col83` DOUBLE PRECISION,
+`col84` NUMERIC,
+`col85` VARCHAR (184),
+`col86` DOUBLE PRECISION,
+`col87` MEDIUMTEXT,
+`col88` MEDIUMBLOB,
+`col89` BOOL,
+`col90` SMALLINT,
+`col91` TINYINT,
+`col92` ENUM ('test1','test2','test3'),
+`col93` BOOL,
+`col94` TIMESTAMP,
+`col95` BOOL,
+`col96` MEDIUMTEXT,
+`col97` DECIMAL,
+`col98` BOOL,
+`col99` DECIMAL,
+`col100` MEDIUMINT,
+`col101` DOUBLE PRECISION,
+`col102` TINYINT,
+`col103` BOOL,
+`col104` MEDIUMINT,
+`col105` DECIMAL,
+`col106` NUMERIC,
+`col107` TIMESTAMP,
+`col108` MEDIUMBLOB,
+`col109` TINYBLOB,
+`col110` SET ('test1','test2','test3'),
+`col111` YEAR,
+`col112` TIMESTAMP,
+`col113` CHAR (201),
+`col114` BOOL,
+`col115` TINYINT,
+`col116` DOUBLE,
+`col117` TINYINT,
+`col118` TIMESTAMP,
+`col119` SET ('test1','test2','test3'),
+`col120` SMALLINT,
+`col121` TINYBLOB,
+`col122` TIMESTAMP,
+`col123` BLOB,
+`col124` DATE,
+`col125` SMALLINT,
+`col126` ENUM ('test1','test2','test3'),
+`col127` MEDIUMBLOB,
+`col128` DOUBLE PRECISION,
+`col129` REAL,
+`col130` VARCHAR (159),
+`col131` MEDIUMBLOB,
+`col132` BIGINT,
+`col133` INT,
+`col134` SET ('test1','test2','test3'),
+`col135` CHAR (198),
+`col136` SET ('test1','test2','test3'),
+`col137` MEDIUMTEXT,
+`col138` SMALLINT,
+`col139` BLOB,
+`col140` LONGBLOB,
+KEY `idx0` (`col14`(139),`col24`(208),`col38`,`col35`),
+KEY `idx1` (`col48`,`col118`,`col29`(131),`col100`),
+KEY `idx2` (`col86`,`col67`,`col43`(175)),
+KEY `idx3` (`col19`),
+KEY `idx4` (`col40`(220),`col67`),
+KEY `idx5` (`col99`,`col56`),
+KEY `idx6` (`col68`,`col28`,`col137`(157)),
+KEY `idx7` (`col51`(160),`col99`,`col45`,`col39`(9)),
+KEY `idx8` (`col15`,`col52`,`col90`,`col94`),
+KEY `idx9` (`col24`(3),`col139`(248),`col108`(118),`col41`),
+KEY `idx10` (`col36`,`col92`,`col114`),
+KEY `idx11` (`col115`,`col9`(116)),
+KEY `idx12` (`col130`,`col93`,`col134`),
+KEY `idx13` (`col123`(65)),
+KEY `idx14` (`col44`(90),`col86`,`col119`),
+KEY `idx15` (`col69`),
+KEY `idx16` (`col132`,`col81`(118),`col18`),
+KEY `idx17` (`col24`(250),`col7`,`col92`,`col45`)
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+# Creating a table with 199 columns and 1 indexes
+DROP TABLE IF EXISTS `table3`;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table3`
+(`col0` SMALLINT,
+`col1` SET ('test1','test2','test3'),
+`col2` TINYTEXT,
+`col3` DOUBLE,
+`col4` NUMERIC,
+`col5` DATE,
+`col6` BIGINT,
+`col7` DOUBLE,
+`col8` TEXT,
+`col9` INT,
+`col10` REAL,
+`col11` TINYINT,
+`col12` NUMERIC,
+`col13` NUMERIC,
+`col14` TIME,
+`col15` DOUBLE,
+`col16` REAL,
+`col17` MEDIUMBLOB,
+`col18` YEAR,
+`col19` TINYTEXT,
+`col20` YEAR,
+`col21` CHAR (250),
+`col22` TINYINT,
+`col23` TINYINT,
+`col24` SMALLINT,
+`col25` DATETIME,
+`col26` MEDIUMINT,
+`col27` LONGBLOB,
+`col28` VARCHAR (106),
+`col29` FLOAT,
+`col30` MEDIUMTEXT,
+`col31` TINYBLOB,
+`col32` BIGINT,
+`col33` YEAR,
+`col34` REAL,
+`col35` MEDIUMBLOB,
+`col36` LONGTEXT,
+`col37` LONGBLOB,
+`col38` BIGINT,
+`col39` FLOAT,
+`col40` TIME,
+`col41` DATETIME,
+`col42` BOOL,
+`col43` BIGINT,
+`col44` SMALLINT,
+`col45` TIME,
+`col46` DOUBLE PRECISION,
+`col47` TIME,
+`col48` TINYTEXT,
+`col49` DOUBLE PRECISION,
+`col50` BIGINT,
+`col51` NUMERIC,
+`col52` TINYBLOB,
+`col53` DATE,
+`col54` DECIMAL,
+`col55` SMALLINT,
+`col56` TINYTEXT,
+`col57` ENUM ('test1','test2','test3'),
+`col58` YEAR,
+`col59` TIME,
+`col60` TINYINT,
+`col61` DECIMAL,
+`col62` DOUBLE,
+`col63` DATE,
+`col64` LONGTEXT,
+`col65` DOUBLE,
+`col66` VARCHAR (88),
+`col67` MEDIUMTEXT,
+`col68` DATE,
+`col69` MEDIUMINT,
+`col70` DECIMAL,
+`col71` MEDIUMTEXT,
+`col72` LONGTEXT,
+`col73` REAL,
+`col74` DOUBLE,
+`col75` TIME,
+`col76` DATE,
+`col77` DECIMAL,
+`col78` MEDIUMBLOB,
+`col79` NUMERIC,
+`col80` BIGINT,
+`col81` YEAR,
+`col82` SMALLINT,
+`col83` MEDIUMINT,
+`col84` TINYINT,
+`col85` MEDIUMBLOB,
+`col86` TIME,
+`col87` MEDIUMBLOB,
+`col88` LONGTEXT,
+`col89` BOOL,
+`col90` BLOB,
+`col91` LONGBLOB,
+`col92` YEAR,
+`col93` BLOB,
+`col94` INT,
+`col95` TINYTEXT,
+`col96` TINYINT,
+`col97` DECIMAL,
+`col98` ENUM ('test1','test2','test3'),
+`col99` MEDIUMINT,
+`col100` TINYINT,
+`col101` MEDIUMBLOB,
+`col102` TINYINT,
+`col103` SET ('test1','test2','test3'),
+`col104` TIMESTAMP,
+`col105` TEXT,
+`col106` DATETIME,
+`col107` MEDIUMTEXT,
+`col108` CHAR (220),
+`col109` TIME,
+`col110` VARCHAR (131),
+`col111` DECIMAL,
+`col112` FLOAT,
+`col113` SMALLINT,
+`col114` BIGINT,
+`col115` LONGBLOB,
+`col116` SET ('test1','test2','test3'),
+`col117` ENUM ('test1','test2','test3'),
+`col118` BLOB,
+`col119` MEDIUMTEXT,
+`col120` SET ('test1','test2','test3'),
+`col121` DATETIME,
+`col122` FLOAT,
+`col123` VARCHAR (242),
+`col124` YEAR,
+`col125` MEDIUMBLOB,
+`col126` TIME,
+`col127` BOOL,
+`col128` TINYBLOB,
+`col129` DOUBLE,
+`col130` TINYINT,
+`col131` BIGINT,
+`col132` SMALLINT,
+`col133` INT,
+`col134` DOUBLE PRECISION,
+`col135` MEDIUMBLOB,
+`col136` SET ('test1','test2','test3'),
+`col137` TINYTEXT,
+`col138` DOUBLE PRECISION,
+`col139` NUMERIC,
+`col140` BLOB,
+`col141` SET ('test1','test2','test3'),
+`col142` INT,
+`col143` VARCHAR (26),
+`col144` BLOB,
+`col145` REAL,
+`col146` SET ('test1','test2','test3'),
+`col147` LONGBLOB,
+`col148` TEXT,
+`col149` BLOB,
+`col150` CHAR (189),
+`col151` LONGTEXT,
+`col152` INT,
+`col153` FLOAT,
+`col154` LONGTEXT,
+`col155` DATE,
+`col156` LONGBLOB,
+`col157` TINYBLOB,
+`col158` REAL,
+`col159` DATE,
+`col160` TIME,
+`col161` YEAR,
+`col162` DOUBLE,
+`col163` VARCHAR (90),
+`col164` FLOAT,
+`col165` NUMERIC,
+`col166` ENUM ('test1','test2','test3'),
+`col167` DOUBLE PRECISION,
+`col168` DOUBLE PRECISION,
+`col169` TINYBLOB,
+`col170` TIME,
+`col171` SMALLINT,
+`col172` TINYTEXT,
+`col173` SMALLINT,
+`col174` DOUBLE,
+`col175` VARCHAR (14),
+`col176` VARCHAR (90),
+`col177` REAL,
+`col178` MEDIUMINT,
+`col179` TINYBLOB,
+`col180` FLOAT,
+`col181` TIMESTAMP,
+`col182` REAL,
+`col183` DOUBLE PRECISION,
+`col184` BIGINT,
+`col185` INT,
+`col186` MEDIUMTEXT,
+`col187` TIME,
+`col188` FLOAT,
+`col189` TIME,
+`col190` INT,
+`col191` FLOAT,
+`col192` MEDIUMINT,
+`col193` TINYINT,
+`col194` MEDIUMTEXT,
+`col195` DATE,
+`col196` TIME,
+`col197` YEAR,
+`col198` CHAR (206),
+KEY `idx0` (`col39`,`col23`)
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+# Creating a table with 133 columns and 16 indexes
+DROP TABLE IF EXISTS `table4`;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table4`
+(`col0` VARCHAR (60),
+`col1` NUMERIC,
+`col2` LONGTEXT,
+`col3` MEDIUMTEXT,
+`col4` LONGTEXT,
+`col5` LONGBLOB,
+`col6` LONGBLOB,
+`col7` DATETIME,
+`col8` TINYTEXT,
+`col9` BLOB,
+`col10` BOOL,
+`col11` BIGINT,
+`col12` TEXT,
+`col13` VARCHAR (213),
+`col14` TINYBLOB,
+`col15` BOOL,
+`col16` MEDIUMTEXT,
+`col17` DOUBLE,
+`col18` TEXT,
+`col19` BLOB,
+`col20` SET ('test1','test2','test3'),
+`col21` TINYINT,
+`col22` DATETIME,
+`col23` TINYINT,
+`col24` ENUM ('test1','test2','test3'),
+`col25` REAL,
+`col26` BOOL,
+`col27` FLOAT,
+`col28` LONGBLOB,
+`col29` DATETIME,
+`col30` FLOAT,
+`col31` SET ('test1','test2','test3'),
+`col32` LONGBLOB,
+`col33` NUMERIC,
+`col34` YEAR,
+`col35` VARCHAR (146),
+`col36` BIGINT,
+`col37` DATETIME,
+`col38` DATE,
+`col39` SET ('test1','test2','test3'),
+`col40` CHAR (112),
+`col41` FLOAT,
+`col42` YEAR,
+`col43` TIME,
+`col44` DOUBLE,
+`col45` NUMERIC,
+`col46` FLOAT,
+`col47` DECIMAL,
+`col48` BIGINT,
+`col49` DECIMAL,
+`col50` YEAR,
+`col51` MEDIUMTEXT,
+`col52` LONGBLOB,
+`col53` SET ('test1','test2','test3'),
+`col54` BLOB,
+`col55` FLOAT,
+`col56` REAL,
+`col57` REAL,
+`col58` TEXT,
+`col59` MEDIUMBLOB,
+`col60` INT,
+`col61` INT,
+`col62` DATE,
+`col63` TEXT,
+`col64` DATE,
+`col65` ENUM ('test1','test2','test3'),
+`col66` DOUBLE PRECISION,
+`col67` TINYTEXT,
+`col68` TINYBLOB,
+`col69` FLOAT,
+`col70` BLOB,
+`col71` DATETIME,
+`col72` DOUBLE,
+`col73` LONGTEXT,
+`col74` TIME,
+`col75` DATETIME,
+`col76` VARCHAR (122),
+`col77` MEDIUMTEXT,
+`col78` MEDIUMTEXT,
+`col79` BOOL,
+`col80` LONGTEXT,
+`col81` TINYTEXT,
+`col82` NUMERIC,
+`col83` DOUBLE PRECISION,
+`col84` DATE,
+`col85` YEAR,
+`col86` BLOB,
+`col87` TINYTEXT,
+`col88` DOUBLE PRECISION,
+`col89` MEDIUMINT,
+`col90` MEDIUMTEXT,
+`col91` NUMERIC,
+`col92` DATETIME,
+`col93` NUMERIC,
+`col94` SET ('test1','test2','test3'),
+`col95` TINYTEXT,
+`col96` SET ('test1','test2','test3'),
+`col97` YEAR,
+`col98` MEDIUMINT,
+`col99` TEXT,
+`col100` TEXT,
+`col101` TIME,
+`col102` VARCHAR (225),
+`col103` TINYTEXT,
+`col104` TEXT,
+`col105` MEDIUMTEXT,
+`col106` TINYINT,
+`col107` TEXT,
+`col108` LONGBLOB,
+`col109` LONGTEXT,
+`col110` TINYTEXT,
+`col111` CHAR (56),
+`col112` YEAR,
+`col113` ENUM ('test1','test2','test3'),
+`col114` TINYBLOB,
+`col115` DATETIME,
+`col116` DATE,
+`col117` TIME,
+`col118` MEDIUMTEXT,
+`col119` DOUBLE PRECISION,
+`col120` FLOAT,
+`col121` TIMESTAMP,
+`col122` MEDIUMINT,
+`col123` YEAR,
+`col124` DATE,
+`col125` TEXT,
+`col126` FLOAT,
+`col127` TINYTEXT,
+`col128` BOOL,
+`col129` NUMERIC,
+`col130` TIMESTAMP,
+`col131` INT,
+`col132` MEDIUMBLOB,
+KEY `idx0` (`col130`),
+KEY `idx1` (`col30`,`col55`,`col19`(31)),
+KEY `idx2` (`col104`(186)),
+KEY `idx3` (`col131`),
+KEY `idx4` (`col64`,`col93`,`col2`(11)),
+KEY `idx5` (`col34`,`col121`,`col22`),
+KEY `idx6` (`col33`,`col55`,`col83`),
+KEY `idx7` (`col17`,`col87`(245),`col99`(17)),
+KEY `idx8` (`col65`,`col120`),
+KEY `idx9` (`col82`),
+KEY `idx10` (`col9`(72)),
+KEY `idx11` (`col88`),
+KEY `idx12` (`col128`,`col9`(200),`col71`,`col66`),
+KEY `idx13` (`col77`(126)),
+KEY `idx14` (`col105`(26),`col13`,`col117`),
+KEY `idx15` (`col4`(246),`col130`,`col115`,`col3`(141))
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+# Creating a table with 176 columns and 13 indexes
+DROP TABLE IF EXISTS `table5`;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table5`
+(`col0` MEDIUMTEXT,
+`col1` VARCHAR (90),
+`col2` TINYTEXT,
+`col3` TIME,
+`col4` BOOL,
+`col5` TINYTEXT,
+`col6` BOOL,
+`col7` TIMESTAMP,
+`col8` TINYBLOB,
+`col9` TINYINT,
+`col10` YEAR,
+`col11` SET ('test1','test2','test3'),
+`col12` TEXT,
+`col13` CHAR (248),
+`col14` BIGINT,
+`col15` TEXT,
+`col16` TINYINT,
+`col17` NUMERIC,
+`col18` SET ('test1','test2','test3'),
+`col19` LONGBLOB,
+`col20` FLOAT,
+`col21` INT,
+`col22` TEXT,
+`col23` BOOL,
+`col24` DECIMAL,
+`col25` DOUBLE PRECISION,
+`col26` FLOAT,
+`col27` TINYBLOB,
+`col28` NUMERIC,
+`col29` MEDIUMBLOB,
+`col30` DATE,
+`col31` LONGTEXT,
+`col32` DATE,
+`col33` FLOAT,
+`col34` BIGINT,
+`col35` TINYTEXT,
+`col36` MEDIUMTEXT,
+`col37` TIME,
+`col38` INT,
+`col39` TINYINT,
+`col40` SET ('test1','test2','test3'),
+`col41` CHAR (130),
+`col42` SMALLINT,
+`col43` INT,
+`col44` MEDIUMTEXT,
+`col45` VARCHAR (126),
+`col46` INT,
+`col47` DOUBLE PRECISION,
+`col48` BIGINT,
+`col49` MEDIUMTEXT,
+`col50` TINYBLOB,
+`col51` MEDIUMINT,
+`col52` TEXT,
+`col53` VARCHAR (208),
+`col54` VARCHAR (207),
+`col55` NUMERIC,
+`col56` DATETIME,
+`col57` ENUM ('test1','test2','test3'),
+`col58` NUMERIC,
+`col59` TINYBLOB,
+`col60` VARCHAR (73),
+`col61` MEDIUMTEXT,
+`col62` TINYBLOB,
+`col63` DATETIME,
+`col64` NUMERIC,
+`col65` MEDIUMINT,
+`col66` DATETIME,
+`col67` NUMERIC,
+`col68` TINYINT,
+`col69` VARCHAR (58),
+`col70` DECIMAL,
+`col71` MEDIUMTEXT,
+`col72` DATE,
+`col73` TIME,
+`col74` DOUBLE PRECISION,
+`col75` DECIMAL,
+`col76` MEDIUMBLOB,
+`col77` REAL,
+`col78` YEAR,
+`col79` YEAR,
+`col80` LONGBLOB,
+`col81` BLOB,
+`col82` BIGINT,
+`col83` ENUM ('test1','test2','test3'),
+`col84` NUMERIC,
+`col85` SET ('test1','test2','test3'),
+`col86` MEDIUMTEXT,
+`col87` LONGBLOB,
+`col88` TIME,
+`col89` ENUM ('test1','test2','test3'),
+`col90` DECIMAL,
+`col91` FLOAT,
+`col92` DATETIME,
+`col93` TINYTEXT,
+`col94` TIMESTAMP,
+`col95` TIMESTAMP,
+`col96` TEXT,
+`col97` REAL,
+`col98` VARCHAR (198),
+`col99` TIME,
+`col100` TINYINT,
+`col101` BIGINT,
+`col102` LONGBLOB,
+`col103` LONGBLOB,
+`col104` MEDIUMINT,
+`col105` MEDIUMTEXT,
+`col106` TIMESTAMP,
+`col107` SMALLINT,
+`col108` NUMERIC,
+`col109` DECIMAL,
+`col110` FLOAT,
+`col111` DECIMAL,
+`col112` REAL,
+`col113` TINYTEXT,
+`col114` FLOAT,
+`col115` VARCHAR (7),
+`col116` LONGTEXT,
+`col117` DATE,
+`col118` BIGINT,
+`col119` TEXT,
+`col120` BIGINT,
+`col121` BLOB,
+`col122` CHAR (110),
+`col123` NUMERIC,
+`col124` MEDIUMBLOB,
+`col125` NUMERIC,
+`col126` NUMERIC,
+`col127` BOOL,
+`col128` TIME,
+`col129` TINYBLOB,
+`col130` TINYBLOB,
+`col131` DATE,
+`col132` INT,
+`col133` VARCHAR (123),
+`col134` CHAR (238),
+`col135` VARCHAR (225),
+`col136` LONGTEXT,
+`col137` LONGBLOB,
+`col138` REAL,
+`col139` TINYBLOB,
+`col140` DATETIME,
+`col141` TINYTEXT,
+`col142` LONGBLOB,
+`col143` BIGINT,
+`col144` VARCHAR (236),
+`col145` TEXT,
+`col146` YEAR,
+`col147` DECIMAL,
+`col148` TEXT,
+`col149` MEDIUMBLOB,
+`col150` TINYINT,
+`col151` BOOL,
+`col152` VARCHAR (72),
+`col153` INT,
+`col154` VARCHAR (165),
+`col155` TINYINT,
+`col156` MEDIUMTEXT,
+`col157` DOUBLE PRECISION,
+`col158` TIME,
+`col159` MEDIUMBLOB,
+`col160` LONGBLOB,
+`col161` DATETIME,
+`col162` DOUBLE PRECISION,
+`col163` BLOB,
+`col164` ENUM ('test1','test2','test3'),
+`col165` TIMESTAMP,
+`col166` DATE,
+`col167` TINYBLOB,
+`col168` TINYBLOB,
+`col169` LONGBLOB,
+`col170` DATETIME,
+`col171` BIGINT,
+`col172` VARCHAR (30),
+`col173` LONGTEXT,
+`col174` TIME,
+`col175` FLOAT,
+KEY `idx0` (`col16`,`col156`(139),`col97`,`col120`),
+KEY `idx1` (`col24`,`col0`(108)),
+KEY `idx2` (`col117`,`col173`(34),`col132`,`col82`),
+KEY `idx3` (`col2`(86)),
+KEY `idx4` (`col2`(43)),
+KEY `idx5` (`col83`,`col35`(87),`col111`),
+KEY `idx6` (`col6`,`col134`,`col92`),
+KEY `idx7` (`col56`),
+KEY `idx8` (`col30`,`col53`,`col129`(66)),
+KEY `idx9` (`col53`,`col113`(211),`col32`,`col15`(75)),
+KEY `idx10` (`col34`),
+KEY `idx11` (`col126`),
+KEY `idx12` (`col24`)
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+# Creating a table with 179 columns and 46 indexes
+DROP TABLE IF EXISTS `table6`;
+-- error ER_TOO_BIG_ROWSIZE
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE IF NOT EXISTS `table6`
+(`col0` ENUM ('test1','test2','test3'),
+`col1` MEDIUMBLOB,
+`col2` MEDIUMBLOB,
+`col3` DATETIME,
+`col4` DATE,
+`col5` YEAR,
+`col6` REAL,
+`col7` NUMERIC,
+`col8` MEDIUMBLOB,
+`col9` TEXT,
+`col10` TIMESTAMP,
+`col11` DOUBLE,
+`col12` DOUBLE,
+`col13` SMALLINT,
+`col14` TIMESTAMP,
+`col15` DECIMAL,
+`col16` DATE,
+`col17` TEXT,
+`col18` LONGBLOB,
+`col19` BIGINT,
+`col20` FLOAT,
+`col21` DATETIME,
+`col22` TINYINT,
+`col23` MEDIUMBLOB,
+`col24` SET ('test1','test2','test3'),
+`col25` TIME,
+`col26` TEXT,
+`col27` LONGTEXT,
+`col28` BIGINT,
+`col29` REAL,
+`col30` YEAR,
+`col31` MEDIUMBLOB,
+`col32` MEDIUMINT,
+`col33` FLOAT,
+`col34` TEXT,
+`col35` DATE,
+`col36` TIMESTAMP,
+`col37` REAL,
+`col38` BLOB,
+`col39` BLOB,
+`col40` BLOB,
+`col41` TINYBLOB,
+`col42` INT,
+`col43` TINYINT,
+`col44` REAL,
+`col45` BIGINT,
+`col46` TIMESTAMP,
+`col47` BLOB,
+`col48` ENUM ('test1','test2','test3'),
+`col49` BOOL,
+`col50` CHAR (109),
+`col51` DOUBLE,
+`col52` DOUBLE PRECISION,
+`col53` ENUM ('test1','test2','test3'),
+`col54` FLOAT,
+`col55` DOUBLE PRECISION,
+`col56` CHAR (166),
+`col57` TEXT,
+`col58` TIME,
+`col59` DECIMAL,
+`col60` TEXT,
+`col61` ENUM ('test1','test2','test3'),
+`col62` LONGTEXT,
+`col63` YEAR,
+`col64` DOUBLE,
+`col65` CHAR (87),
+`col66` DATE,
+`col67` BOOL,
+`col68` MEDIUMBLOB,
+`col69` DATETIME,
+`col70` DECIMAL,
+`col71` TIME,
+`col72` REAL,
+`col73` LONGTEXT,
+`col74` BLOB,
+`col75` REAL,
+`col76` INT,
+`col77` INT,
+`col78` FLOAT,
+`col79` DOUBLE,
+`col80` MEDIUMINT,
+`col81` ENUM ('test1','test2','test3'),
+`col82` VARCHAR (221),
+`col83` BIGINT,
+`col84` TINYINT,
+`col85` BIGINT,
+`col86` FLOAT,
+`col87` MEDIUMBLOB,
+`col88` CHAR (126),
+`col89` MEDIUMBLOB,
+`col90` DATETIME,
+`col91` TINYINT,
+`col92` DOUBLE,
+`col93` NUMERIC,
+`col94` DATE,
+`col95` BLOB,
+`col96` DATETIME,
+`col97` TIME,
+`col98` LONGBLOB,
+`col99` INT,
+`col100` SET ('test1','test2','test3'),
+`col101` TINYBLOB,
+`col102` INT,
+`col103` MEDIUMBLOB,
+`col104` MEDIUMTEXT,
+`col105` FLOAT,
+`col106` TINYBLOB,
+`col107` VARCHAR (26),
+`col108` TINYINT,
+`col109` TIME,
+`col110` TINYBLOB,
+`col111` LONGBLOB,
+`col112` TINYTEXT,
+`col113` FLOAT,
+`col114` TINYINT,
+`col115` NUMERIC,
+`col116` TIME,
+`col117` SET ('test1','test2','test3'),
+`col118` DATE,
+`col119` SMALLINT,
+`col120` BLOB,
+`col121` TINYTEXT,
+`col122` REAL,
+`col123` YEAR,
+`col124` REAL,
+`col125` BOOL,
+`col126` BLOB,
+`col127` REAL,
+`col128` MEDIUMBLOB,
+`col129` TIMESTAMP,
+`col130` LONGBLOB,
+`col131` MEDIUMBLOB,
+`col132` YEAR,
+`col133` YEAR,
+`col134` INT,
+`col135` MEDIUMINT,
+`col136` MEDIUMINT,
+`col137` TINYTEXT,
+`col138` TINYBLOB,
+`col139` BLOB,
+`col140` SET ('test1','test2','test3'),
+`col141` ENUM ('test1','test2','test3'),
+`col142` ENUM ('test1','test2','test3'),
+`col143` TINYTEXT,
+`col144` DATETIME,
+`col145` TEXT,
+`col146` DOUBLE PRECISION,
+`col147` DECIMAL,
+`col148` MEDIUMTEXT,
+`col149` TINYTEXT,
+`col150` SET ('test1','test2','test3'),
+`col151` MEDIUMTEXT,
+`col152` CHAR (126),
+`col153` DOUBLE,
+`col154` CHAR (243),
+`col155` SET ('test1','test2','test3'),
+`col156` SET ('test1','test2','test3'),
+`col157` DATETIME,
+`col158` DOUBLE,
+`col159` NUMERIC,
+`col160` DECIMAL,
+`col161` FLOAT,
+`col162` LONGBLOB,
+`col163` LONGTEXT,
+`col164` INT,
+`col165` TIME,
+`col166` CHAR (27),
+`col167` VARCHAR (63),
+`col168` TEXT,
+`col169` TINYBLOB,
+`col170` TINYBLOB,
+`col171` ENUM ('test1','test2','test3'),
+`col172` INT,
+`col173` TIME,
+`col174` DECIMAL,
+`col175` DOUBLE,
+`col176` MEDIUMBLOB,
+`col177` LONGBLOB,
+`col178` CHAR (43),
+KEY `idx0` (`col131`(219)),
+KEY `idx1` (`col67`,`col122`,`col59`,`col87`(33)),
+KEY `idx2` (`col83`,`col42`,`col57`(152)),
+KEY `idx3` (`col106`(124)),
+KEY `idx4` (`col173`,`col80`,`col165`,`col89`(78)),
+KEY `idx5` (`col174`,`col145`(108),`col23`(228),`col141`),
+KEY `idx6` (`col157`,`col140`),
+KEY `idx7` (`col130`(188),`col15`),
+KEY `idx8` (`col52`),
+KEY `idx9` (`col144`),
+KEY `idx10` (`col155`),
+KEY `idx11` (`col62`(230),`col1`(109)),
+KEY `idx12` (`col151`(24),`col95`(85)),
+KEY `idx13` (`col114`),
+KEY `idx14` (`col42`,`col98`(56),`col146`),
+KEY `idx15` (`col147`,`col39`(254),`col35`),
+KEY `idx16` (`col79`),
+KEY `idx17` (`col65`),
+KEY `idx18` (`col149`(165),`col168`(119),`col32`,`col117`),
+KEY `idx19` (`col64`),
+KEY `idx20` (`col93`),
+KEY `idx21` (`col64`,`col113`,`col104`(182)),
+KEY `idx22` (`col52`,`col111`(189)),
+KEY `idx23` (`col45`),
+KEY `idx24` (`col154`,`col107`,`col110`(159)),
+KEY `idx25` (`col149`(1),`col87`(131)),
+KEY `idx26` (`col58`,`col115`,`col63`),
+KEY `idx27` (`col95`(9),`col0`,`col87`(113)),
+KEY `idx28` (`col92`,`col130`(1)),
+KEY `idx29` (`col151`(129),`col137`(254),`col13`),
+KEY `idx30` (`col49`),
+KEY `idx31` (`col28`),
+KEY `idx32` (`col83`,`col146`),
+KEY `idx33` (`col155`,`col90`,`col17`(245)),
+KEY `idx34` (`col174`,`col169`(44),`col107`),
+KEY `idx35` (`col113`),
+KEY `idx36` (`col52`),
+KEY `idx37` (`col16`,`col120`(190)),
+KEY `idx38` (`col28`),
+KEY `idx39` (`col131`(165)),
+KEY `idx40` (`col135`,`col26`(86)),
+KEY `idx41` (`col69`,`col94`),
+KEY `idx42` (`col105`,`col151`(38),`col97`),
+KEY `idx43` (`col88`),
+KEY `idx44` (`col176`(100),`col42`,`col73`(189),`col94`),
+KEY `idx45` (`col2`(27),`col27`(116))
+)engine=innodb ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+DROP TABLE IF EXISTS table0;
+DROP TABLE IF EXISTS table1;
+DROP TABLE IF EXISTS table2;
+DROP TABLE IF EXISTS table3;
+DROP TABLE IF EXISTS table4;
+DROP TABLE IF EXISTS table5;
+DROP TABLE IF EXISTS table6;
+
+EVAL SET GLOBAL innodb_file_format=$file_format;
+EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug36172.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug36172.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug36172.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug36172.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,30 @@
+#
+# Test case for bug 36172
+#
+
+-- source include/not_embedded.inc
+-- source include/have_innodb.inc
+
+SET storage_engine=InnoDB;
+
+# we do not really care about what gets printed, we are only
+# interested in getting success or failure according to our
+# expectations
+
+-- disable_query_log
+-- disable_result_log
+
+let $file_format=`select @@innodb_file_format`;
+let $file_per_table=`select @@innodb_file_per_table`;
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=on;
+
+DROP TABLE IF EXISTS `table0`;
+CREATE TABLE `table0` (   `col0` tinyint(1) DEFAULT NULL,   `col1` tinyint(1) DEFAULT NULL,   `col2` tinyint(4) DEFAULT NULL,   `col3` date DEFAULT NULL,   `col4` time DEFAULT NULL,   `col5` set('test1','test2','test3') DEFAULT NULL,   `col6` time DEFAULT NULL,   `col7` text,   `col8` decimal(10,0) DEFAULT NULL,   `col9` set('test1','test2','test3') DEFAULT NULL,   `col10` float DEFAULT NULL,   `col11` double DEFAULT NULL,   `col12` enum('test1','test2','test3') DEFAULT NULL,   `col13` tinyblob,   `col14` year(4) DEFAULT NULL,   `col15` set('test1','test2','test3') DEFAULT NULL,   `col16` decimal(10,0) DEFAULT NULL,   `col17` decimal(10,0) DEFAULT NULL,   `col18` blob,   `col19` datetime DEFAULT NULL,   `col20` double DEFAULT NULL,   `col21` decimal(10,0) DEFAULT NULL,   `col22` datetime DEFAULT NULL,   `col23` decimal(10,0) DEFAULT NULL,   `col24` decimal(10,0) DEFAULT NULL,   `col25` longtext,   `col26` tinyblob,   `col27` time DEFAULT NULL,   `col28` tinyblob,   `col29` enum('test1','test2','test3') DEFAULT NULL,   `col30` smallint(6) DEFAULT NULL,   `col31` double DEFAULT NULL,   `col32` float DEFAULT NULL,   `col33` char(175) DEFAULT NULL,   `col34` tinytext,   `col35` tinytext,   `col36` tinyblob,   `col37` tinyblob,   `col38` tinytext,   `col39` mediumblob,   `col40` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,   `col41` double DEFAULT NULL,   `col42` smallint(6) DEFAULT NULL,   `col43` longblob,   `col44` varchar(80) DEFAULT NULL,   `col45` mediumtext,   `col46` decimal(10,0) DEFAULT NULL,   `col47` bigint(20) DEFAULT NULL,   `col48` date DEFAULT NULL,   `col49` tinyblob,   `col50` date DEFAULT NULL,   `col51` tinyint(1) DEFAULT NULL,   `col52` mediumint(9) DEFAULT NULL,   `col53` float DEFAULT NULL,   `col54` tinyblob,   `col55` longtext,   `col56` smallint(6) DEFAULT NULL,   `col57` enum('test1','test2','test3') DEFAULT NULL,   `col58` datetime DEFAULT NULL,   `col59` mediumtext,   `col60` varchar(232) DEFAULT NULL,   `col61` decimal(10,0) DEFAULT NULL,   `col62` year(4) DEFAULT NULL,   `col63` smallint(6) DEFAULT NULL,   `col64` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',   `col65` blob,   `col66` longblob,   `col67` int(11) DEFAULT NULL,   `col68` longtext,   `col69` enum('test1','test2','test3') DEFAULT NULL,   `col70` int(11) DEFAULT NULL,   `col71` time DEFAULT NULL,   `col72` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',   `col73` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',   `col74` varchar(170) DEFAULT NULL,   `col75` set('test1','test2','test3') DEFAULT NULL,   `col76` tinyblob,   `col77` bigint(20) DEFAULT NULL,   `col78` decimal(10,0) DEFAULT NULL,   `col79` datetime DEFAULT NULL,   `col80` year(4) DEFAULT NULL,   `col81` decimal(10,0) DEFAULT NULL,   `col82` longblob,   `col83` text,   `col84` char(83) DEFAULT NULL,   `col85` decimal(10,0) DEFAULT NULL,   `col86` float DEFAULT NULL,   `col87` int(11) DEFAULT NULL,   `col88` varchar(145) DEFAULT NULL,   `col89` date DEFAULT NULL,   `col90` decimal(10,0) DEFAULT NULL,   `col91` decimal(10,0) DEFAULT NULL,   `col92` mediumblob,   `col93` time DEFAULT NULL,   KEY `idx0` (`col69`,`col90`,`col8`),   KEY `idx1` (`col60`),   KEY `idx2` (`col60`,`col70`,`col74`),   KEY `idx3` (`col22`,`col32`,`col72`,`col30`),   KEY `idx4` (`col29`),   KEY `idx5` (`col19`,`col45`(143)),   KEY `idx6` (`col46`,`col48`,`col5`,`col39`(118)),   KEY `idx7` (`col48`,`col61`),   KEY `idx8` (`col93`),   KEY `idx9` (`col31`),   KEY `idx10` (`col30`,`col21`),   KEY `idx11` (`col67`),   KEY `idx12` (`col44`,`col6`,`col8`,`col38`(226)),   KEY `idx13` (`col71`,`col41`,`col15`,`col49`(88)),   KEY `idx14` (`col78`),   KEY `idx15` (`col63`,`col67`,`col64`),   KEY `idx16` (`col17`,`col86`),   KEY `idx17` (`col77`,`col56`,`col10`,`col55`(24)),   KEY `idx18` (`col62`),   KEY `idx19` (`col31`,`col57`,`col56`,`col53`),   KEY `idx20` (`col46`),   KEY `idx21` (`col83`(54)),   KEY `idx22` (`col51`,`col7`(120)),   KEY `idx23` (`col7`(163),`col31`,`col71`,`col14`) ) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
+insert ignore into `table0` set  `col23` = 7887371.5084383683, `col24` = 4293854615.6906948000, `col25` = 'vitalist', `col26` = 'widespread', `col27` = '3570490', `col28` = 'habitual', `col30` = -5471, `col31` = 4286985783.6771750000, `col32` = 6354540.9826654866, `col33` = 'defoliation', `col34` = 'logarithms', `col35` = 'tegument\'s', `col36` = 'scouting\'s', `col37` = 'intermittency', `col38` = 'elongates', `col39` = 'prophecies', `col40` = '20560103035939', `col41` = 4292809130.0544143000, `col42` = 22057, `col43` = 'Hess\'s', `col44` = 'bandstand', `col45` = 'phenylketonuria', `col46` = 6338767.4018677324, `col47` = 5310247, `col48` = '12592418', `col49` = 'churchman\'s', `col50` = '32226125', `col51` = -58, `col52` = -6207968, `col53` = 1244839.3255104220, `col54` = 'robotized', `col55` = 'monotonous', `col56` = -26909, `col58` = '20720107023550', `col59` = 'suggestiveness\'s', `col60` = 'gemology', `col61` = 4287800670.2229986000, `col62` = '1944', `col63` = -16827, `col64` = '20700107212324', `col65` = 'Nicolais', `col66` = 'apteryx', `col67` = 6935317, `col68` = 'stroganoff', `col70` = 3316430, `col71` = '3277608', `col72` = '19300511045918', `col73` = '20421201003327', `col74` = 'attenuant', `col75` = '15173', `col76` = 'upstroke\'s', `col77` = 8118987, `col78` = 6791516.2735374002, `col79` = '20780701144624', `col80` = '2134', `col81` = 4290682351.3127537000, `col82` = 'unexplainably', `col83` = 'Storm', `col84` = 'Greyso\'s', `col85` = 4289119212.4306774000, `col86` = 7617575.8796655172, `col87` = -6325335, `col88` = 'fondue\'s', `col89` = '40608940', `col90` = 1659421.8093508712, `col91` = 8346904.6584368423, `col92` = 'reloads', `col93` = '5188366';
+CHECK TABLE table0 EXTENDED;
+INSERT IGNORE INTO `table0` SET `col19` = '19940127002709', `col20` = 2383927.9055146948, `col21` = 4293243420.5621204000, `col22` = '20511211123705', `col23` = 4289899778.6573381000, `col24` = 4293449279.0540481000, `col25` = 'emphysemic', `col26` = 'dentally', `col27` = '2347406', `col28` = 'eruct', `col30` = 1222, `col31` = 4294372994.9941406000, `col32` = 4291385574.1173744000, `col33` = 'borrowing\'s', `col34` = 'septics', `col35` = 'ratter\'s', `col36` = 'Kaye', `col37` = 'Florentia', `col38` = 'allium', `col39` = 'barkeep', `col40` = '19510407003441', `col41` = 4293559200.4215522000, `col42` = 22482, `col43` = 'decussate', `col44` = 'Brom\'s', `col45` = 'violated', `col46` = 4925506.4635456400, `col47` = 930549, `col48` = '51296066', `col49` = 'voluminously', `col50` = '29306676', `col51` = -88, `col52` = -2153690, `col53` = 4290250202.1464887000, `col54` = 'expropriation', `col55` = 'Aberdeen\'s', `col56` = 20343, `col58` = '19640415171532', `col59` = 'extern', `col60` = 'Ubana', `col61` = 4290487961.8539081000, `col62` = '2147', `col63` = -24271, `col64` = '20750801194548', `col65` = 'Cunaxa\'s', `col66` = 'pasticcio', `col67` = 2795817, `col68` = 'Indore\'s', `col70` = 6864127, `col71` = '1817832', `col72` = '20540506114211', `col73` = '20040101012300', `col74` = 'rationalized', `col75` = '45522', `col76` = 'indene', `col77` = -6964559, `col78` = 4247535.5266884370, `col79` = '20720416124357', `col80` = '2143', `col81` = 4292060102.4466386000, `col82` = 'striving', `col83` = 'boneblack\'s', `col84` = 'redolent', `col85` = 6489697.9009369183, `col86` = 4287473465.9731131000, `col87` = 7726015, `col88` = 'perplexed', `col89` = '17153791', `col90` = 5478587.1108127078, `col91` = 4287091404.7004304000, `col92` = 'Boulez\'s', `col93` = '2931278';
+CHECK TABLE table0 EXTENDED;
+DROP TABLE table0;
+EVAL SET GLOBAL innodb_file_format=$file_format;
+EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug52745.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug52745.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug52745.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug52745.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,107 @@
+-- source include/have_innodb.inc
+
+let $file_format=`select @@innodb_file_format`;
+let $file_per_table=`select @@innodb_file_per_table`;
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=on;
+
+CREATE TABLE bug52745 (
+  a2 int(10) unsigned DEFAULT NULL,
+  col37 time DEFAULT NULL,
+  col38 char(229) CHARACTER SET utf8 DEFAULT NULL,
+  col39 text,
+  col40 timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+  col41 int(10) unsigned DEFAULT NULL,
+  col42 varchar(248) CHARACTER SET utf8 DEFAULT NULL,
+  col43 smallint(5) unsigned zerofill DEFAULT NULL,
+  col44 varchar(150) CHARACTER SET utf8 DEFAULT NULL,
+  col45 float unsigned zerofill DEFAULT NULL,
+  col46 binary(1) DEFAULT NULL,
+  col47 tinyint(4) DEFAULT NULL,
+  col48 tinyint(1) DEFAULT NULL,
+  col49 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  col50 binary(1) DEFAULT NULL,
+  col51 double unsigned zerofill DEFAULT NULL,
+  col52 int(10) unsigned DEFAULT NULL,
+  col53 time DEFAULT NULL,
+  col54 double unsigned DEFAULT NULL,
+  col55 time DEFAULT NULL,
+  col56 mediumtext CHARACTER SET latin2,
+  col57 blob,
+  col58 decimal(52,16) unsigned zerofill NOT NULL DEFAULT '000000000000000000000000000000000000.0000000000000000',
+  col59 binary(1) DEFAULT NULL,
+  col60 longblob,
+  col61 time DEFAULT NULL,
+  col62 longtext CHARACTER SET utf8 COLLATE utf8_persian_ci,
+  col63 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  col64 int(10) unsigned DEFAULT NULL,
+  col65 date DEFAULT NULL,
+  col66 timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+  col67 binary(1) DEFAULT NULL,
+  col68 tinyblob,
+  col69 date DEFAULT NULL,
+  col70 tinyint(3) unsigned zerofill DEFAULT NULL,
+  col71 varchar(44) CHARACTER SET utf8 DEFAULT NULL,
+  col72 datetime DEFAULT NULL,
+  col73 smallint(5) unsigned zerofill DEFAULT NULL,
+  col74 longblob,
+  col75 bit(34) DEFAULT NULL,
+  col76 float unsigned zerofill DEFAULT NULL,
+  col77 year(2) DEFAULT NULL,
+  col78 tinyint(3) unsigned DEFAULT NULL,
+  col79 set('msfheowh','tbpxbgf','by','wahnrjw','myqfasxz','rsokyumrt') CHARACTER SET latin2 DEFAULT NULL,
+  col80 datetime DEFAULT NULL,
+  col81 smallint(6) DEFAULT NULL,
+  col82 enum('xtaurnqfqz','rifrse','kuzwpbvb','niisabk','zxavro','rbvasv','','uulrfaove','','') DEFAULT NULL,
+  col83 bigint(20) unsigned zerofill DEFAULT NULL,
+  col84 float unsigned zerofill DEFAULT NULL,
+  col85 double DEFAULT NULL,
+  col86 enum('ylannv','','vlkhycqc','snke','cxifustp','xiaxaswzp','oxl') CHARACTER SET latin1 COLLATE latin1_german2_ci DEFAULT NULL,
+  col87 varbinary(221) DEFAULT NULL,
+  col88 double unsigned DEFAULT NULL,
+  col89 float unsigned zerofill DEFAULT NULL,
+  col90 tinyblob
+) ENGINE=InnoDB DEFAULT CHARSET=latin1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+INSERT INTO bug52745 SET
+col40='0000-00-00 00:00:00',
+col51=16547,
+col53='7711484',
+col54=-28604,
+col55='7112612',
+col56='wakefulness\'',
+col57=repeat('absorbefacient\'',106),
+col58=11027,
+col59='AM09gW7',
+col60=repeat('Noelani\'',16),
+col61='2520576',
+col62='substitutiv',
+col63='19950106155112',
+col64=-12038,
+col65='86238806',
+col66='19600719080256',
+col68=repeat('Sagittarius\'',54),
+col69='38943902',
+col70=1232,
+col71='Elora\'',
+col74=repeat('zipp',11),
+col75='0',
+col76=23254,
+col78=13247,
+col79='56219',
+col80='20500609035724',
+col81=11632,
+col82=7,
+col84=-23863,
+col85=6341,
+col87='HZdkf.4 s7t,5Rmq	8so fmr,ruGLUG25TrtI.yQ	2SuHq0ML7rw7.4 b2yf2E5TJxOtBBZImezDnzpj,uPYfznnEUDN1e9aQoO 2DsplB7TFWy	oQJ br  HLF :F,eQ p4i1oWsr lL3PG,hjCz6hYqN h1QTjLCjrv:QCdSzpYBibJAtZCxLOk3l6Blsh.W',
+col88=16894,
+col89=6161,
+col90=repeat('gale',48);
+
+SHOW WARNINGS;
+
+DROP TABLE bug52745;
+
+EVAL SET GLOBAL innodb_file_format=$file_format;
+EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug53591.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug53591.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug53591.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug53591.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,20 @@
+-- source include/have_innodb.inc
+
+let $file_format=`select @@innodb_file_format`;
+let $file_per_table=`select @@innodb_file_per_table`;
+
+SET GLOBAL innodb_file_format='Barracuda';
+SET GLOBAL innodb_file_per_table=on;
+
+set old_alter_table=0;
+
+CREATE TABLE bug53591(a text charset utf8 not null)
+ENGINE=InnoDB KEY_BLOCK_SIZE=1;
+-- error 139
+ALTER TABLE bug53591 ADD PRIMARY KEY(a(220));
+SHOW WARNINGS;
+
+DROP TABLE bug53591;
+
+EVAL SET GLOBAL innodb_file_format=$file_format;
+EVAL SET GLOBAL innodb_file_per_table=$file_per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug56680.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug56680.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_bug56680.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_bug56680.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,140 @@
+#
+# Bug #56680 InnoDB may return wrong results from a case-insensitive index
+#
+-- source include/have_innodb.inc
+
+-- disable_query_log
+SET @tx_isolation_orig = @@tx_isolation;
+SET @innodb_file_per_table_orig = @@innodb_file_per_table;
+SET @innodb_file_format_orig = @@innodb_file_format;
+# The flag innodb_change_buffering_debug is only available in debug builds.
+# It instructs InnoDB to try to evict pages from the buffer pool when
+# change buffering is possible, so that the change buffer will be used
+# whenever possible.
+-- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
+SET @innodb_change_buffering_debug_orig = @@innodb_change_buffering_debug;
+-- error 0,ER_UNKNOWN_SYSTEM_VARIABLE
+SET GLOBAL innodb_change_buffering_debug = 1;
+-- enable_query_log
+SET GLOBAL tx_isolation='REPEATABLE-READ';
+SET GLOBAL innodb_file_format=Barracuda;
+SET GLOBAL innodb_file_per_table=on;
+
+CREATE TABLE bug56680(
+       a INT AUTO_INCREMENT PRIMARY KEY,
+       b CHAR(1),
+       c INT,
+       INDEX(b))
+ENGINE=InnoDB;
+
+INSERT INTO bug56680 VALUES(0,'x',1);
+BEGIN;
+SELECT b FROM bug56680;
+
+connect (con1,localhost,root,,);
+connection con1;
+BEGIN;
+UPDATE bug56680 SET b='X';
+
+connection default;
+# This should return the last committed value 'x', but would return 'X'
+# due to a bug in row_search_for_mysql().
+SELECT b FROM bug56680;
+# This would always return the last committed value 'x'.
+SELECT * FROM bug56680;
+
+connection con1;
+ROLLBACK;
+disconnect con1;
+
+connection default;
+
+SELECT b FROM bug56680;
+
+# For the rest of this test, use the READ UNCOMMITTED isolation level
+# to see what exists in the secondary index.
+SET GLOBAL tx_isolation='READ-UNCOMMITTED';
+
+# Create enough rows for the table, so that the insert buffer will be
+# used for modifying the secondary index page. There must be multiple
+# index pages, because changes to the root page are never buffered.
+
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+INSERT INTO bug56680 SELECT 0,b,c FROM bug56680;
+
+BEGIN;
+SELECT b FROM bug56680 LIMIT 2;
+
+connect (con1,localhost,root,,);
+connection con1;
+BEGIN;
+DELETE FROM bug56680 WHERE a=1;
+# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
+INSERT INTO bug56680 VALUES(1,'X',1);
+
+# This should force an insert buffer merge, and return 'X' in the first row.
+SELECT b FROM bug56680 LIMIT 3;
+
+connection default;
+SELECT b FROM bug56680 LIMIT 2;
+CHECK TABLE bug56680;
+
+connection con1;
+ROLLBACK;
+SELECT b FROM bug56680 LIMIT 2;
+CHECK TABLE bug56680;
+
+connection default;
+disconnect con1;
+
+SELECT b FROM bug56680 LIMIT 2;
+
+CREATE TABLE bug56680_2(
+       a INT AUTO_INCREMENT PRIMARY KEY,
+       b VARCHAR(2) CHARSET latin1 COLLATE latin1_german2_ci,
+       c INT,
+       INDEX(b))
+ENGINE=InnoDB;
+
+INSERT INTO bug56680_2 SELECT 0,_latin1 0xdf,c FROM bug56680;
+
+BEGIN;
+SELECT HEX(b) FROM bug56680_2 LIMIT 2;
+DELETE FROM bug56680_2 WHERE a=1;
+# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
+INSERT INTO bug56680_2 VALUES(1,'SS',1);
+
+# This should force an insert buffer merge, and return 'SS' in the first row.
+SELECT HEX(b) FROM bug56680_2 LIMIT 3;
+CHECK TABLE bug56680_2;
+
+# Test this with compressed tables.
+ALTER TABLE bug56680_2 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+
+SELECT HEX(b) FROM bug56680_2 LIMIT 2;
+DELETE FROM bug56680_2 WHERE a=1;
+# This should be buffered, if innodb_change_buffering_debug = 1 is in effect.
+INSERT INTO bug56680_2 VALUES(1,_latin1 0xdf,1);
+
+# This should force an insert buffer merge, and return 0xdf in the first row.
+SELECT HEX(b) FROM bug56680_2 LIMIT 3;
+CHECK TABLE bug56680_2;
+
+DROP TABLE bug56680_2;
+DROP TABLE bug56680;
+
+-- disable_query_log
+SET GLOBAL tx_isolation = @tx_isolation_orig;
+SET GLOBAL innodb_file_per_table = @innodb_file_per_table_orig;
+SET GLOBAL innodb_file_format = @innodb_file_format_orig;
+-- error 0, ER_UNKNOWN_SYSTEM_VARIABLE
+SET GLOBAL innodb_change_buffering_debug = @innodb_change_buffering_debug_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table-master.opt	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1 @@
+--innodb-buffer-pool-size=8M
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_cmp_drop_table.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,59 @@
+-- source include/have_innodb.inc
+
+let $per_table=`select @@innodb_file_per_table`;
+let $format=`select @@innodb_file_format`;
+
+-- let $query_i_s = SELECT page_size FROM information_schema.innodb_cmpmem WHERE pages_used > 0
+
+set global innodb_file_per_table=on;
+set global innodb_file_format=`1`;
+ 
+create table t1(a text) engine=innodb key_block_size=8;
+
+-- disable_query_log
+
+# insert some rows so we are using compressed pages
+-- let $i = 10
+while ($i)
+{
+  insert into t1 values(repeat('abcdefghijklmnopqrstuvwxyz',100));
+  dec $i;
+}
+-- enable_query_log
+
+# we should be using some 8K pages
+-- eval $query_i_s
+
+drop table t1;
+
+# because of lazy eviction at drop table in 5.5 there should be some
+# used 8K pages
+-- eval $query_i_s
+
+# create a non-compressed table and insert enough into it to evict
+# compressed pages
+create table t2(a text) engine=innodb;
+
+-- disable_query_log
+
+-- let $i = 400
+while ($i)
+{
+  insert into t2 values(repeat('abcdefghijklmnopqrstuvwxyz',1000));
+  dec $i;
+}
+
+-- enable_query_log
+
+# now there should be no 8K pages in the buffer pool
+-- eval $query_i_s
+
+drop table t2;
+
+#
+# restore environment to the state it was before this test execution
+#
+
+-- disable_query_log
+eval set global innodb_file_format=$format;
+eval set global innodb_file_per_table=$per_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb-create-options.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb-create-options.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb-create-options.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb-create-options.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,573 @@
+# Tests for various combinations of ROW_FORMAT and KEY_BLOCK_SIZE
+# Related bugs; 
+# Bug#54679: ALTER TABLE causes compressed row_format to revert to compact
+# Bug#56628: ALTER TABLE .. KEY_BLOCK_SIZE=0 produces untrue warning or unnecessary error
+# Bug#56632: ALTER TABLE implicitly changes ROW_FORMAT to COMPRESSED
+# Rules for interpreting CREATE_OPTIONS
+# 1) Create options on an ALTER are added to the options on the
+#    previous CREATE or ALTER statements.
+# 2) KEY_BLOCK_SIZE=0 is considered a unspecified value.
+#    If the current ROW_FORMAT has explicitly been set to COMPRESSED,
+#    InnoDB will use a default value of 8.  Otherwise KEY_BLOCK_SIZE
+#    will not be used.
+# 3) ROW_FORMAT=DEFAULT allows InnoDB to choose its own default, COMPACT.
+# 4) ROW_FORMAT=DEFAULT and KEY_BLOCK_SIZE=0 can be used at any time to
+#    unset or erase the values persisted in the MySQL dictionary and
+#    by SHOW CTREATE TABLE.
+# 5) When incompatible values for ROW_FORMAT and KEY_BLOCK_SIZE are
+#    both explicitly given, the ROW_FORMAT is always used in non-strict
+#    mode.
+# 6) InnoDB will automatically convert a table to COMPRESSED only if a
+#    valid non-zero KEY_BLOCK_SIZE has been given and ROW_FORMAT=DEFAULT
+#    or has not been used on a previous CREATE TABLE or ALTER TABLE.
+# 7) InnoDB strict mode is designed to prevent incompatible create
+#    options from being used together.
+# 8) The non-strict behavior is intended to permit you to import a
+#    mysqldump file into a database that does not support compressed
+#    tables, even if the source database contained compressed tables.
+#    All invalid values and/or incompatible combinations of ROW_FORMAT
+#    and KEY_BLOCK_SIZE are automatically corrected
+#
+# *** innodb_strict_mode=ON ***
+# 1) Valid ROW_FORMATs are COMPRESSED, COMPACT, DEFAULT, DYNAMIC
+#    & REDUNDANT. All others are rejected.
+# 2) Valid KEY_BLOCK_SIZEs are 0,1,2,4,8,16.  All others are rejected.
+# 3) KEY_BLOCK_SIZE=0 can be used to set it to 'unspecified'.
+# 4) KEY_BLOCK_SIZE=1,2,4,8 & 16 are incompatible with COMPACT, DYNAMIC &
+#    REDUNDANT.
+# 5) KEY_BLOCK_SIZE=1,2,4,8 & 16 as well as ROW_FORMAT=COMPRESSED and
+#    ROW_FORMAT=DYNAMIC are incompatible with innodb_file_format=Antelope
+#    and innodb_file_per_table=OFF
+# 6) KEY_BLOCK_SIZE on an ALTER must occur with ROW_FORMAT=COMPRESSED
+#    or ROW_FORMAT=DEFAULT if the ROW_FORMAT was previously specified
+#    as COMPACT, DYNAMIC or REDUNDANT.
+# 7) KEY_BLOCK_SIZE on an ALTER can occur without a ROW_FORMAT if the
+#    previous ROW_FORMAT was DEFAULT, COMPRESSED, or unspecified.
+#
+# *** innodb_strict_mode=OFF ***
+# 1. Ignore a bad KEY_BLOCK_SIZE, defaulting it to 8.
+# 2. Ignore a bad ROW_FORMAT, defaulting to COMPACT.
+# 3. Ignore a valid KEY_BLOCK_SIZE when an incompatible but valid
+#    ROW_FORMAT is specified.
+# 4. If innodb_file_format=Antelope or innodb_file_per_table=OFF
+#    it will ignore ROW_FORMAT=COMPRESSED or DYNAMIC and it will
+#    ignore all non-zero KEY_BLOCK_SIZEs.
+#
+# See InnoDB documentation page "SQL Compression Syntax Warnings and Errors"
+
+-- source include/have_innodb.inc
+SET storage_engine=InnoDB;
+
+--disable_query_log
+# These values can change during the test
+LET $innodb_file_format_orig=`select @@innodb_file_format`;
+LET $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
+LET $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
+--enable_query_log
+
+SET GLOBAL innodb_file_format=`Barracuda`;
+SET GLOBAL innodb_file_per_table=ON;
+
+# The first half of these tests are with strict mode ON.
+SET SESSION innodb_strict_mode = ON;
+
+--echo # Test 1) StrictMode=ON, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
+--echo #         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
+DROP TABLE IF EXISTS t1;
+--echo #         'FIXED' is sent to InnoDB since it is used by MyISAM.
+--echo #         But it is an invalid mode in InnoDB
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
+SHOW WARNINGS;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+
+
+--echo # Test 2) StrictMode=ON, CREATE with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
+--echo #         KEY_BLOCK_SIZE is incompatible with COMPACT, REDUNDANT, & DYNAMIC
+DROP TABLE IF EXISTS t1;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
+SHOW WARNINGS;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+SHOW WARNINGS;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+
+--echo # Test 3) StrictMode=ON, ALTER with each ROW_FORMAT & a valid non-zero KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+
+--echo # Test 4) StrictMode=ON, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid non-zero KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 KEY_BLOCK_SIZE=2;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 KEY_BLOCK_SIZE=4;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 KEY_BLOCK_SIZE=8;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 5) StrictMode=ON, CREATE with a valid KEY_BLOCK_SIZE
+--echo #         ALTER with each ROW_FORMAT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=2;
+SHOW CREATE TABLE t1;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW CREATE TABLE t1;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 6) StrictMode=ON, CREATE with an invalid KEY_BLOCK_SIZE.
+DROP TABLE IF EXISTS t1;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=9;
+SHOW WARNINGS;
+
+--echo # Test 7) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
+--echo #         and a valid non-zero KEY_BLOCK_SIZE are rejected with Antelope
+--echo #         and that they can be set to default values during strict mode.
+SET GLOBAL innodb_file_format=Antelope;
+DROP TABLE IF EXISTS t1;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=4;
+SHOW WARNINGS;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 KEY_BLOCK_SIZE=8;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+SET GLOBAL innodb_file_format=Barracuda;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
+SET GLOBAL innodb_file_format=Antelope;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ADD COLUMN f1 INT;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+SET GLOBAL innodb_file_format=Barracuda;
+
+--echo # Test 8) StrictMode=ON, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and
+--echo #         and a valid non-zero KEY_BLOCK_SIZE are rejected with
+--echo #         innodb_file_per_table=OFF and that they can be set to default
+--echo #         values during strict mode.
+SET GLOBAL innodb_file_per_table=OFF;
+DROP TABLE IF EXISTS t1;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+--error ER_CANT_CREATE_TABLE
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT;
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 KEY_BLOCK_SIZE=1;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DEFAULT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_per_table=ON;
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4;
+SET GLOBAL innodb_file_per_table=OFF;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ADD COLUMN f1 INT;
+--replace_regex /'[^']*test\.#sql-[0-9a-f_]*'/'#sql-temporary'/
+SHOW WARNINGS;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+SET GLOBAL innodb_file_per_table=ON;
+
+--echo ##################################################
+SET SESSION innodb_strict_mode = OFF;
+
+--echo # Test 9) StrictMode=OFF, CREATE and ALTER with each ROW_FORMAT & KEY_BLOCK_SIZE=0
+--echo #         KEY_BLOCK_SIZE=0 means 'no KEY_BLOCK_SIZE is specified'
+--echo #         'FIXED' is sent to InnoDB since it is used by MyISAM.
+--echo #         It is an invalid mode in InnoDB, use COMPACT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=FIXED;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 10) StrictMode=OFF, CREATE with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
+--echo #          KEY_BLOCK_SIZE is ignored with COMPACT, REDUNDANT, & DYNAMIC
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=2;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+
+--echo # Test 11) StrictMode=OFF, ALTER with each ROW_FORMAT & a valid KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=FIXED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=COMPACT KEY_BLOCK_SIZE=2;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC KEY_BLOCK_SIZE=4;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT );
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+
+--echo # Test 12) StrictMode=OFF, CREATE with ROW_FORMAT=COMPACT, ALTER with a valid KEY_BLOCK_SIZE
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 KEY_BLOCK_SIZE=2;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 KEY_BLOCK_SIZE=4;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPACT;
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=8;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 13) StrictMode=OFF, CREATE with a valid KEY_BLOCK_SIZE
+--echo #          ALTER with each ROW_FORMAT
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=16;
+SHOW WARNINGS;
+SHOW CREATE TABLE t1;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SHOW CREATE TABLE t1;
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=REDUNDANT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPRESSED;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=DEFAULT KEY_BLOCK_SIZE=0;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+ALTER TABLE t1 ROW_FORMAT=COMPACT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 14) StrictMode=OFF, CREATE with an invalid KEY_BLOCK_SIZE, it defaults to 8
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) KEY_BLOCK_SIZE=15;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 15) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
+--echo            valid KEY_BLOCK_SIZE are remembered but not used when ROW_FORMAT
+--echo            is reverted to Antelope and then used again when ROW_FORMAT=Barracuda.
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_format=Antelope;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_format=Barracuda;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_format=Antelope;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_format=Barracuda;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+--echo # Test 16) StrictMode=OFF, Make sure ROW_FORMAT= COMPRESSED & DYNAMIC and a
+--echo            valid KEY_BLOCK_SIZE are remembered but not used when innodb_file_per_table=OFF
+--echo            and then used again when innodb_file_per_table=ON.
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_per_table=OFF;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_per_table=ON;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 ( i INT ) ROW_FORMAT=DYNAMIC;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_per_table=OFF;
+ALTER TABLE t1 ADD COLUMN f1 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+SET GLOBAL innodb_file_per_table=ON;
+ALTER TABLE t1 ADD COLUMN f2 INT;
+SHOW WARNINGS;
+SELECT TABLE_NAME,ROW_FORMAT,CREATE_OPTIONS FROM information_schema.tables WHERE TABLE_NAME = 't1';
+
+
+--echo # Cleanup
+DROP TABLE IF EXISTS t1;
+
+--disable_query_log
+EVAL SET GLOBAL innodb_file_format=$innodb_file_format_orig;
+EVAL SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
+EVAL SET SESSION innodb_strict_mode=$innodb_strict_mode_orig;
+--enable_query_log
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_index_large_prefix.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,269 @@
+# Testcase for worklog #5743: Lift the limit of index key prefixes
+
+--source include/have_innodb.inc
+
+let $innodb_file_format_orig=`select @@innodb_file_format`;
+let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
+let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
+
+set global innodb_file_format="Barracuda";
+set global innodb_file_per_table=1;
+set global innodb_large_prefix=1;
+
+# Create a table of DYNAMIC format, with a primary index of 1000 bytes in
+# size
+create table worklog5743(a TEXT not null, primary key (a(1000)))
+ROW_FORMAT=DYNAMIC, engine = innodb;
+
+# Do some insertion and update to excercise the external cache
+# code path
+insert into worklog5743 values(repeat("a", 20000));
+
+# default session, update the table
+update worklog5743 set a = (repeat("b", 16000));
+
+# Create a secondary index
+create index idx on worklog5743(a(2000));
+
+# Start a few sessions to do selections on table being updated in default
+# session, so it would rebuild the previous version from undo log.
+# 1) Default session:	Initiate an update on the externally stored column
+# 2) Session con1:	Select from table with repeated read
+# 3) Session con2:	Select from table with read uncommitted
+# 4) Default session:	rollback updates
+
+begin;
+update worklog5743 set a = (repeat("x", 17000));
+
+# Start a new session to select the column to force it build
+# an earlier version of the clustered index through undo log. So it should
+# just see the result of repeat("b", 16000)
+select @@session.tx_isolation;
+--connect (con1,localhost,root,,)
+select a = repeat("x", 17000) from worklog5743;
+select a = repeat("b", 16000) from worklog5743;
+
+# Start another session doing "read uncommitted" query, it
+# should see the uncommitted update
+--connect (con2,localhost,root,,)
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+select a = repeat("x", 17000) from worklog5743;
+
+# Roll back the transaction
+--connection default
+rollback;
+
+drop table worklog5743;
+
+# Create a table with only a secondary index has large prefix column
+create table worklog5743(a1 int, a2 TEXT not null)
+ROW_FORMAT=DYNAMIC, engine = innodb;
+
+create index idx on worklog5743(a1, a2(2000));
+
+insert into worklog5743 values(9, repeat("a", 10000));
+
+begin;
+
+update worklog5743 set a1 = 1000;
+
+# Do a select from another connection that would use the secondary index
+--connection con1
+select @@session.tx_isolation;
+explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+
+# Do read uncommitted in another session, it would show there is no
+# row with a1 = 9
+--connection con2
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+
+--connection default
+rollback;
+
+drop table worklog5743;
+
+# Create a table with a secondary index has small (50 bytes) prefix column
+create table worklog5743(a1 int, a2 TEXT not null)
+ROW_FORMAT=DYNAMIC, engine = innodb;
+
+create index idx on worklog5743(a1, a2(50));
+
+insert into worklog5743 values(9, repeat("a", 10000));
+
+begin;
+
+update worklog5743 set a1 = 1000;
+
+# Do a select from another connection that would use the secondary index
+--connection con1
+select @@session.tx_isolation;
+explain select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+
+# Do read uncommitted in another session, it would show there is no
+# row with a1 = 9
+--connection con2
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+select a1, a2 = repeat("a", 10000) from worklog5743 where a1 = 9;
+
+--connection default
+rollback;
+
+drop table worklog5743;
+
+# Create a table of ROW_FORMAT=COMPRESSED format
+create table worklog5743_2(a1 int, a2 TEXT not null)
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+
+create table worklog5743_4(a1 int, a2 TEXT not null)
+ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+
+# The maximum overall index record (not prefix) length for this table
+# is page_zip_empty_size() / 2, which is 960. "Too big row" error (
+# HA_ERR_TO_BIG_ROW) will be printed if this limit is exceeded.
+# Considering other fields and their overhead, the maximum length
+# for column a2 is 940 or 941 depending on the zlib version used and
+# compressBound() value used in page_zip_empty_size() (please refer
+# to Bug #47495 for more detail).
+-- error 139
+create index idx1 on worklog5743_2(a1, a2(942));
+
+create index idx1 on worklog5743_2(a1, a2(940));
+
+# similarly, the maximum index record length for the table is
+# 1984. Considering other fields and their overhead, the
+# maximum length for column a2 is 1964 or 1965 (please refer
+# to Bug #47495 for more detail).
+-- error 139
+create index idx1 on worklog5743_4(a1, a2(1966));
+
+create index idx1 on worklog5743_4(a1, a2(1964));
+
+insert into worklog5743_2 values(9, repeat("a", 10000));
+insert into worklog5743_4 values(9, repeat("a", 10000));
+
+begin;
+
+update worklog5743_2 set a1 = 1000;
+update worklog5743_4 set a1 = 1000;
+
+# Do a select from another connection that would use the secondary index
+--connection con1
+select @@session.tx_isolation;
+explain select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
+select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
+select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
+
+# Do read uncommitted in another session, it would show there is no
+# row with a1 = 9
+--connection con2
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+select a1, a2 = repeat("a", 10000) from worklog5743_2 where a1 = 9;
+select a1, a2 = repeat("a", 10000) from worklog5743_4 where a1 = 9;
+
+--connection default
+rollback;
+
+drop table worklog5743_2;
+drop table worklog5743_4;
+
+# Create a table with varchar column, and create index directly on this
+# large column (without prefix)
+create table worklog5743(a1 int, a2 varchar(3000))
+ROW_FORMAT=DYNAMIC, engine = innodb;
+
+# Create an index with large column without prefix
+create index idx on worklog5743(a1, a2);
+
+insert into worklog5743 values(9, repeat("a", 3000));
+
+begin;
+
+update worklog5743 set a1 = 1000;
+
+# Do a select from another connection that would use the secondary index
+--connection con1
+select @@session.tx_isolation;
+explain select a1 from worklog5743 where a1 = 9;
+select a1 from worklog5743 where a1 = 9;
+
+# Do read uncommitted, it would show there is no row with a1 = 9
+--connection con2
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+select a1 from worklog5743 where a1 = 9;
+
+--connection default
+rollback;
+
+drop table worklog5743;
+
+# Create a table with old format, and the limit is 768 bytes.
+-- error ER_INDEX_COLUMN_TOO_LONG
+create table worklog5743(a TEXT not null, primary key (a(1000)))
+engine = innodb;
+
+create table worklog5743(a TEXT) engine = innodb;
+
+# Excercise the column length check in ha_innobase::add_index()
+-- error ER_INDEX_COLUMN_TOO_LONG
+create index idx on worklog5743(a(1000));
+
+# This should be successful
+create index idx on worklog5743(a(725));
+
+# Perform some DMLs
+insert into worklog5743 values(repeat("a", 20000));
+
+begin;
+insert into worklog5743 values(repeat("b", 20000));
+update worklog5743 set a = (repeat("x", 25000));
+
+# Start a new session to select the table to force it build
+# an earlier version of the cluster index through undo log
+select @@session.tx_isolation;
+--connection con1
+select a = repeat("a", 20000) from worklog5743;
+
+--connection con2
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+select a = repeat("x", 25000) from worklog5743;
+
+--connection default
+rollback;
+
+drop table worklog5743;
+
+# Some border line test on the column length.
+# We have a limit of 3072 bytes for Barracuda table
+create table worklog5743(a TEXT not null) ROW_FORMAT=DYNAMIC, engine = innodb;
+
+# Length exceeds maximum supported key length, will auto-truncated to 3072
+create index idx on worklog5743(a(3073));
+
+create index idx2 on worklog5743(a(3072));
+
+show create table worklog5743;
+
+drop table worklog5743;
+
+# We have a limit of 767 bytes for Antelope table
+create table worklog5743(a TEXT not null) engine = innodb;
+
+-- error ER_INDEX_COLUMN_TOO_LONG
+create index idx on worklog5743(a(768));
+
+create index idx2 on worklog5743(a(767));
+
+drop table worklog5743;
+
+eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
+eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
+eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb_prefix_index_liftedlimit.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,1338 @@
+######## suite/innodb/t/innodb_prefix_index_liftedlimit.test ##########
+#                                                                    #
+# Testcase for worklog WL#5743: Lift the limit of index key prefixes #
+# Accorrding to WL#5743 - prefix index limit is increased from 767   #
+# to 3072 for innodb. This change is applicable with Barracuda file  #
+# format.                                                            #
+# All sub-test in this file focus on prefix index along with other   #
+# operations                                                         #
+#                                                                    #
+#                                                                    #
+# Creation:                                                          #
+# 2011-05-19 Implemented this test as part of WL#5743                #
+#                                                                    #
+######################################################################
+
+
+--source include/have_innodb.inc
+# Save innodb variables
+let $innodb_file_format_orig=`select @@innodb_file_format`;
+let $innodb_file_per_table_orig=`select @@innodb_file_per_table`;
+let $innodb_large_prefix_orig=`select @@innodb_large_prefix`;
+
+# Set Innodb file format as feature works for Barracuda file format
+set global innodb_file_format="Barracuda";
+set global innodb_file_per_table=1;
+set global innodb_large_prefix=1;
+
+-- disable_warnings
+DROP TABLE IF EXISTS worklog5743;
+-- enable_warnings
+#------------------------------------------------------------------------------
+# Prefix index with VARCHAR data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+# check IS
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
+INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with TEXT data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
+# check IS
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
+INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with MEDIUMTEXT data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_mediumtext MEDIUMTEXT , col_2_mediumtext MEDIUMTEXT ,
+PRIMARY KEY (col_1_mediumtext(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_mediumtext (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_mediumtext = REPEAT("a", 4000),col_2_mediumtext = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_mediumtext = REPEAT("c", 4000)
+WHERE col_1_mediumtext = REPEAT("a", 4000)
+AND col_2_mediumtext = REPEAT("o", 4000);
+SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_mediumtext = REPEAT("c", 4000)
+AND col_2_mediumtext = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_mediumtext = REPEAT("b", 4000);
+SELECT col_1_mediumtext = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with LONGTEXT data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_longtext LONGTEXT , col_2_longtext LONGTEXT ,
+PRIMARY KEY (col_1_longtext(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_longtext (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_longtext = REPEAT("a", 4000) , col_2_longtext = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_longtext = REPEAT("c", 4000)
+WHERE col_1_longtext = REPEAT("a", 4000)
+AND col_2_longtext = REPEAT("o", 4000);
+SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_longtext = REPEAT("c", 4000)
+AND col_2_longtext = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_longtext = REPEAT("b", 4000);
+SELECT col_1_longtext = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with BLOB data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_blob (3072));
+# check IS
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE FROM
+INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with MEDIUMBLOB data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_mediumblob MEDIUMBLOB  , col_2_mediumblob MEDIUMBLOB  ,
+PRIMARY KEY (col_1_mediumblob(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_mediumblob (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_mediumblob = REPEAT("a", 4000),col_2_mediumblob = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_mediumblob = REPEAT("c", 4000)
+WHERE col_1_mediumblob = REPEAT("a", 4000)
+AND col_2_mediumblob = REPEAT("o", 4000);
+SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_mediumblob = REPEAT("c", 4000)
+AND col_2_mediumblob = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_mediumblob = REPEAT("b", 4000);
+SELECT col_1_mediumblob = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with LONGBLOB data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_longblob LONGBLOB  , col_2_longblob LONGBLOB  ,
+PRIMARY KEY (col_1_longblob(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_longblob (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_longblob = REPEAT("a", 4000) , col_2_longblob = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_longblob = REPEAT("c", 4000)
+WHERE col_1_longblob = REPEAT("a", 4000)
+AND col_2_longblob = REPEAT("o", 4000);
+SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_longblob = REPEAT("c", 4000)
+AND col_2_longblob = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_longblob = REPEAT("b", 4000);
+SELECT col_1_longblob = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with VARBINARY data type , primary/secondary index and DML ops
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
+PRIMARY KEY (col_1_varbinary(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with CHAR data type , composite index and DML ops
+CREATE TABLE worklog5743 (col_1_char CHAR (255) , col_2_char CHAR (255),
+col_3_char CHAR (255), col_4_char CHAR (255),col_5_char CHAR (255),
+col_6_char CHAR (255), col_7_char CHAR (255),col_8_char CHAR (255),
+col_9_char CHAR (255), col_10_char CHAR (255),col_11_char CHAR (255),
+col_12_char CHAR (255), col_13_char CHAR (255),col_14_char CHAR (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
+);
+# Create index with total prefix index length = 3072
+CREATE INDEX prefix_idx ON worklog5743(col_1_char(250),col_2_char(250),
+col_3_char(250),col_4_char(250),col_5_char(250),col_6_char(250),
+col_7_char(250),col_8_char(250),col_9_char(250),col_10_char(250),
+col_11_char(250),col_12_char(250),col_13_char(72)
+);
+INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
+);
+SELECT col_1_char = REPEAT("a", 255) , col_2_char = REPEAT("o", 255) FROM worklog5743;
+UPDATE worklog5743 SET col_1_char = REPEAT("c", 255)
+WHERE col_1_char = REPEAT("a", 255) AND col_2_char = REPEAT("o", 255);
+SELECT col_1_char = REPEAT("c", 255) FROM worklog5743
+WHERE col_1_char = REPEAT("c", 255) AND col_2_char = REPEAT("o", 255);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255),REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_char = REPEAT("b", 255);
+SELECT col_1_char = REPEAT("c", 255) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with BINARY data type , composite index and DML ops
+CREATE TABLE worklog5743 (col_1_binary BINARY (255) , col_2_binary BINARY (255),
+col_3_binary BINARY(255),col_4_binary BINARY (255),col_5_binary BINARY (255),
+col_6_binary BINARY(255),col_7_binary BINARY (255),col_8_binary BINARY (255),
+col_9_binary BINARY(255),col_10_binary BINARY (255),col_11_binary BINARY (255),
+col_12_binary BINARY(255),col_13_binary BINARY (255),col_14_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
+);
+# Create index with total prefix index length = 3072
+CREATE INDEX prefix_idx ON worklog5743(col_1_binary (250),col_2_binary (250),
+col_3_binary (250),col_4_binary (250),col_5_binary (250),
+col_6_binary (250),col_7_binary (250),col_8_binary (250),
+col_9_binary (250),col_10_binary (250),col_11_binary (250),
+col_12_binary (250),col_13_binary (72)
+);
+INSERT INTO worklog5743 VALUES(REPEAT("b", 255) , REPEAT("p", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
+);
+SELECT col_1_binary = REPEAT("a", 255) , col_2_binary = REPEAT("o", 255) FROM worklog5743;
+UPDATE worklog5743 SET col_1_binary = REPEAT("c", 255)
+WHERE col_1_binary = REPEAT("a", 255)
+AND col_2_binary = REPEAT("o", 255);
+SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743
+WHERE col_1_binary = REPEAT("c", 255)
+AND col_2_binary = REPEAT("o", 255);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 255) , REPEAT("o", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255),
+REPEAT("a", 255) , REPEAT("o", 255), REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_binary = REPEAT("b", 255);
+SELECT col_1_binary = REPEAT("c", 255) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with VARCHAR data type , primary/seconday index , DML ops
+# and COMPRESSED row format. KEY_BLOCK_SIZE is varied as 2 , 4 , 8.
+
+# With KEY_BLOCK_SIZE = 2,prefix index limit comes around ~948 for following
+CREATE TABLE worklog5743_key2 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key2 (col_1_varchar (767));
+INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743_key2;
+UPDATE worklog5743_key2 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2
+WHERE col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key2 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key2;
+DROP TABLE worklog5743_key2;
+
+# With KEY_BLOCK_SIZE = 4,prefix index limit comes around ~1964 for following
+CREATE TABLE worklog5743_key4 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(1964))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key4 (col_1_varchar (767));
+INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743_key4;
+UPDATE worklog5743_key4 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key4
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key4 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key4;
+DROP TABLE worklog5743_key4;
+
+# With KEY_BLOCK_SIZE = 8,prefix index limit comes around ~3072 for following
+CREATE TABLE worklog5743_key8 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key8 (col_1_varchar (767));
+INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar  = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743_key8;
+UPDATE worklog5743_key8 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743_key8
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key8 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743_key8;
+DROP TABLE worklog5743_key8;
+
+# Prefix index with TEXT data type , primary/seconday index , DML ops
+# and COMPRESSED row format. KEY_BLOCK_SIZE is varied as 2 , 4 , 8.
+
+# With KEY_BLOCK_SIZE = 2,prefix index limit comes around ~948 for following
+CREATE TABLE worklog5743_key2 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key2 (col_1_text (767));
+INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743_key2;
+UPDATE worklog5743_key2 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key2
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key2 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key2;
+DROP TABLE worklog5743_key2;
+
+# With KEY_BLOCK_SIZE = 4,prefix index limit comes around ~1964 for following
+CREATE TABLE worklog5743_key4 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(1964))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key4 (col_1_text (767));
+INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743_key4;
+UPDATE worklog5743_key4 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key4
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key4 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key4;
+DROP TABLE worklog5743_key4;
+
+# With KEY_BLOCK_SIZE = 8,prefix index limit comes around ~3072 for following
+CREATE TABLE worklog5743_key8 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key8 (col_1_text (767));
+INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text  = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743_key8;
+UPDATE worklog5743_key8 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("b", 3500) FROM worklog5743_key8
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key8 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743_key8;
+DROP TABLE worklog5743_key8;
+
+# Prefix index with BLOB data type , primary/seconday index , DML ops
+# and COMPRESSED row format. KEY_BLOCK_SIZE is varied as 2 , 4 , 8.
+
+# With KEY_BLOCK_SIZE = 2,prefix index limit comes around ~948 for following
+CREATE TABLE worklog5743_key2 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key2 (col_1_blob (767));
+INSERT INTO worklog5743_key2 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743_key2;
+UPDATE worklog5743_key2 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key2
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+INSERT INTO worklog5743_key2 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key2 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key2;
+DROP TABLE worklog5743_key2;
+
+# With KEY_BLOCK_SIZE = 4,prefix index limit comes around ~1964 for following
+CREATE TABLE worklog5743_key4 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(1964))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4, engine = innodb;
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key4 (col_1_blob (767));
+INSERT INTO worklog5743_key4 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743_key4;
+UPDATE worklog5743_key4 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key4
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+INSERT INTO worklog5743_key4 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key4 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key4;
+DROP TABLE worklog5743_key4;
+
+# With KEY_BLOCK_SIZE = 8,prefix index limit comes around ~3072 for following
+CREATE TABLE worklog5743_key8 (
+col_1_blob BLOB (4000) , col_2_blob BLOB (4000) ,
+PRIMARY KEY (col_1_blob(3072))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=8, engine = innodb;
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+#CREATE INDEX prefix_idx ON worklog5743_key8 (col_1_blob (767));
+INSERT INTO worklog5743_key8 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_blob  = REPEAT("a", 4000) , col_2_blob = REPEAT("o", 4000)
+FROM worklog5743_key8;
+UPDATE worklog5743_key8 SET col_1_blob = REPEAT("c", 4000)
+WHERE col_1_blob = REPEAT("a", 4000) AND col_2_blob = REPEAT("o", 4000);
+SELECT col_1_blob = REPEAT("b", 3500) FROM worklog5743_key8
+WHERE col_1_blob = REPEAT("c", 4000) AND col_2_blob = REPEAT("o", 4000);
+INSERT INTO worklog5743_key8 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743_key8 WHERE col_1_blob = REPEAT("b", 4000);
+SELECT col_1_blob = REPEAT("c", 4000) FROM worklog5743_key8;
+DROP TABLE worklog5743_key8;
+
+
+#------------------------------------------------------------------------------
+# Create mutiple prefix index. We can not create prefix index length > 16K
+# as index is written in undo log page which of 16K size.
+# So we can create max 5 prefix index of length 3072 on table
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
+col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
+col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+
+# Update hangs if we create following 5 indexes. Uncomment them once its fix
+# Bug#12547647 - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
+#CREATE INDEX prefix_idx1 ON worklog5743(col_1_varbinary (3072));
+#CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (3072));
+#CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
+#CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
+#CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
+
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Create mutiple prefix index. We can not create prefix index length > 16K as
+# we write in undo log page which of 16K size.
+# so we can create max 5 prefix index of length 3072 on table.
+# Similar to above case but with transactions
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varchar VARCHAR (4000) ,
+col_3_text TEXT (4000), col_4_blob BLOB (4000),col_5_text TEXT (4000),
+col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+
+
+# Update hangs if we create following 5 indexes. Uncomment them once its fix
+CREATE INDEX prefix_idx1 ON worklog5743(col_1_varbinary (3072));
+CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (3072));
+CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (3072));
+CREATE INDEX prefix_idx4 ON worklog5743(col_4_blob (3072));
+CREATE INDEX prefix_idx5 ON worklog5743(col_5_text (3072));
+
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+ROLLBACK;
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+COMMIT;
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+ROLLBACK;
+# Uncomment Update fater Bug#12547647 is fixed - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
+# Bug#12547647 - UPDATE LOGGING COULD EXCEED LOG PAGE SIZE
+#UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+#WHERE col_1_varbinary = REPEAT("a", 4000)
+#AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with utf8 charset
+# utf8 charcter takes 3 bytes in mysql so prefix index limit is 3072/3 = 1024
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) CHARACTER SET 'utf8',
+col_2_text TEXT (4000) CHARACTER SET 'utf8',
+PRIMARY KEY (col_1_text(1024))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+# Prefix index with utf8 charset + varchar.
+# For varchar we also log the column itself as oppose of TEXT so it error
+# with limit 1024 due to overhead.
+--replace_regex /> [0-9]*/> max_row_size/
+-- error 1118
+CREATE TABLE worklog5743 (col_1_varchar VARCHAR (4000) CHARACTER SET 'utf8',
+col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8' ,
+PRIMARY KEY (col_1_varchar(1024))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+
+#------------------------------------------------------------------------------
+# prefinx index on utf8 charset with transaction
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) ,
+col_2_varchar VARCHAR (4000) CHARACTER SET 'utf8',
+col_3_text TEXT (4000) CHARACTER SET 'utf8',
+col_4_blob BLOB (4000),col_5_text TEXT (4000),
+col_6_varchar VARCHAR (4000), col_7_binary BINARY (255)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+
+
+CREATE INDEX prefix_idx2 ON worklog5743(col_2_varchar (500));
+CREATE INDEX prefix_idx3 ON worklog5743(col_3_text (500));
+
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+ROLLBACK;
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) ,  REPEAT("a", 255)
+);
+COMMIT;
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+ROLLBACK;
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000),
+REPEAT("a", 4000) , REPEAT("o", 4000), REPEAT("a", 4000),
+REPEAT("a", 4000) , REPEAT("a", 255)
+);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("b", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with utf8 charset on TEXT data type with actual utf8 character
+# like "स" and "क"
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) CHARACTER SET 'utf8',
+col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(1024))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("स", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (1024));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("स", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("क", 4000)
+WHERE col_1_text = REPEAT("स", 4000) AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("b", 4000);
+SELECT col_1_text = REPEAT("क", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with transaction when 2 client are ruuning there transaction
+# in different sessions.With ISOLATION LEVEL as REPEATABLE READ and
+# READ UNCOMMITTED.
+CREATE TABLE worklog5743 (
+col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+
+--echo "In connection 1"
+--connect (con1,localhost,root,,)
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+
+
+--echo "In connection 2"
+--connect (con2,localhost,root,,)
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
+# Uncomment after Bug#12552164 - TRANSACTION CAN NOT SEE OLD VERSION ROWS THAT
+# BEING UPDATED
+#UPDATE worklog5743 SET col_1_varchar = REPEAT("d", 200) WHERE col_1_varchar =
+#REPEAT("a", 200) AND col_2_varchar = REPEAT("o", 200);
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+
+
+--echo "In connection 1"
+--connection con1
+select @@session.tx_isolation;
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+
+START TRANSACTION;
+
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+
+--echo "In connection 2"
+--connection con2
+COMMIT;
+# Wait for commit
+let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist
+WHERE info='COMMIT';
+--source include/wait_condition.inc 
+
+--echo "In connection 1"
+--connection con1
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+COMMIT;
+
+--connection default
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Prefix index with transaction when 2 client are ruuning there transaction
+# in different sessions.With ISOLATION LEVEL as REPEATABLE READ and
+# READ UNCOMMITTED. Same as above case but con2 starts tnx before con1
+
+CREATE TABLE worklog5743 (
+col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+
+--echo "In connection 1"
+--connection con1
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+START TRANSACTION;
+
+
+--echo "In connection 2"
+--connection con2
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+COMMIT;
+# Wait for commit
+let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist
+WHERE info='COMMIT';
+--source include/wait_condition.inc 
+
+
+--echo "In connection 1"
+--connection con1
+SET SESSION TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;
+select @@session.tx_isolation;
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SET SESSION TRANSACTION ISOLATION LEVEL REPEATABLE READ;
+
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+COMMIT;
+
+--connection default
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+
+# Prefix index with transaction when 2 client are ruuning there transaction
+# in different sessions.With ISOLATION LEVEL as REPEATABLE READ and
+# READ UNCOMMITTED. Same as above cases but with ROLLBACK
+
+CREATE TABLE worklog5743 (
+col_1_text TEXT(4000) , col_2_text TEXT(4000) ,
+PRIMARY KEY (col_1_text(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 200) , REPEAT("o", 200));
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+
+--echo "In connection 1"
+--connection con1
+SELECT col_1_text = REPEAT("a", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+START TRANSACTION;
+
+
+--echo "In connection 2"
+--connection con2
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("b", 200) , REPEAT("o", 200));
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("a", 200);
+SELECT col_1_text = REPEAT("a", 200) , col_2_text  = REPEAT("o", 200) FROM
+worklog5743;
+ROLLBACK;
+# Wait for rollback
+let $wait_condition=SELECT COUNT(*)=0 FROM information_schema.processlist
+WHERE info='COMMIT';
+--source include/wait_condition.inc 
+
+
+--echo "In connection 1"
+--connection con1
+SELECT col_1_text = REPEAT("b", 200) , col_2_text = REPEAT("o", 200) FROM
+worklog5743;
+SELECT COUNT(*) FROM worklog5743;
+COMMIT;
+
+--disconnect con1
+--disconnect con2
+
+--connection default
+DROP TABLE worklog5743;
+
+
+#------------------------------------------------------------------------------
+# Select queries on prefix index column as index will be used in queries.
+# Use few select functions , join condition , subqueries.
+
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+
+# Select with Join
+SELECT tbl1.col_1_varchar = tbl2.col_1_varchar
+FROM worklog5743 tbl1 , worklog5743 tbl2
+WHERE tbl1.col_1_varchar = tbl2.col_1_varchar ;
+
+# Select in subquey
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar NOT IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2) ;
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1 WHERE
+col_1_varchar IN (SELECT tbl2.col_1_varchar FROM worklog5743 tbl2)
+AND col_1_varchar = REPEAT("c", 4000);
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar in (
+SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
+WHERE tbl1.col_1_varchar != tbl2.col_1_varchar
+) ;
+SELECT tbl1.col_1_varchar = REPEAT("c", 4000) FROM worklog5743 tbl1
+WHERE col_1_varchar in (
+SELECT tbl2.col_1_varchar FROM worklog5743 tbl2
+WHERE tbl1.col_1_varchar = tbl2.col_1_varchar
+) ;
+
+# function
+SELECT
+REVERSE(col_1_varchar) = REPEAT("c", 4000) ,
+REVERSE(REVERSE(col_1_varchar)) = REPEAT("c", 4000)
+FROM worklog5743;
+SELECT
+UPPER(col_1_varchar) = REPEAT("c", 4000) ,
+UPPER(col_1_varchar) = REPEAT("C", 4000) ,
+LOWER(UPPER(col_1_varchar)) = REPEAT("c", 4000)
+FROM worklog5743;
+SELECT
+col_1_varchar = REPEAT("c", 4000)
+FROM worklog5743 WHERE col_1_varchar like '%c__%';
+SELECT SUBSTRING(INSERT(col_1_varchar, 1, 4, 'kkkk'),1,10) FROM worklog5743 ;
+SELECT CONCAT(SUBSTRING(col_1_varchar,-5,3),'append') FROM worklog5743 ;
+
+
+DROP TABLE worklog5743;
+
+#------------------------------------------------------------------------------
+# Prefix index with NULL values
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) ,
+col_2_varchar VARCHAR (4000) ,
+UNIQUE INDEX (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)), REPEAT("o", 4000));
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
+INSERT INTO worklog5743 VALUES(NULL,NULL);
+INSERT INTO worklog5743 VALUES(NULL,NULL);
+# check IS
+SELECT COLUMN_NAME,INDEX_NAME,SUB_PART,INDEX_TYPE
+FROM INFORMATION_SCHEMA.STATISTICS WHERE table_name = 'worklog5743' ;
+SELECT col_1_varchar FROM worklog5743 WHERE col_1_varchar IS NULL;
+SELECT col_1_varchar = concat(REPEAT("a", 2000),REPEAT("b", 2000))
+FROM worklog5743 WHERE col_1_varchar IS NOT NULL ORDER BY 1;
+
+
+DROP TABLE worklog5743;
+
+# -----------------------------------------------------------------------------
+#  Try drop and add secondary prefix index
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+# Create index
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+# Drop index
+DROP INDEX prefix_idx ON worklog5743;
+
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+# Again add index
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+# -----------------------------------------------------------------------------
+
+#  Try drop and add primary prefix index
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+# Create index
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+# Drop index
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000)
+AND col_2_varchar = REPEAT("o", 4000);
+# Again add index
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
+
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+--error 1062
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+# -----------------------------------------------------------------------------
+
+#  Try drop and add both (primary/secondary) prefix index
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY `prefix_primary` (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+# Create index
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+# Drop primary index
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+# Drop secondary index
+DROP INDEX prefix_idx ON worklog5743;
+
+SELECT col_1_varchar = REPEAT("a", 4000) , col_2_varchar = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varchar = REPEAT("c", 4000)
+WHERE col_1_varchar = REPEAT("a", 4000) AND col_2_varchar = REPEAT("o", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varchar = REPEAT("c", 4000) AND col_2_varchar = REPEAT("o", 4000);
+# Again add index
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar(3072));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+--error 1062
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+DELETE FROM worklog5743 WHERE col_1_varchar = REPEAT("b", 4000);
+SELECT col_1_varchar = REPEAT("c", 4000) FROM worklog5743;
+DROP TABLE worklog5743;
+
+
+# -----------------------------------------------------------------------------
+# Drop index from differnt session
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR(4000) , col_2_varchar VARCHAR(4000) ,
+PRIMARY KEY (col_1_varchar (3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("c", 3500) , REPEAT("o", 3500));
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (3072));
+
+# Start new session
+--connect (con1,localhost,root,,)
+
+
+--echo " Switching to con1 connection For select "
+--connection con1
+SELECT col_1_varchar = REPEAT("c", 3500) , col_2_varchar = REPEAT("o", 3500)
+FROM worklog5743;
+
+--echo " Switching to default connection For DMLs "
+--connection default
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 3500) , REPEAT("o", 3500));
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
+WHERE col_2_varchar = REPEAT("o", 3500);
+COMMIT;
+
+--echo " Switching to con1 connection For Dropping index and some DMLs "
+--connection con1
+START TRANSACTION;
+INSERT INTO worklog5743 VALUES(REPEAT("k", 3500),REPEAT("p", 3500));
+# Drop primary index
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+UPDATE worklog5743 SET col_1_varchar  = REPEAT("b", 3500)
+WHERE col_1_varchar = REPEAT("a", 3500)
+AND col_2_varchar = REPEAT("o", 3500);
+SELECT col_1_varchar = REPEAT("b", 3500) FROM worklog5743
+WHERE col_2_varchar = REPEAT("o", 3500);
+
+--echo " Switching to default connection For DELETE "
+--connection default
+DELETE FROM worklog5743 WHERE col_1_varchar  = REPEAT("b", 3500);
+SELECT col_1_varchar = REPEAT("a", 3500) FROM worklog5743
+WHERE col_2_varchar = REPEAT("p", 3500);
+
+--echo " Switching to con1 connection to commit changes "
+--connection con1
+COMMIT;
+
+--echo " Switching to default connection to drop and end sub-test "
+--connection default
+DROP TABLE worklog5743;
+
+
+
+# -----------------------------------------------------------------------------
+#  Create prefix index with length < 3072 , length = 3072 , length > 3072
+# - varbinary data type + secondary index
+CREATE TABLE worklog5743 (
+col_1_varbinary VARBINARY (4000) , col_2_varbinary VARBINARY (4000) ,
+PRIMARY KEY (col_1_varbinary(3072))) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+# Create index of 3072
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) , col_2_varbinary = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+# Drop index
+DROP INDEX prefix_idx ON worklog5743;
+SELECT col_1_varbinary = REPEAT("b", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("b", 4000)
+AND col_2_varbinary = REPEAT("p", 4000);
+
+
+# Again add index length < 3072
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (2000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+# Drop index
+DROP INDEX prefix_idx ON worklog5743;
+
+# Again add index length > 3072.
+# If "innodb_large_prefix" is turned on, than the index prefix larger than 3072
+# will be truncated to 3072. If the table is REDUNDANT and COMPACT, which does
+# not support prefix > 767, the create index will be rejected. 
+CREATE INDEX prefix_idx ON worklog5743(col_1_varbinary (4000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_varbinary = REPEAT("a", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_varbinary = REPEAT("c", 4000)
+WHERE col_1_varbinary = REPEAT("a", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_varbinary = REPEAT("c", 4000);
+SELECT col_1_varbinary = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_varbinary = REPEAT("c", 4000)
+AND col_2_varbinary = REPEAT("o", 4000);
+
+
+DROP TABLE worklog5743;
+
+# -----------------------------------------------------------------------------
+# Create prefix index with length < 3072 , length = 3072 , length > 3072
+#  text data type + secondary index
+CREATE TABLE worklog5743 (col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(500))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+# Create index of 3072
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (3072));
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000)
+FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+# Drop index
+DROP INDEX prefix_idx ON worklog5743;
+SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("b", 4000) AND col_2_text = REPEAT("p", 4000);
+
+# Again add index length < 3072
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (1000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+# Drop index
+DROP INDEX prefix_idx ON worklog5743;
+
+# Again add index length > 3072. Expect error.Length exceeds maximum supported
+# key length
+# Again add index length > 3072.
+# If "innodb_large_prefix" is turned on, than the index prefix larger than 3072
+# will be truncated to 3072. If the table is REDUNDANT and COMPACT, which does
+# not support prefix > 767, the create index will be rejected.
+CREATE INDEX prefix_idx ON worklog5743(col_1_text (4000));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000) AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000) AND col_2_text = REPEAT("o", 4000);
+
+DROP TABLE worklog5743;
+
+
+# -----------------------------------------------------------------------------
+# Create prefix index with length < 948 , length = 948 , length > 948
+# For compressed row type + primary key
+CREATE TABLE worklog5743 (
+col_1_text TEXT (4000) , col_2_text TEXT (4000) ,
+PRIMARY KEY (col_1_text(948))
+) ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2, engine = innodb;
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000) , REPEAT("o", 4000));
+# Create index of 767
+INSERT INTO worklog5743 VALUES(REPEAT("b", 4000) , REPEAT("p", 4000));
+SELECT col_1_text = REPEAT("a", 4000) , col_2_text = REPEAT("o", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+# Drop index
+#DROP INDEX prefix_idx ON worklog5743;
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+SELECT col_1_text = REPEAT("b", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("b", 4000)
+AND col_2_text = REPEAT("p", 4000);
+
+# Again add index length < 767
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (700));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+# Drop index
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+
+# Again add index length > 948. Expect error 'to big row ' due to exceed
+# in key length.  
+-- error 139
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_text (950));
+INSERT INTO worklog5743 VALUES(REPEAT("a", 4000),REPEAT("o", 4000));
+SELECT col_1_text = REPEAT("a", 4000) FROM worklog5743;
+UPDATE worklog5743 SET col_1_text = REPEAT("c", 4000)
+WHERE col_1_text = REPEAT("a", 4000)
+AND col_2_text = REPEAT("o", 4000);
+DELETE FROM worklog5743 WHERE col_1_text = REPEAT("c", 4000);
+SELECT col_1_text = REPEAT("c", 4000) FROM worklog5743
+WHERE col_1_text = REPEAT("c", 4000)
+AND col_2_text = REPEAT("o", 4000);
+
+DROP TABLE worklog5743;
+
+# -----------------------------------------------------------------------------
+#  Create prefix index with length < 3072 , length = 3072 , length > 3072
+# data types VARCHAR
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (900));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+# Again add index length > 3072. Expect error.Length exceeds maximum supported
+# key length
+# Again add index length > 3072.
+# If "innodb_large_prefix" is turned on, than the index prefix larger than 3072
+# will be truncated to 3072. If the table is REDUNDANT and COMPACT, which does
+# not support prefix > 767, the create index will be rejected.
+# Index length is truncated only for 'create index' , but error if we add
+# prefix index with length > 3072
+--error ER_TOO_LONG_KEY
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_varchar (3073));
+DROP TABLE worklog5743;
+
+
+CREATE TABLE worklog5743 (
+col_1_BLOB BLOB (4000) , PRIMARY KEY (col_1_BLOB(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (500));
+ALTER TABLE worklog5743 DROP PRIMARY KEY;
+# Negative case
+# Again add index length > 3072. Expect error.Length exceeds maximum supported
+# key length
+# Index length is truncated only for 'create index' , but error if we add
+# prefix index with length > 3072
+--error ER_TOO_LONG_KEY
+ALTER TABLE worklog5743 ADD PRIMARY KEY (col_1_BLOB (3073));
+
+DROP TABLE worklog5743;
+
+# -----------------------------------------------------------------------------
+# Error on adding larger prefix if violates unique index.
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000)
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 1000),REPEAT("c", 1000)),
+REPEAT("o", 4000));
+INSERT INTO worklog5743
+VALUES(concat(REPEAT("a", 2000),REPEAT("b", 2000)), REPEAT("o", 4000));
+--error 1062
+ALTER TABLE worklog5743 ADD PRIMARY KEY `pk_idx` (col_1_varchar(3000));
+DROP TABLE worklog5743;
+
+# -----------------------------------------------------------------------------
+set global innodb_large_prefix=0;
+# Prefix index > 767 is allowed if innodb_large_prefix is set to 1
+--error ER_TOO_LONG_KEY
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(3072))
+) ROW_FORMAT=DYNAMIC, engine = innodb;
+
+
+# -----------------------------------------------------------------------------
+set global innodb_large_prefix=0;
+# Backward compatibility test - Index lenghth > 767 is truncated for REDUNDANT
+# and COMPACT
+CREATE TABLE worklog5743 (
+col_1_varchar VARCHAR (4000) , col_2_varchar VARCHAR (4000) ,
+PRIMARY KEY (col_1_varchar(767))
+) engine = innodb;
+# Prefix index > 767 is truncated with REDUNDANT and COMPACT 
+CREATE INDEX prefix_idx ON worklog5743(col_1_varchar (1000));
+DROP TABLE worklog5743;
+#------------------------------------------------------------------------------
+
+eval SET GLOBAL innodb_file_format=$innodb_file_format_orig;
+eval SET GLOBAL innodb_file_per_table=$innodb_file_per_table_orig;
+eval SET GLOBAL innodb_large_prefix=$innodb_large_prefix_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb-zip.test mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb-zip.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/innodb_zip/t/innodb-zip.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/innodb_zip/t/innodb-zip.test	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,342 @@
+-- source include/have_innodb.inc
+
+let $per_table=`select @@innodb_file_per_table`;
+let $format=`select @@innodb_file_format`;
+let $innodb_strict_mode_orig=`select @@session.innodb_strict_mode`;
+
+set session innodb_strict_mode=0;
+set global innodb_file_per_table=off;
+set global innodb_file_format=`0`;
+ 
+create table t0(a int primary key) engine=innodb row_format=compressed;
+create table t00(a int primary key) engine=innodb
+key_block_size=4 row_format=compressed;
+create table t1(a int primary key) engine=innodb row_format=dynamic;
+create table t2(a int primary key) engine=innodb row_format=redundant;
+create table t3(a int primary key) engine=innodb row_format=compact;
+create table t4(a int primary key) engine=innodb key_block_size=9;
+create table t5(a int primary key) engine=innodb
+key_block_size=1 row_format=redundant;
+
+set global innodb_file_per_table=on;
+create table t6(a int primary key) engine=innodb
+key_block_size=1 row_format=redundant;
+set global innodb_file_format=`1`;
+create table t7(a int primary key) engine=innodb
+key_block_size=1 row_format=redundant;
+create table t8(a int primary key) engine=innodb
+key_block_size=1 row_format=fixed;
+create table t9(a int primary key) engine=innodb
+key_block_size=1 row_format=compact;
+create table t10(a int primary key) engine=innodb
+key_block_size=1 row_format=dynamic;
+create table t11(a int primary key) engine=innodb
+key_block_size=1 row_format=compressed;
+create table t12(a int primary key) engine=innodb
+key_block_size=1;
+create table t13(a int primary key) engine=innodb
+row_format=compressed;
+create table t14(a int primary key) engine=innodb key_block_size=9;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+
+drop table t0,t00,t2,t3,t4,t5,t6,t7,t8,t9,t10,t11,t12,t13,t14;
+alter table t1 key_block_size=0;
+alter table t1 row_format=dynamic;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+alter table t1 row_format=compact;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+alter table t1 row_format=redundant;
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+drop table t1;
+
+create table t1(a int not null, b text, index(b(10))) engine=innodb
+key_block_size=1;
+
+create table t2(b text)engine=innodb;
+insert into t2 values(concat('1abcdefghijklmnopqrstuvwxyz', repeat('A',5000)));
+
+insert into t1 select 1, b from t2;
+commit;
+
+connect (a,localhost,root,,);
+connect (b,localhost,root,,);
+
+connection a;
+begin;
+update t1 set b=repeat('B',100);
+
+connection b;
+select a,left(b,40) from t1 natural join t2;
+
+connection a;
+rollback;
+
+connection b;
+select a,left(b,40) from t1 natural join t2;
+
+connection default;
+disconnect a;
+disconnect b;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+drop table t1,t2;
+
+# The following should fail in non-strict mode too.
+# (The fix of Bug #50945 only affects REDUNDANT and COMPACT tables.)
+SET SESSION innodb_strict_mode = off;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE t1(
+	c TEXT NOT NULL, d TEXT NOT NULL,
+	PRIMARY KEY (c(767),d(767)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE t1(
+	c TEXT NOT NULL, d TEXT NOT NULL,
+	PRIMARY KEY (c(767),d(767)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=2 CHARSET=ASCII;
+CREATE TABLE t1(
+	c TEXT NOT NULL, d TEXT NOT NULL,
+	PRIMARY KEY (c(767),d(767)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=4 CHARSET=ASCII;
+drop table t1;
+--error ER_TOO_BIG_ROWSIZE
+CREATE TABLE t1(c TEXT, PRIMARY KEY (c(440)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+CREATE TABLE t1(c TEXT, PRIMARY KEY (c(438)))
+ENGINE=InnoDB ROW_FORMAT=COMPRESSED KEY_BLOCK_SIZE=1 CHARSET=ASCII;
+INSERT INTO t1 VALUES(REPEAT('A',512)),(REPEAT('B',512));
+DROP TABLE t1;
+
+#
+# Test blob column inheritance (mantis issue#36)
+#
+
+create table t1( c1 int not null, c2 blob, c3 blob, c4 blob,
+		primary key(c1, c2(22), c3(22)))
+		engine = innodb row_format = dynamic;
+begin;
+insert into t1 values(1, repeat('A', 20000), repeat('B', 20000),
+			repeat('C', 20000));
+
+update t1 set c3 = repeat('D', 20000) where c1 = 1;
+commit;
+
+# one blob column which is unchanged in update and part of PK
+# one blob column which is changed and part of of PK
+# one blob column which is not part of PK and is unchanged
+select count(*) from t1 where c2 = repeat('A', 20000);
+select count(*) from t1 where c3 = repeat('D', 20000);
+select count(*) from t1 where c4 = repeat('C', 20000);
+
+update t1 set c3 = repeat('E', 20000) where c1 = 1;
+drop table t1;
+
+#
+#
+# Test innodb_file_format
+#
+set global innodb_file_format=`0`;
+select @@innodb_file_format;
+set global innodb_file_format=`1`;
+select @@innodb_file_format;
+-- error ER_WRONG_VALUE_FOR_VAR
+set global innodb_file_format=`2`;
+-- error ER_WRONG_VALUE_FOR_VAR
+set global innodb_file_format=`-1`;
+set global innodb_file_format=`Antelope`;
+set global innodb_file_format=`Barracuda`;
+-- error ER_WRONG_VALUE_FOR_VAR
+set global innodb_file_format=`Cheetah`;
+-- error ER_WRONG_VALUE_FOR_VAR
+set global innodb_file_format=`abc`;
+-- error ER_WRONG_VALUE_FOR_VAR
+set global innodb_file_format=`1a`;
+-- error ER_WRONG_VALUE_FOR_VAR
+set global innodb_file_format=``;
+
+#test strict mode.
+# this does not work anymore, has been removed from mysqltest
+# -- enable_errors
+set global innodb_file_per_table = on;
+set global innodb_file_format = `1`;
+
+set innodb_strict_mode = off;
+create table t1 (id int primary key) engine = innodb key_block_size = 0;
+drop table t1;
+
+#set strict_mode
+set innodb_strict_mode = on;
+
+#Test different values of KEY_BLOCK_SIZE
+
+create table t1 (id int primary key) engine = innodb key_block_size = 0;
+
+--error ER_CANT_CREATE_TABLE
+create table t2 (id int primary key) engine = innodb key_block_size = 9;
+show warnings;
+
+
+create table t3 (id int primary key) engine = innodb key_block_size = 1;
+create table t4 (id int primary key) engine = innodb key_block_size = 2;
+create table t5 (id int primary key) engine = innodb key_block_size = 4;
+create table t6 (id int primary key) engine = innodb key_block_size = 8;
+create table t7 (id int primary key) engine = innodb key_block_size = 16;
+
+#check various ROW_FORMAT values.
+create table t8 (id int primary key) engine = innodb row_format = compressed;
+create table t9 (id int primary key) engine = innodb row_format = dynamic;
+create table t10(id int primary key) engine = innodb row_format = compact;
+create table t11(id int primary key) engine = innodb row_format = redundant;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+drop table t1, t3, t4, t5, t6, t7, t8, t9, t10, t11;
+
+#test different values of ROW_FORMAT with KEY_BLOCK_SIZE
+create table t1 (id int primary key) engine = innodb
+key_block_size = 8 row_format = compressed;
+
+--error ER_CANT_CREATE_TABLE
+create table t2 (id int primary key) engine = innodb
+key_block_size = 8 row_format = redundant;
+show warnings;
+
+--error ER_CANT_CREATE_TABLE
+create table t3 (id int primary key) engine = innodb
+key_block_size = 8 row_format = compact;
+show warnings;
+
+--error ER_CANT_CREATE_TABLE
+create table t4 (id int primary key) engine = innodb
+key_block_size = 8 row_format = dynamic;
+show warnings;
+
+create table t5 (id int primary key) engine = innodb
+key_block_size = 8 row_format = default;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+drop table t1, t5;
+
+#test multiple errors
+--error ER_CANT_CREATE_TABLE
+create table t1 (id int primary key) engine = innodb
+key_block_size = 9 row_format = redundant;
+show warnings;
+
+--error ER_CANT_CREATE_TABLE
+create table t2 (id int primary key) engine = innodb
+key_block_size = 9 row_format = compact;
+show warnings;
+
+--error ER_CANT_CREATE_TABLE
+create table t2 (id int primary key) engine = innodb
+key_block_size = 9 row_format = dynamic;
+show warnings;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+
+#test valid values with innodb_file_per_table unset
+set global innodb_file_per_table = off;
+
+--error ER_CANT_CREATE_TABLE
+create table t1 (id int primary key) engine = innodb key_block_size = 1;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t2 (id int primary key) engine = innodb key_block_size = 2;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t3 (id int primary key) engine = innodb key_block_size = 4;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t4 (id int primary key) engine = innodb key_block_size = 8;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t5 (id int primary key) engine = innodb key_block_size = 16;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t6 (id int primary key) engine = innodb row_format = compressed;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t7 (id int primary key) engine = innodb row_format = dynamic;
+show warnings;
+create table t8 (id int primary key) engine = innodb row_format = compact;
+create table t9 (id int primary key) engine = innodb row_format = redundant;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+drop table t8, t9;
+
+#test valid values with innodb_file_format unset
+set global innodb_file_per_table = on;
+set global innodb_file_format = `0`; 
+
+--error ER_CANT_CREATE_TABLE
+create table t1 (id int primary key) engine = innodb key_block_size = 1;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t2 (id int primary key) engine = innodb key_block_size = 2;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t3 (id int primary key) engine = innodb key_block_size = 4;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t4 (id int primary key) engine = innodb key_block_size = 8;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t5 (id int primary key) engine = innodb key_block_size = 16;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t6 (id int primary key) engine = innodb row_format = compressed;
+show warnings;
+--error ER_CANT_CREATE_TABLE
+create table t7 (id int primary key) engine = innodb row_format = dynamic;
+show warnings;
+create table t8 (id int primary key) engine = innodb row_format = compact;
+create table t9 (id int primary key) engine = innodb row_format = redundant;
+
+SELECT table_schema, table_name, row_format, data_length, index_length
+FROM information_schema.tables WHERE engine='innodb';
+drop table t8, t9;
+
+eval set global innodb_file_per_table=$per_table;
+eval set global innodb_file_format=$format;
+#
+# Testing of tablespace tagging
+#
+-- disable_info
+set global innodb_file_per_table=on;
+set global innodb_file_format=`Barracuda`;
+set global innodb_file_format_max=`Antelope`;
+create table normal_table (
+  c1 int
+) engine = innodb;
+select @@innodb_file_format_max;
+create table zip_table (
+  c1 int
+) engine = innodb key_block_size = 8;
+select @@innodb_file_format_max;
+set global innodb_file_format_max=`Antelope`;
+select @@innodb_file_format_max;
+-- disable_result_log
+show table status;
+-- enable_result_log
+select @@innodb_file_format_max;
+drop table normal_table, zip_table;
+-- disable_result_log
+
+#
+# restore environment to the state it was before this test execution
+#
+
+-- disable_query_log
+eval set global innodb_file_format=$format;
+eval set global innodb_file_per_table=$per_table;
+eval set session innodb_strict_mode=$innodb_strict_mode_orig;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/perfschema_stress/README mysql-5.5-5.5.43/mysql-test/suite/perfschema_stress/README
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/perfschema_stress/README	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/perfschema_stress/README	2015-02-27 08:30:35.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (c) 2009, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_4threads_deadlock.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,43 @@
+include/master-slave.inc
+[connection master]
+FLUSH LOGS;
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
+include/stop_slave.inc
+include/start_slave.inc
+"Wait_for dump_thread_signal"
+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
+SHOW BINARY LOGS;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
+PURGE BINARY LOGS BEFORE '9999-12-31';
+"Wait_for parked2"
+SET DEBUG_SYNC='now WAIT_FOR parked2';
+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
+SELECT * FROM information_schema.processlist;
+"Wait_for parked3"
+SET DEBUG_SYNC='now WAIT_FOR parked3';
+SET DEBUG_SYNC='now SIGNAL go';
+include/stop_slave.inc
+include/start_slave.inc
+"Wait_for dump_thread_signal"
+SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
+SHOW BINARY LOGS;
+"Wait_for parked1"
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
+PURGE BINARY LOGS BEFORE '9999-12-31';
+"Wait_for parked2"
+SET DEBUG_SYNC='now WAIT_FOR parked2';
+SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
+SHOW PROCESSLIST;
+"Wait_for parked3"
+SET DEBUG_SYNC='now WAIT_FOR parked3';
+SET DEBUG_SYNC='now SIGNAL go';
+"Cleanup"
+SET DEBUG_SYNC='RESET';
+SET GLOBAL DEBUG=@save_debug;
+include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_drop_db_fail.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_drop_db_fail.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_drop_db_fail.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_drop_db_fail.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,16 @@
+include/master-slave.inc
+[connection master]
+CREATE DATABASE IF NOT EXISTS db1;
+CREATE DATABASE IF NOT EXISTS db2;
+use db1;
+CREATE TABLE a(id INT);
+CREATE VIEW v AS SELECT * FROM a;
+CREATE TABLE table_father(id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20)) ENGINE=INNODB;
+use db2;
+CREATE TABLE table_child(id INT PRIMARY KEY, info VARCHAR(20), father_id INT) ENGINE=INNODB;
+ALTER TABLE table_child ADD CONSTRAINT aaa FOREIGN KEY (father_id) REFERENCES db1.table_father(id);
+DROP DATABASE db1;
+ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+DROP DATABASE db2;
+DROP DATABASE db1;
+include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_row_create_select.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_row_create_select.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_row_create_select.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_row_create_select.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,28 @@
+include/master-slave.inc
+[connection master]
+#
+# BUG#17994219: CREATE TABLE .. SELECT PRODUCES INVALID STRUCTURE, 
+#               BREAKS RBR 
+#
+#After the patch, the display width is set to a default
+#value of 21.
+CREATE TABLE t1 AS SELECT REPEAT('A', 1000) DIV 1 AS a;
+Warnings:
+Warning	1366	Incorrect decimal value: '' for column '' at row -1
+SHOW CREATE TABLE t1;
+Table	Create Table
+t1	CREATE TABLE `t1` (
+  `a` bigint(21) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a;
+Warnings:
+Warning	1366	Incorrect decimal value: '' for column '' at row -1
+SHOW CREATE TABLE t2;
+Table	Create Table
+t2	CREATE TABLE `t2` (
+  `a` bigint(21) DEFAULT NULL
+) ENGINE=MyISAM DEFAULT CHARSET=latin1
+#After the patch, no error is reported.
+DROP TABLE t1;
+DROP TABLE t2;
+include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_semi_sync.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_semi_sync.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_semi_sync.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_semi_sync.result	2015-02-27 08:30:35.000000000 +0000
@@ -386,6 +386,7 @@
 include/stop_slave.inc
 [ on master ]
 set sql_log_bin=0;
+include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 set sql_log_bin=1;
 SHOW VARIABLES LIKE 'rpl_semi_sync_master_enabled';
@@ -439,9 +440,8 @@
 #
 # Clean up
 #
+include/uninstall_semisync.inc
 include/stop_slave.inc
-UNINSTALL PLUGIN rpl_semi_sync_slave;
-UNINSTALL PLUGIN rpl_semi_sync_master;
 change master to master_user='root',master_password='';
 include/start_slave.inc
 drop table t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_semi_sync_uninstall_plugin.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,36 @@
+include/master-slave.inc
+[connection master]
+INSTALL PLUGIN rpl_semi_sync_master SONAME 'SEMISYNC_MASTER_PLUGIN';
+INSTALL PLUGIN rpl_semi_sync_slave SONAME 'SEMISYNC_SLAVE_PLUGIN';
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+UNINSTALL PLUGIN rpl_semi_sync_master;
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (1);
+DROP TABLE t1;
+include/install_semisync.inc
+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+ERROR HY000: Unknown error
+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
+UNINSTALL PLUGIN rpl_semi_sync_master;
+ERROR HY000: Unknown error
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (2);
+DROP TABLE t1;
+include/assert.inc [semi sync slave status should be ON.]
+include/assert.inc [semi sync master status should be ON.]
+include/assert.inc [semi sync master clients should be 1.]
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+include/assert.inc [semi sync master clients should be 1.]
+UNINSTALL PLUGIN rpl_semi_sync_master;
+ERROR HY000: Unknown error
+include/stop_slave.inc
+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
+include/start_slave.inc
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+include/assert.inc [semi sync master clients should be 0.]
+UNINSTALL PLUGIN rpl_semi_sync_master;
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (3);
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_special_charset.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_special_charset.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_special_charset.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_special_charset.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,7 @@
+include/master-slave.inc
+[connection master]
+CREATE TABLE t1(i VARCHAR(20));
+INSERT INTO t1 VALUES (0xFFFF);
+include/diff_tables.inc [master:t1, slave:t1]
+DROP TABLE t1;
+include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_stop_slave.result mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_stop_slave.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/r/rpl_stop_slave.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/r/rpl_stop_slave.result	2015-02-27 08:30:35.000000000 +0000
@@ -93,10 +93,12 @@
 CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
 CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
 INSERT INTO t1 VALUES(1, 1);
+include/stop_slave.inc
 [connection master]
+include/stop_dump_threads.inc
 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
 [connection slave]
-include/restart_slave.inc
+include/start_slave.inc
 BEGIN;
 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
 [connection master]
@@ -115,8 +117,11 @@
 [connection slave]
 include/wait_for_slave_to_stop.inc
 [connection slave1]
+[connection master]
+SET GLOBAL debug= '$debug_save';
+include/stop_dump_threads.inc
+[connection slave1]
 include/start_slave.inc
 [connection master]
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
 include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_4threads_deadlock.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,117 @@
+###############################################################################
+# Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+#                        SHOW BINLOGS
+# Problem:  A deadlock was occuring when 4 threads were involved in acquiring
+#                locks
+#     Thread 1: Dump thread ( Slave is reconnecting, so on Master, a new dump
+#                    thread is trying kill zombie dump threads. It acquired
+#                    thread's LOCK_thd_data and it is about to acquire
+#                    mysys_var->current_mutex ( which LOCK_log)
+#     Thread 2: Application thread is executing show binlogs and acquired
+#                    LOCK_log and it is about to acquire LOCK_index.
+#     Thread 3: Applicaiton thread is executing Purge binary logs and acquired
+#                    LOCK_index and it is about to acquire LOCK_thread_count.
+#     Thread 4: Application thread is executing show processlist and acquired
+#                    LOCK_thread_count and it is about to acquire zombie dump
+#                    thread's LOCK_thd_data.
+#     Deadlock : Thread 1 -> Thread 2 -> Thread 3-> Thread 4 -> Thread 1
+# The same above deadlock was observed when thread 4 is replaced with another
+# thread which is executing 'SELECT * FROM information_schema.processlist'
+# command and acquired LOCK_thread_count and it is about to acquire zombie
+# dump thread's LOCK_thd_data.
+# Fix: Introuced a new lock (Lock_thread_remove) which will guard the thread
+# deletion (exit process) and the same lock is used in show processlist
+# execution instead of LOCK_thread_count. i.e., After the patch, Server allows
+# new threads to join the system but it will not any threads to execute its
+# 'cleanup' process.  Now the new lock order is: LOCK_thread_remove ->
+# LOCK_thd_data -> LOCK_log -> LOCK_index -> LOCK_thread_count Both the above
+# scenarios are tested with the below test code and it proves that there is no
+# deadlock after the fix.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+connect(master2,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect(master3,127.0.0.1,root,,test,$MASTER_MYPORT,);
+--connection master
+# Create atleast one binary log, otherwise purge logs command, show binary
+# logs command do not hit the DEBUG_SYNC points.
+FLUSH LOGS;
+SET @save_debug=@@global.debug;
+SET GLOBAL DEBUG='+d,before_dump_thread_acquires_current_mutex,processlist_acquiring_dump_threads_LOCK_thd_data';
+
+# Iteration 1 with "SHOW PROCESSLIST command"
+# Iteration 2 with "SELECT * FROM information_schema.processlist"
+--let $iter=2
+while ($iter)
+{
+  --connection slave
+  --source include/stop_slave.inc
+  --source include/start_slave.inc
+  # Thread 1
+  --connection master
+  --echo "Wait_for dump_thread_signal"
+  SET DEBUG_SYNC='now WAIT_FOR dump_thread_signal';
+
+  # Thread 2
+  --connection master1
+  SET DEBUG_SYNC='show_binlogs_after_lock_log_before_lock_index SIGNAL parked1 WAIT_FOR go';
+  --send SHOW BINARY LOGS
+
+  --connection master
+  echo "Wait_for parked1";
+  SET DEBUG_SYNC='now WAIT_FOR parked1';
+
+  # Thread 3
+  --connection master2
+  SET DEBUG_SYNC='purge_logs_after_lock_index_before_thread_count SIGNAL parked2 WAIT_FOR go';
+  --send PURGE BINARY LOGS BEFORE '9999-12-31'
+
+  --connection master
+  echo "Wait_for parked2";
+  SET DEBUG_SYNC='now WAIT_FOR parked2';
+
+  # Thread 4
+  --connection master3
+  SET DEBUG_SYNC='processlist_after_LOCK_thd_count_before_LOCK_thd_data SIGNAL parked3 WAIT_FOR go';
+  if ($iter == 1)
+  {
+    --let $query=SHOW PROCESSLIST
+  }
+  if ($iter == 2)
+  {
+    --let $query=SELECT * FROM information_schema.processlist
+  }
+  --send_eval $query
+
+  --connection master
+  echo "Wait_for parked3";
+  SET DEBUG_SYNC='now WAIT_FOR parked3';
+
+  --connection master
+  SET DEBUG_SYNC='now SIGNAL go';
+
+  # Output of each command vary depends on other tests ran in suite(output vary
+  # in Pb2 runs), so lets ignore output. Anyways, we are interested in seeing
+  # that there is no deadlock.
+  --disable_result_log
+  --connection master1
+  --reap
+  --connection master2
+  --reap
+  --connection master3
+  --reap
+  --enable_result_log
+
+  --dec $iter
+}
+
+--echo "Cleanup"
+--disconnect master2
+--disconnect master3
+
+--connection master
+SET DEBUG_SYNC='RESET';
+SET GLOBAL DEBUG=@save_debug;
+source include/rpl_end.inc;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_drop_db_fail.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_drop_db_fail.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_drop_db_fail.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_drop_db_fail.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,33 @@
+###############################################################################
+# Bug#20041860: SLAVE ERROR WHEN DROP DATABASE
+#
+# Test:
+# =====
+# Create two databases such that one database has a dependency over the other
+# database and try to drop the database which has a dependency. This should
+# not cause slave to break.
+###############################################################################
+--source include/master-slave.inc
+
+connection master;
+CREATE DATABASE IF NOT EXISTS db1;
+CREATE DATABASE IF NOT EXISTS db2;
+
+use db1;
+CREATE TABLE a(id INT);
+CREATE VIEW v AS SELECT * FROM a;
+CREATE TABLE table_father(id INT AUTO_INCREMENT PRIMARY KEY, name VARCHAR(20)) ENGINE=INNODB;
+--sync_slave_with_master
+
+connection master;
+use db2;
+CREATE TABLE table_child(id INT PRIMARY KEY, info VARCHAR(20), father_id INT) ENGINE=INNODB;
+ALTER TABLE table_child ADD CONSTRAINT aaa FOREIGN KEY (father_id) REFERENCES db1.table_father(id);
+
+--error ER_ROW_IS_REFERENCED
+DROP DATABASE db1;
+DROP DATABASE db2;
+--sync_slave_with_master
+--connection master
+DROP DATABASE db1;
+--source include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_heartbeat_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -363,13 +363,11 @@
 --connection master
 DELETE FROM t1;
 DROP EVENT e1;
+--sync_slave_with_master
 --echo
 
 
-
-
 # Check received heartbeat events while logs flushed on slave
---connection slave
 --echo *** Flush logs on slave ***
 STOP SLAVE;
 RESET SLAVE;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_row_create_select.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_row_create_select.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_row_create_select.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_row_create_select.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,28 @@
+# Testing table creations for row-based replication.
+
+--source include/have_binlog_format_row.inc
+--source include/master-slave.inc
+
+--echo #
+--echo # BUG#17994219: CREATE TABLE .. SELECT PRODUCES INVALID STRUCTURE, 
+--echo #               BREAKS RBR 
+--echo #
+
+connection master;
+--echo #After the patch, the display width is set to a default
+--echo #value of 21.
+CREATE TABLE t1 AS SELECT REPEAT('A', 1000) DIV 1 AS a;
+SHOW CREATE TABLE t1;
+
+CREATE TABLE t2 AS SELECT CONVERT(REPEAT('A', 255) USING UCS2) DIV 1 AS a;
+SHOW CREATE TABLE t2;
+
+--echo #After the patch, no error is reported.
+sync_slave_with_master;
+
+connection master;
+DROP TABLE t1;
+DROP TABLE t2;
+
+--source include/rpl_end.inc
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync.test	2015-02-27 08:30:35.000000000 +0000
@@ -545,6 +545,7 @@
 connection master;
 echo [ on master ];
 set sql_log_bin=0;
+--source include/stop_dump_threads.inc
 UNINSTALL PLUGIN rpl_semi_sync_master;
 set sql_log_bin=1;
 enable_query_log;
@@ -598,19 +599,10 @@
 --echo #
 --echo # Clean up
 --echo #
+--source include/uninstall_semisync.inc
 
 connection slave;
 source include/stop_slave.inc;
-UNINSTALL PLUGIN rpl_semi_sync_slave;
-
-connection master;
-# The dump thread may still be running on the master, and so the following
-# UNINSTALL could generate a warning about the plugin is busy.
-disable_warnings;
-UNINSTALL PLUGIN rpl_semi_sync_master;
-enable_warnings;
-
-connection slave;
 change master to master_user='root',master_password='';
 source include/start_slave.inc;
 
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-master.opt	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin-slave.opt	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1 @@
+$SEMISYNC_PLUGIN_OPT
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_semi_sync_uninstall_plugin.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,145 @@
+###############################################################################
+# Bug#17638477 UNINSTALL AND INSTALL SEMI-SYNC PLUGIN CAUSES SLAVES TO BREAK
+#  Problem: Uninstallation of Semi sync plugin should be blocked when it is
+#  in use.
+#  Test case: Uninstallation of semi sync should be allowed
+#   On Master:
+#     1) When there is no dump thread
+#     2) When there are no semi sync slaves (i.e., async replication).
+#   On Slave:
+#     1) When there is no I/O thread
+#     2) When there are no semi sync enabled I/O thread (i.e.,async replication).
+###############################################################################
+
+--source include/have_semisync_plugin.inc
+--source include/not_embedded.inc
+--source include/have_binlog_format_statement.inc
+--source include/master-slave.inc
+
+###############################################################################
+# Case 1: Uninstallation of semi sync plugins should be allowed when it is
+#  not in use i.e., when asynchronous replication is active.
+###############################################################################
+# Step 1.1: Install semi sync master plugin on master
+--replace_result $SEMISYNC_MASTER_PLUGIN SEMISYNC_MASTER_PLUGIN
+eval INSTALL PLUGIN rpl_semi_sync_master SONAME '$SEMISYNC_MASTER_PLUGIN';
+
+# Step 1.2: Install semi sync slave plugin on slave
+--connection slave
+--replace_result $SEMISYNC_SLAVE_PLUGIN SEMISYNC_SLAVE_PLUGIN
+eval INSTALL PLUGIN rpl_semi_sync_slave SONAME '$SEMISYNC_SLAVE_PLUGIN';
+
+# Step 1.3: Uninstallation of semisync plugin on master and slave should be
+#  allowed at this state as there is no semi sync replication enabled between
+#  master and slave.
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+--connection master
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 1.4: Check that replication is working fine at the end of the test case.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (1);
+DROP TABLE t1;
+--sync_slave_with_master
+
+###############################################################################
+# Case 2: Uninstallation of semi sync plugins should be disallowed
+#  when it is in use i.e., when semi sync replication is active
+###############################################################################
+# Step 2.1: Install and enable semi sync replication between master and slave
+--source include/install_semisync.inc
+
+# Step 2.2: Check that rpl_semi_sync_slave uninstallation on Slave is not
+#  possible at this state
+--connection slave
+call mtr.add_suppression("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now");
+--error ER_UNKNOWN_ERROR
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+# Step 2.3: Check that rpl_semi_sync_master uninstallation on Master is not
+#  possible at this state
+--connection master
+call mtr.add_suppression("Plugin 'rpl_semi_sync_master' cannot be uninstalled now");
+--error ER_UNKNOWN_ERROR
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 2.4: Check that replication is working fine at the end of the test case.
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (2);
+DROP TABLE t1;
+--sync_slave_with_master
+
+# Step 2.5: Make sure rpl_semi_sync_master_status on Master and
+# rpl_semi_sync_slave_staus on Slave are ON
+--let $slave_status=[show status like "Rpl_semi_sync_slave_status", Value, 1]
+--let assert_cond= "$slave_status" = "ON"
+--let assert_text= semi sync slave status should be ON.
+--source include/assert.inc
+
+--connection master
+--let $master_status=[show status like "Rpl_semi_sync_master_status", Value, 1]
+--let assert_cond= "$master_status" = "ON"
+--let assert_text= semi sync master status should be ON.
+--source include/assert.inc
+
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 1
+--let assert_text= semi sync master clients should be 1.
+--source include/assert.inc
+
+###############################################################################
+# Case 3: Uninstallation of semi sync plugin should be disallowed when there
+#  are semi sync slaves even though rpl_semi_sync_master_enabled= OFF;.
+###############################################################################
+# Step 3.1: Disable semi sync on master
+--connection master
+SET GLOBAL rpl_semi_sync_master_enabled = OFF;
+
+# Step 3.2: Check that still Rpl_semi_sync_master_clients is 1
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 1
+--let assert_text= semi sync master clients should be 1.
+--source include/assert.inc
+
+# Step 3.3: Since Rpl_semi_sync_master_clients is 1, uninstallation of
+#  rpl_semi_sync_master should be disallowed.
+--error ER_UNKNOWN_ERROR
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+###############################################################################
+# Case 4: Uninstallation of semi sync plugin should be allowed when it is not
+#  in use. Same as Case 1 but this case is to check the case after enabling and
+#  disabling semi sync replication.
+###############################################################################
+
+# Step 4.1: Stop IO thread on slave.
+--connection slave
+--source include/stop_slave.inc
+
+# Step 4.2: Disable semi sync on slave.
+SET GLOBAL rpl_semi_sync_slave_enabled = OFF;
+
+# Step 4.3: Start IO thread on slave.
+--source include/start_slave.inc
+
+# Step 4.4: Uninstall semi sync plugin, it should be successful now.
+UNINSTALL PLUGIN rpl_semi_sync_slave;
+
+# Step 4.5: On Master, check that semi sync slaves are now '0'.
+--connection master
+--let $master_clients=[show status like "Rpl_semi_sync_master_clients", Value, 1]
+--let assert_cond= $master_clients = 0
+--let assert_text= semi sync master clients should be 0.
+--source include/assert.inc
+
+# Step 4.6: So uninstalling semi sync plugin should be allowed
+UNINSTALL PLUGIN rpl_semi_sync_master;
+
+# Step 4.7: Check that replication is working fine at the end of the test case
+CREATE TABLE t1(i int);
+INSERT INTO t1 values (3);
+DROP TABLE t1;
+--sync_slave_with_master
+
+# Cleanup
+source include/rpl_end.inc;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_special_charset-master.opt mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_special_charset-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_special_charset-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_special_charset-master.opt	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1 @@
+--character-set-server=utf16
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_special_charset-slave.opt	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1 @@
+--character-set-server=utf16
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_special_charset.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_special_charset.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_special_charset.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_special_charset.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,25 @@
+################################################################################
+# Bug#19855907 IO THREAD AUTHENTICATION ISSUE WITH SOME CHARACTER SETS
+# Problem: IO thread fails to connect to master if servers are configured with
+#  special character sets like utf16, utf32, ucs2.
+#
+# Analysis: MySQL server does not support few special character sets like
+#  utf16,utf32 and ucs2 as "client's character set"(eg: utf16,utf32, ucs2).
+#  When IO thread is trying to connect to Master, it sets server's character
+#  set as client's character set. When Slave server is started with these
+#  special character sets, IO thread (a connection to Master) fails because
+#  of the above said reason.
+#
+# Fix: If server's character set is not supported as client's character set,
+#  then set default's client character set(latin1) as client's character set.
+###############################################################################
+--source include/master-slave.inc
+CREATE TABLE t1(i VARCHAR(20));
+INSERT INTO t1 VALUES (0xFFFF);
+--sync_slave_with_master
+--let diff_tables=master:t1, slave:t1
+--source include/diff_tables.inc
+# Cleanup
+--connection master
+DROP TABLE t1;
+--source include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_stop_slave.test mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_stop_slave.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/rpl/t/rpl_stop_slave.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/rpl/t/rpl_stop_slave.test	2015-02-27 08:30:35.000000000 +0000
@@ -72,14 +72,17 @@
 INSERT INTO t1 VALUES(1, 1);
 
 sync_slave_with_master;
+--source include/stop_slave.inc
 
 --source include/rpl_connection_master.inc
+# make sure that there are no zombie threads
+--source include/stop_dump_threads.inc
 
 let $debug_save= `SELECT @@GLOBAL.debug`;
 SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
 
 --source include/rpl_connection_slave.inc
-source include/restart_slave_sql.inc;
+--source include/start_slave.inc
 
 BEGIN;
 UPDATE t1 SET c2 = 2 WHERE c1 = 1;
@@ -91,6 +94,10 @@
 UPDATE t1 SET c2 = 3 WHERE c1 = 1;
 COMMIT;
 
+# wait for the dump thread reach the sync point
+--let $wait_condition= select count(*)=1 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
+--source include/wait_condition.inc
+
 --source include/rpl_connection_slave1.inc
 let $show_statement= SHOW PROCESSLIST;
 let $field= Info;
@@ -103,7 +110,12 @@
 ROLLBACK;
 
 --source include/rpl_connection_master.inc
+
 SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+# wait for the dump thread to come out of the
+# waiting phase before resetting the signals
+--let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
+--source include/wait_condition.inc
 SET DEBUG_SYNC= 'RESET';
 
 --source include/rpl_connection_slave.inc
@@ -111,9 +123,22 @@
 
 --source include/rpl_connection_slave1.inc
 reap;
+
+# Slave has stopped, thence lets make sure that
+# we kill the zombie dump threads. Also, make
+# sure that we disable the DBUG_EXECUTE_IF
+# that would set the dump thread to wait
+--source include/rpl_connection_master.inc
+SET GLOBAL debug= '$debug_save';
+# make sure that there are no zombie threads
+--source include/stop_dump_threads.inc
+
+--source include/rpl_connection_slave1.inc
+# now the dump thread on the master will start
+# from a clean slate, i.e. without the
+# DBUG_EXECUTE_IF set
 source include/start_slave.inc;
 
 --source include/rpl_connection_master.inc
 DROP TABLE t1, t2;
-SET GLOBAL debug= $debug_save;
 --source include/rpl_end.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc mysql-5.5-5.5.43/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/inc/transaction_alloc_block_size_basic.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,234 +0,0 @@
-############## mysql-test\t\transaction_alloc_block_size_basic.test ###########
-#                                                                             #
-# Variable Name: transaction_alloc_block_size                                 #
-# Scope: GLOBAL | SESSION                                                     #
-# Access Type: Dynamic                                                        #
-# Data Type: numeric                                                          #
-# Default Value: 8192                                                         #
-# Range: 1024-4294967295                                                      #
-#                                                                             #
-#                                                                             #
-# Creation Date: 2008-02-14                                                   #
-# Author:  Salman                                                             #
-#                                                                             #
-# Description: Test Cases of Dynamic System Variable                          #
-#              transaction_alloc_block_size                                   #
-#              that checks the behavior of this variable in the following ways#
-#              * Default Value                                                #
-#              * Valid & Invalid values                                       #
-#              * Scope & Access method                                        #
-#              * Data Integrity                                               #
-#                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html                                               #
-#                                                                             #
-###############################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-#           START OF transaction_alloc_block_size TESTS                #
-########################################################################
-
-
-#############################################################
-#                 Save initial value                        #
-#############################################################
-
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
-
-
---echo '#--------------------FN_DYNVARS_005_01-------------------------#'
-########################################################################
-#     Display the DEFAULT value of transaction_alloc_block_size        #
-########################################################################
-
-SET @@global.transaction_alloc_block_size = 100;
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-
-
-SET @@session.transaction_alloc_block_size = 200;
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-
-
-
---echo '#--------------------FN_DYNVARS_005_02-------------------------#'
-########################################################################
-#     Check the DEFAULT value of transaction_alloc_block_size          #
-########################################################################
-
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-
-
---echo '#--------------------FN_DYNVARS_005_03-------------------------#'
-##################################################################
-# Change the value of variable to a valid value for GLOBAL Scope #
-##################################################################
-
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = 60020;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = 4294967295;
-SELECT @@global.transaction_alloc_block_size;
-
---echo '#--------------------FN_DYNVARS_005_04-------------------------#'
-###################################################################
-# Change the value of variable to a valid value for SESSION Scope #
-###################################################################
- 
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size =4294967295;
-SELECT @@session.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size = 65535;
-SELECT @@session.transaction_alloc_block_size;
-
-
---echo '#------------------FN_DYNVARS_005_05-----------------------#'
-########################################################################
-# Change the value of transaction_alloc_block_size to an invalid value #
-########################################################################
-
-SET @@global.transaction_alloc_block_size = 0;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = -1024;
-SELECT @@global.transaction_alloc_block_size;
-
-
-SET @@global.transaction_alloc_block_size = 123456789201;
-SELECT @@global.transaction_alloc_block_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size = ON;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size = OFF;
-
-
-SET @@global.transaction_alloc_block_size = True;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@global.transaction_alloc_block_size = False;
-SELECT @@global.transaction_alloc_block_size;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size = 65530.34;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_alloc_block_size ="Test";
-
-SET @@global.transaction_alloc_block_size = 1000;
-SELECT @@global.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size = 12345678901;
-SELECT @@session.transaction_alloc_block_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = ON;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = OFF;
-
-SET @@session.transaction_alloc_block_size = True;
-SELECT @@session.transaction_alloc_block_size;
-
-SET @@session.transaction_alloc_block_size = False;
-SELECT @@session.transaction_alloc_block_size;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = "Test";
-
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_alloc_block_size = 'test';
-
---echo '#------------------FN_DYNVARS_005_06-----------------------#'
-####################################################################
-#   Check if the value in GLOBAL Table matches value in variable   #
-####################################################################
-
-
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-
---echo '#------------------FN_DYNVARS_005_07-----------------------#'
-####################################################################
-#  Check if the value in SESSION Table matches value in variable   #
-####################################################################
-
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-
-
---echo '#---------------------FN_DYNVARS_001_08----------------------#'
-###########################################################################
-#  Check if global and session variable are independent of each other     #
-###########################################################################
-
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
- 
-
---echo '#---------------------FN_DYNVARS_001_09----------------------#'
-########################################################################
-#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
-#    points to same session variable                                   #
-########################################################################
-
-SET @@transaction_alloc_block_size = 100;
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-
-
---echo '#---------------------FN_DYNVARS_001_10----------------------#'
-################################################################
-#   Check if variable can be accessed with and without @@ sign #
-################################################################
-
-SET transaction_alloc_block_size = 1027;
-SELECT @@transaction_alloc_block_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.transaction_alloc_block_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.transaction_alloc_block_size;
-
---Error ER_BAD_FIELD_ERROR
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-
-
-####################################
-#     Restore initial value        #
-####################################
-
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-
-
-#############################################################
-#             END OF transaction_alloc_block_size TESTS     #
-#############################################################
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc mysql-5.5-5.5.43/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/inc/transaction_prealloc_size_basic.inc	1970-01-01 00:00:00.000000000 +0000
@@ -1,225 +0,0 @@
-############## mysql-test\t\transaction_prealloc_size_basic.test ##############
-#                                                                             #
-# Variable Name: transaction_prealloc_size                                    #
-# Scope: GLOBAL | SESSION                                                     #
-# Access Type: Dynamic                                                        #
-# Data Type: numeric                                                          #
-# Default Value: 4096                                                         #
-# Range:                                                                      #
-#                                                                             #
-#                                                                             #
-# Creation Date: 2008-02-14                                                   #
-# Author: Sharique Abdullah                                                       #
-#                                                                             #
-# Description: Test Cases of Dynamic System Variable transaction_prealloc_size#
-#              that checks the behavior of this variable in the following ways#
-#              * Default Value                                                #
-#              * Valid & Invalid values                                       #
-#              * Scope & Access method                                        #
-#              * Data Integrity                                               #
-#                                                                             #
-# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
-#  server-system-variables.html#option_mysqld_transaction_prealloc_size       #
-#                                                                             #
-###############################################################################
-
---source include/load_sysvars.inc
-
-########################################################################
-#           START OF transaction_prealloc_size TESTS                   #
-########################################################################
-
-
-#############################################################
-#                 Save initial value                        #
-#############################################################
-
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
-
---echo '#--------------------FN_DYNVARS_005_01-------------------------#'
-########################################################################
-#     Display the DEFAULT value of transaction_prealloc_size           #
-########################################################################
-
-SET @@global.transaction_prealloc_size = 100;
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-
-
-SET @@session.transaction_prealloc_size = 200;
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-
---echo '#--------------------FN_DYNVARS_005_02-------------------------#'
-########################################################################
-#     Check the DEFAULT value of transaction_prealloc_size             #
-########################################################################
-
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-
---echo '#--------------------FN_DYNVARS_005_03-------------------------#'
-##################################################################
-# Change the value of variable to a valid value for GLOBAL Scope #
-##################################################################
-
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = 60020;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-
-
---echo '#--------------------FN_DYNVARS_005_04-------------------------#'
-###################################################################
-# Change the value of variable to a valid value for SESSION Scope #
-###################################################################
- 
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-SET @@session.transaction_prealloc_size = 65535;
-SELECT @@session.transaction_prealloc_size;
-
-
---echo '#------------------FN_DYNVARS_005_05-----------------------#'
-#####################################################################
-# Change the value of transaction_prealloc_size to an invalid value #
-#####################################################################
-
-SET @@global.transaction_prealloc_size = 0;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = -1024;
-SELECT @@global.transaction_prealloc_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size = ON;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size = OFF;
-
-
-SET @@global.transaction_prealloc_size = True;
-SELECT @@global.transaction_prealloc_size;
-
-SET @@global.transaction_prealloc_size = False;
-SELECT @@global.transaction_prealloc_size;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size = 65530.34;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@global.transaction_prealloc_size ="Test";
-
-SET @@global.transaction_prealloc_size = 1000;
-SELECT @@global.transaction_prealloc_size;
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_prealloc_size = ON;
-
-
--- Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_prealloc_size = OFF;
-
-SET @@session.transaction_prealloc_size = True;
-SELECT @@session.transaction_prealloc_size;
-
-SET @@session.transaction_prealloc_size = False;
-SELECT @@session.transaction_prealloc_size;
-
---Error ER_WRONG_TYPE_FOR_VAR
-SET @@session.transaction_prealloc_size = "Test";
-
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-
-
---echo '#------------------FN_DYNVARS_005_06-----------------------#'
-####################################################################
-#   Check if the value in GLOBAL Table matches value in variable   #
-####################################################################
-
-
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-
---echo '#------------------FN_DYNVARS_005_07-----------------------#'
-####################################################################
-#  Check if the value in SESSION Table matches value in variable   #
-####################################################################
-
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-
-
-
-
---echo '#---------------------FN_DYNVARS_001_09----------------------#'
-###########################################################################
-#  Check if global and session variable are independent of each other     #
-###########################################################################
-
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
- 
-
---echo '#---------------------FN_DYNVARS_001_10----------------------#'
-########################################################################
-#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
-#    points to same session variable                                   #
-########################################################################
-
-SET @@transaction_prealloc_size = 100;
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-
-
---echo '#---------------------FN_DYNVARS_001_11----------------------#'
-###############################################################################
-# Check if transaction_prealloc_size can be accessed with and without @@ sign #
-###############################################################################
-
-SET transaction_prealloc_size = 1027;
-SELECT @@transaction_prealloc_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT local.transaction_prealloc_size;
-
---Error ER_UNKNOWN_TABLE
-SELECT session.transaction_prealloc_size;
-
---Error ER_BAD_FIELD_ERROR
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-
-####################################
-#     Restore initial value        #
-####################################
-
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-
-
-#############################################################
-#                 END OF transaction_prealloc_size TESTS     #
-#############################################################
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/general_log_file_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/general_log_file_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/general_log_file_basic.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/general_log_file_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -10,6 +10,7 @@
 1
 '#--------------------FN_DYNVARS_004_02------------------------#'
 SET @@global.general_log_file = mytest.log;
+ERROR 42000: Incorrect argument type to variable 'general_log_file'
 SET @@global.general_log_file = 12;
 ERROR 42000: Incorrect argument type to variable 'general_log_file'
 '#----------------------FN_DYNVARS_004_03------------------------#'
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/innodb_thread_sleep_delay_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -41,6 +41,8 @@
 ERROR 42000: Incorrect argument type to variable 'innodb_thread_sleep_delay'
 set global innodb_thread_sleep_delay="foo";
 ERROR 42000: Incorrect argument type to variable 'innodb_thread_sleep_delay'
+set global innodb_thread_sleep_delay=18446744073709551616;
+ERROR 42000: Incorrect argument type to variable 'innodb_thread_sleep_delay'
 set global innodb_thread_sleep_delay=-7;
 Warnings:
 Warning	1292	Truncated incorrect innodb_thread_sleep_delay value: '-7'
@@ -50,6 +52,34 @@
 select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay';
 VARIABLE_NAME	VARIABLE_VALUE
 INNODB_THREAD_SLEEP_DELAY	0
+set global innodb_thread_sleep_delay=0;
+select @@global.innodb_thread_sleep_delay;
+@@global.innodb_thread_sleep_delay
+0
+set global innodb_thread_sleep_delay=1000;
+select @@global.innodb_thread_sleep_delay;
+@@global.innodb_thread_sleep_delay
+1000
+set global innodb_thread_sleep_delay=1000000;
+select @@global.innodb_thread_sleep_delay;
+@@global.innodb_thread_sleep_delay
+1000000
+set global innodb_thread_sleep_delay=1000001;
+Warnings:
+Warning	1292	Truncated incorrect innodb_thread_sleep_delay value: '1000001'
+select @@global.innodb_thread_sleep_delay;
+@@global.innodb_thread_sleep_delay
+1000000
+set global innodb_thread_sleep_delay=4294967295;
+Warnings:
+Warning	1292	Truncated incorrect innodb_thread_sleep_delay value: '4294967295'
+select @@global.innodb_thread_sleep_delay;
+@@global.innodb_thread_sleep_delay
+1000000
+set global innodb_thread_sleep_delay=555;
+select @@global.innodb_thread_sleep_delay;
+@@global.innodb_thread_sleep_delay
+555
 SET @@global.innodb_thread_sleep_delay = @start_global_value;
 SELECT @@global.innodb_thread_sleep_delay;
 @@global.innodb_thread_sleep_delay
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/slow_query_log_file_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -7,6 +7,7 @@
 1
 '#--------------------FN_DYNVARS_004_02------------------------#'
 SET @@global.slow_query_log_file = mytest.log;
+ERROR 42000: Incorrect argument type to variable 'slow_query_log_file'
 SET @@global.slow_query_log_file = 12;
 ERROR 42000: Incorrect argument type to variable 'slow_query_log_file'
 '#----------------------FN_DYNVARS_004_03------------------------#'
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/sql_log_bin_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -57,11 +57,16 @@
 SET @@session.sql_log_bin = NO;
 ERROR 42000: Variable 'sql_log_bin' can't be set to the value of 'NO'
 '#-------------------FN_DYNVARS_156_05----------------------------#'
+SELECT @@global.sql_log_bin;
+@@global.sql_log_bin
+1
 SET @@global.sql_log_bin = 0;
+ERROR 42000: Variable 'sql_log_bin' can't be set to the value of '0'
 SELECT @@global.sql_log_bin;
 @@global.sql_log_bin
-0
+1
 SET @@global.sql_log_bin = 1;
+ERROR 42000: Variable 'sql_log_bin' can't be set to the value of '1'
 '#----------------------FN_DYNVARS_156_06------------------------#'
 SELECT count(VARIABLE_VALUE) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES WHERE VARIABLE_NAME='sql_log_bin';
 count(VARIABLE_VALUE)
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/timed_mutexes_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -4,7 +4,11 @@
 0
 '#--------------------FN_DYNVARS_177_01------------------------#'
 SET @@global.timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SET @@global.timed_mutexes = DEFAULT;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
@@ -17,15 +21,21 @@
 SELECT global.timed_mutexes;
 ERROR 42S02: Unknown table 'global' in field list
 SET global timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
 '#--------------------FN_DYNVARS_177_03------------------------#'
 SET @@global.timed_mutexes = 0;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 SET @@global.timed_mutexes = 1;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
@@ -82,23 +92,33 @@
 ON
 '#---------------------FN_DYNVARS_177_08-------------------------#'
 SET @@global.timed_mutexes = OFF;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 SET @@global.timed_mutexes = ON;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
 '#---------------------FN_DYNVARS_177_09----------------------#'
 SET @@global.timed_mutexes = TRUE;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 1
 SET @@global.timed_mutexes = FALSE;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
 SET @@global.timed_mutexes = @global_start_value;
+Warnings:
+Warning	1287	'@@timed_mutexes' is deprecated and will be removed in a future release.
 SELECT @@global.timed_mutexes;
 @@global.timed_mutexes
 0
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_32.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
-@start_global_value
-8192
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
-@start_session_value
-8192
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.transaction_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-@@global.transaction_alloc_block_size = 8192
-1
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-@@session.transaction_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 60020;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-59392
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size =4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = 65535;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 123456789201;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '123456789201'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-SET @@global.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = 12345678901;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '12345678901'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@global.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@session.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
-1
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET transaction_alloc_block_size = 1027;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
-SELECT @@transaction_alloc_block_size;
-@@transaction_alloc_block_size
-1024
-SELECT local.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic_64.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,188 +0,0 @@
-SET @start_global_value = @@global.transaction_alloc_block_size;
-SELECT @start_global_value;
-@start_global_value
-8192
-SET @start_session_value = @@session.transaction_alloc_block_size;
-SELECT @start_session_value;
-@start_session_value
-8192
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.transaction_alloc_block_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-8192
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_alloc_block_size = DEFAULT;
-SELECT @@global.transaction_alloc_block_size = 8192;
-@@global.transaction_alloc_block_size = 8192
-1
-SET @@session.transaction_alloc_block_size = DEFAULT;
-SELECT @@session.transaction_alloc_block_size = 8192;
-@@session.transaction_alloc_block_size = 8192
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_alloc_block_size = 1024;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 60020;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-59392
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_alloc_block_size = 1024;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size =4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-4294966272
-SET @@session.transaction_alloc_block_size = 65535;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_alloc_block_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 123456789201;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '123456789201'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-123456788480
-SET @@global.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@global.transaction_alloc_block_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@global.transaction_alloc_block_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = 12345678901;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '12345678901'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-12345678848
-SET @@session.transaction_alloc_block_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
-SET @@session.transaction_alloc_block_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-SET @@session.transaction_alloc_block_size = 'test';
-ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@global.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_alloc_block_size';
-@@session.transaction_alloc_block_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_08----------------------#'
-SET @@transaction_alloc_block_size = 1024;
-SET @@global.transaction_alloc_block_size = 4294967295;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '4294967295'
-SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
-0
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@transaction_alloc_block_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
-SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
-@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
-1
-SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
-1
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET transaction_alloc_block_size = 1027;
-Warnings:
-Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
-SELECT @@transaction_alloc_block_size;
-@@transaction_alloc_block_size
-1024
-SELECT local.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_alloc_block_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
-ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
-SET @@global.transaction_alloc_block_size = @start_global_value;
-SELECT @@global.transaction_alloc_block_size;
-@@global.transaction_alloc_block_size
-8192
-SET @@session.tmp_table_size = @start_session_value;
-SELECT @@session.transaction_alloc_block_size;
-@@session.transaction_alloc_block_size
-1024
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_alloc_block_size_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,174 @@
+SET @start_global_value = @@global.transaction_alloc_block_size;
+SELECT @start_global_value;
+@start_global_value
+8192
+SET @start_session_value = @@session.transaction_alloc_block_size;
+SELECT @start_session_value;
+@start_session_value
+8192
+'#--------------------FN_DYNVARS_005_01-------------------------#'
+SET @@global.transaction_alloc_block_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+8192
+SET @@session.transaction_alloc_block_size = 200;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '200'
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+8192
+'#--------------------FN_DYNVARS_005_02-------------------------#'
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size = 8192;
+@@global.transaction_alloc_block_size = 8192
+1
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size = 8192;
+@@session.transaction_alloc_block_size = 8192
+1
+'#--------------------FN_DYNVARS_005_03-------------------------#'
+SET @@global.transaction_alloc_block_size = 1024;
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = 60020;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '60020'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+59392
+'#--------------------FN_DYNVARS_005_04-------------------------#'
+SET @@session.transaction_alloc_block_size = 1024;
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = 65535;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '65535'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+64512
+'#------------------FN_DYNVARS_005_05-----------------------#'
+SET @@global.transaction_alloc_block_size = 0;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = -1024;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '-1024'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = 135217728;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '135217728'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+134217728
+SET @@global.transaction_alloc_block_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@global.transaction_alloc_block_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size ="Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@global.transaction_alloc_block_size = 1000;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1000'
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = 135217728;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '135217728'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+134217728
+SET @@session.transaction_alloc_block_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@session.transaction_alloc_block_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@session.transaction_alloc_block_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '0'
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
+SET @@session.transaction_alloc_block_size = "Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+SET @@session.transaction_alloc_block_size = 'test';
+ERROR 42000: Incorrect argument type to variable 'transaction_alloc_block_size'
+'#------------------FN_DYNVARS_005_06-----------------------#'
+SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+@@global.transaction_alloc_block_size = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_07-----------------------#'
+SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+@@session.transaction_alloc_block_size = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_001_08----------------------#'
+SET @@transaction_alloc_block_size = 1024;
+SET @@global.transaction_alloc_block_size = 134217728;
+SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
+@@transaction_alloc_block_size = @@global.transaction_alloc_block_size
+0
+'#---------------------FN_DYNVARS_001_09----------------------#'
+SET @@transaction_alloc_block_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '100'
+SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
+@@transaction_alloc_block_size = @@local.transaction_alloc_block_size
+1
+SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+@@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size
+1
+'#---------------------FN_DYNVARS_001_10----------------------#'
+SET transaction_alloc_block_size = 1027;
+Warnings:
+Warning	1292	Truncated incorrect transaction_alloc_block_size value: '1027'
+SELECT @@transaction_alloc_block_size;
+@@transaction_alloc_block_size
+1024
+SELECT local.transaction_alloc_block_size;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT session.transaction_alloc_block_size;
+ERROR 42S02: Unknown table 'session' in field list
+SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+ERROR 42S22: Unknown column 'transaction_alloc_block_size' in 'field list'
+SET @@global.transaction_alloc_block_size = @start_global_value;
+SELECT @@global.transaction_alloc_block_size;
+@@global.transaction_alloc_block_size
+8192
+SET @@session.tmp_table_size = @start_session_value;
+SELECT @@session.transaction_alloc_block_size;
+@@session.transaction_alloc_block_size
+1024
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_32.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,172 +0,0 @@
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
-@start_global_value
-4096
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
-@start_session_value
-4096
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-@@global.transaction_prealloc_size = 4096
-1
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-@@session.transaction_prealloc_size = 4096
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 60020;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
-SET @@session.transaction_prealloc_size = 65535;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_prealloc_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@global.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '123456789031'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@global.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@session.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
-@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-@@transaction_prealloc_size = @@local.transaction_prealloc_size
-1
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET transaction_prealloc_size = 1027;
-SELECT @@transaction_prealloc_size;
-@@transaction_prealloc_size
-1024
-SELECT local.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic_64.result	1970-01-01 00:00:00.000000000 +0000
@@ -1,170 +0,0 @@
-SET @start_global_value = @@global.transaction_prealloc_size;
-SELECT @start_global_value;
-@start_global_value
-4096
-SET @start_session_value = @@session.transaction_prealloc_size;
-SELECT @start_session_value;
-@start_session_value
-4096
-'Bug# 34876: This variable has invalid default value as compared to documentation';
-'#--------------------FN_DYNVARS_005_01-------------------------#'
-SET @@global.transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = 200;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
-'#--------------------FN_DYNVARS_005_02-------------------------#'
-SET @@global.transaction_prealloc_size = DEFAULT;
-SELECT @@global.transaction_prealloc_size = 4096;
-@@global.transaction_prealloc_size = 4096
-1
-SET @@session.transaction_prealloc_size = DEFAULT;
-SELECT @@session.transaction_prealloc_size = 4096;
-@@session.transaction_prealloc_size = 4096
-1
-'#--------------------FN_DYNVARS_005_03-------------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 60020;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-59392
-SET @@global.transaction_prealloc_size = 4294966272;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4294966272
-'#--------------------FN_DYNVARS_005_04-------------------------#'
-SET @@session.transaction_prealloc_size = 1024;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size =4294966272;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4294966272
-SET @@session.transaction_prealloc_size = 65535;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-64512
-'#------------------FN_DYNVARS_005_05-----------------------#'
-SET @@global.transaction_prealloc_size = 0;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = -1024;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-'Bug # 34837: Errors are not coming on assigning invalid values to variable';
-SET @@global.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@global.transaction_prealloc_size = 65530.34;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size ="Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@global.transaction_prealloc_size = 1000;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = ON;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = OFF;
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = True;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = False;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-1024
-SET @@session.transaction_prealloc_size = "Test";
-ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
-SET @@session.transaction_prealloc_size = 123456789031;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-123456788480
-'#------------------FN_DYNVARS_005_06-----------------------#'
-SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@global.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#------------------FN_DYNVARS_005_07-----------------------#'
-SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
-FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
-WHERE VARIABLE_NAME='transaction_prealloc_size';
-@@session.transaction_prealloc_size = VARIABLE_VALUE
-1
-'#---------------------FN_DYNVARS_001_09----------------------#'
-SET @@global.transaction_prealloc_size = 1024;
-SET @@global.transaction_prealloc_size = 10;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
-SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
-@@transaction_prealloc_size = @@global.transaction_prealloc_size
-0
-'#---------------------FN_DYNVARS_001_10----------------------#'
-SET @@transaction_prealloc_size = 100;
-Warnings:
-Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
-SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
-@@transaction_prealloc_size = @@local.transaction_prealloc_size
-1
-SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
-@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
-1
-'#---------------------FN_DYNVARS_001_11----------------------#'
-SET transaction_prealloc_size = 1027;
-SELECT @@transaction_prealloc_size;
-@@transaction_prealloc_size
-1024
-SELECT local.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'local' in field list
-SELECT session.transaction_prealloc_size;
-ERROR 42S02: Unknown table 'session' in field list
-SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
-ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
-SET @@global.transaction_prealloc_size = @start_global_value;
-SELECT @@global.transaction_prealloc_size;
-@@global.transaction_prealloc_size
-4096
-SET @@session.transaction_prealloc_size = @start_session_value;
-SELECT @@session.transaction_prealloc_size;
-@@session.transaction_prealloc_size
-4096
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/r/transaction_prealloc_size_basic.result	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,168 @@
+SET @start_global_value = @@global.transaction_prealloc_size;
+SELECT @start_global_value;
+@start_global_value
+4096
+SET @start_session_value = @@session.transaction_prealloc_size;
+SELECT @start_session_value;
+@start_session_value
+4096
+'#--------------------FN_DYNVARS_005_01-------------------------#'
+SET @@global.transaction_prealloc_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+4096
+SET @@session.transaction_prealloc_size = 200;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '200'
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+4096
+'#--------------------FN_DYNVARS_005_02-------------------------#'
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size = 4096;
+@@global.transaction_prealloc_size = 4096
+1
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size = 4096;
+@@session.transaction_prealloc_size = 4096
+1
+'#--------------------FN_DYNVARS_005_03-------------------------#'
+SET @@global.transaction_prealloc_size = 1024;
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = 60020;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '60020'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+59392
+'#--------------------FN_DYNVARS_005_04-------------------------#'
+SET @@session.transaction_prealloc_size = 1024;
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = 65535;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '65535'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+64512
+'#------------------FN_DYNVARS_005_05-----------------------#'
+SET @@global.transaction_prealloc_size = 0;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = -1024;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '-1024'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@global.transaction_prealloc_size = 65530.34;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size ="Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@global.transaction_prealloc_size = 1000;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1000'
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = ON;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@session.transaction_prealloc_size = OFF;
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@session.transaction_prealloc_size = True;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = False;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '0'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+1024
+SET @@session.transaction_prealloc_size = "Test";
+ERROR 42000: Incorrect argument type to variable 'transaction_prealloc_size'
+SET @@session.transaction_prealloc_size = 135217728;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '135217728'
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+134217728
+'#------------------FN_DYNVARS_005_06-----------------------#'
+SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+@@global.transaction_prealloc_size = VARIABLE_VALUE
+1
+'#------------------FN_DYNVARS_005_07-----------------------#'
+SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+@@session.transaction_prealloc_size = VARIABLE_VALUE
+1
+'#---------------------FN_DYNVARS_001_09----------------------#'
+SET @@global.transaction_prealloc_size = 1024;
+SET @@global.transaction_prealloc_size = 10;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '10'
+SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
+@@transaction_prealloc_size = @@global.transaction_prealloc_size
+0
+'#---------------------FN_DYNVARS_001_10----------------------#'
+SET @@transaction_prealloc_size = 100;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '100'
+SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
+@@transaction_prealloc_size = @@local.transaction_prealloc_size
+1
+SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
+@@local.transaction_prealloc_size = @@session.transaction_prealloc_size
+1
+'#---------------------FN_DYNVARS_001_11----------------------#'
+SET transaction_prealloc_size = 1027;
+Warnings:
+Warning	1292	Truncated incorrect transaction_prealloc_size value: '1027'
+SELECT @@transaction_prealloc_size;
+@@transaction_prealloc_size
+1024
+SELECT local.transaction_prealloc_size;
+ERROR 42S02: Unknown table 'local' in field list
+SELECT session.transaction_prealloc_size;
+ERROR 42S02: Unknown table 'session' in field list
+SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
+ERROR 42S22: Unknown column 'transaction_prealloc_size' in 'field list'
+SET @@global.transaction_prealloc_size = @start_global_value;
+SELECT @@global.transaction_prealloc_size;
+@@global.transaction_prealloc_size
+4096
+SET @@session.transaction_prealloc_size = @start_session_value;
+SELECT @@session.transaction_prealloc_size;
+@@session.transaction_prealloc_size
+4096
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/disabled.def mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/disabled.def
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/disabled.def	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/disabled.def	2015-02-27 08:30:35.000000000 +0000
@@ -9,8 +9,6 @@
 #  Do not use any TAB characters for whitespace.
 #
 ##############################################################################
-transaction_prealloc_size_basic_32  : Bug#11748572
-transaction_prealloc_size_basic_64  : Bug#11748572
 query_cache_size_basic_32           : Bug#13535584
 query_cache_size_basic_64           : Bug#11748572
 #thread_cache_size_func             : Bug#11750172: 2008-11-07 joro main.thread_cache_size_func fails in pushbuild when run with pool of threads
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/general_log_file_basic.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/general_log_file_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/general_log_file_basic.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/general_log_file_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -54,7 +54,7 @@
 #        Change the value of general_log_file to a invalid value      #
 #######################################################################
 
-# Assumed text if no quotes or numbers.
+--error ER_WRONG_TYPE_FOR_VAR
 SET @@global.general_log_file = mytest.log;
 --error ER_WRONG_TYPE_FOR_VAR
 SET @@global.general_log_file = 12;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/innodb_thread_sleep_delay_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -40,12 +40,30 @@
 set global innodb_thread_sleep_delay=1e1;
 --error ER_WRONG_TYPE_FOR_VAR
 set global innodb_thread_sleep_delay="foo";
+--error ER_WRONG_TYPE_FOR_VAR
+set global innodb_thread_sleep_delay=18446744073709551616;
 
 set global innodb_thread_sleep_delay=-7;
 select @@global.innodb_thread_sleep_delay;
 select * from information_schema.global_variables where variable_name='innodb_thread_sleep_delay';
 
 #
+# correct/overflowed values
+#
+set global innodb_thread_sleep_delay=0;
+select @@global.innodb_thread_sleep_delay;
+set global innodb_thread_sleep_delay=1000;
+select @@global.innodb_thread_sleep_delay;
+set global innodb_thread_sleep_delay=1000000;
+select @@global.innodb_thread_sleep_delay;
+set global innodb_thread_sleep_delay=1000001;
+select @@global.innodb_thread_sleep_delay;
+set global innodb_thread_sleep_delay=4294967295;
+select @@global.innodb_thread_sleep_delay;
+set global innodb_thread_sleep_delay=555;
+select @@global.innodb_thread_sleep_delay;
+
+#
 # cleanup
 #
 SET @@global.innodb_thread_sleep_delay = @start_global_value;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/slow_query_log_file_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -52,7 +52,7 @@
 #      Change the value of slow_query_log_file to a invalid value     #
 #######################################################################
 
-# Assumed text if no quotes or numbers.
+--error ER_WRONG_TYPE_FOR_VAR
 SET @@global.slow_query_log_file = mytest.log;
 --error ER_WRONG_TYPE_FOR_VAR
 SET @@global.slow_query_log_file = 12;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/sql_log_bin_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -109,11 +109,15 @@
 
 --echo '#-------------------FN_DYNVARS_156_05----------------------------#'
 ########################################################################### 
-#       Test if accessing global sql_log_bin gives error                  #
+#       Test if setting global sql_log_bin gives error,                   #
+#       and there is no error on reading it.                              #
 ########################################################################### 
 
+SELECT @@global.sql_log_bin;
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.sql_log_bin = 0;
 SELECT @@global.sql_log_bin;
+--Error ER_WRONG_VALUE_FOR_VAR
 SET @@global.sql_log_bin = 1;
 
 --echo '#----------------------FN_DYNVARS_156_06------------------------#'
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_32.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic_64.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/transaction_alloc_block_size_basic.inc
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_alloc_block_size_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,228 @@
+############## mysql-test\t\transaction_alloc_block_size_basic.test ###########
+#                                                                             #
+# Variable Name: transaction_alloc_block_size                                 #
+# Scope: GLOBAL | SESSION                                                     #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+# Default Value: 8192                                                         #
+# Range: 1024-134217728                                                       #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2008-02-14                                                   #
+# Author:  Salman                                                             #
+#                                                                             #
+# Description: Test Cases of Dynamic System Variable                          #
+#              transaction_alloc_block_size                                   #
+#              that checks the behavior of this variable in the following ways#
+#              * Default Value                                                #
+#              * Valid & Invalid values                                       #
+#              * Scope & Access method                                        #
+#              * Data Integrity                                               #
+#                                                                             #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
+#  server-system-variables.html                                               #
+#                                                                             #
+###############################################################################
+
+--source include/load_sysvars.inc
+
+########################################################################
+#           START OF transaction_alloc_block_size TESTS                #
+########################################################################
+
+
+#############################################################
+#                 Save initial value                        #
+#############################################################
+
+SET @start_global_value = @@global.transaction_alloc_block_size;
+SELECT @start_global_value;
+SET @start_session_value = @@session.transaction_alloc_block_size;
+SELECT @start_session_value;
+
+
+--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
+########################################################################
+#     Display the DEFAULT value of transaction_alloc_block_size        #
+########################################################################
+
+SET @@global.transaction_alloc_block_size = 100;
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size;
+
+
+SET @@session.transaction_alloc_block_size = 200;
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size;
+
+
+
+--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
+########################################################################
+#     Check the DEFAULT value of transaction_alloc_block_size          #
+########################################################################
+
+SET @@global.transaction_alloc_block_size = DEFAULT;
+SELECT @@global.transaction_alloc_block_size = 8192;
+
+SET @@session.transaction_alloc_block_size = DEFAULT;
+SELECT @@session.transaction_alloc_block_size = 8192;
+
+
+--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
+##################################################################
+# Change the value of variable to a valid value for GLOBAL Scope #
+##################################################################
+
+SET @@global.transaction_alloc_block_size = 1024;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@global.transaction_alloc_block_size = 60020;
+SELECT @@global.transaction_alloc_block_size;
+
+--echo '#--------------------FN_DYNVARS_005_04-------------------------#'
+###################################################################
+# Change the value of variable to a valid value for SESSION Scope #
+###################################################################
+ 
+SET @@session.transaction_alloc_block_size = 1024;
+SELECT @@session.transaction_alloc_block_size;
+
+SET @@session.transaction_alloc_block_size = 65535;
+SELECT @@session.transaction_alloc_block_size;
+
+
+--echo '#------------------FN_DYNVARS_005_05-----------------------#'
+########################################################################
+# Change the value of transaction_alloc_block_size to an invalid value #
+########################################################################
+
+SET @@global.transaction_alloc_block_size = 0;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@global.transaction_alloc_block_size = -1024;
+SELECT @@global.transaction_alloc_block_size;
+
+
+SET @@global.transaction_alloc_block_size = 135217728;
+SELECT @@global.transaction_alloc_block_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size = ON;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size = OFF;
+
+
+SET @@global.transaction_alloc_block_size = True;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@global.transaction_alloc_block_size = False;
+SELECT @@global.transaction_alloc_block_size;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size = 65530.34;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_alloc_block_size ="Test";
+
+SET @@global.transaction_alloc_block_size = 1000;
+SELECT @@global.transaction_alloc_block_size;
+
+SET @@session.transaction_alloc_block_size = 135217728;
+SELECT @@session.transaction_alloc_block_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = ON;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = OFF;
+
+SET @@session.transaction_alloc_block_size = True;
+SELECT @@session.transaction_alloc_block_size;
+
+SET @@session.transaction_alloc_block_size = False;
+SELECT @@session.transaction_alloc_block_size;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = "Test";
+
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_alloc_block_size = 'test';
+
+--echo '#------------------FN_DYNVARS_005_06-----------------------#'
+####################################################################
+#   Check if the value in GLOBAL Table matches value in variable   #
+####################################################################
+
+
+SELECT @@global.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+
+--echo '#------------------FN_DYNVARS_005_07-----------------------#'
+####################################################################
+#  Check if the value in SESSION Table matches value in variable   #
+####################################################################
+
+SELECT @@session.transaction_alloc_block_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_alloc_block_size';
+
+
+--echo '#---------------------FN_DYNVARS_001_08----------------------#'
+###########################################################################
+#  Check if global and session variable are independent of each other     #
+###########################################################################
+
+SET @@transaction_alloc_block_size = 1024;
+SET @@global.transaction_alloc_block_size = 134217728;
+SELECT @@transaction_alloc_block_size = @@global.transaction_alloc_block_size;
+ 
+
+--echo '#---------------------FN_DYNVARS_001_09----------------------#'
+########################################################################
+#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
+#    points to same session variable                                   #
+########################################################################
+
+SET @@transaction_alloc_block_size = 100;
+SELECT @@transaction_alloc_block_size = @@local.transaction_alloc_block_size;
+SELECT @@local.transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+
+
+--echo '#---------------------FN_DYNVARS_001_10----------------------#'
+################################################################
+#   Check if variable can be accessed with and without @@ sign #
+################################################################
+
+SET transaction_alloc_block_size = 1027;
+SELECT @@transaction_alloc_block_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT local.transaction_alloc_block_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT session.transaction_alloc_block_size;
+
+--Error ER_BAD_FIELD_ERROR
+SELECT transaction_alloc_block_size = @@session.transaction_alloc_block_size;
+
+
+####################################
+#     Restore initial value        #
+####################################
+
+SET @@global.transaction_alloc_block_size = @start_global_value;
+SELECT @@global.transaction_alloc_block_size;
+SET @@session.tmp_table_size = @start_session_value;
+SELECT @@session.transaction_alloc_block_size;
+
+
+#############################################################
+#             END OF transaction_alloc_block_size TESTS     #
+#############################################################
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_32.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 32 bit machines                                                  #
-################################################################################
-
---source include/have_32bit.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic_64.test	1970-01-01 00:00:00.000000000 +0000
@@ -1,9 +0,0 @@
-################################################################################
-# Created by Horst Hunger      2008-05-07                                      #
-#                                                                              #
-# Wrapper for 64 bit machines                                                  #
-################################################################################
-
---source include/have_64bit.inc
---source suite/sys_vars/inc/transaction_prealloc_size_basic.inc
-
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/suite/sys_vars/t/transaction_prealloc_size_basic.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,219 @@
+############## mysql-test\t\transaction_prealloc_size_basic.test ##############
+#                                                                             #
+# Variable Name: transaction_prealloc_size                                    #
+# Scope: GLOBAL | SESSION                                                     #
+# Access Type: Dynamic                                                        #
+# Data Type: numeric                                                          #
+# Default Value: 4096                                                         #
+# Range: 1024-134217728                                                       #
+#                                                                             #
+#                                                                             #
+# Creation Date: 2008-02-14                                                   #
+# Author: Sharique Abdullah                                                       #
+#                                                                             #
+# Description: Test Cases of Dynamic System Variable transaction_prealloc_size#
+#              that checks the behavior of this variable in the following ways#
+#              * Default Value                                                #
+#              * Valid & Invalid values                                       #
+#              * Scope & Access method                                        #
+#              * Data Integrity                                               #
+#                                                                             #
+# Reference: http://dev.mysql.com/doc/refman/5.1/en/                          #
+#  server-system-variables.html#option_mysqld_transaction_prealloc_size       #
+#                                                                             #
+###############################################################################
+
+--source include/load_sysvars.inc
+
+########################################################################
+#           START OF transaction_prealloc_size TESTS                   #
+########################################################################
+
+
+#############################################################
+#                 Save initial value                        #
+#############################################################
+
+SET @start_global_value = @@global.transaction_prealloc_size;
+SELECT @start_global_value;
+SET @start_session_value = @@session.transaction_prealloc_size;
+SELECT @start_session_value;
+
+--echo '#--------------------FN_DYNVARS_005_01-------------------------#'
+########################################################################
+#     Display the DEFAULT value of transaction_prealloc_size           #
+########################################################################
+
+SET @@global.transaction_prealloc_size = 100;
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size;
+
+
+SET @@session.transaction_prealloc_size = 200;
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size;
+
+--echo '#--------------------FN_DYNVARS_005_02-------------------------#'
+########################################################################
+#     Check the DEFAULT value of transaction_prealloc_size             #
+########################################################################
+
+SET @@global.transaction_prealloc_size = DEFAULT;
+SELECT @@global.transaction_prealloc_size = 4096;
+
+SET @@session.transaction_prealloc_size = DEFAULT;
+SELECT @@session.transaction_prealloc_size = 4096;
+
+--echo '#--------------------FN_DYNVARS_005_03-------------------------#'
+##################################################################
+# Change the value of variable to a valid value for GLOBAL Scope #
+##################################################################
+
+SET @@global.transaction_prealloc_size = 1024;
+SELECT @@global.transaction_prealloc_size;
+
+SET @@global.transaction_prealloc_size = 60020;
+SELECT @@global.transaction_prealloc_size;
+
+--echo '#--------------------FN_DYNVARS_005_04-------------------------#'
+###################################################################
+# Change the value of variable to a valid value for SESSION Scope #
+###################################################################
+ 
+SET @@session.transaction_prealloc_size = 1024;
+SELECT @@session.transaction_prealloc_size;
+
+SET @@session.transaction_prealloc_size = 65535;
+SELECT @@session.transaction_prealloc_size;
+
+
+--echo '#------------------FN_DYNVARS_005_05-----------------------#'
+#####################################################################
+# Change the value of transaction_prealloc_size to an invalid value #
+#####################################################################
+
+SET @@global.transaction_prealloc_size = 0;
+SELECT @@global.transaction_prealloc_size;
+
+SET @@global.transaction_prealloc_size = -1024;
+SELECT @@global.transaction_prealloc_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size = ON;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size = OFF;
+
+
+SET @@global.transaction_prealloc_size = True;
+SELECT @@global.transaction_prealloc_size;
+
+SET @@global.transaction_prealloc_size = False;
+SELECT @@global.transaction_prealloc_size;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size = 65530.34;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@global.transaction_prealloc_size ="Test";
+
+SET @@global.transaction_prealloc_size = 1000;
+SELECT @@global.transaction_prealloc_size;
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_prealloc_size = ON;
+
+
+-- Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_prealloc_size = OFF;
+
+SET @@session.transaction_prealloc_size = True;
+SELECT @@session.transaction_prealloc_size;
+
+SET @@session.transaction_prealloc_size = False;
+SELECT @@session.transaction_prealloc_size;
+
+--Error ER_WRONG_TYPE_FOR_VAR
+SET @@session.transaction_prealloc_size = "Test";
+
+SET @@session.transaction_prealloc_size = 135217728;
+SELECT @@session.transaction_prealloc_size;
+
+
+--echo '#------------------FN_DYNVARS_005_06-----------------------#'
+####################################################################
+#   Check if the value in GLOBAL Table matches value in variable   #
+####################################################################
+
+
+SELECT @@global.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+
+--echo '#------------------FN_DYNVARS_005_07-----------------------#'
+####################################################################
+#  Check if the value in SESSION Table matches value in variable   #
+####################################################################
+
+SELECT @@session.transaction_prealloc_size = VARIABLE_VALUE 
+FROM INFORMATION_SCHEMA.SESSION_VARIABLES 
+WHERE VARIABLE_NAME='transaction_prealloc_size';
+
+
+
+
+--echo '#---------------------FN_DYNVARS_001_09----------------------#'
+###########################################################################
+#  Check if global and session variable are independent of each other     #
+###########################################################################
+
+SET @@global.transaction_prealloc_size = 1024;
+SET @@global.transaction_prealloc_size = 10;
+
+SELECT @@transaction_prealloc_size = @@global.transaction_prealloc_size;
+ 
+
+--echo '#---------------------FN_DYNVARS_001_10----------------------#'
+########################################################################
+#    Check if accessing variable with SESSION,LOCAL and without SCOPE  #
+#    points to same session variable                                   #
+########################################################################
+
+SET @@transaction_prealloc_size = 100;
+SELECT @@transaction_prealloc_size = @@local.transaction_prealloc_size;
+SELECT @@local.transaction_prealloc_size = @@session.transaction_prealloc_size;
+
+
+--echo '#---------------------FN_DYNVARS_001_11----------------------#'
+###############################################################################
+# Check if transaction_prealloc_size can be accessed with and without @@ sign #
+###############################################################################
+
+SET transaction_prealloc_size = 1027;
+SELECT @@transaction_prealloc_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT local.transaction_prealloc_size;
+
+--Error ER_UNKNOWN_TABLE
+SELECT session.transaction_prealloc_size;
+
+--Error ER_BAD_FIELD_ERROR
+SELECT transaction_prealloc_size = @@session.transaction_prealloc_size;
+
+####################################
+#     Restore initial value        #
+####################################
+
+SET @@global.transaction_prealloc_size = @start_global_value;
+SELECT @@global.transaction_prealloc_size;
+SET @@session.transaction_prealloc_size = @start_session_value;
+SELECT @@session.transaction_prealloc_size;
+
+
+#############################################################
+#                 END OF transaction_prealloc_size TESTS     #
+#############################################################
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/ctype_cp932.test mysql-5.5-5.5.43/mysql-test/t/ctype_cp932.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/ctype_cp932.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/ctype_cp932.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,29 @@
+-- source include/have_cp932.inc
+--echo #
+--echo # Bug #11755818 LIKE DOESN'T MATCH WHEN CP932_BIN/SJIS_BIN COLLATIONS ARE 
+--echo #               USED.
+--echo #
+
+SET @old_character_set_client= @@character_set_client;
+SET @old_character_set_connection= @@character_set_connection;
+SET @old_character_set_results= @@character_set_results;
+SET character_set_client= 'utf8';
+SET character_set_connection= 'utf8';
+SET character_set_results= 'utf8';
+
+CREATE TABLE t1 (a VARCHAR(10) COLLATE cp932_bin);
+INSERT INTO t1 VALUES('ｶｶ');
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+
+ALTER TABLE t1 MODIFY a VARCHAR(100) COLLATE sjis_bin;
+SELECT * FROM t1 WHERE a LIKE '%ｶ';
+SELECT * FROM t1 WHERE a LIKE '_ｶ';
+SELECT * FROM t1 WHERE a LIKE '%_ｶ';
+DROP TABLE t1;
+
+## Reset to initial values
+SET @@character_set_client= @old_character_set_client;
+SET @@character_set_connection= @old_character_set_connection;
+SET @@character_set_results= @old_character_set_results;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/distinct.test mysql-5.5-5.5.43/mysql-test/t/distinct.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/distinct.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/distinct.test	2015-02-27 08:30:35.000000000 +0000
@@ -625,5 +625,42 @@
 SELECT DISTINCT CONCAT(a,b) AS c FROM t1 ORDER BY 1;
 DROP TABLE t1;
 
+--echo #
+--echo # Bug#16539979 BASIC SELECT COUNT(DISTINCT ID) IS BROKEN.
+--echo # Bug#17867117 ERROR RESULT WHEN "COUNT + DISTINCT + CASE WHEN" NEED MERGE_WALK 
+--echo #
+
+SET @tmp_table_size_save= @@tmp_table_size;
+SET @@tmp_table_size= 1024;
+
+CREATE TABLE t1 (a INT);
+INSERT INTO t1 VALUES (1),(2),(3),(4),(5),(6),(7),(8);
+INSERT INTO t1 SELECT a+8 FROM t1;
+INSERT INTO t1 SELECT a+16 FROM t1;
+INSERT INTO t1 SELECT a+32 FROM t1;
+INSERT INTO t1 SELECT a+64 FROM t1;
+INSERT INTO t1 VALUE(NULL);
+SELECT COUNT(DISTINCT a) FROM t1;
+SELECT COUNT(DISTINCT (a+0)) FROM t1;
+DROP TABLE t1;
+
+create table tb(
+id int auto_increment primary key,
+v varchar(32))
+engine=myisam charset=gbk;
+insert into tb(v) values("aaa");
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+insert into tb(v) (select v from tb);
+
+update tb set v=concat(v, id);
+select count(distinct case when id<=64 then id end) from tb;
+select count(distinct case when id<=63 then id end) from tb;
+drop table tb;
+
+SET @@tmp_table_size= @tmp_table_size_save;
 
 --echo End of 5.5 tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/error_simulation-master.opt mysql-5.5-5.5.43/mysql-test/t/error_simulation-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/error_simulation-master.opt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/error_simulation-master.opt	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1 @@
+--tmpdir=$MYSQLTEST_VARDIR/tmp
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/error_simulation.test mysql-5.5-5.5.43/mysql-test/t/error_simulation.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/error_simulation.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/error_simulation.test	2015-02-27 08:30:35.000000000 +0000
@@ -1,4 +1,5 @@
 -- source include/have_debug.inc
+--source include/not_embedded.inc
 
 #
 # Bug #28499: crash for grouping query when tmp_table_size is too small
@@ -106,3 +107,35 @@
 --echo #
 --echo # End of 5.1 tests
 --echo #
+
+
+--echo #
+--echo # BUG#11747548:DETECT ORPHAN TEMP-POOL FILES, AND HANDLE GRACEFULLY.
+--echo #
+
+--echo #Set up.
+CREATE TABLE pid_table(pid_no INT);
+CREATE TABLE t1 (a BLOB);
+INSERT INTO t1 VALUES (1), (2);
+
+--echo #Create MYD and MYI files for intrinsic temp table.
+--let $pid_file=`SELECT @@pid_file`
+--replace_result $pid_file pid_file
+--eval LOAD DATA LOCAL INFILE '$pid_file' INTO TABLE pid_table
+--let $temp_file_MYD= `SELECT CONCAT('#sql_', LCASE(HEX(pid_no)), '_0', '.MYD') FROM pid_table`
+--let $temp_file_MYI= `SELECT CONCAT('#sql_', LCASE(HEX(pid_no)), '_0', '.MYI') FROM pid_table`
+--write_file $MYSQLTEST_VARDIR/tmp/$temp_file_MYD
+EOF
+--write_file $MYSQLTEST_VARDIR/tmp/$temp_file_MYI
+EOF
+
+--echo #Reports an error since the temp file already exists.
+--replace_regex /.*Can't create\/write *.*/Can't create or write to file/
+--error 1
+SELECT a FROM t1 ORDER BY rand(1);
+
+--echo #With patch, the query executes successfully.
+SELECT a FROM t1 ORDER BY rand(1);
+
+--echo #cleanup
+DROP TABLE t1, pid_table;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/events_trans.test mysql-5.5-5.5.43/mysql-test/t/events_trans.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/events_trans.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/events_trans.test	2015-02-27 08:30:35.000000000 +0000
@@ -146,3 +146,4 @@
 ROLLBACK WORK TO SAVEPOINT A;
 
 DROP TABLE t1, t2;
+DROP EVENT e1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/file_contents.test mysql-5.5-5.5.43/mysql-test/t/file_contents.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/file_contents.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/file_contents.test	2015-02-27 08:30:35.000000000 +0000
@@ -17,7 +17,7 @@
   $dir_docs =~ s|/lib|/share/doc|;
   if(-d "$dir_docs/packages") {
     # SuSE: "packages/" in the documentation path
-    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
+    $dir_docs = glob "$dir_docs/packages/*-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
@@ -27,13 +27,13 @@
   $dir_docs = "$dir_bin/share/doc";
   if(-d "$dir_docs/packages") {
     # SuSE: "packages/" in the documentation path
-    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
+    $dir_docs = glob "$dir_docs/packages/*-server*";
   } else {
     # RedHat: version number in directory name
     $dir_docs = glob "$dir_docs/MySQL-server*";
   }
 } else {
-  # tar.gz package, Windows, or developer work (in BZR)
+  # tar.gz package, Windows, or developer work (in git)
   $dir_docs = $dir_bin;
   $dir_docs =~ s|/lib||;
   if(-d "$dir_docs/docs") {
@@ -47,7 +47,7 @@
 open(I_SRC,"<","$dir_docs/INFO_SRC") or print "Cannot open 'INFO_SRC' in '$dir_docs' (starting from bindir '$dir_bin')\n";
 while(defined ($line = <I_SRC>)) {
   if ($line =~ m|^MySQL source \d\.\d\.\d+|) {$found_version = "Found MySQL version number";}
-  if ($line =~ m|^revision-id: .*@.*-2\d{13}-\w+$|) {$found_revision = "Found BZR revision id";}
+  if ($line =~ m|^commit: \w{40}$|) {$found_revision = "Found GIT revision id";}
 }
 close I_SRC;
 print "INFO_SRC: $found_version / $found_revision\n";
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/gis.test mysql-5.5-5.5.43/mysql-test/t/gis.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/gis.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/gis.test	2015-02-27 08:30:35.000000000 +0000
@@ -868,4 +868,22 @@
 
 DROP TABLE g1;
 
+--echo #
+--echo # Bug#16451878 GEOMETRY QUERY CRASHES SERVER
+--echo #
+
+--echo # should not crash
+SELECT ASTEXT(0x0100000000030000000100000000000010);
+
+--echo #should not crash
+SELECT ENVELOPE(0x0100000000030000000100000000000010);
+
+--echo #should not crash
+SELECT
+  GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffff0000, 1);
+
+--echo #should not crash
+SELECT
+  GEOMETRYN(0x0100000000070000000100000001030000000200000000000000ffffff0f, 1);
+
 --echo End of 5.5 tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/group_min_max_innodb.test mysql-5.5-5.5.43/mysql-test/t/group_min_max_innodb.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/group_min_max_innodb.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/group_min_max_innodb.test	2015-02-27 08:30:35.000000000 +0000
@@ -137,3 +137,96 @@
 DROP TABLE t1;
 
 --echo End of 5.5 tests
+
+--echo #
+--echo # Bug#17909656 - WRONG RESULTS FOR A SIMPLE QUERY WITH GROUP BY
+--echo #
+
+CREATE TABLE t0 (
+  i1 INTEGER NOT NULL
+);
+
+INSERT INTO t0 VALUES (1),(2),(3),(4),(5),(6),(7),(8),(9),(10),
+                      (11),(12),(13),(14),(15),(16),(17),(18),(19),(20),
+                      (21),(22),(23),(24),(25),(26),(27),(28),(29),(30);
+
+CREATE TABLE t1 (
+  c1 CHAR(1) NOT NULL,
+  i1 INTEGER NOT NULL,
+  i2 INTEGER NOT NULL,
+  UNIQUE KEY k1 (c1,i2)
+) ENGINE=InnoDB;
+
+INSERT INTO t1 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t1 SELECT 'F',i1,i1 FROM t0;
+                 
+CREATE TABLE t2 (
+  c1 CHAR(1) NOT NULL,
+  i1 INTEGER NOT NULL,
+  i2 INTEGER NOT NULL,
+  UNIQUE KEY k2 (c1,i1,i2)
+) ENGINE=InnoDB;
+
+INSERT INTO t2 SELECT 'A',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'B',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'C',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'D',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'E',i1,i1 FROM t0;
+INSERT INTO t2 SELECT 'F',i1,i1 FROM t0;
+
+-- disable_result_log
+ANALYZE TABLE t1;
+ANALYZE TABLE t2;
+-- enable_result_log
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' AND i2 = 17) OR ( c1 = 'F')
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR ( c1 = 'F' AND i2 = 17))
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, max(i2) FROM t1 WHERE (c1 = 'C' OR c1 = 'F' ) AND ( i2 = 17 )
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, max(i2) FROM t1 
+WHERE ((c1 = 'C' AND (i2 = 40 OR i2 = 30)) OR ( c1 = 'F' AND (i2 = 40 )))
+GROUP BY c1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2
+WHERE (c1 = 'C' OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 )
+GROUP BY c1,i1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2 
+WHERE (((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35)) AND ( i2 = 17 ))
+GROUP BY c1,i1;
+eval EXPLAIN $query;
+eval $query;
+
+let query=
+SELECT c1, i1, max(i2) FROM t2 
+WHERE ((c1 = 'C' AND i1 < 40) OR ( c1 = 'F' AND i1 < 35) OR ( i2 = 17 ))
+GROUP BY c1,i1;
+eval EXPLAIN $query;
+eval $query;
+
+DROP TABLE t0,t1,t2;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/group_min_max.test mysql-5.5-5.5.43/mysql-test/t/group_min_max.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/group_min_max.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/group_min_max.test	2015-02-27 08:30:35.000000000 +0000
@@ -1243,3 +1243,27 @@
 drop table t1;
 --echo # End of test#50539.
 
+--echo #
+--echo # Bug#17217128 -  BAD INTERACTION BETWEEN MIN/MAX AND
+--echo #                 "HAVING SUM(DISTINCT)": WRONG RESULTS.
+--echo #
+
+CREATE TABLE t (a INT, b INT, KEY(a,b));
+INSERT INTO t VALUES (1,1), (2,2), (3,3), (4,4), (1,0), (3,2), (4,5);
+ANALYZE TABLE t;
+
+SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b) FROM t GROUP BY a;
+
+SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MAX(b) FROM t GROUP BY a;
+
+SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+EXPLAIN SELECT a, MAX(b) FROM t GROUP BY a HAVING SUM(DISTINCT a);
+
+SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+EXPLAIN SELECT SUM(DISTINCT a), MIN(b), MAX(b) FROM t;
+
+SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+EXPLAIN SELECT a, SUM(DISTINCT a), MIN(b), MAX(b) FROM t GROUP BY a;
+DROP TABLE t;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/information_schema.test mysql-5.5-5.5.43/mysql-test/t/information_schema.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/information_schema.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/information_schema.test	2015-02-27 08:30:35.000000000 +0000
@@ -1782,6 +1782,23 @@
 --echo # Clean-up.
 drop database mysqltest;
 
+--echo #
+--echo # Test for bug #16869534 - "QUERYING SUBSET OF COLUMNS DOESN'T USE TABLE
+--echo #                           CACHE; OPENED_TABLES INCREASES"
+--echo #
+--disable_result_log
+SELECT * FROM INFORMATION_SCHEMA.TABLES;
+--enable_result_log
+SELECT VARIABLE_VALUE INTO @val1 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+  VARIABLE_NAME LIKE 'Opened_tables';
+--disable_result_log
+SELECT ENGINE FROM INFORMATION_SCHEMA.TABLES;
+--enable_result_log
+--echo # The below SELECT query should give same output as above SELECT query.
+SELECT VARIABLE_VALUE INTO @val2 FROM INFORMATION_SCHEMA.GLOBAL_STATUS WHERE
+  VARIABLE_NAME LIKE 'Opened_tables';
+--echo # The below select should return '1'
+SELECT @val1 = @val2;
 
 --echo #
 --echo # End of 5.5 tests
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/loaddata.test mysql-5.5-5.5.43/mysql-test/t/loaddata.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/loaddata.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/loaddata.test	2015-02-27 08:30:35.000000000 +0000
@@ -635,3 +635,24 @@
 drop table t1;
 
 --echo End of 5.1 tests
+
+--echo #
+--echo # Bug#11759519 INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATA LOCAL AND IMPORT ERRORS
+--echo #
+SET @old_mode= @@sql_mode;
+CREATE TABLE t1 (fld1 INT);
+--copy_file $EXE_MYSQL $MYSQLTEST_VARDIR/mysql
+
+SET sql_mode='strict_all_tables';
+
+--echo # Without fix, load data hangs forever.
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_TRUNCATED_WRONG_VALUE_FOR_FIELD,1000
+eval LOAD DATA LOCAL INFILE '$MYSQLTEST_VARDIR/mysql' REPLACE INTO TABLE t1
+     FIELDS TERMINATED BY 't' LINES TERMINATED BY '';
+
+SET @@sql_mode= @old_mode;
+
+--remove_file $MYSQLTEST_VARDIR/mysql
+DROP TABLE t1;
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/lock_sync.test mysql-5.5-5.5.43/mysql-test/t/lock_sync.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/lock_sync.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/lock_sync.test	2015-02-27 08:30:35.000000000 +0000
@@ -1136,6 +1136,61 @@
 disconnect con1;
 disconnect con2;
 
+--echo #
+--echo # Bug#19070633 - POSSIBLE ACCESS TO FREED MEMORY IN IS_FREE_LOCK() AND IS_USED_LOCK().
+--echo #
+
+--enable_connect_log
+
+--echo # Verifying issue for IS_FREE_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+
+connect (con1, localhost, root,,);
+--echo # Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+--echo # Sending: SELECT IS_FREE_LOCK("lock_19070633");
+send SELECT IS_FREE_LOCK("lock_19070633");
+
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+--echo # Signaling connection con1 after releasing the lock.
+--echo # Without fix, accessing user level lock info in con1 would result in
+--echo # crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+
+connection con1;
+--echo # Reaping: SELECT IS_FREE_LOCK("lock_19070633");
+--reap
+
+connection default;
+--echo # Verifying issue for IS_USED_LOCK() function.
+SELECT GET_LOCK("lock_19070633", 600);
+
+connection con1;
+--echo # Waiting after getting user level lock info and releasing mutex.
+SET DEBUG_SYNC= 'after_getting_user_level_lock_info SIGNAL parked WAIT_FOR go';
+--echo # Sending: SELECT IS_USED_LOCK("lock_19070633");
+send SELECT IS_USED_LOCK("lock_19070633");
+
+connection default;
+SET DEBUG_SYNC= 'now WAIT_FOR parked';
+SELECT RELEASE_LOCK("lock_19070633");
+--echo # Signaling connection con1 after releasing the lock.
+--echo # Without fix, accessing user level lock info in con1 would result in
+--echo # crash or valgrind issue invalid read is reported.
+SET DEBUG_SYNC= 'now SIGNAL go';
+
+connection con1;
+--echo # Reaping: SELECT IS_USED_LOCK("lock_19070633");
+--replace_column 1 #
+--reap
+
+connection default;
+SET DEBUG_SYNC= 'RESET';
+disconnect con1;
+
+--disable_connect_log
 
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/log_errchk.test mysql-5.5-5.5.43/mysql-test/t/log_errchk.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/log_errchk.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/log_errchk.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,65 @@
+#
+--source include/not_windows.inc
+--source include/force_restart.inc
+--source include/not_embedded.inc
+
+# 
+# Bug#14757009 : WHEN THE GENERAL_LOG IS A SOCKET AND THE READER GOES AWAY,
+#                MYSQL QUITS WORKING.
+#
+call mtr.add_suppression("Could not use");
+
+--let $gen_log_file= $MYSQLTEST_VARDIR/tmp/general_log.fifo
+--let $slow_query_log_file= $MYSQLTEST_VARDIR/tmp/slow_log.fifo
+--let GREP_FILE=$MYSQLTEST_VARDIR/log/mysqld.1.err
+
+--exec mkfifo $gen_log_file
+--exec mkfifo $slow_query_log_file
+
+--echo # Case 1: Setting fife file to general_log_file and slow_query_log_file
+--echo #         system variable.
+# Only regular files can be set to general log. Setting fifo file to general log
+# reports an error.
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_WRONG_VALUE_FOR_VAR
+--eval SET GLOBAL general_log_file="$gen_log_file";
+
+--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
+--error ER_WRONG_VALUE_FOR_VAR
+--eval SET GLOBAL slow_query_log_file="$slow_query_log_file";
+
+--echo # Case 2: Starting server with fifo file as general log file
+--echo #         and slow query log file.
+# Restart server with fifo file as general log file.
+--exec echo "wait" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--shutdown_server 60
+--source include/wait_until_disconnected.inc
+--enable_reconnect
+# Write file to make mysql-test-run.pl start up the server again
+--exec echo "restart: --general-log-file=$gen_log_file --slow-query-log-file=$slow_query_log_file" > $MYSQLTEST_VARDIR/tmp/mysqld.1.expect
+--source include/wait_until_connected_again.inc
+
+# With fix error should be reported in the error log file if file is not a
+# regular file.
+--perl
+  my $file= $ENV{'GREP_FILE'};
+  my $pattern= "Turning logging off for the whole duration";
+  open(FILE, "$file") or die("Unable to open $file: $!\n");
+  my $count = 0;
+  while (<FILE>) {
+    if ($_ =~ m/$pattern/) {
+      $count++;
+      break;
+    }
+  }
+  if ($count >= 2){
+    print "Setting fifo file as general log file and slow query log failed.\n";
+  } else {
+    print "test failed.\n";
+  }
+  close(FILE);
+EOF
+
+# Cleanup
+--remove_file $gen_log_file
+--remove_file $slow_query_log_file
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/long_tmpdir-master.sh mysql-5.5-5.5.43/mysql-test/t/long_tmpdir-master.sh
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/long_tmpdir-master.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/long_tmpdir-master.sh	2015-02-27 08:30:35.000000000 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+
 d="$MYSQLTEST_VARDIR/tmp/long_temporary_directory_path_123456789_123456789_123456789_123456789_123456789_123456789_123456789_123456789"
 test -d "$d" || mkdir "$d"
 rm -f "$d"/*
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/lowercase_mixed_tmpdir-master.sh mysql-5.5-5.5.43/mysql-test/t/lowercase_mixed_tmpdir-master.sh
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/lowercase_mixed_tmpdir-master.sh	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/lowercase_mixed_tmpdir-master.sh	2015-02-27 08:30:35.000000000 +0000
@@ -1,3 +1,5 @@
+#! /bin/bash
+
 # This test requires a non-lowercase tmpdir directory on a case-sensitive
 # filesystem.
 
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/lowercase_table4-master.opt mysql-5.5-5.5.43/mysql-test/t/lowercase_table4-master.opt
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/lowercase_table4-master.opt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/lowercase_table4-master.opt	2015-02-27 08:30:35.000000000 +0000
@@ -1 +1 @@
---lower-case-table-names=2
+--lower-case-table-names=2
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/openssl_1.test mysql-5.5-5.5.43/mysql-test/t/openssl_1.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/openssl_1.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/openssl_1.test	2015-02-27 08:30:35.000000000 +0000
@@ -15,8 +15,8 @@
 
 grant select on test.* to ssl_user1@localhost require SSL;
 grant select on test.* to ssl_user2@localhost require cipher "DHE-RSA-AES256-SHA";
-grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB";
-grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Uppsala/O=MySQL AB" ISSUER "/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB";
+grant select on test.* to ssl_user3@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client";
+grant select on test.* to ssl_user4@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=Client" ISSUER "/C=SE/ST=Stockholm/L=Stockholm/O=Oracle/OU=MySQL/CN=CA";
 grant select on test.* to ssl_user5@localhost require cipher "DHE-RSA-AES256-SHA" AND SUBJECT "xxx";
 flush privileges;
 
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/outfile_loaddata.test mysql-5.5-5.5.43/mysql-test/t/outfile_loaddata.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/outfile_loaddata.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/outfile_loaddata.test	2015-02-27 08:30:35.000000000 +0000
@@ -169,6 +169,8 @@
 --eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET binary FIELDS TERMINATED BY 'ъ'
 --remove_file $file
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
+SELECT * FROM t1;
+SELECT * FROM t2;
 
 --replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
 --eval SELECT * FROM t1 INTO OUTFILE '$file' LINES STARTING BY 'ъ'
@@ -191,6 +193,8 @@
 --eval LOAD DATA INFILE '$file' INTO TABLE t2 CHARACTER SET binary LINES TERMINATED BY 'ъ'
 --remove_file $file
 SELECT * FROM t1 UNION SELECT * FROM t2 ORDER BY a, b, c;
+SELECT * FROM t1;
+SELECT * FROM t2;
 
 --echo # Default (binary) charset:
 
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/parser.test mysql-5.5-5.5.43/mysql-test/t/parser.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/parser.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/parser.test	2015-02-27 08:30:35.000000000 +0000
@@ -733,3 +733,28 @@
 --echo # End of 5.1 tests
 --echo #
 
+--echo #
+--echo # Bug#17075846 : unquoted file names for variable values are
+--echo #                accepted but parsed incorrectly
+--echo #
+--error ER_WRONG_TYPE_FOR_VAR 
+SET default_storage_engine=a.myisam;
+--error ER_WRONG_TYPE_FOR_VAR 
+SET default_storage_engine = .a.MyISAM;
+--error ER_WRONG_TYPE_FOR_VAR 
+SET default_storage_engine = a.b.MyISAM;
+--error ER_WRONG_TYPE_FOR_VAR 
+SET default_storage_engine = `a`.MyISAM;
+--error ER_WRONG_TYPE_FOR_VAR 
+SET default_storage_engine = `a`.`MyISAM`; 
+--error ER_UNKNOWN_STORAGE_ENGINE 
+set default_storage_engine = "a.MYISAM";
+--error ER_UNKNOWN_STORAGE_ENGINE 
+set default_storage_engine = 'a.MYISAM';
+--error ER_UNKNOWN_STORAGE_ENGINE 
+set default_storage_engine = `a.MYISAM`;
+CREATE TABLE t1 (s VARCHAR(100));
+--ERROR ER_BAD_FIELD_ERROR
+CREATE TRIGGER trigger1 BEFORE INSERT ON t1 FOR EACH ROW
+SET default_storage_engine = NEW.INNODB;
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/partition_archive.test mysql-5.5-5.5.43/mysql-test/t/partition_archive.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/partition_archive.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/partition_archive.test	2015-02-27 08:30:35.000000000 +0000
@@ -126,3 +126,21 @@
 select count(*) from t1;
 drop table t1;
 
+
+--echo #
+--echo #BUG 18618561: FAILED ALTER TABLE ENGINE CHANGE WITH PARTITIONS
+--echo #              CORRUPTS FRM
+
+CREATE TABLE t1 (fld1 INT PRIMARY KEY) ENGINE= MYISAM PARTITION BY HASH(fld1)
+PARTITIONS 5;
+SHOW CREATE TABLE t1;
+
+--replace_regex /#sql-[0-9a-f_]*/#sql-temporary/
+--error ER_CANT_CREATE_TABLE
+ALTER TABLE t1 ENGINE= ARCHIVE;
+
+--echo #After the patch, the ENGINE is correctly displayed as MyISAM
+SHOW CREATE TABLE t1;
+
+--echo #Cleanup.
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/partition_pruning.test mysql-5.5-5.5.43/mysql-test/t/partition_pruning.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/partition_pruning.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/partition_pruning.test	2015-02-27 08:30:35.000000000 +0000
@@ -1410,3 +1410,51 @@
 explain partitions select * from t1 where a between 10 and 10+33;
 
 drop table t0, t1;
+
+--echo #
+--echo # Bug#71095: Wrong results with PARTITION BY LIST COLUMNS()
+--echo #
+CREATE TABLE t1
+(c1 int,
+ c2 int,
+ c3 int,
+ c4 int,
+ PRIMARY KEY (c1,c2))
+PARTITION BY LIST COLUMNS (c2)
+(PARTITION p1 VALUES IN (1,2),
+ PARTITION p2 VALUES IN (3,4));
+INSERT INTO t1 VALUES (1, 1, 1, 1), (2, 3, 1, 1);
+INSERT INTO t1 VALUES (1, 2, 1, 1), (2, 4, 1, 1);
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 = 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 >= 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 > 1;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 < 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 1 AND c2 <= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 3;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 < 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 <= 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 = 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 >= 4;
+EXPLAIN PARTITIONS SELECT * FROM t1 WHERE c1 = 2 AND c2 > 4;
+DROP TABLE t1;
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/plugin.test mysql-5.5-5.5.43/mysql-test/t/plugin.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/plugin.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/plugin.test	2015-02-27 08:30:35.000000000 +0000
@@ -1,5 +1,7 @@
+#
 --source include/not_windows_embedded.inc
 --source include/have_example_plugin.inc
+--source include/have_debug_sync.inc
 
 CREATE TABLE t1(a int) ENGINE=EXAMPLE;
 DROP TABLE t1;
@@ -137,3 +139,118 @@
 SELECT @@SESSION.example_double_thdvar;
 
 UNINSTALL PLUGIN example;
+
+--echo #
+--echo # BUG#18008907 - DEADLOCK BETWEEN MYSQL_CHANGE_USER(), SHOW VARIABLES AND INSTALL PLUGIN
+--echo #
+
+--enable_connect_log
+
+delimiter |;
+
+CREATE PROCEDURE p_install()
+BEGIN
+  INSTALL PLUGIN no_such_plugin SONAME 'no_such_object';
+END
+|
+
+CREATE PROCEDURE p_show_vars()
+BEGIN
+  SELECT COUNT(*) FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES;
+END|
+
+delimiter ;|
+
+connect(con1, localhost, root,,);
+
+--echo # Case 18008907_1: Deadlock situation cause by
+--echo #                  con1: has LOCK_system_variables_hash and waits on LOCK_plugin  AND
+--echo #                  default: has LOCK_plugin and waits on LOCK_system_variables_hash.
+--echo #
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR cont_show_vars';
+--send call p_show_vars();
+
+connection default;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL cont_show_vars';
+--send call p_install();
+
+connection con1;
+# Without fix, reap will hang.
+--replace_column 1 #
+--reap;
+SET DEBUG_SYNC='RESET';
+
+connection default;
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
+--reap;
+SET DEBUG_SYNC='RESET';
+
+--echo # Case 18008907_2: Deadlock situation caused by
+--echo #                  default: has LOCK_system_variables_hash and waits on LOCK_global_system_variables,
+--echo #                  con1: has LOCK_plugin and waits on LOCK_system_variables_hash AND
+--echo #                  con2: has LOCK_global_system_variables and waits on LOCK_plugin.
+
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL install_plugin WAIT_FOR nothing TIMEOUT 10';
+--send call p_show_vars();
+
+connection con1;
+SET DEBUG_SYNC='now WAIT_FOR install_plugin';
+SET DEBUG_SYNC='acquired_LOCK_plugin SIGNAL create_connection WAIT_FOR nothing TIMEOUT 10';
+--send call p_install();
+
+connect(con2, localhost, root,,);
+SET DEBUG_SYNC='now WAIT_FOR create_connection';
+# Without fix, deadlock situation will occur on timeout of debug_syncs in
+# default and con1.  Because of this, change_user operation hangs.
+change_user;
+
+connection con1;
+--replace_regex /(Can\'t open shared library).*$/\1/
+--error ER_CANT_OPEN_LIBRARY
+--reap;
+
+connection default;
+--replace_column 1 #
+--reap;
+disconnect con2;
+
+--echo # Case 18008907_3: Testing Concurrent "Show Variables" and "Plugin Uninstall" operations.
+
+#Installing plugin
+--replace_regex /\.dll/.so/
+eval INSTALL PLUGIN example SONAME '$EXAMPLE_PLUGIN';
+
+connection con1;
+#Acquiring LOCK_system_variables_hash and LOCK_plugin_delete
+SET DEBUG_SYNC='acquired_LOCK_system_variables_hash SIGNAL uninstall_plugin WAIT_FOR go';
+--send call p_show_vars();
+
+connect(con2, localhost, root,,);
+SET DEBUG_SYNC='now WAIT_FOR uninstall_plugin';
+--send UNINSTALL PLUGIN example;
+
+connection default;
+#Plugin Uninstall operation will wait until show variables operations releases LOCK_plugin_delete.
+let $wait_condition= SELECT count(*) = 1 FROM INFORMATION_SCHEMA.PROCESSLIST
+                     WHERE INFO LIKE 'UNINSTALL PLUGIN example' and
+                     STATE LIKE 'Waiting on cond';
+--source include/wait_condition.inc
+SET DEBUG_SYNC='now SIGNAL go';
+
+connection con1;
+--replace_column 1 #
+--reap
+
+connection con2;
+--reap
+
+connection default;
+DROP PROCEDURE p_show_vars;
+DROP PROCEDURE p_install;
+SET DEBUG_SYNC='RESET';
+disconnect con1;
+disconnect con2;
+
+--disable_connect_log
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/show_processlist.test mysql-5.5-5.5.43/mysql-test/t/show_processlist.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/show_processlist.test	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/show_processlist.test	2015-02-27 08:30:35.000000000 +0000
@@ -0,0 +1,63 @@
+###############################################################################
+--echo Bug#17283409  4-WAY DEADLOCK: ZOMBIES, PURGING BINLOGS, SHOW PROCESSLIST,
+--echo SHOW BINLOGS
+# After the fix for bug 17283409, We allow new connections while processing
+# 'SHOW PROCESSLIST' command. This test script is to prove that even though we
+# allow new connections to come in, 'SHOW PROCESSLIST' will not consider them,
+# hence there is no worry of 'SHOW PROCESSLIST' going into a infinite loop if
+# new connections are coming in continously.
+###############################################################################
+--source include/have_debug_sync.inc
+--source include/count_sessions.inc
+--enable_connect_log
+connect(connection1,localhost,root,,test,$MASTER_MYPORT,);
+--connection default
+SET DEBUG_SYNC='before_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
+--send SHOW PROCESSLIST
+--connection connection1
+echo "Wait_for parked1";
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect(connection2,localhost,root,,test,$MASTER_MYPORT,);
+connect(connection3,localhost,root,,test,$MASTER_MYPORT,);
+SET DEBUG_SYNC='now SIGNAL go';
+
+--connection default
+# We are yet to read the first element from the iterator when connection 2 and
+# connection 3 joined the system. So this will show all 4 connections
+# ( default + connection 1,2,3).
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+--reap
+
+# Test 2: To prove that connections which joined after reading the
+# first element from the thread iterator will not be entertained
+SET DEBUG_SYNC='after_one_element_read_from_threads_iterator SIGNAL parked1 WAIT_FOR go';
+--send SHOW PROCESSLIST
+
+--connection connection1
+echo "Wait_for parked1";
+SET DEBUG_SYNC='now WAIT_FOR parked1';
+connect(connection4,localhost,root,,test,$MASTER_MYPORT,);
+connect(connection5,localhost,root,,test,$MASTER_MYPORT,);
+SET DEBUG_SYNC='now SIGNAL go';
+--connection default
+# This will show 4 connections only ( default + connection 1,2,3 ).  Connections
+# (connection4, connection 5) which entered after reading the first element
+# from the iterator will not be processed by show processlist.
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+--reap
+
+#Now try the command once again.
+# This will show 6 connections ( default + connection 1,2,3,4,5 )
+--replace_column 1 <Id> 3 <Host> 5 <Command> 6 <Time> 7 <State> 8 <Info>
+SHOW PROCESSLIST;
+
+--echo "Cleanup"
+# Reset DEBUG_SYNC
+SET DEBUG_SYNC='RESET';
+--disconnect connection1
+--disconnect connection2
+--disconnect connection3
+--disconnect connection4
+--disconnect connection5
+--disable_connect_log
+--source include/wait_until_count_sessions.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/sp.test mysql-5.5-5.5.43/mysql-test/t/sp.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/sp.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/sp.test	2015-02-27 08:30:35.000000000 +0000
@@ -15,6 +15,9 @@
 # Tests that require multibyte character sets, which are not always available,
 #   go into separate files (e.g. sp-ucs2.test)
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 use test;
 
 # Test tables
@@ -9093,3 +9096,118 @@
 SELECT f1();
 
 DROP FUNCTION f1;
+
+
+--echo
+--echo #
+--echo # BUG 16041903: CONTINUE HANDLER NOT INVOKED
+--echo # IN A STORED FUNCTION AFTER A LOCK WAIT TIMEOUT
+--echo #
+
+--echo
+--echo # Save and set lock wait timeout
+SET @lock_wait_timeout_saved= @@lock_wait_timeout;
+SET @innodb_lock_wait_timeout_saved= @@innodb_lock_wait_timeout;
+SET @@lock_wait_timeout= 1;
+SET @@innodb_lock_wait_timeout= 1;
+
+--echo
+--echo # Create a function with exit handler:
+DELIMITER //;
+CREATE FUNCTION f1() RETURNS VARCHAR(20)
+BEGIN
+  DECLARE EXIT HANDLER FOR SQLSTATE '42S02' RETURN 'No such table';
+  INSERT INTO no_such_table VALUES (1);
+END//
+
+--echo
+--echo # Create a function calling f1():
+CREATE FUNCTION f2() RETURNS VARCHAR(20)
+BEGIN
+  RETURN f1();
+END//
+
+--echo
+--echo # Create a function provoking deadlock:
+CREATE FUNCTION f3() RETURNS VARCHAR(20)
+BEGIN
+  UPDATE t1 SET i= 1 WHERE i= 1;
+  RETURN 'Will never get here';
+END//
+
+--echo
+--echo # Create a function calling f3, to create
+--echo # a deadlock indirectly:
+CREATE FUNCTION f4() RETURNS VARCHAR(20)
+BEGIN
+  RETURN f3();
+END//
+DELIMITER ;//
+
+--echo
+--echo # Open another connection, create and initialize a table
+--echo # to be used for provoking deadlock, put a lock on the table:
+connect (con1,localhost,root,,);
+CREATE TABLE t1 (i INT) ENGINE=InnoDB;
+INSERT INTO t1 VALUES (1);
+SET AUTOCOMMIT= 0;
+UPDATE t1 SET i=1 WHERE i=1;
+
+--echo
+--echo # On the default connection, do an update to provoke a
+--echo # deadlock, then call the function with handler. This case
+--echo # fails without the patch (with error ER_NO_SUCH_TABLE):
+--connection default
+SET AUTOCOMMIT= 0;
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t1 SET i=1 WHERE i=1;
+SELECT f1() AS 'f1():';
+
+--echo
+--echo # Provoke another deadlock, then call the function with
+--echo # handler indirectly. This case fails without the patch
+--echo # (with error ER_NO_SUCH_TABLE):
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t1 SET i= 1 WHERE i= 1;
+SELECT f2() AS 'f2():';
+
+--echo
+--echo # Provoke yet another deadlock, but now from within a function,
+--echo # then call the function with handler. This succeeds even
+--echo # without the patch because is_fatal_sub_stmt_error is reset
+--echo # in restore_sub_stmt after the failing function has been
+--echo # executed. The test case is included anyway for better coverage:
+--error ER_LOCK_WAIT_TIMEOUT
+SELECT f3() AS 'f3():';
+SELECT f1() AS 'f1():';
+
+--echo # Provoke yet another deadlock, but now from within a function,
+--echo # calling another function, then call the function with handler.
+--echo # This succeeds even without the patch because
+--echo # is_fatal_sub_stmt_error is reset in restore_sub_stmt after
+--echo # the failing function has been executed. The test case is
+--echo # included anyway for better coverage:
+--error ER_LOCK_WAIT_TIMEOUT
+SELECT f4() AS 'f4():';
+SELECT f1() AS 'f1():';
+
+--echo
+--echo # Disconnect, drop functions and table:
+--disconnect con1
+DROP FUNCTION f4;
+DROP FUNCTION f3;
+DROP FUNCTION f2;
+DROP FUNCTION f1;
+DROP TABLE t1;
+
+--echo
+--echo # Reset lock wait timeouts
+SET @@lock_wait_timeout= @lock_wait_timeout_saved;
+SET @@innodb_lock_wait_timeout= @innodb_lock_wait_timeout_saved;
+
+--echo #
+--echo # BUG 16041903: End of test case
+--echo #
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/trigger-trans.test mysql-5.5-5.5.43/mysql-test/t/trigger-trans.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/trigger-trans.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/trigger-trans.test	2015-02-27 08:30:35.000000000 +0000
@@ -2,6 +2,9 @@
 # (or just InnoDB storage engine)
 --source include/have_innodb.inc
 
+# Save the initial number of concurrent sessions
+--source include/count_sessions.inc
+
 --disable_warnings
 drop table if exists t1;
 --enable_warnings
@@ -182,3 +185,54 @@
 select * from t2 order by b;
 drop trigger t1_after_insert;
 drop table t1,t2;
+
+--echo #
+--echo #Bug#19683834 SOME INNODB ERRORS CAUSES STORED FUNCTION
+--echo #             AND TRIGGER HANDLERS TO BE IGNORED
+
+--echo #Code fixed in Bug#16041903
+--enable_connect_log
+
+CREATE TABLE t1 (id int unsigned PRIMARY KEY, val int DEFAULT 0)
+ENGINE=InnoDB;
+INSERT INTO t1 (id) VALUES (1), (2);
+
+CREATE TABLE t2 (id int PRIMARY KEY);
+CREATE TABLE t3 LIKE t2;
+
+# Trigger with continue handler for ER_DUP_ENTRY(1062)
+DELIMITER //;
+CREATE TRIGGER bef_insert BEFORE INSERT ON t2 FOR EACH ROW
+BEGIN
+   DECLARE CONTINUE HANDLER FOR 1062 BEGIN END;
+   INSERT INTO t3 (id) VALUES (NEW.id);
+   INSERT INTO t3 (id) VALUES (NEW.id);
+END//
+DELIMITER ;//
+
+# Transaction 1: Grab locks on t1
+START TRANSACTION;
+UPDATE t1 SET val = val + 1;
+
+# Transaction 2:
+--connect (con2,localhost,root,,test,,)
+SET SESSION innodb_lock_wait_timeout = 2;
+# Trigger lock timeout (1205)
+--error ER_LOCK_WAIT_TIMEOUT
+UPDATE t1 SET val = val + 1;
+
+# This insert should go through, as the continue handler should
+# handle ER_DUP_ENTRY, even after ER_LOCK_WAIT_TIMEOUT (Bug#16041903)
+INSERT INTO t2 (id) VALUES (1);
+
+# Cleanup
+disconnect con2;
+--source include/wait_until_disconnected.inc
+connection default;
+
+DROP TABLE t3, t2, t1;
+
+--disable_connect_log
+
+# Wait till we reached the initial number of concurrent sessions
+--source include/wait_until_count_sessions.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/union.test mysql-5.5-5.5.43/mysql-test/t/union.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/union.test	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/union.test	2015-02-27 08:30:35.000000000 +0000
@@ -1225,3 +1225,34 @@
 SELECT(SELECT 1 AS a ORDER BY a) AS dev;
 SELECT(SELECT 1 AS a LIMIT 1) AS dev;
 SELECT(SELECT 1 AS a FROM dual ORDER BY a DESC LIMIT 1) AS dev;
+
+
+--echo #
+--echo # Bug #17059925 : UNIONS COMPUTES ROWS_EXAMINED INCORRECTLY
+--echo #
+
+## Save current state of slow log variables
+SET @old_slow_query_log= @@global.slow_query_log;
+SET @old_log_output= @@global.log_output;
+SET @old_long_query_time= @@long_query_time;
+SET GLOBAL log_output= "TABLE";
+SET GLOBAL slow_query_log= ON;
+SET SESSION long_query_time= 0;
+
+CREATE TABLE t17059925 (a INT);
+CREATE TABLE t2 (b INT);
+CREATE TABLE t3 (c INT);
+INSERT INTO t17059925 VALUES (1), (2), (3);
+INSERT INTO t2 VALUES (4), (5), (6);
+INSERT INTO t3 VALUES (7), (8), (9);
+TRUNCATE table mysql.slow_log;
+--sorted_result
+SELECT * FROM t17059925 UNION SELECT * FROM t2 UNION SELECT * FROM t3;
+SELECT sql_text, rows_examined FROM mysql.slow_log WHERE sql_text LIKE '%SELECT%t17059925%';
+DROP TABLE t17059925, t2, t3;
+
+## Reset to initial values
+SET @@long_query_time= @old_long_query_time;
+SET @@global.log_output= @old_log_output;
+SET @@global.slow_query_log= @old_slow_query_log;
+
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/view.test mysql-5.5-5.5.43/mysql-test/t/view.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/view.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/view.test	2015-02-27 08:30:35.000000000 +0000
@@ -4147,6 +4147,43 @@
 --error ER_BAD_DB_ERROR
 CREATE VIEW nodb.a AS SELECT 1;
 
+
+--echo #
+--echo # BUG#14117018 - MYSQL SERVER CREATES INVALID VIEW DEFINITION
+--echo # BUG#18405221 - SHOW CREATE VIEW OUTPUT INCORRECT
+--echo #
+
+CREATE VIEW v1 AS (SELECT '' FROM DUAL);
+CREATE VIEW v2 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL);
+CREATE VIEW v3 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL);
+CREATE VIEW v4 AS (SELECT 'BUG#14117018' AS col1 FROM DUAL) UNION ALL
+                  (SELECT '' AS col2 FROM DUAL) UNION ALL
+                  (SELECT '' FROM DUAL);
+
+--echo # Name for the column in select1 is set properly with or
+--echo # without this fix.
+SHOW CREATE VIEW v1;
+
+--echo # Name for the column in select2 is set with this fix.
+--echo # Without this fix, name would not have set for the
+--echo # columns in select2.
+SHOW CREATE VIEW v2;
+
+--echo # Name for the field item in select2 & select3 is set with this fix.
+--echo # Without this fix, name would not have set for the
+--echo # columns in select2 & select3.
+SHOW CREATE VIEW v3;
+
+--echo # Name for the field item in select3 is set with this fix.
+--echo # Without this fix, name would not have set for the
+--echo # columns in select3.
+SHOW CREATE VIEW v4;
+
+DROP VIEW v1, v2, v3, v4;
+
 # Check that all connections opened by test cases in this file are really
 # gone so execution of other tests won't be affected by their presence.
 --source include/wait_until_count_sessions.inc
diff -Nru mysql-5.5-5.5.35+dfsg/mysql-test/t/windows.test mysql-5.5-5.5.43/mysql-test/t/windows.test
--- mysql-5.5-5.5.35+dfsg/mysql-test/t/windows.test	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/mysql-test/t/windows.test	2015-02-27 08:30:35.000000000 +0000
@@ -98,3 +98,19 @@
 
 SELECT VARIABLE_NAME FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES
   WHERE VARIABLE_NAME = 'socket';
+
+--echo #
+--echo # Bug#16581605: REPLACE.EXE UTILITY IS BROKEN IN 5.5
+--echo #
+
+# Creating a temporary text file.
+--write_file $MYSQL_TMP_DIR/bug16581605.txt
+abc
+def
+EOF
+
+#REPLACE.EXE UTILITY will work fine after the fix.
+--exec $REPLACE abc xyz < $MYSQL_TMP_DIR/bug16581605.txt
+
+#Cleanup
+remove_file $MYSQL_TMP_DIR/bug16581605.txt;
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/CMakeLists.txt mysql-5.5-5.5.43/mysys/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/mysys/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -78,7 +78,6 @@
 TARGET_LINK_LIBRARIES(thr_lock mysys)
 SET_TARGET_PROPERTIES(thr_lock PROPERTIES COMPILE_FLAGS "-DMAIN")
 
-INSTALL_DEBUG_SYMBOLS(mysys)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(mysys DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/md5.c mysql-5.5-5.5.43/mysys/md5.c
--- mysql-5.5-5.5.35+dfsg/mysys/md5.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/md5.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_arr_appstr.c mysql-5.5-5.5.43/mysys/mf_arr_appstr.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_arr_appstr.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_arr_appstr.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_iocache2.c mysql-5.5-5.5.43/mysys/mf_iocache2.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_iocache2.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_iocache2.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -408,6 +408,13 @@
       if (my_b_write(info, (uchar*) par, length2))
 	goto err;
     }
+    else if (*fmt == 'c')                     /* char type parameter */
+    {
+      char par[2];
+      par[0] = va_arg(args, int);
+      if (my_b_write(info, (uchar*) par, 1))
+        goto err;
+    }
     else if (*fmt == 'b')                       /* Sized buffer parameter, only precision makes sense */
     {
       char *par = va_arg(args, char *);
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_keycache.c mysql-5.5-5.5.43/mysys/mf_keycache.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_keycache.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_keycache.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_qsort2.c mysql-5.5-5.5.43/mysys/mf_qsort2.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_qsort2.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_qsort2.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_qsort.c mysql-5.5-5.5.43/mysys/mf_qsort.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_qsort.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_qsort.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000-2002, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_radix.c mysql-5.5-5.5.43/mysys/mf_radix.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_radix.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_radix.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_same.c mysql-5.5-5.5.43/mysys/mf_same.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_same.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_same.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_soundex.c mysql-5.5-5.5.43/mysys/mf_soundex.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_soundex.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_soundex.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_tempdir.c mysql-5.5-5.5.43/mysys/mf_tempdir.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_tempdir.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_tempdir.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
@@ -43,7 +43,7 @@
       pathlist=getenv("TMP");
 #endif
     if (!pathlist || !pathlist[0])
-      pathlist=(char*) P_tmpdir;
+      pathlist= DEFAULT_TMPDIR;
   }
   do
   {
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_tempfile.c mysql-5.5-5.5.43/mysys/mf_tempfile.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_tempfile.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_tempfile.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
@@ -111,7 +111,7 @@
 				    sizeof(prefix_buff)-7),"XXXXXX") -
 		     prefix_buff);
     if (!dir && ! (dir =getenv("TMPDIR")))
-      dir=P_tmpdir;
+      dir= DEFAULT_TMPDIR;
     if (strlen(dir)+ pfx_len > FN_REFLEN-2)
     {
       errno=my_errno= ENAMETOOLONG;
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mf_wcomp.c mysql-5.5-5.5.43/mysys/mf_wcomp.c
--- mysql-5.5-5.5.35+dfsg/mysys/mf_wcomp.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mf_wcomp.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/mulalloc.c mysql-5.5-5.5.43/mysys/mulalloc.c
--- mysql-5.5-5.5.35+dfsg/mysys/mulalloc.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/mulalloc.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_access.c mysql-5.5-5.5.43/mysys/my_access.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_access.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_access.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/mysys/my_aes.c mysql-5.5-5.5.43/mysys/my_aes.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_aes.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_aes.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002 MySQL AB
+/* Copyright (c) 2002, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_alarm.c mysql-5.5-5.5.43/mysys/my_alarm.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_alarm.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_alarm.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_conio.c mysql-5.5-5.5.43/mysys/my_conio.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_conio.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_conio.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_crc32.c mysql-5.5-5.5.43/mysys/my_crc32.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_crc32.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_crc32.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_div.c mysql-5.5-5.5.43/mysys/my_div.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_div.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_div.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002, 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_error.c mysql-5.5-5.5.43/mysys/my_error.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_error.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_error.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_fopen.c mysql-5.5-5.5.43/mysys/my_fopen.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_fopen.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_fopen.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/mysys/my_getpagesize.c mysql-5.5-5.5.43/mysys/my_getpagesize.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_getpagesize.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_getpagesize.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_libwrap.c mysql-5.5-5.5.43/mysys/my_libwrap.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_libwrap.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_libwrap.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_lockmem.c mysql-5.5-5.5.43/mysys/my_lockmem.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_lockmem.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_lockmem.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_malloc.c mysql-5.5-5.5.43/mysys/my_malloc.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_malloc.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_malloc.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_memmem.c mysql-5.5-5.5.43/mysys/my_memmem.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_memmem.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_memmem.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_mkdir.c mysql-5.5-5.5.43/mysys/my_mkdir.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_mkdir.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_mkdir.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_once.c mysql-5.5-5.5.43/mysys/my_once.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_once.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_once.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_symlink2.c mysql-5.5-5.5.43/mysys/my_symlink2.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_symlink2.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_symlink2.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_thr_init.c mysql-5.5-5.5.43/mysys/my_thr_init.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_thr_init.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_thr_init.c	2015-02-27 08:30:34.000000000 +0000
@@ -313,6 +313,9 @@
   struct st_my_thread_var *tmp;
   my_bool error=0;
 
+  if (!my_thread_global_init_done)
+    return 1; /* cannot proceed with unintialized library */
+
 #ifdef EXTRA_DEBUG_THREADS
   fprintf(stderr,"my_thread_init(): thread_id: 0x%lx\n",
           (ulong) pthread_self());
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_wincond.c mysql-5.5-5.5.43/mysys/my_wincond.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_wincond.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_wincond.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -305,7 +305,7 @@
 
 
 int pthread_cond_timedwait(pthread_cond_t *cond, pthread_mutex_t *mutex,
-  struct timespec *abstime)
+  const struct timespec *abstime)
 {
   if (have_native_conditions)
   {
@@ -344,26 +344,4 @@
   return 0;
 }
 
-/****************************************************************************
-** Fix localtime_r() to be a bit safer
-****************************************************************************/
-
-struct tm *localtime_r(const time_t *timep,struct tm *tmp)
-{
-  if (*timep == (time_t) -1)			/* This will crash win32 */
-  {
-    bzero(tmp,sizeof(*tmp));
-  }
-  else
-  {
-    struct tm *res=localtime(timep);
-    if (!res)                                   /* Wrong date */
-    {
-      bzero(tmp,sizeof(*tmp));                  /* Keep things safe */
-      return 0;
-    }
-    *tmp= *res;
-  }
-  return tmp;
-}
 #endif /* __WIN__ */
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/my_winthread.c mysql-5.5-5.5.43/mysys/my_winthread.c
--- mysql-5.5-5.5.35+dfsg/mysys/my_winthread.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/my_winthread.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/sha1.c mysql-5.5-5.5.43/mysys/sha1.c
--- mysql-5.5-5.5.35+dfsg/mysys/sha1.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/sha1.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (c) 2002, 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/test_dir.c mysql-5.5-5.5.43/mysys/test_dir.c
--- mysql-5.5-5.5.35+dfsg/mysys/test_dir.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/test_dir.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/test_xml.c mysql-5.5-5.5.43/mysys/test_xml.c
--- mysql-5.5-5.5.35+dfsg/mysys/test_xml.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/test_xml.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* 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
diff -Nru mysql-5.5-5.5.35+dfsg/mysys/thr_alarm.c mysql-5.5-5.5.43/mysys/thr_alarm.c
--- mysql-5.5-5.5.35+dfsg/mysys/thr_alarm.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/mysys/thr_alarm.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
@@ -254,7 +254,7 @@
   {
     if ((ALARM*) queue_element(&alarm_queue,i) == alarm_data)
     {
-      queue_remove(&alarm_queue,i),MYF(0);
+      queue_remove(&alarm_queue,i);
       if (alarm_data->malloced)
 	my_free(alarm_data);
       found++;
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/CMakeLists.txt mysql-5.5-5.5.43/packaging/rpm-oel/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,36 @@
+# Copyright (c) 2012, 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
+# 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
+
+
+IF(UNIX)
+  SET(prefix ${CMAKE_INSTALL_PREFIX})
+
+  SET(SPECFILENAME "mysql.spec")
+  IF("${VERSION}" MATCHES "-ndb-")
+    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
+    SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
+  ENDIF()
+
+  # Left in current directory, to be taken during build
+  CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
+
+  FOREACH(fedfile my.cnf my_config.h mysql_config.sh
+          mysqld.service mysql-systemd-start mysql.conf
+          filter-requires.sh filter-provides.sh mysql.init
+          mysql-5.5-libmysqlclient-symbols.patch)
+    CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
+  ENDFOREACH()
+ENDIF()
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/filter-provides.sh mysql-5.5-5.5.43/packaging/rpm-oel/filter-provides.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/filter-provides.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/filter-provides.sh	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.prov $* |
+sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/filter-requires.sh mysql-5.5-5.5.43/packaging/rpm-oel/filter-requires.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/filter-requires.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/filter-requires.sh	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.req $* |
+sed -e '/perl(GD)/d' -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/my.cnf mysql-5.5-5.5.43/packaging/rpm-oel/my.cnf
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/my.cnf	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,31 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.5/en/server-configuration-defaults.html
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Recommended in standard MySQL setup
+#sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES 
+
+[mysqld_safe]
+log-error=/var/log/mysqld.log
+pid-file=/var/run/mysqld/mysqld.pid
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/my_config.h mysql-5.5-5.5.43/packaging/rpm-oel/my_config.h
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/my_config.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/my_config.h	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Fedora supports multi arch: having 32 and 64 versions of MySQL
+ *  installed at the same time. my_config.h will differ due arch
+ *  dependent defs creating a file conflict. We move arch specific
+ *  headers to arch specific file names and include the correct arch
+ *  specific file by installing this generic file.
+ *
+ */
+
+#if defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ia64__)
+#include "my_config_ia64.h"
+#elif defined(__powerpc__)
+#include "my_config_ppc.h"
+#elif defined(__powerpc64__)
+#include "my_config_ppc64.h"
+#elif defined(__s390x__)
+#include "my_config_s390x.h"
+#elif defined(__s390__)
+#include "my_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "my_config_sparc64.h"
+#elif defined(__sparc__)
+#include "my_config_sparc.h"
+#elif defined(__x86_64__)
+#include "my_config_x86_64.h"
+#else
+#error "This MySQL devel package does not work your architecture?"
+#endif
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch mysql-5.5-5.5.43/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysql-5.5-libmysqlclient-symbols.patch	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,982 @@
+diff -rup old/libmysql/CMakeLists.txt new/libmysql/CMakeLists.txt
+--- old/libmysql/CMakeLists.txt	2013-11-05 08:19:26.000000000 +0100
++++ new/libmysql/CMakeLists.txt	2014-01-10 15:41:30.530068723 +0100
+@@ -205,13 +205,14 @@ IF(NOT DISABLE_SHARED)
+       OUTPUT_NAME mysqlclient 
+       VERSION "${OS_SHARED_LIB_VERSION}" 
+       SOVERSION "${SHARED_LIB_MAJOR_VERSION}")
++    CONFIGURE_FILE(libmysql.ver.in ${CMAKE_CURRENT_BINARY_DIR}/libmysql.ver)
+     IF(LINK_FLAG_NO_UNDEFINED)
+       GET_TARGET_PROPERTY(libmysql_link_flags libmysql LINK_FLAGS)
+       IF(NOT libmysql_link_flag)
+         SET(libmysql_link_flags)
+       ENDIF()
+       SET_TARGET_PROPERTIES(libmysql PROPERTIES LINK_FLAGS 
+-        "${libmysql_link_flags} ${LINK_FLAG_NO_UNDEFINED}")
++        "${libmysql_link_flags} -Wl,--version-script=libmysql.ver ${LINK_FLAG_NO_UNDEFINED}")
+     ENDIF() 
+     # clean direct output needs to be set several targets have the same name
+     #(mysqlclient in this case)
+diff -rup old/libmysql/libmysql.c new/libmysql/libmysql.c
+--- old/libmysql/libmysql.c	2013-11-05 08:19:26.000000000 +0100
++++ new/libmysql/libmysql.c	2014-01-10 15:46:35.708928462 +0100
+@@ -4870,3 +4870,612 @@ my_bool STDCALL mysql_read_query_result(
+   return (*mysql->methods->read_query_result)(mysql);
+ }
+ 
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions
++
++#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16")
++
++void STDCALL symver16_myodbc_remove_escape(MYSQL *mysql,char *name)
++{
++  return myodbc_remove_escape(mysql, name);
++}
++SYM_16(myodbc_remove_escape);
++
++
++my_ulonglong STDCALL symver16_mysql_affected_rows(MYSQL *mysql)
++{
++  return mysql_affected_rows(mysql);
++}
++SYM_16(mysql_affected_rows);
++
++
++my_bool STDCALL symver16_mysql_autocommit(MYSQL * mysql, my_bool auto_mode)
++{
++  return mysql_autocommit(mysql, auto_mode);
++}
++SYM_16(mysql_autocommit);
++
++
++my_bool STDCALL symver16_mysql_change_user(MYSQL *mysql, const char *user, const char *passwd, const char *db)
++{
++  return mysql_change_user(mysql, user, passwd, db);
++}
++SYM_16(mysql_change_user);
++
++
++const char * STDCALL symver16_mysql_character_set_name(MYSQL *mysql)
++{
++  return mysql_character_set_name(mysql);
++}
++SYM_16(mysql_character_set_name);
++
++
++my_bool STDCALL symver16_mysql_commit(MYSQL * mysql)
++{
++  return mysql_commit(mysql);
++}
++SYM_16(mysql_commit);
++
++
++void STDCALL symver16_mysql_data_seek(MYSQL_RES *result, my_ulonglong row)
++{
++  return mysql_data_seek(result, row);
++}
++SYM_16(mysql_data_seek);
++
++
++void STDCALL symver16_mysql_debug(const char *debug __attribute__((unused)))
++{
++  return mysql_debug(debug);
++}
++SYM_16(mysql_debug);
++
++
++int STDCALL symver16_mysql_dump_debug_info(MYSQL *mysql)
++{
++  return mysql_dump_debug_info(mysql);
++}
++SYM_16(mysql_dump_debug_info);
++
++
++my_bool STDCALL symver16_mysql_embedded(void)
++{
++  return mysql_embedded();
++}
++SYM_16(mysql_embedded);
++
++
++my_bool STDCALL symver16_mysql_eof(MYSQL_RES *res)
++{
++  return mysql_eof(res);
++}
++SYM_16(mysql_eof);
++
++
++ulong STDCALL symver16_mysql_escape_string(char *to,const char *from,ulong length)
++{
++  return mysql_escape_string(to, from, length);
++}
++SYM_16(mysql_escape_string);
++
++
++MYSQL_FIELD * STDCALL symver16_mysql_fetch_field(MYSQL_RES *result)
++{
++  return mysql_fetch_field(result);
++}
++SYM_16(mysql_fetch_field);
++
++
++MYSQL_FIELD * STDCALL symver16_mysql_fetch_field_direct(MYSQL_RES *res,uint fieldnr)
++{
++  return mysql_fetch_field_direct(res, fieldnr);
++}
++SYM_16(mysql_fetch_field_direct);
++
++
++MYSQL_FIELD * STDCALL symver16_mysql_fetch_fields(MYSQL_RES *res)
++{
++  return mysql_fetch_fields(res);
++}
++SYM_16(mysql_fetch_fields);
++
++
++unsigned int STDCALL symver16_mysql_field_count(MYSQL *mysql)
++{
++  return mysql_field_count(mysql);
++}
++SYM_16(mysql_field_count);
++
++
++MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_seek(MYSQL_RES *result, MYSQL_FIELD_OFFSET field_offset)
++{
++  return mysql_field_seek(result, field_offset);
++}
++SYM_16(mysql_field_seek);
++
++
++MYSQL_FIELD_OFFSET STDCALL symver16_mysql_field_tell(MYSQL_RES *res)
++{
++  return mysql_field_tell(res);
++}
++SYM_16(mysql_field_tell);
++
++
++void STDCALL symver16_mysql_get_character_set_info(MYSQL *mysql, MY_CHARSET_INFO *csinfo)
++{
++  return mysql_get_character_set_info(mysql, csinfo);
++}
++SYM_16(mysql_get_character_set_info);
++
++
++const char * STDCALL symver16_mysql_get_client_info(void)
++{
++  return mysql_get_client_info();
++}
++SYM_16(mysql_get_client_info);
++
++ulong STDCALL symver16_mysql_get_client_version(void)
++{
++  return mysql_get_client_version();
++}
++SYM_16(mysql_get_client_version);
++
++
++const char * STDCALL symver16_mysql_get_host_info(MYSQL *mysql)
++{
++  return mysql_get_host_info(mysql);
++}
++SYM_16(mysql_get_host_info);
++
++
++MYSQL_PARAMETERS *STDCALL symver16_mysql_get_parameters(void)
++{
++  return mysql_get_parameters();
++}
++SYM_16(mysql_get_parameters);
++
++
++uint STDCALL symver16_mysql_get_proto_info(MYSQL *mysql)
++{
++  return mysql_get_proto_info(mysql);
++}
++SYM_16(mysql_get_proto_info);
++
++
++const char * STDCALL symver16_mysql_get_server_info(MYSQL *mysql)
++{
++  return mysql_get_server_info(mysql);
++}
++SYM_16(mysql_get_server_info);
++
++
++ulong STDCALL symver16_mysql_hex_string(char *to, const char *from, ulong length)
++{
++  return mysql_hex_string(to, from, length);
++}
++SYM_16(mysql_hex_string);
++
++
++const char *STDCALL symver16_mysql_info(MYSQL *mysql)
++{
++  return mysql_info(mysql);
++}
++SYM_16(mysql_info);
++
++
++my_ulonglong STDCALL symver16_mysql_insert_id(MYSQL *mysql)
++{
++  return mysql_insert_id(mysql);
++}
++SYM_16(mysql_insert_id);
++
++
++int STDCALL symver16_mysql_kill(MYSQL *mysql,ulong pid)
++{
++  return mysql_kill(mysql, pid);
++}
++SYM_16(mysql_kill);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_dbs(MYSQL *mysql, const char *wild)
++{
++  return mysql_list_dbs(mysql, wild);
++}
++SYM_16(mysql_list_dbs);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_fields(MYSQL *mysql, const char *table, const char *wild)
++{
++  return mysql_list_fields(mysql, table, wild);
++}
++SYM_16(mysql_list_fields);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_processes(MYSQL *mysql)
++{
++  return mysql_list_processes(mysql);
++}
++SYM_16(mysql_list_processes);
++
++
++MYSQL_RES * STDCALL symver16_mysql_list_tables(MYSQL *mysql, const char *wild)
++{
++  return mysql_list_tables(mysql, wild);
++}
++SYM_16(mysql_list_tables);
++
++
++my_bool STDCALL symver16_mysql_more_results(MYSQL *mysql)
++{
++  return mysql_more_results(mysql);
++}
++SYM_16(mysql_more_results);
++
++
++int STDCALL symver16_mysql_next_result(MYSQL *mysql)
++{
++  return mysql_next_result(mysql);
++}
++SYM_16(mysql_next_result);
++
++
++int STDCALL symver16_mysql_ping(MYSQL *mysql)
++{
++  return mysql_ping(mysql);
++}
++SYM_16(mysql_ping);
++
++
++int STDCALL symver16_mysql_query(MYSQL *mysql, const char *query)
++{
++  return mysql_query(mysql, query);
++}
++SYM_16(mysql_query);
++
++
++my_bool STDCALL symver16_mysql_read_query_result(MYSQL *mysql)
++{
++  return mysql_read_query_result(mysql);
++}
++SYM_16(mysql_read_query_result);
++
++
++ulong STDCALL symver16_mysql_real_escape_string(MYSQL *mysql, char *to,const char *from, ulong length)
++{
++  return mysql_real_escape_string(mysql, to, from, length);
++}
++SYM_16(mysql_real_escape_string);
++
++
++int STDCALL symver16_mysql_refresh(MYSQL *mysql,uint options)
++{
++  return mysql_refresh(mysql, options);
++}
++SYM_16(mysql_refresh);
++
++
++my_bool STDCALL symver16_mysql_rollback(MYSQL * mysql)
++{
++  return mysql_rollback(mysql);
++}
++SYM_16(mysql_rollback);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_seek(MYSQL_RES *result, MYSQL_ROW_OFFSET row)
++{
++  return mysql_row_seek(result, row);
++}
++SYM_16(mysql_row_seek);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_row_tell(MYSQL_RES *res)
++{
++  return mysql_row_tell(res);
++}
++SYM_16(mysql_row_tell);
++
++
++void STDCALL symver16_mysql_server_end()
++{
++  return mysql_server_end();
++}
++SYM_16(mysql_server_end);
++
++
++int STDCALL symver16_mysql_server_init(int argc __attribute__((unused)), char **argv __attribute__((unused)), char **groups __attribute__((unused)))
++{
++  return mysql_server_init(argc, argv, groups);
++}
++SYM_16(mysql_server_init);
++
++
++void symver16_mysql_set_local_infile_default(MYSQL *mysql)
++{
++  return mysql_set_local_infile_default(mysql);
++}
++SYM_16(mysql_set_local_infile_default);
++
++
++void symver16_mysql_set_local_infile_handler(MYSQL *mysql, int (*local_infile_init)(void **, const char *, void *), int (*local_infile_read)(void *, char *, uint), void (*local_infile_end)(void *), int (*local_infile_error)(void *, char *, uint), void *userdata)
++{
++  return mysql_set_local_infile_handler(mysql, local_infile_init, local_infile_read, local_infile_end, local_infile_error, userdata);
++}
++SYM_16(mysql_set_local_infile_handler);
++
++
++int STDCALL symver16_mysql_set_server_option(MYSQL *mysql, enum enum_mysql_set_option option)
++{
++  return mysql_set_server_option(mysql, option);
++}
++SYM_16(mysql_set_server_option);
++
++
++int STDCALL symver16_mysql_shutdown(MYSQL *mysql, enum mysql_enum_shutdown_level shutdown_level)
++{
++  return mysql_shutdown(mysql, shutdown_level);
++}
++SYM_16(mysql_shutdown);
++
++
++const char *STDCALL symver16_mysql_sqlstate(MYSQL *mysql)
++{
++  return mysql_sqlstate(mysql);
++}
++SYM_16(mysql_sqlstate);
++
++
++const char * STDCALL symver16_mysql_stat(MYSQL *mysql)
++{
++  return mysql_stat(mysql);
++}
++SYM_16(mysql_stat);
++
++
++my_ulonglong STDCALL symver16_mysql_stmt_affected_rows(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_affected_rows(stmt);
++}
++SYM_16(mysql_stmt_affected_rows);
++
++
++my_bool STDCALL symver16_mysql_stmt_attr_get(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, void *value)
++{
++  return mysql_stmt_attr_get(stmt, attr_type, value);
++}
++SYM_16(mysql_stmt_attr_get);
++
++
++my_bool STDCALL symver16_mysql_stmt_attr_set(MYSQL_STMT *stmt, enum enum_stmt_attr_type attr_type, const void *value)
++{
++  return mysql_stmt_attr_set(stmt, attr_type, value);
++}
++SYM_16(mysql_stmt_attr_set);
++
++
++my_bool STDCALL symver16_mysql_stmt_bind_param(MYSQL_STMT *stmt, MYSQL_BIND *my_bind)
++{
++  return mysql_stmt_bind_param(stmt, my_bind);
++}
++SYM_16(mysql_stmt_bind_param);
++
++
++my_bool STDCALL symver16_mysql_stmt_bind_result(MYSQL_STMT *stmt, MYSQL_BIND *my_bind)
++{
++  return mysql_stmt_bind_result(stmt, my_bind);
++}
++SYM_16(mysql_stmt_bind_result);
++
++
++my_bool STDCALL symver16_mysql_stmt_close(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_close(stmt);
++}
++SYM_16(mysql_stmt_close);
++
++
++void STDCALL symver16_mysql_stmt_data_seek(MYSQL_STMT *stmt, my_ulonglong row)
++{
++  return mysql_stmt_data_seek(stmt, row);
++}
++SYM_16(mysql_stmt_data_seek);
++
++
++uint STDCALL symver16_mysql_stmt_errno(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_errno(stmt);
++}
++SYM_16(mysql_stmt_errno);
++
++
++const char *STDCALL symver16_mysql_stmt_error(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_error(stmt);
++}
++SYM_16(mysql_stmt_error);
++
++
++int STDCALL symver16_mysql_stmt_execute(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_execute(stmt);
++}
++SYM_16(mysql_stmt_execute);
++
++
++int STDCALL symver16_mysql_stmt_fetch(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_fetch(stmt);
++}
++SYM_16(mysql_stmt_fetch);
++
++
++int STDCALL symver16_mysql_stmt_fetch_column(MYSQL_STMT *stmt, MYSQL_BIND *my_bind, uint column, ulong offset)  
++{
++  return mysql_stmt_fetch_column(stmt, my_bind, column, offset);
++}
++SYM_16(mysql_stmt_fetch_column);
++
++
++unsigned int STDCALL symver16_mysql_stmt_field_count(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_field_count(stmt);
++}
++SYM_16(mysql_stmt_field_count);
++
++
++my_bool STDCALL symver16_mysql_stmt_free_result(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_free_result(stmt);
++}
++SYM_16(mysql_stmt_free_result);
++
++
++MYSQL_STMT * STDCALL symver16_mysql_stmt_init(MYSQL *mysql)
++{
++  return mysql_stmt_init(mysql);
++}
++SYM_16(mysql_stmt_init);
++
++
++my_ulonglong STDCALL symver16_mysql_stmt_insert_id(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_insert_id(stmt);
++}
++SYM_16(mysql_stmt_insert_id);
++
++
++my_ulonglong STDCALL symver16_mysql_stmt_num_rows(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_num_rows(stmt);
++}
++SYM_16(mysql_stmt_num_rows);
++
++
++ulong STDCALL symver16_mysql_stmt_param_count(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_param_count(stmt);
++}
++SYM_16(mysql_stmt_param_count);
++
++
++MYSQL_RES * STDCALL symver16_mysql_stmt_param_metadata(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_param_metadata(stmt);
++}
++SYM_16(mysql_stmt_param_metadata);
++
++
++int STDCALL symver16_mysql_stmt_prepare(MYSQL_STMT *stmt, const char *query, ulong length)
++{
++  return mysql_stmt_prepare(stmt, query, length);
++}
++SYM_16(mysql_stmt_prepare);
++
++
++my_bool STDCALL symver16_mysql_stmt_reset(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_reset(stmt);
++}
++SYM_16(mysql_stmt_reset);
++
++
++MYSQL_RES * STDCALL symver16_mysql_stmt_result_metadata(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_result_metadata(stmt);
++}
++SYM_16(mysql_stmt_result_metadata);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_seek(MYSQL_STMT *stmt, MYSQL_ROW_OFFSET row)
++{
++  return mysql_stmt_row_seek(stmt, row);
++}
++SYM_16(mysql_stmt_row_seek);
++
++
++MYSQL_ROW_OFFSET STDCALL symver16_mysql_stmt_row_tell(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_row_tell(stmt);
++}
++SYM_16(mysql_stmt_row_tell);
++
++
++my_bool STDCALL symver16_mysql_stmt_send_long_data(MYSQL_STMT *stmt, uint param_number, const char *data, ulong length)
++{
++  return mysql_stmt_send_long_data(stmt, param_number, data, length);
++}
++SYM_16(mysql_stmt_send_long_data);
++
++
++const char *STDCALL symver16_mysql_stmt_sqlstate(MYSQL_STMT * stmt)
++{
++  return mysql_stmt_sqlstate(stmt);
++}
++SYM_16(mysql_stmt_sqlstate);
++
++
++int STDCALL symver16_mysql_stmt_store_result(MYSQL_STMT *stmt)
++{
++  return mysql_stmt_store_result(stmt);
++}
++SYM_16(mysql_stmt_store_result);
++
++
++void STDCALL symver16_mysql_thread_end()
++{
++  return mysql_thread_end();
++}
++SYM_16(mysql_thread_end);
++
++
++ulong STDCALL symver16_mysql_thread_id(MYSQL *mysql)
++{
++  return mysql_thread_id(mysql);
++}
++SYM_16(mysql_thread_id);
++
++
++my_bool STDCALL symver16_mysql_thread_init()
++{
++  return mysql_thread_init();
++}
++SYM_16(mysql_thread_init);
++
++
++uint STDCALL symver16_mysql_thread_safe(void)
++{
++  return mysql_thread_safe();
++}
++SYM_16(mysql_thread_safe);
++
++
++MYSQL_RES * STDCALL symver16_mysql_use_result(MYSQL *mysql)
++{
++  return mysql_use_result(mysql);
++}
++SYM_16(mysql_use_result);
++
++
++uint STDCALL symver16_mysql_warning_count(MYSQL *mysql)
++{
++  return mysql_warning_count(mysql);
++}
++SYM_16(mysql_warning_count);
++
++/*****/
++
++MYSQL * STDCALL symver16_mysql_real_connect(MYSQL *mysql,const char *host, const char *user, const char *passwd, const char *db, uint port, const char *unix_socket,ulong client_flag)
++{
++  return mysql_real_connect(mysql, host, user, passwd, db, port, unix_socket, client_flag);
++}
++SYM_16(mysql_real_connect);
++
++/*****/
++
++my_bool symver16_my_init(void)
++{
++  return my_init();
++}
++SYM_16(my_init);
++
++#endif
+diff -rup old/libmysql/libmysql.ver.in new/libmysql/libmysql.ver.in
+--- old/libmysql/libmysql.ver.in	2013-11-05 08:19:26.000000000 +0100
++++ new/libmysql/libmysql.ver.in	2014-01-10 15:41:30.545182782 +0100
+@@ -1 +1,136 @@
+-libmysqlclient_@SHARED_LIB_MAJOR_VERSION@ { global: *; };
++libmysqlclient_16
++{
++  local:
++    symver16_*;
++};
++
++libmysqlclient_18
++{
++  global:
++    my_init;
++    myodbc_remove_escape;
++    mysql_affected_rows;
++    mysql_autocommit;
++    mysql_change_user;
++    mysql_character_set_name;
++    mysql_close;
++    mysql_commit;
++    mysql_data_seek;
++    mysql_debug;
++    mysql_dump_debug_info;
++    mysql_embedded;
++    mysql_eof;
++    mysql_errno;
++    mysql_error;
++    mysql_escape_string;
++    mysql_fetch_field;
++    mysql_fetch_field_direct;
++    mysql_fetch_fields;
++    mysql_fetch_lengths;
++    mysql_fetch_row;
++    mysql_field_count;
++    mysql_field_seek;
++    mysql_field_tell;
++    mysql_free_result;
++    mysql_get_character_set_info;
++    mysql_get_client_info;
++    mysql_get_client_version;
++    mysql_get_host_info;
++    mysql_get_parameters;
++    mysql_get_proto_info;
++    mysql_get_server_info;
++    mysql_get_server_version;
++    mysql_get_ssl_cipher;
++    mysql_hex_string;
++    mysql_info;
++    mysql_init;
++    mysql_insert_id;
++    mysql_kill;
++    mysql_list_dbs;
++    mysql_list_fields;
++    mysql_list_processes;
++    mysql_list_tables;
++    mysql_more_results;
++    mysql_next_result;
++    mysql_num_fields;
++    mysql_num_rows;
++    mysql_options;
++    mysql_ping;
++    mysql_query;
++    mysql_read_query_result;
++    mysql_real_connect;
++    mysql_real_escape_string;
++    mysql_real_query;
++    mysql_refresh;
++    mysql_rollback;
++    mysql_row_seek;
++    mysql_row_tell;
++    mysql_select_db;
++    mysql_send_query;
++    mysql_server_end;
++    mysql_server_init;
++    mysql_set_character_set;
++    mysql_set_local_infile_default;
++    mysql_set_local_infile_handler;
++    mysql_set_server_option;
++    mysql_shutdown;
++    mysql_sqlstate;
++    mysql_ssl_set;
++    mysql_stat;
++    mysql_stmt_affected_rows;
++    mysql_stmt_attr_get;
++    mysql_stmt_attr_set;
++    mysql_stmt_bind_param;
++    mysql_stmt_bind_result;
++    mysql_stmt_close;
++    mysql_stmt_data_seek;
++    mysql_stmt_errno;
++    mysql_stmt_error;
++    mysql_stmt_execute;
++    mysql_stmt_fetch;
++    mysql_stmt_fetch_column;
++    mysql_stmt_field_count;
++    mysql_stmt_free_result;
++    mysql_stmt_init;
++    mysql_stmt_insert_id;
++    mysql_stmt_num_rows;
++    mysql_stmt_param_count;
++    mysql_stmt_param_metadata;
++    mysql_stmt_prepare;
++    mysql_stmt_reset;
++    mysql_stmt_result_metadata;
++    mysql_stmt_row_seek;
++    mysql_stmt_row_tell;
++    mysql_stmt_send_long_data;
++    mysql_stmt_sqlstate;
++    mysql_stmt_store_result;
++    mysql_store_result;
++    mysql_thread_end;
++    mysql_thread_id;
++    mysql_thread_init;
++    mysql_thread_safe;
++    mysql_use_result;
++    mysql_warning_count;
++
++    free_defaults;
++    handle_options;
++    load_defaults;
++    my_print_help;
++
++    #my_make_scrambled_password;
++    THR_KEY_mysys;
++
++    mysql_client_find_plugin;
++    mysql_client_register_plugin;
++    mysql_load_plugin;
++    mysql_load_plugin_v;
++    mysql_plugin_options;
++    mysql_stmt_next_result;
++
++    #mysql_default_charset_info;
++    mysql_get_charset;
++    mysql_get_charset_by_csname;
++    mysql_net_realloc;
++    #mysql_client_errors;
++    *;
++} libmysqlclient_16;
+diff -rup old/mysys/charset.c new/mysys/charset.c
+--- old/mysys/charset.c	2013-11-05 08:19:26.000000000 +0100
++++ new/mysys/charset.c	2014-01-10 15:41:30.552919678 +0100
+@@ -941,3 +941,20 @@ size_t escape_quotes_for_mysql(CHARSET_I
+   *to= 0;
+   return overflow ? (ulong)~0 : (ulong) (to - to_start);
+ }
++
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide Fedora symbols
++
++CHARSET_INFO *mysql_get_charset(uint cs_number, myf flags)
++{
++  return get_charset(cs_number, flags);
++}
++
++
++CHARSET_INFO * mysql_get_charset_by_csname(const char *cs_name, uint cs_flags, myf flags)
++{
++  return get_charset_by_csname(cs_name, cs_flags, flags);
++}
++
++#endif
+diff -rup old/sql/net_serv.cc new/sql/net_serv.cc
+--- old/sql/net_serv.cc	2013-11-05 08:19:26.000000000 +0100
++++ new/sql/net_serv.cc	2014-01-10 15:41:30.563377346 +0100
+@@ -1190,3 +1190,17 @@ void my_net_set_write_timeout(NET *net,
+ #endif
+   DBUG_VOID_RETURN;
+ }
++
++#ifndef EMBEDDED_LIBRARY
++C_MODE_START
++
++// Hack to provide Fedora symbols
++
++my_bool mysql_net_realloc(NET *net, size_t length)
++{
++  return net_realloc(net, length);
++}
++
++C_MODE_END
++#endif
++
+diff -rup old/sql/password.c new/sql/password.c
+--- old/sql/password.c	2013-11-05 08:19:26.000000000 +0100
++++ new/sql/password.c	2014-01-10 15:41:30.567134663 +0100
+@@ -563,3 +563,17 @@ void make_password_from_salt(char *to, c
+   *to++= PVERSION41_CHAR;
+   octet2hex(to, (const char*) hash_stage2, SHA1_HASH_SIZE);
+ }
++
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions
++
++#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16")
++
++void symver16_my_make_scrambled_password(char *to, const char *password, size_t pass_len)
++{
++  my_make_scrambled_password(to, password, pass_len);
++}
++SYM_16(my_make_scrambled_password);
++
++#endif
+diff -rup old/sql-common/client.c new/sql-common/client.c
+--- old/sql-common/client.c	2013-11-05 08:19:26.000000000 +0100
++++ new/sql-common/client.c	2014-01-10 15:41:30.574151024 +0100
+@@ -4399,3 +4399,136 @@ static int clear_password_auth_client(MY
+ 
+   return res ? CR_ERROR : CR_OK;
+ }
++
++#ifndef EMBEDDED_LIBRARY
++
++// Hack to provide both libmysqlclient_16 and libmysqlclient_18 symbol versions
++
++#define SYM_16(_exportedsym) __asm__(".symver symver16_" #_exportedsym "," #_exportedsym "@libmysqlclient_16")
++
++void STDCALL symver16_mysql_close(MYSQL *mysql)
++{
++  return mysql_close(mysql);
++}
++SYM_16(mysql_close);
++
++
++uint STDCALL symver16_mysql_errno(MYSQL *mysql)
++{
++  return mysql_errno(mysql);
++}
++SYM_16(mysql_errno);
++
++
++const char * STDCALL symver16_mysql_error(MYSQL *mysql)
++{
++  return mysql_error(mysql);
++}
++SYM_16(mysql_error);
++
++
++ulong * STDCALL symver16_mysql_fetch_lengths(MYSQL_RES *res)
++{
++  return mysql_fetch_lengths(res);
++}
++SYM_16(mysql_fetch_lengths);
++
++
++MYSQL_ROW STDCALL symver16_mysql_fetch_row(MYSQL_RES *res)
++{
++  return mysql_fetch_row(res);
++}
++SYM_16(mysql_fetch_row);
++
++
++void STDCALL symver16_mysql_free_result(MYSQL_RES *result)
++{
++  return mysql_free_result(result);
++}
++SYM_16(mysql_free_result);
++
++
++ulong STDCALL symver16_mysql_get_server_version(MYSQL *mysql)
++{
++  return mysql_get_server_version(mysql);
++}
++SYM_16(mysql_get_server_version);
++
++
++const char * STDCALL symver16_mysql_get_ssl_cipher(MYSQL *mysql __attribute__((unused)))
++{
++  return mysql_get_ssl_cipher(mysql);
++}
++SYM_16(mysql_get_ssl_cipher);
++
++
++MYSQL * STDCALL symver16_mysql_init(MYSQL *mysql)
++{
++  return mysql_init(mysql);
++}
++SYM_16(mysql_init);
++
++
++unsigned int STDCALL symver16_mysql_num_fields(MYSQL_RES *res)
++{
++  return mysql_num_fields(res);
++}
++SYM_16(mysql_num_fields);
++
++
++my_ulonglong STDCALL symver16_mysql_num_rows(MYSQL_RES *res)
++{
++  return mysql_num_rows(res);
++}
++SYM_16(mysql_num_rows);
++
++
++int STDCALL symver16_mysql_options(MYSQL *mysql,enum mysql_option option, const void *arg)
++{
++  return mysql_options(mysql, option, arg);
++}
++SYM_16(mysql_options);
++
++
++int STDCALL symver16_mysql_real_query(MYSQL *mysql, const char *query, ulong length)
++{
++  return mysql_real_query(mysql, query, length);
++}
++SYM_16(mysql_real_query);
++
++
++int STDCALL symver16_mysql_select_db(MYSQL *mysql, const char *db)
++{
++  return mysql_select_db(mysql, db);
++}
++SYM_16(mysql_select_db);
++
++
++int STDCALL symver16_mysql_send_query(MYSQL* mysql, const char* query, ulong length)
++{
++  return mysql_send_query(mysql, query, length);
++}
++SYM_16(mysql_send_query);
++
++
++int STDCALL symver16_mysql_set_character_set(MYSQL *mysql, const char *cs_name)
++{
++  return mysql_set_character_set(mysql, cs_name);
++}
++SYM_16(mysql_set_character_set);
++
++
++my_bool STDCALL symver16_mysql_ssl_set(MYSQL *mysql __attribute__((unused)), const char *key __attribute__((unused)), const char *cert __attribute__((unused)), const char *ca __attribute__((unused)), const char *capath __attribute__((unused)), const char *cipher __attribute__((unused)))
++{
++  return mysql_ssl_set(mysql, key, cert, ca, capath, cipher);
++}
++SYM_16(mysql_ssl_set);
++
++
++MYSQL_RES * STDCALL symver16_mysql_store_result(MYSQL *mysql)
++{
++  return mysql_store_result(mysql);
++}
++SYM_16(mysql_store_result);
++
++#endif
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql.conf mysql-5.5-5.5.43/packaging/rpm-oel/mysql.conf
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql.conf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysql.conf	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1 @@
+d /var/run/mysqld 0755 mysql mysql -
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql_config.sh mysql-5.5-5.5.43/packaging/rpm-oel/mysql_config.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql_config.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysql_config.sh	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,28 @@
+#! /bin/bash
+#
+# Wrapper script for mysql_config to support multilib
+#
+# Only works on OEL6/RHEL6 and similar
+#
+# This command respects setarch
+
+bits=$(rpm --eval %__isa_bits)
+
+case $bits in
+    32|64) status=known ;;
+        *) status=unknown ;;
+esac
+
+if [ "$status" = "unknown" ] ; then
+    echo "$0: error: command 'rpm --eval %__isa_bits' returned unknown value: $bits"
+    exit 1
+fi
+
+
+if [ -x /usr/bin/mysql_config-$bits ] ; then
+    /usr/bin/mysql_config-$bits "$@"
+else
+    echo "$0: error: needed binary: /usr/bin/mysql_config-$bits is missing. Please check your MySQL installation."
+    exit 1
+fi
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysqld.service mysql-5.5-5.5.43/packaging/rpm-oel/mysqld.service
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysqld.service	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysqld.service	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,48 @@
+#
+# Simple MySQL systemd service file
+#
+# systemd supports lots of fancy features, look here (and linked docs) for a full list: 
+#   http://www.freedesktop.org/software/systemd/man/systemd.exec.html
+#
+# Note: this file ( /usr/lib/systemd/system/mysql.service )
+# will be overwritten on package upgrade, please copy the file to 
+#
+#  /etc/systemd/system/mysql.service 
+#  
+# to make needed changes.
+# 
+# systemd-delta can be used to check differences between the two mysql.service files.
+#
+
+[Unit]
+Description=MySQL Community Server
+After=network.target
+After=syslog.target
+
+[Install]
+WantedBy=multi-user.target
+Alias=mysql.service
+
+[Service]
+User=mysql
+Group=mysql
+
+# Execute pre and post scripts as root
+PermissionsStartOnly=true
+
+# Needed to create system tables etc.
+ExecStartPre=/usr/bin/mysql-systemd-start pre
+
+# Start main service
+ExecStart=/usr/bin/mysqld_safe
+
+# Don't signal startup success before a ping works
+ExecStartPost=/usr/bin/mysql-systemd-start post
+
+# Give up if ping don't get an answer
+TimeoutSec=600
+
+Restart=always
+PrivateTmp=false
+
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql.init mysql-5.5-5.5.43/packaging/rpm-oel/mysql.init
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysql.init	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,213 @@
+#!/bin/sh
+#
+# mysqld	This shell script takes care of starting and stopping
+#		the MySQL subsystem (mysqld).
+#
+# chkconfig: - 64 36
+# description:	MySQL database server.
+# processname: mysqld
+# config: /etc/my.cnf
+# pidfile: /var/run/mysqld/mysqld.pid
+
+# Source function library.
+. /etc/rc.d/init.d/functions
+
+# Source networking configuration.
+. /etc/sysconfig/network
+
+
+exec="/usr/bin/mysqld_safe"
+prog="mysqld"
+
+# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld
+STARTTIMEOUT=120
+STOPTIMEOUT=60
+
+[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
+
+lockfile=/var/lock/subsys/$prog
+
+
+# extract value of a MySQL option from config files
+# Usage: get_mysql_option SECTION VARNAME DEFAULT
+# result is returned in $result
+# We use my_print_defaults which prints all options from multiple files,
+# with the more specific ones later; hence take the last match.
+get_mysql_option(){
+	result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1`
+	if [ -z "$result" ]; then
+	    # not found, use default
+	    result="$3"
+	fi
+}
+
+get_mysql_option mysqld datadir "/var/lib/mysql"
+datadir="$result"
+get_mysql_option mysqld socket "$datadir/mysql.sock"
+socketfile="$result"
+get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
+errlogfile="$result"
+get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
+mypidfile="$result"
+
+case $socketfile in
+    /*) adminsocket="$socketfile" ;;
+     *) adminsocket="$datadir/$socketfile" ;;
+esac
+
+start(){
+    [ -x $exec ] || exit 5
+    # check to see if it's already running
+    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1)
+    if [ $? = 0 ]; then
+	# already running, do nothing
+	action $"Starting $prog: " /bin/true
+	ret=0
+    elif echo "$RESPONSE" | grep -q "Access denied for user"
+    then
+	# already running, do nothing
+	action $"Starting $prog: " /bin/true
+	ret=0
+    else
+    	# prepare for start
+	touch "$errlogfile"
+	chown mysql:mysql "$errlogfile" 
+	chmod 0640 "$errlogfile"
+	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
+	if [ ! -d "$datadir/mysql" ] ; then
+	    # First, make sure $datadir is there with correct permissions
+	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
+	    then
+		mkdir -p "$datadir" || exit 1
+	    fi
+	    chown mysql:mysql "$datadir"
+	    chmod 0755 "$datadir"
+	    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
+	    # Now create the database
+	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+	    ret=$?
+	    chown -R mysql:mysql "$datadir"
+	    if [ $ret -ne 0 ] ; then
+		return $ret
+	    fi
+	fi
+	chown mysql:mysql "$datadir"
+	chmod 0755 "$datadir"
+	# Pass all the options determined above, to ensure consistent behavior.
+	# In many cases mysqld_safe would arrive at the same conclusions anyway
+	# but we need to be sure.  (An exception is that we don't force the
+	# log-error setting, since this script doesn't really depend on that,
+	# and some users might prefer to configure logging to syslog.)
+	# Note: set --basedir to prevent probes that might trigger SELinux
+	# alarms, per bug #547485
+	$exec   --datadir="$datadir" --socket="$socketfile" \
+		--pid-file="$mypidfile" \
+		--basedir=/usr --user=mysql >/dev/null 2>&1 &
+	safe_pid=$!
+	# Spin for a maximum of N seconds waiting for the server to come up;
+	# exit the loop immediately if mysqld_safe process disappears.
+	# Rather than assuming we know a valid username, accept an "access
+	# denied" response as meaning the server is functioning.
+	ret=0
+	TIMEOUT="$STARTTIMEOUT"
+	while [ $TIMEOUT -gt 0 ]; do
+	    RESPONSE=$(/usr/bin/mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping 2>&1) && break
+	    echo "$RESPONSE" | grep -q "Access denied for user" && break
+	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
+		echo "MySQL Daemon failed to start."
+		ret=1
+		break
+	    fi
+	    sleep 1
+	    let TIMEOUT=${TIMEOUT}-1
+	done
+	if [ $TIMEOUT -eq 0 ]; then
+	    echo "Timeout error occurred trying to start MySQL Daemon."
+	    ret=1
+	fi
+	if [ $ret -eq 0 ]; then
+	    action $"Starting $prog: " /bin/true
+	    touch $lockfile
+	else
+	    action $"Starting $prog: " /bin/false
+	fi
+    fi
+    return $ret
+}
+
+stop(){
+	if [ ! -f "$mypidfile" ]; then
+	    # not running; per LSB standards this is "ok"
+	    action $"Stopping $prog: " /bin/true
+	    return 0
+	fi
+	MYSQLPID=`cat "$mypidfile"`
+	if [ -n "$MYSQLPID" ]; then
+	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
+	    ret=$?
+	    if [ $ret -eq 0 ]; then
+		TIMEOUT="$STOPTIMEOUT"
+		while [ $TIMEOUT -gt 0 ]; do
+		    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
+		    sleep 1
+		    let TIMEOUT=${TIMEOUT}-1
+		done
+		if [ $TIMEOUT -eq 0 ]; then
+		    echo "Timeout error occurred trying to stop MySQL Daemon."
+		    ret=1
+		    action $"Stopping $prog: " /bin/false
+		else
+		    rm -f $lockfile
+		    rm -f "$socketfile"
+		    action $"Stopping $prog: " /bin/true
+		fi
+	    else
+		action $"Stopping $prog: " /bin/false
+	    fi
+	else
+	    # failed to read pidfile, probably insufficient permissions
+	    action $"Stopping $prog: " /bin/false
+	    ret=4
+	fi
+	return $ret
+}
+ 
+restart(){
+    stop
+    start
+}
+
+condrestart(){
+    [ -e $lockfile ] && restart || :
+}
+
+
+# See how we were called.
+case "$1" in
+  start)
+    start
+    ;;
+  stop)
+    stop
+    ;;
+  status)
+    status -p "$mypidfile" $prog
+    ;;
+  restart)
+    restart
+    ;;
+  condrestart|try-restart)
+    condrestart
+    ;;
+  reload)
+    exit 3
+    ;;
+  force-reload)
+    restart
+    ;;
+  *)
+    echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
+    exit 2
+esac
+
+exit $?
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql.spec.in mysql-5.5-5.5.43/packaging/rpm-oel/mysql.spec.in
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql.spec.in	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysql.spec.in	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,1714 @@
+# Copyright (c) 2000, 2014, 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; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
+# MA  02110-1301  USA.
+
+# Rebuild on OL5/RHEL5 needs following rpmbuild options:
+#  rpmbuild --define 'dist .el5' --define 'rhel 5' --define 'el5 1' mysql.spec
+
+# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
+# change these, has to be exactly as is.
+
+%global mysql_vendor Oracle and/or its affiliates
+%global mysqldatadir /var/lib/mysql
+
+# By default, a build will include the bundeled "yaSSL" library for SSL.
+%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
+
+# Regression tests may take a long time, override the default to skip them
+%{!?runselftest:%global runselftest 0}
+
+%{!?with_systemd:                %global systemd 0}
+%{?el7:                          %global systemd 1}
+%{!?with_debuginfo:              %global nodebuginfo 1}
+%{!?product_suffix:              %global product_suffix community}
+%{!?feature_set:                 %global feature_set community}
+%{!?compilation_comment_release: %global compilation_comment_release MySQL Community Server - (GPL)}
+%{!?compilation_comment_debug:   %global compilation_comment_debug MySQL Community Server - Debug (GPL)}
+%{!?src_base:                    %global src_base mysql}
+
+# Version for compat libs
+%if 0%{?rhel} == 5
+%global compatver             5.0.96
+%global compatlib             15
+%global compatsrc             http://downloads.mysql.com/archives/mysql-5.0/mysql-%{compatver}.tar.gz
+%endif
+
+%if 0%{?rhel} == 6
+%global compatver             5.1.72
+%global compatlib             16
+%global compatsrc             https://cdn.mysql.com/Downloads/MySQL-5.1/mysql-%{compatver}.tar.gz
+%endif
+
+# multiarch
+%global multiarchs            ppc %{power64} %{ix86} x86_64 %{sparc}
+
+# Hack to support el5 where __isa_bits not defined. Note: supports i386 and x86_64 only, sorry.
+%if x%{?__isa_bits} == x
+%ifarch %{ix86}
+%global __isa_bits            32
+%endif
+%ifarch x86_64
+%global __isa_bits            64
+%endif
+%endif
+
+%global src_dir               %{src_base}-%{version}
+
+# No debuginfo for now, ships /usr/sbin/mysqld-debug and libmysqlcliet-debug.a
+%if 0%{?nodebuginfo}
+%global _enable_debug_package 0
+%global debug_package         %{nil}
+%global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
+%endif
+
+%if 0%{?commercial}
+%global license_files_server  %{src_dir}/LICENSE.mysql
+%global license_type          Commercial
+%else
+%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
+%global license_type          GPLv2
+%endif
+
+Name:           mysql-%{product_suffix}
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Version:        @VERSION@
+Release:        2%{?commercial:.1}%{?dist}
+License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
+Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
+URL:            http://www.mysql.com/
+Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
+Vendor:         %{mysql_vendor}
+Source1:        mysql-systemd-start
+Source2:        mysqld.service
+Source3:        mysql.conf
+Source4:        my_config.h
+Source5:        mysql_config.sh
+%if 0%{?compatlib}
+Source7:        %{compatsrc}
+%endif
+Source90:       filter-provides.sh
+Source91:       filter-requires.sh
+Patch0:         mysql-5.5-libmysqlclient-symbols.patch
+BuildRequires:  cmake
+BuildRequires:  perl
+%{?el7:BuildRequires: perl(Time::HiRes)}
+%{?el7:BuildRequires: perl(Env)}
+BuildRequires:  time
+BuildRequires:  libaio-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  zlib-devel
+%if 0%{?systemd}
+BuildRequires:  systemd
+%endif
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+%if 0%{?rhel} > 6
+# For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
+%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
+%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
+%else
+# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
+%global __perl_provides %{SOURCE90}
+%global __perl_requires %{SOURCE91}
+%endif
+
+%description
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest
+news and information about the MySQL software. Also please see the
+documentation and the manual for more information.
+
+%package        server
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Requires:       coreutils
+Requires:       grep
+Requires:       procps
+Requires:       shadow-utils
+Requires:       net-tools
+%if 0%{?commercial}
+Provides:       MySQL-server-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-server-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-server < %{version}-%{release}
+Requires:       mysql-commercial-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-server%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-server < %{version}-%{release}
+Obsoletes:      mysql-server < %{version}-%{release}
+Obsoletes:      mariadb-server
+Obsoletes:      mariadb-galera-server
+Provides:       mysql-server = %{version}-%{release}
+Provides:       mysql-server%{?_isa} = %{version}-%{release}
+Provides:       mysql-compat-server = %{version}-%{release}
+Provides:       mysql-compat-server%{?_isa} = %{version}-%{release}
+%if 0%{?systemd}
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
+%else
+Requires(post):   /sbin/chkconfig
+Requires(preun):  /sbin/chkconfig
+Requires(preun):  /sbin/service
+%endif
+
+%description    server
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest news and
+information about the MySQL software.  Also please see the documentation
+and the manual for more information.
+
+This package includes the MySQL server binary as well as related utilities
+to run and administer a MySQL server.
+
+%package        client
+Summary:        MySQL database client applications and tools
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-client-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-client-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-client < %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-client < %{version}-%{release}
+Obsoletes:      mariadb
+%if 0%{?rhel} > 5
+Obsoletes:      mysql < %{version}-%{release}
+Provides:       mysql = %{version}-%{release}
+Provides:       mysql%{?_isa} = %{version}-%{release}
+%endif
+
+%description    client
+This package contains the standard MySQL clients and administration
+tools.
+
+%package        common
+Summary:        MySQL database common files for server and client libs
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-common < %{version}-%{release}
+%endif
+Provides:       mysql-common = %{version}-%{release}
+Provides:       mysql-common%{?_isa} = %{version}-%{release}
+%{?el5:Requires: mysql%{?_isa} = %{version}-%{release}} 
+
+%description    common
+This packages contains common files needed by MySQL client library,
+MySQL database server, and MySQL embedded server.
+
+
+%package        test
+Summary:        Test suite for the MySQL database server
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-test-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-test-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-test < %{version}-%{release}
+Requires:       mysql-commercial-server%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-test%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-test < %{version}-%{release}
+Obsoletes:      mysql-test < %{version}-%{release}
+Obsoletes:      mariadb-test
+Provides:       mysql-test = %{version}-%{release}
+Provides:       mysql-test%{?_isa} = %{version}-%{release}
+
+
+%description    test
+This package contains the MySQL regression test suite for MySQL
+database server.
+
+
+%package        bench
+Summary:        MySQL benchmark suite
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-bench < %{version}-%{release}
+Requires:       mysql-commercial-server%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-server%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-bench
+Obsoletes:      community-mysql-bench < %{version}-%{release}
+Obsoletes:      mysql-bench < %{version}-%{release}
+Provides:       mysql-bench = %{version}-%{release}
+Provides:       mysql-bench%{?_isa} = %{version}-%{release}
+
+%description    bench
+This package contains the MySQL Benchmark Suite for MySQL database
+server.
+
+%package        devel
+Summary:        Development header files and libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-devel-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-devel-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-devel < %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-devel < %{version}-%{release}
+Obsoletes:      mysql-devel < %{version}-%{release}
+Obsoletes:      mariadb-devel
+Provides:       mysql-devel = %{version}-%{release}
+Provides:       mysql-devel%{?_isa} = %{version}-%{release}
+
+%description    devel
+This package contains the development header files and libraries necessary
+to develop MySQL client applications.
+
+%package        libs
+Summary:        Shared libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-shared-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-shared-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-libs < %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-shared%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-shared < %{version}-%{release}
+Obsoletes:      mysql-libs < %{version}-%{release}
+Obsoletes:      mariadb-libs
+Provides:       mysql-libs = %{version}-%{release}
+Provides:       mysql-libs%{?_isa} = %{version}-%{release}
+
+%description    libs
+This package contains the shared libraries for MySQL client
+applications.
+
+%if 0%{?compatlib}
+%package        libs-compat
+Summary:        Shared compat libraries for MySQL %{compatver} database client applications
+Group:          Applications/Databases
+Obsoletes:      mysql-libs-compat < %{version}-%{release}
+Provides:       mysql-libs-compat = %{version}-%{release}
+Provides:       mysql-libs-compat%{?_isa} = %{version}-%{release}
+%if 0%{?commercial}
+Provides:       MySQL-shared-compat-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-shared-compat-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-libs-compat < %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-shared-compat%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-shared-compat < %{version}-%{release}
+%if 0%{?rhel} > 5
+Obsoletes:      mysql-libs < %{version}-%{release}
+%endif
+
+%description    libs-compat
+This package contains the shared compat libraries for MySQL %{compatver} client
+applications.
+%endif
+
+%package        embedded
+Summary:        MySQL embedded library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-embedded-advanced%{?_isa} = %{version}-%{release}
+Obsoletes:      MySQL-embedded-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-embedded < %{version}-%{release}
+Requires:       mysql-commercial-common%{?_isa} = %{version}-%{release}
+%else
+Provides:       MySQL-embedded%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-common%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-embedded
+Obsoletes:      MySQL-embedded < %{version}-%{release}
+Obsoletes:      mysql-embedded < %{version}-%{release}
+Provides:       mysql-embedded = %{version}-%{release}
+Provides:       mysql-emdedded%{?_isa} = %{version}-%{release}
+
+%description    embedded
+This package contains the MySQL server as an embedded library.
+
+The embedded MySQL server library makes it possible to run a full-featured
+MySQL server inside the client application. The main benefits are increased
+speed and more simple management for embedded applications.
+
+The API is identical for the embedded MySQL version and the
+client/server version.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+%package        embedded-devel
+Summary:        Development header files and libraries for MySQL as an embeddable library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-embedded-devel < %{version}-%{release}
+Requires:       mysql-commercial-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-embedded%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-devel%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-embedded%{?_isa} = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-embedded-devel
+Obsoletes:      mysql-embedded-devel < %{version}-%{release}
+Provides:       mysql-embedded-devel = %{version}-%{release}
+Provides:       mysql-embedded-devel%{?_isa} = %{version}-%{release}
+
+%description    embedded-devel
+This package contains files needed for developing applications using
+the embedded version of the MySQL server.
+
+%if 0%{?rhel} == 5
+%package -n     mysql
+Summary:        Convenience package for easy upgrades of MySQL package set
+Group:          Applications/Databases
+%if 0%{?commercial}
+Requires:       mysql-commercial-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-commercial-libs-compat%{?_isa} = %{version}-%{release}
+%else
+Requires:       mysql-community-client%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs%{?_isa} = %{version}-%{release}
+Requires:       mysql-community-libs-compat%{?_isa} = %{version}-%{release}
+%endif
+
+%description -n mysql
+This package has as sole purpose to require other MySQL packages such
+that upgrades will be more convenient.
+
+Technical background: this is done to reflect the fact that mysql
+package has been split into several subpackages.
+%endif
+
+%prep
+%if 0%{?compatlib}
+%setup -q -T -a 0 -a 7 -c -n %{src_dir}
+%else
+%setup -q -T -a 0 -c -n %{src_dir}
+%endif # 0%{?compatlib}
+pushd %{src_dir}
+%{?el7:%patch0 -p1}
+
+%build
+# Fail quickly and obviously if user tries to build as root
+%if 0%{?runselftest}
+if [ "x$(id -u)" = "x0" ] ; then
+   echo "The MySQL regression tests may fail if run as root."
+   echo "If you really need to build the RPM as root, use"
+   echo "--define='runselftest 0' to skip the regression tests."
+   exit 1
+fi
+%endif
+
+%if 0%{?compatlib}
+# Build compat libs
+(
+export CFLAGS="%{optflags} -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -fno-strict-aliasing -fwrapv"
+export CXXFLAGS="$CFLAGS %{?el6:-felide-constructors} -fno-rtti -fno-exceptions"
+pushd mysql-%{compatver}
+%configure \
+    --with-readline \
+    --without-debug \
+    --enable-shared \
+    --localstatedir=/var/lib/mysql \
+    --with-unix-socket-path=/var/lib/mysql/mysql.sock \
+    --with-mysqld-user="mysql" \
+    --with-extra-charsets=all \
+    --enable-local-infile \
+    --enable-largefile \
+    --enable-thread-safe-client \
+%if 0%{?rhel} == 6
+    --with-ssl=%{_prefix} \
+    --with-embedded-server \
+    --with-big-tables \
+    --with-pic \
+    --with-plugin-innobase \
+    --with-plugin-innodb_plugin \
+    --with-plugin-partition \
+%endif
+%if 0%{?rhel} == 5
+    --with-openssl \
+    --with-bench \
+     -with-innodb \
+    --with-berkeley-db \
+    --enable-community-features \
+    --enable-profiling \
+    --with-named-thread-libs="-lpthread" \
+%endif
+    --disable-dependency-tracking
+make %{?_smp_mflags}
+popd
+)
+%endif # 0%{?compatlib}
+
+# Build debug versions of mysqld and libmysqld.a
+mkdir debug
+(
+  cd debug
+  # Attempt to remove any optimisation flags from the debug build
+  optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=Debug \
+           -DENABLE_DTRACE=OFF \
+           -DCMAKE_C_FLAGS="$optflags" \
+           -DCMAKE_CXX_FLAGS="$optflags" \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
+           -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+# Build full release
+mkdir release
+(
+  cd release
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DENABLE_DTRACE=OFF \
+           -DCMAKE_C_FLAGS="%{optflags}" \
+           -DCMAKE_CXX_FLAGS="%{optflags}" \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
+           -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+%install
+%if 0%{?compatlib}
+# Install compat libs
+for dir in libmysql libmysql_r ; do
+    pushd mysql-%{compatver}/$dir
+    make DESTDIR=%{buildroot} install
+    popd
+done
+rm -f %{buildroot}%{_libdir}/mysql/libmysqlclient{,_r}.{a,la,so}
+%endif # 0%{?compatlib}
+
+MBD=$RPM_BUILD_DIR/%{src_dir}
+
+# Ensure that needed directories exists
+install -d -m 0755 %{buildroot}%{_datadir}/mysql/SELinux/RHEL4
+install -d -m 0755 %{buildroot}/var/lib/mysql
+install -d -m 0755 %{buildroot}/var/run/mysqld
+
+# Install all binaries
+cd $MBD/release
+make DESTDIR=%{buildroot} install
+
+# Install logrotate and autostart
+install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
+install -D -m 0644 $MBD/release/packaging/rpm-oel/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+%if 0%{?systemd}
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service
+%else
+install -D -m 0755 $MBD/release/packaging/rpm-oel/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysqld
+%endif
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
+
+# Make library links
+install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+
+# multiarch support
+%ifarch %{multiarchs}
+mv %{buildroot}/%{_includedir}/mysql/my_config.h \
+   %{buildroot}/%{_includedir}/mysql/my_config_%{_arch}.h
+install -p -m 0644 %{SOURCE4} %{buildroot}/%{_includedir}/mysql/my_config.h
+mv %{buildroot}/%{_bindir}/mysql_config %{buildroot}/%{_bindir}/mysql_config-%{__isa_bits}
+install -p -m 0755 %{SOURCE5} %{buildroot}/%{_bindir}/mysql_config
+%endif
+
+# Install SELinux files in datadir
+install -m 0644 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
+    %{buildroot}%{_datadir}/mysql/SELinux/RHEL4
+
+# Remove files pages we explicitly do not want to package
+rm -rf %{buildroot}%{_datadir}/mysql/solaris
+rm -rf %{buildroot}%{_infodir}/mysql.info*
+rm -rf %{buildroot}%{_datadir}/mysql/binary-configure
+rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
+rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+rm -f  %{buildroot}%{_datadir}/mysql/{ndb-config-2-node,config*}.ini
+rm -f  %{buildroot}%{_datadir}/mysql/my-*.cnf
+%if 0%{?systemd}
+rm -rf %{buildroot}%{_sysconfdir}/init.d/mysqld
+%endif
+rm -rf %{buildroot}%{_bindir}/mysql_embedded
+rm -rf %{buildroot}%{_bindir}/mysql_setpermission
+rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
+
+%check
+%if 0%{?runselftest}
+pushd release
+make test VERBOSE=1
+export MTR_BUILD_THREAD=auto
+pushd mysql-test
+./mtr \
+    --mem --parallel=auto --force --retry=0 \
+    --mysqld=--binlog-format=mixed \
+    --suite-timeout=720 --testcase-timeout=30 \
+    --clean-vardir
+rm -r $(readlink var) var
+%endif
+
+%pre server
+/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
+/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
+    -c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
+
+%post server
+datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+/bin/chmod 0755 "$datadir"
+/bin/touch /var/log/mysqld.log
+%if 0%{?systemd}
+%systemd_post mysqld.service
+/sbin/service mysqld enable >/dev/null 2>&1 || :
+%else
+/sbin/chkconfig --add mysqld
+%endif
+
+%preun server
+%if 0%{?systemd}
+%systemd_preun mysqld.service
+%else
+if [ "$1" = 0 ]; then
+    /sbin/service mysqld stop >/dev/null 2>&1 || :
+    /sbin/chkconfig --del mysqld
+fi
+%endif
+
+%postun server
+%if 0%{?systemd}
+%systemd_postun_with_restart mysqld.service
+%else
+if [ $1 -ge 1 ]; then
+    /sbin/service mysqld condrestart >/dev/null 2>&1 || :
+fi
+%endif
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%if 0%{?compatlib}
+%post libs-compat -p /sbin/ldconfig
+
+%postun libs-compat -p /sbin/ldconfig
+%endif
+
+%post embedded -p /sbin/ldconfig
+
+%postun embedded -p /sbin/ldconfig
+
+%files server
+%defattr(-, root, root, -)
+%doc %{?license_files_server} %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
+%attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
+%attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
+%attr(644, root, root) %{_mandir}/man1/myisamchk.1*
+%attr(644, root, root) %{_mandir}/man1/myisamlog.1*
+%attr(644, root, root) %{_mandir}/man1/myisampack.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_convert_table_format.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_fix_extensions.1*
+%attr(644, root, root) %{_mandir}/man8/mysqld.8*
+%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1*
+%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_install_db.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_plugin.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
+%attr(644, root, root) %{_mandir}/man1/perror.1*
+%attr(644, root, root) %{_mandir}/man1/replace.1*
+%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
+%attr(644, root, root) %{_mandir}/man1/resolveip.1*
+
+%config(noreplace) %{_sysconfdir}/my.cnf
+
+%attr(755, root, root) %{_bindir}/innochecksum
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/myisam_ftdump
+%attr(755, root, root) %{_bindir}/myisamchk
+%attr(755, root, root) %{_bindir}/myisamlog
+%attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_fix_extensions
+%attr(755, root, root) %{_bindir}/mysql_install_db
+%attr(755, root, root) %{_bindir}/mysql_plugin
+%attr(755, root, root) %{_bindir}/mysql_secure_installation
+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
+%attr(755, root, root) %{_bindir}/mysql_upgrade
+%attr(755, root, root) %{_bindir}/mysql_zap
+%attr(755, root, root) %{_bindir}/mysqlbug
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
+%attr(755, root, root) %{_bindir}/mysqldumpslow
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/perror
+%attr(755, root, root) %{_bindir}/replace
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
+%attr(755, root, root) %{_bindir}/resolveip
+%if 0%{?systemd}
+%attr(755, root, root) %{_bindir}/mysql-systemd-start
+%endif
+%attr(755, root, root) %{_sbindir}/mysqld
+%attr(755, root, root) %{_sbindir}/mysqld-debug
+
+%dir %{_libdir}/mysql/plugin
+%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
+%dir %{_libdir}/mysql/plugin/debug
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
+
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
+%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
+
+%if 0%{?commercial}
+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
+%endif
+
+%attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_test_data_timezone.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql-log-rotate
+%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.fc
+%attr(644, root, root) %{_datadir}/mysql/SELinux/RHEL4/mysql.te
+%attr(644, root, root) %{_datadir}/mysql/magic
+%attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf
+%if 0%{?systemd}
+%attr(644, root, root) %{_unitdir}/mysqld.service
+%else
+%attr(755, root, root) %{_sysconfdir}/init.d/mysqld
+%endif
+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
+%dir %attr(755, mysql, mysql) /var/lib/mysql
+%dir %attr(755, mysql, mysql) /var/run/mysqld
+
+%files common
+%defattr(-, root, root, -)
+%{_datadir}/mysql/charsets/
+%{_datadir}/mysql/errmsg-utf8.txt
+%{_datadir}/mysql/czech/
+%{_datadir}/mysql/danish/
+%{_datadir}/mysql/dutch/
+%{_datadir}/mysql/english/
+%{_datadir}/mysql/estonian/
+%{_datadir}/mysql/french/
+%{_datadir}/mysql/german/
+%{_datadir}/mysql/greek/
+%{_datadir}/mysql/hungarian/
+%{_datadir}/mysql/italian/
+%{_datadir}/mysql/japanese/
+%{_datadir}/mysql/korean/
+%{_datadir}/mysql/norwegian-ny/
+%{_datadir}/mysql/norwegian/
+%{_datadir}/mysql/polish/
+%{_datadir}/mysql/portuguese/
+%{_datadir}/mysql/romanian/
+%{_datadir}/mysql/russian/
+%{_datadir}/mysql/serbian/
+%{_datadir}/mysql/slovak/
+%{_datadir}/mysql/spanish/
+%{_datadir}/mysql/swedish/
+%{_datadir}/mysql/ukrainian/
+
+%files client
+%defattr(-, root, root, -)
+%attr(755, root, root) %{_bindir}/msql2mysql
+%attr(755, root, root) %{_bindir}/mysql
+%attr(755, root, root) %{_bindir}/mysql_find_rows
+%attr(755, root, root) %{_bindir}/mysql_waitpid
+%attr(755, root, root) %{_bindir}/mysqlaccess
+# XXX: This should be moved to %{_sysconfdir}
+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
+%attr(755, root, root) %{_bindir}/mysqladmin
+%attr(755, root, root) %{_bindir}/mysqlbinlog
+%attr(755, root, root) %{_bindir}/mysqlcheck
+%attr(755, root, root) %{_bindir}/mysqldump
+%attr(755, root, root) %{_bindir}/mysqlimport
+%attr(755, root, root) %{_bindir}/mysqlshow
+%attr(755, root, root) %{_bindir}/mysqlslap
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
+
+%attr(644, root, root) %{_mandir}/man1/msql2mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_find_rows.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_waitpid.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlaccess.1*
+%attr(644, root, root) %{_mandir}/man1/mysqladmin.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbinlog.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlcheck.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldump.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlimport.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlshow.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlslap.1*
+
+%files devel
+%defattr(-, root, root, -)
+%attr(644, root, root) %{_mandir}/man1/comp_err.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_config.1*
+%attr(755, root, root) %{_bindir}/mysql_config
+%attr(755, root, root) %{_bindir}/mysql_config-%{__isa_bits}
+%{_includedir}/mysql
+%{_datadir}/aclocal/mysql.m4
+%{_libdir}/mysql/libmysqlclient.a
+%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libmysqlservices.a
+%{_libdir}/mysql/libmysqlclient_r.so
+%{_libdir}/mysql/libmysqlclient.so
+
+%files libs
+%defattr(-, root, root, -)
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.18*
+%{_libdir}/mysql/libmysqlclient_r.so.18*
+
+%if 0%{?compatlib}
+%files libs-compat
+%defattr(-, root, root, -)
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.%{compatlib}
+%{_libdir}/mysql/libmysqlclient.so.%{compatlib}.0.0
+%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}
+%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}.0.0
+%endif
+
+%files test
+%defattr(-, root, root, -)
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
+
+%files bench
+%defattr(-, root, root, -)
+%{_datadir}/sql-bench
+
+%files embedded
+%defattr(-, root, root, -)
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so.*
+
+%files embedded-devel
+%defattr(-, root, root, -)
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
+
+%if 0%{?rhel} == 5
+%files -n mysql
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%endif
+
+%changelog
+* Tue Jul 22 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-5
+- Provide mysql-compat-server dependencies
+
+* Tue Jul 08 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-4
+- Remove perl(GD) and dtrace dependencies 
+
+* Tue Jul 01 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.5.39-3
+- Disable dtrace, as it fails on OEL6 boxes with Oracle dtrace installed
+
+* Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-2
+- Resolve embedded-devel conflict issue
+
+* Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.39-1
+- Add bench package
+- Enable dtrace 
+
+* Sun May 11 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-2
+- Increment release version to resolve upgrade conflict issue
+
+* Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.38-1
+- Updated for 5.5.38
+
+* Mon Apr 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-6
+- Fix Cflags for el7 
+
+* Mon Mar 31 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-5
+- Support for enterprise packages
+- Upgrade from MySQL-* packages
+
+* Fri Mar 14 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-4
+- Resolve mysql conflict with mysql-community-client
+
+* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-3
+- Resolve conflict with mysql-libs-compat
+
+* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-2
+- Resolve conflict issues during upgrade
+
+* Mon Feb 10 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.37-1
+- Add support for el7 (with systemd enabled)
+- Enable shared libmysqld by cmake option
+
+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.35-1
+- Backport changes from 5.6
+
+* Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Allow to override the default to use the bundled yaSSL by an option like
+      --define="with_ssl /path/to/ssl"
+
+* Wed Oct 10 2012 Bjorn Munch <bjorn.munch@oracle.com>
+
+- Replace old my-*.cnf config file examples with template my-default.cnf
+
+* Fri Oct 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the installation use the new option "--random-passwords" of "mysql_install_db".
+  (Bug# 12794345 Ensure root password)
+- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence
+  of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff).
+
+* Tue Jul 24 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add a macro "runselftest":
+  if set to 1 (default), the test suite will be run during the RPM build;
+  this can be oveeridden via the command line by adding
+      --define "runselftest 0"
+  Failures of the test suite will NOT make the RPM build fail!
+
+* Mon Jul 16 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the man page for the "mysql_config_editor".
+
+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+
+* Wed Feb 29 2012 Brajmohan Saxena <brajmohan.saxena@oracle.com>
+
+- Removal all traces of the readline library from mysql (BUG 13738013)
+
+* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
+  it is better to keep alphabetic order in the files list (merging!).
+
+* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
+  the RPMs of any configuration (of the current or the preceding release series)
+  by the new ones. This is done by not using the implicitly generated capabilities
+  (which include the configuration name) and relying on more generic ones which
+  just list the function ("server", "client", ...).
+  The implicit generation cannot be prevented, so all these capabilities must be
+  explicitly listed in "Obsoletes:"
+
+* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to
+  changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
+  this necessitated a move of the libmygcc.a installation to the install
+  phase, which is probably where it belonged in the first place.
+
+* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
+
+* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Add mysql_plugin man page.
+
+* Tue Aug 30 2011 Tor Didriksen <tor.didriksen@oracle.com>
+
+- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
+  Also, remove the use of the -fno-exceptions and -fno-rtti flags.
+  TODO: update distro_buildreq/distro_requires
+
+* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the manual page for "mysql_plugin" to the server package.
+
+* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Null-upmerge the fix of bug#37165: This spec file is not affected.
+- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}".
+
+* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Source plugin library files list from cmake-generated file.
+
+* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
+
+- Added the mysql_plugin client - enables or disables plugins.
+
+* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
+
+- Fix bug#12561297: Added the MySQL embedded binary
+
+* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#45415: "rpm upgrade recreates test database"
+  Let the creation of the "test" database happen only during a new installation,
+  not in an RPM upgrade.
+  This affects both the "mkdir" and the call of "mysql_install_db".
+
+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#56581: If an installation deviates from the default file locations
+  ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
+  should still work, and use these locations.
+  The problem was that the fix for bug#27072 did not check for local settings.
+
+* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
+
+* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too
+- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
+  a '-j' argument to make.
+
+* Mon Nov 1 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added test authentication (WL#1054) plugin binaries
+
+* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added example external authentication (WL#1054) plugin binaries
+
+* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
+  Reflect that in the "Obsoletes" specifications.
+- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
+- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
+
+* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change the behaviour on installation and upgrade:
+  On installation, do not autostart the server.
+  *Iff* the server was stopped before the upgrade is started, this is taken as a
+  sign the administrator is handling that manually, and so the new server will
+  not be started automatically at the end of the upgrade.
+  The start/stop scripts will still be installed, so the server will be started
+  on the next machine boot.
+  This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
+
+* Tue Jun 1 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Implement SELinux checks from distribution-specific spec file.
+
+* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Large number of changes to build using CMake
+- Introduce distribution-specific RPMs
+- Drop debuginfo, build all binaries with debug/symbols
+- Remove __os_install_post, use native macro
+- Remove _unpackaged_files_terminate_build, make it an error to have
+  unpackaged files
+- Remove cluster RPMs
+
+* Wed Mar 24 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Add "--with-perfschema" to the configure options.
+
+* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64",
+  mask "rmdir" return code 1.
+- Remove "ha_example.*" files from the list, they aren't built.
+
+* Wed Mar 17 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix a wrong path name in handling the debug plugins.
+
+* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Take the result of the debug plugin build and put it into the optimized tree,
+  so that it becomes part of the final installation;
+  include the files in the packlist. Part of the fixes for bug#49022.
+
+* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
+  accept upgrading from packages showing MySQL or Sun as vendor.
+
+* Fri Feb 12 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Formatting changes:
+  Have a consistent structure of separator lines and of indentation
+  (8 leading blanks => tab).
+- Introduce the variable "src_dir".
+- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence
+  over "CC" ("CXX").
+- Drop the old "with_static" argument analysis, this is not supported
+  in 5.1 since ages.
+- Introduce variables to control the handlers individually, as well
+  as other options.
+- Use the new "--with-plugin" notation for the table handlers.
+- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql"
+  was done back in 2002 already.
+- Make "--with-zlib-dir=bundled" the default, add an option to disable it.
+- Add missing manual pages to the file list.
+- Improve the runtime check for "libgcc.a", protect it against being tried
+  with the Intel compiler "icc".
+
+* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change RPM file naming:
+  - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
+  - Release counts from 1, not 0.
+
+* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- The "semisync" plugin file name has lost its introductory "lib",
+  adapt the file lists for the subpackages.
+  This is a part missing from the fix for bug#48351.
+- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
+  (and likely, the whole script will go, too).
+
+* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix some problems with the directives around "tcmalloc" (experimental),
+  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+
+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
+
+- Removed mysql_fix_privilege_tables
+
+* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
+
+- "mysqlmanager" got removed from version 5.4, all references deleted.
+
+* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
+
+* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- This version does not contain the "Instance manager", "mysqlmanager":
+  Remove it from the spec file so that packaging succeeds.
+
+* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Add conditionals for bundled zlib and innodb plugin
+
+* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Install plugin libraries in appropriate packages.
+- Disable libdaemon_example and ftexample plugins.
+
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Update variable used for mysql-test suite location to match source.
+
+* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Correct yesterday's fix, so that it also works for the last flag,
+  and fix a wrong quoting: un-quoted quote marks must not be escaped.
+
+* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
+
+- Removed "mysql_upgrade_shell"
+- Removed some copy/paste between debug and normal build
+
+* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
+  This should cover both gcc and icc flags.  Fixes bug#40546.
+
+* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
+
+- Removed the "Federated" storage engine option, and enabled in all
+
+* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
+  Some generated files aren't needed in RPMs:
+  - the "sql-bench/" subdirectory
+  Some files were missing:
+  - /usr/share/aclocal/mysql.m4  ("devel" subpackage)
+  - Manual "mysqlbug" ("server" subpackage)
+  - Program "innochecksum" and its manual ("server" subpackage)
+  - Manual "mysql_find_rows" ("client" subpackage)
+  - Script "mysql_upgrade_shell" ("client" subpackage)
+  - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
+  - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
+
+* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
+
+- Made the "Federated" storage engine an option
+- Made the "Cluster" storage engine and sub packages an option
+
+* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Add the man pages for "ndbd" and "ndb_mgmd".
+
+* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
+
+- Require a manual upgrade if the alread-installed mysql-server is
+  from another vendor, or is of a different major version.
+
+* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- "ndb_size.tmpl" is not needed any more,
+  "man1/mysql_install_db.1" lacked the trailing '*'.
+
+* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
+
+- Removed man page for "mysql_create_system_tables"
+
+* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
+
+- Add debug server.
+
+* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
+
+- Remove Max RPMs; the server RPMs contain a mysqld compiled with all
+  features that previously only were built into Max.
+
+* Fri Mar 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- Add several man pages for NDB which are now created.
+
+* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
+
+- Put back "libmygcc.a", found no real reason it was removed.
+
+- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
+  correct "libgcc.a" path is returned for the 32/64 bit architecture.
+
+* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
+
+* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
+  in the server RPM.
+- The "mysqlmanager" man page got moved from section 1 to 8.
+
+* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Call "make install" using "benchdir_root=%%{_datadir}",
+  because that is affecting the regression test suite as well.
+
+* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
+  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
+  (bug#22081).
+
+* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Add "--with-partition" t 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use the Perl script to run the tests, because it will automatically check
+  whether the server is configured with SSL.
+
+* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
+
+- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
+
+- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
+  there are some more aspects which need to be solved before this is possible.
+  For now, just ensure the binary "mysql_upgrade" is delivered and installysql.com>
+
+- To run "mysql_upgrade", we need a running server;
+  start it in isolation and skip password checks.
+
+* Sat May 20 2006 Kent Boortz <kent@mysql.com>
+
+- Always compile for PIC, position independent code.
+
+* Wed May 10 2006 Kent Boortz <kent@mysql.com>
+
+- Use character set "all" when compiling with Cluster, to make Cluster
+  nodes independent on the character set directory, and the problem
+  that two RPM sub packages both wants to install this directory.
+
+* Mon May 01 2006 Kent Boortz <kent@mysql.com>
+
+- Use "./libtool --mode=execute" instead of searching for the
+  executable in current directory and ".libs".
+
+* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
+
+- Install and run "mysql_upgrade"
+
+* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove sql-bench, and MySQL-bench RPM (will be built as an independent
+  project from the mysql-bench repository)
+
+* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove old mysqltestmanager and related programs
+* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
+
+- Changed product name from "Community Edition" to "Community Server"
+
+* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
+
+- Fast mutexes is now disabled by default, but should be
+  used in Linux builds.
+
+* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
+
+- Reintroduced a max build
+- Limited testing of 'debug' and 'max' servers
+- Berkeley DB only in 'max'
+
+* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use "-i" on "make test-force";
+  this is essential for later evaluation of this log file.
+
+* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
+
+- Pass '-static' to libtool, link static with our own libraries, dynamic
+  with system libraries.  Link with the bundled zlib.
+
+* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>
+
+- Modified RPM spec to match new 5.1 debug+max combined community packaging.
+
+* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
+
+- Added "client/mysqlslap"
+
+* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
+
+- Added zlib to the list of (static) libraries installed
+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
+- Compile MySQL with bundled zlib
+- Fixed %%packager name to "MySQL Production Engineering Team"
+
+* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Avoid using the "bundled" zlib on "shared" builds:
+  As it is not installed (on the build system), this gives dependency
+  problems with "libtool" causing the build to fail.
+  (Change was done on Nov 11, but left uncommented.)
+
+* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Extend the file existence check for "init.d/mysql" on un-install
+  to also guard the call to "insserv"/"chkconfig".
+
+* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
+
+- added more man pages
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Made yaSSL support an option (off by default)
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Enabled yaSSL support
+
+* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
+
+- Give mode arguments the same way in all places
+lenz@mysql.com>
+
+- fixed the removing of the RPM_BUILD_ROOT in the %%clean section (the
+  $RBR variable did not get expanded, thus leaving old build roots behind)
+
+* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the creation of the mysql user group account in the postinstall
+  section (BUG 12348)
+- Fixed enabling the Archive storage engine in the Max binary
+
+* Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the Requires: tag for the server RPM (BUG 12233)
+
+* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
+
+- create a "mysql" user group and assign the mysql user account to that group
+  in the server postinstall section. (BUG 10984)
+
+* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Do not build statically on i386 by default, only when adding either "--with
+  static" or "--define '_with_static 1'" to the RPM build options. Static
+  linking really only makes sense when linking against the specially patched
+  glibc 2.2.5.
+
+* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_client_test to the "bench" subpackage (BUG 10676)
+- added the libndbclient static and shared libraries (BUG 10676)
+
+* Wed Jun 01 2005 Lenz Grimmer <lenz@mysql.com>
+
+- use "mysqldatadir" variable instead of hard-coding the path multiple times
+- use the "mysqld_user" variable on all occasions a user name is referenced
+- removed (incomplete) Brazilian translations
+- removed redundant release tags from the subpackage descriptions
+
+* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Added a "make clean" between separate calls to "BuildMySQL".
+
+* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
+
+- Removed the mysql_tableinfo script made obsolete by the information schema
+
+* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Enabled the "blackhole" storage engine for the Max RPM
+
+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+  from the MySQL sources and are now available seperately.
+
+* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
+
+- old mysqlmanager, mysq* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
+
+- enabled the "Ndbcluster" storage engine for the max binary
+- added extra make install in ndb subdir after Max build to get ndb binaries
+- added packages for ndbcluster storage engine
+
+* Fri Jan 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
+
+* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Federated" storage engine for the max binary
+
+* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
+
+- ISAM and merge storage engines were purged. As well as appropriate
+  tools and manpages (isamchk and isamlog)
+
+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Archive" storage engine for the max binary
+- enabled the "CSV" storage engine for the max binary
+- enabled the "Example" storage engine for the max binary
+
+* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
+
+* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
+
+- do not link statically on IA64/AMD64 as these systems do not have
+  a patched glibc installed
+
+* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added libmygcc.a to the devel subpackage (required to link applications
+  against the the embedded server libmysqld.a) (BUG 4921)
+
+* Mon Aug 09 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added EXCEPTIONS-CLIENT to the "devel" package
+
+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
+
+- disabled OpenSSL in the Max binaries again (the RPM packages were the
+  only exception to this anyway) (BUG 1043)
+
+* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
+
+- fixed server postinstall (mysql_install_db was called with the wrong
+  parameter)
+
+* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_tzinfo_to_sql to the server subpackage
+- run "make clean" instead of "make distclean"
+
+* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added ncurses-devel to the build prerequisites (BUG 3377)
+
+* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
+
+- when using gcc, _always_ use CXX=gcc
+- replaced Copyright with License field (Copyright is obsolete)
+
+* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added myisam_ftdump to the Server package
+
+* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
+
+- link the mysql client against libreadline instead of libedit (BUG 2289)
+
+* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
+
+- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
+
+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
+
+- fixed file permissions (BUG 1672)
+
+* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- made testing for gcc3 a bit more robust
+
+* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_create_system_tables to the server subpackage
+
+* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed dependency on MySQL-client from the MySQL-devel subpackage
+  as it is not really required. (BUG 1610)
+
+* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 1162 (removed macro names from the changelog)
+- Really fixed BUG 998 (disable the checking for installed but
+  unpackaged files)
+
+* Tue Aug 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 959 (libmysqld not being compiled properly)
+- Fixed BUG 998 (RPM build errors): added missing files to the
+  distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
+  mysql_fix_privilege_tables.1), removed "-n" from install section.
+
+* Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed the GIF Icon (file was not included in the sources anyway)
+- removed unused variable shared_lib_version
+- do not run automake before building the standard binary
+  (should not be necessary)
+- add server suffix '-standard' to standard binary (to be in line
+  with the binary tarball distributions)
+- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
+  _datadir, _includedir) throughout the spec file.
+- allow overriding CC and CXX (required when building with other compilers)
+
+* Fri May 16 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-enabled RAID again
+
+* Wed Apr 30 2003 Lenz Grimmer <lenz@mysql.com>
+
+- disabled MyISAM RAID (--with-raid)- it throws an assertion which
+  needs to be investigated first.
+
+* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_secure_installation to server subpackage
+  (BUG 141)
+
+* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-added missing pre- and post(un)install scripts to server subpackage
+- added config file /etc/my.cnf to the file list (just for completeness)
+- make sure to create the datadir with 755 permissions
+
+* Mon Jan 27 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed unusedql.com>
+
+- Reworked the build steps a little bit: the Max binary is supposed
+  to include OpenSSL, which cannot be linked statically, thus trying
+  to statically link against a special glibc is futile anyway
+- because of this, it is not required to make yet another build run
+  just to compile the shared libs (saves a lot of time)
+- updated package description of the Max subpackage
+- clean up the BuildRoot directory afterwards
+
+* Mon Jul 15 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Updated Packager information
+- Fixed the build options: the regular package is supposed to
+  include InnoDB and linked statically, while the Max package
+  should include BDB and SSL support
+
+* Fri May 03 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Use more RPM macros (e.g. infodir, mandir) to make the spec
+  file more portable
+- reorganized the installation of documentation files: let RPM
+  take care of this
+- reorganized the file list: actually install man pages along
+  with the binaries of the respective subpackage
+- do not include libmysqld.a in the devel subpackage as well, if we
+  have a special "embedded" subpackage
+- reworked the package descriptions
+
+* Mon Oct  8 2001 Monty
+
+- Added embedded server as a separate RPM
+
+* Fri Apr 13 2001 Monty
+
+- Added mysqld-max to the distribution
+
+* Tue Jan 2  2001  Monty
+
+- Added mysql-test to the bench package
+
+* Fri Aug 18 2000 Tim Smith <tim@mysql.com>
+
+- Added separate libmysql_r directory; now both a threaded
+  and non-threaded library is shipped.
+
+* Tue Sep 28 1999 David Axmark <davida@mysql.com>
+
+- Added the support-files/my-example.cnf to the docs directory.
+
+- Removed devel dependency on base since it is about client
+  development.
+
+* Wed Sep 8 1999 David Axmark <davida@mysql.com>
+
+- Cleaned up some for 3.23.
+
+* Thu Jul 1 1999 David Axmark <davida@mysql.com>
+
+- Added support for shared libraries in a separate sub
+  package. Original fix by David Fox (dsfox@cogsci.ucsd.edu)
+
+- The --enable-assembler switch is now automatically disables on
+  platforms there assembler code is unavailable. This should allow
+  building this RPM on non i386 systems.
+
+* Mon Feb 22 1999 David Axmark <david@detron.se>
+
+- Removed unportable cc switches from the spec file. The defaults can
+  now be overridden with environment variables. This feature is used
+  to compile the official RPM with optimal (but compiler version
+  specific) switches.
+
+- Removed the repetitive description parts for the sub rpms. Maybe add
+  again if RPM gets a multiline macro capability.
+
+- Added support for a pt_BR translation. Translation contributed by
+  Jorge Godoy <jorge@bestway.com.br>.
+
+* Wed Nov 4 1998 David Axmark <david@detron.se>
+
+- A lot of changes in all the rpm and install scripts. This may even
+  be a working RPM :-)
+
+* Sun Aug 16 1998 David Axmark <david@detron.se>
+
+- A developers changelog for MySQL is available in the source RPM. And
+  there is a history of major user visible changed in the Reference
+  Manual.  Only RPM specific changes will be documented here.
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql-systemd-start mysql-5.5-5.5.43/packaging/rpm-oel/mysql-systemd-start
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-oel/mysql-systemd-start	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-oel/mysql-systemd-start	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,68 @@
+#! /bin/bash
+#
+# Scripts to run by MySQL systemd service
+# 
+# Needed argument: pre | post
+# 
+# pre mode  :  try to run mysql_install_db and fix perms and SELinux contexts
+# post mode :  ping server until answer is received
+# 
+
+get_option () {
+    local section=$1
+    local option=$2
+    local default=$3
+    ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+    [ -z $ret ] && ret=$default
+    echo $ret
+}
+
+install_db () {    
+    # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    log=/var/log/mysqld.log
+    [ -e $log ] || touch $log
+    chmod 0640 $log
+    chown mysql:mysql $log || exit 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        /usr/sbin/restorecon $log
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && exit 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+    exit 0
+}
+
+pinger () {
+    # Wait for ping to answer to signal startup completed,
+    # might take a while in case of e.g. crash recovery
+    # MySQL systemd service will timeout script if no answer
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+    socket=$(get_option  mysqld socket "$datadir/mysql.sock")
+    case $socket in
+        /*) adminsocket="$socket" ;;
+        *) adminsocket="$datadir/$socket" ;;
+    esac
+
+    while /bin/true ; do
+        sleep 1
+        mysqladmin --no-defaults --socket="$adminsocket" --user=UNKNOWN_MYSQL_USER ping >/dev/null 2>&1 && break
+    done
+    exit 0
+}
+
+# main
+case $1 in
+    "pre") install_db ;;
+    "post") pinger ;;
+esac
+
+exit 0
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/CMakeLists.txt mysql-5.5-5.5.43/packaging/rpm-sles/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,28 @@
+# Copyright (c) 2012, 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
+# 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
+
+
+IF(UNIX)
+  SET(prefix ${CMAKE_INSTALL_PREFIX})
+  SET(SPECFILENAME "mysql.spec")
+  # Left in current directory, to be taken during build
+  CONFIGURE_FILE(mysql.spec.in ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
+  FOREACH(fedfile my.cnf my_config.h mysql.init
+          mysqld.service mysql-systemd-start mysql.conf
+          filter-requires.sh filter-provides.sh)
+    CONFIGURE_FILE(${fedfile} ${CMAKE_CURRENT_BINARY_DIR}/${fedfile} COPYONLY)
+  ENDFOREACH()
+ENDIF()
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/filter-provides.sh mysql-5.5-5.5.43/packaging/rpm-sles/filter-provides.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/filter-provides.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/filter-provides.sh	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.prov $* |
+sed -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/filter-requires.sh mysql-5.5-5.5.43/packaging/rpm-sles/filter-requires.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/filter-requires.sh	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/filter-requires.sh	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,6 @@
+#! /bin/bash
+#
+
+/usr/lib/rpm/perl.req $* |
+sed -e '/perl(GD)/d' -e '/perl(hostnames)/d' -e '/perl(lib::mtr.*/d' -e '/perl(lib::v1.*/d' -e '/perl(mtr_.*/d' -e '/perl(My::.*/d'
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/my.cnf mysql-5.5-5.5.43/packaging/rpm-sles/my.cnf
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/my.cnf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/my.cnf	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,31 @@
+# For advice on how to change settings please see
+# http://dev.mysql.com/doc/refman/5.5/en/server-configuration-defaults.html
+
+[mysqld]
+#
+# Remove leading # and set to the amount of RAM for the most important data
+# cache in MySQL. Start at 70% of total RAM for dedicated server, else 10%.
+# innodb_buffer_pool_size = 128M
+#
+# Remove leading # to turn on a very important data integrity option: logging
+# changes to the binary log between backups.
+# log_bin
+#
+# Remove leading # to set options mainly useful for reporting servers.
+# The server defaults are faster for transactions and fast SELECTs.
+# Adjust sizes as needed, experiment to find the optimal values.
+# join_buffer_size = 128M
+# sort_buffer_size = 2M
+# read_rnd_buffer_size = 2M
+datadir=/var/lib/mysql
+socket=/var/lib/mysql/mysql.sock
+
+# Disabling symbolic-links is recommended to prevent assorted security risks
+symbolic-links=0
+
+# Recommended in standard MySQL setup
+#sql_mode=NO_ENGINE_SUBSTITUTION,STRICT_TRANS_TABLES 
+
+[mysqld_safe]
+log-error=/var/log/mysql/mysqld.log
+pid-file=/var/run/mysql/mysqld.pid
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/my_config.h mysql-5.5-5.5.43/packaging/rpm-sles/my_config.h
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/my_config.h	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/my_config.h	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,30 @@
+/*
+ *  Fedora supports multi arch: having 32 and 64 versions of MySQL
+ *  installed at the same time. my_config.h will differ due arch
+ *  dependent defs creating a file conflict. We move arch specific
+ *  headers to arch specific file names and include the correct arch
+ *  specific file by installing this generic file.
+ *
+ */
+
+#if defined(__i386__)
+#include "my_config_i386.h"
+#elif defined(__ia64__)
+#include "my_config_ia64.h"
+#elif defined(__powerpc__)
+#include "my_config_ppc.h"
+#elif defined(__powerpc64__)
+#include "my_config_ppc64.h"
+#elif defined(__s390x__)
+#include "my_config_s390x.h"
+#elif defined(__s390__)
+#include "my_config_s390.h"
+#elif defined(__sparc__) && defined(__arch64__)
+#include "my_config_sparc64.h"
+#elif defined(__sparc__)
+#include "my_config_sparc.h"
+#elif defined(__x86_64__)
+#include "my_config_x86_64.h"
+#else
+#error "This MySQL devel package does not work your architecture?"
+#endif
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql.conf mysql-5.5-5.5.43/packaging/rpm-sles/mysql.conf
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql.conf	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/mysql.conf	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1 @@
+d /var/run/mysqld 0755 mysql mysql -
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysqld.service mysql-5.5-5.5.43/packaging/rpm-sles/mysqld.service
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysqld.service	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/mysqld.service	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,48 @@
+#
+# Simple MySQL systemd service file
+#
+# systemd supports lots of fancy features, look here (and linked docs) for a full list: 
+#   http://www.freedesktop.org/software/systemd/man/systemd.exec.html
+#
+# Note: this file ( /usr/lib/systemd/system/mysql.service )
+# will be overwritten on package upgrade, please copy the file to 
+#
+#  /etc/systemd/system/mysql.service 
+#  
+# to make needed changes.
+# 
+# systemd-delta can be used to check differences between the two mysql.service files.
+#
+
+[Unit]
+Description=MySQL Community Server
+After=network.target
+After=syslog.target
+
+[Install]
+WantedBy=multi-user.target
+Alias=mysql.service
+
+[Service]
+User=mysql
+Group=mysql
+
+# Execute pre and post scripts as root
+PermissionsStartOnly=true
+
+# Needed to create system tables etc.
+ExecStartPre=/usr/bin/mysql-systemd-start pre
+
+# Start main service
+ExecStart=/usr/bin/mysqld_safe
+
+# Don't signal startup success before a ping works
+ExecStartPost=/usr/bin/mysql-systemd-start post
+
+# Give up if ping don't get an answer
+TimeoutSec=600
+
+Restart=always
+PrivateTmp=false
+
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql.init mysql-5.5-5.5.43/packaging/rpm-sles/mysql.init
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql.init	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/mysql.init	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,236 @@
+#! /bin/bash
+#
+
+# MySQL Database start/stop script
+
+# chkconfig:   - 64 36
+# description: MySQL Database
+# processname: mysqld
+# config:      /etc/my.cnf
+# pidfile:     /var/run/mysql/mysqld.pid
+
+# Comments to support LSB init script conventions
+### BEGIN INIT INFO
+# Provides:          mysql
+# Required-Start:    $network $remote_fs
+# Required-Stop:     $network $remote_fs
+# Default-Start:     3 5
+# Default-Stop:      0 1 6
+# Short-Description: MySQL Database
+# Description:       MySQL Database
+### END INIT INFO
+
+# 
+# https://en.opensuse.org/openSUSE:Packaging_init_scripts#Exit_Status_Codes
+# 
+
+[ -e /etc/rc.status ] && . /etc/rc.status
+
+rc_reset
+
+STARTTIMEOUT=180
+STOPTIMEOUT=60
+PROG=/usr/bin/mysqld_safe
+
+[ -e /etc/sysconfig/mysql ] && . /etc/sysconfig/mysql
+
+# Lock directory
+lockfile=/var/lock/subsys/mysql
+
+get_option () {
+    local section=$1
+    local option=$2
+    local default=$3
+    ret=$(/usr/bin/my_print_defaults $section | grep '^--'${option}'=' | cut -d= -f2-)
+    [ -z $ret ] && ret=$default
+    echo $ret
+}
+
+datadir=$(get_option mysqld datadir "/var/lib/mysql")
+socket=$(get_option  mysqld socket "$datadir/mysql.sock")
+pidfile=$(get_option mysqld_safe pid-file "/var/run/mysql/mysqld.pid")
+logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
+
+install_db () {
+    # Note: something different than datadir=/var/lib/mysql requires 
+    # SELinux policy changes (in enforcing mode)
+    datadir=$(get_option mysqld datadir "/var/lib/mysql")
+    logfile=$(get_option mysqld_safe log-error "/var/log/mysql/mysqld.log")
+
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || return 1
+
+    [ -e $logfile ] || touch $logfile || return 1
+    chmod 0640 $logfile
+    chown mysql:mysql $logfile || return 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        /usr/sbin/restorecon $logfile
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && return 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --datadir="$datadir" --rpm --user=mysql
+    return $?
+}
+
+# Wait for ping to answer to signal startup completed,
+# might take a while in case of e.g. crash recovery
+pinger () {
+    mysqld_safe_pid=$1
+    timer=$STARTTIMEOUT
+    ret=0
+    while [ $timer -gt 0 ]; do
+        sleep 1
+        mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 && break
+	timer=$(expr $timer - 1)
+
+	# Check if mysqld_safe is still alive, if not there is no hope
+	if ! kill -0 $mysqld_safe_pid >/dev/null 2>&1 ; then
+	    ret=1
+	    break
+	fi
+    done
+    
+    # Did we timeout?
+    if [ $timer = 0 ]; then
+	echo "MySQL Database start up timeout after ${STARTTIMEOUT}s"
+	ret=1
+    fi
+    return $ret
+}
+
+# Check if mysqld is running
+chk_running () {
+    ret=0
+    if [ -e "$pidfile" ]; then
+	pid=$(cat "$pidfile") || ret=4
+    else
+	ret=7
+    fi
+
+    # Check if $pid is a mysqld pid
+    if [ $ret -eq 0 ]; then
+	[ -L "/proc/$pid/exe" ] || ret=7 
+    fi
+
+    if [ $ret -eq 0 ]; then
+	exec=$(readlink "/proc/$pid/exe") || ret=7
+    fi
+
+    if [ $ret -eq 0 ]; then
+	[ "x$(basename $exec)" = "xmysqld" ] || ret=7
+    fi
+    return $ret
+}
+
+start () {
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+	echo -n "Starting service MySQL:"
+	rc_reset ; rc_status -v ; rc_exit
+    fi
+
+    if ! install_db; then
+	echo -n "MySQL Database could not initialize data directory:"
+	rc_failed 6 ; rc_status -v ; rc_exit
+    fi
+
+    $PROG --basedir=/usr --datadir="$datadir" --pid-file="$pidfile" >/dev/null 2>&1 &
+    if pinger $! ; then
+	echo -n "Starting service MySQL:"
+	touch $lockfile
+	rc_reset
+    else
+	echo -n "Failed to start service MySQL:"
+	rc_failed 3
+    fi
+    rc_status -v
+}
+
+stop () {
+    chk_running
+    ret=$?
+    if [ $ret -ne 0 ]; then
+	echo -n "Shutting down service MySQL:"
+	rc_reset ; rc_status -v ; return 0
+    fi
+
+    # chk_running has verified this works
+    pid=$(cat "$pidfile")
+
+    # We use a signal to avoid having to know the root password
+    # Send single kill command and then wait
+    if kill $pid >/dev/null 2>&1; then
+	timer=$STOPTIMEOUT
+	while [ $timer -gt 0 ]; do
+            kill -0 $pid >/dev/null 2>&1 || break
+            sleep 1
+            timer=$(expr $timer - 1)
+	done
+    else
+	echo -n "Shutting down service MySQL:"
+	rc_failed 4 ; rc_status -v ; rc_exit
+    fi
+    
+    if [ $timer -eq 0 ]; then
+	echo -n "Failed to stop service MySQL:"
+	rc_failed 1
+    else
+	rm -f $lockfile
+	rm -f "$socketfile"
+	echo -n "Shutting down service MySQL:"
+	rc_reset
+    fi
+    rc_status -v
+} 
+
+restart () {
+    stop
+    start
+}
+
+reload () {
+    ret=0
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+	pid=$(cat "$pidfile")
+	kill -HUP $pid >/dev/null 2>&1
+	echo -n "Reloading service MySQL:"
+	rc_reset
+    else
+	echo -n "Reloading of service MySQL failed:"
+        rc_failed 7
+    fi
+    rc_status -v
+}
+
+condrestart () {
+    if chk_running && mysqladmin --no-defaults --socket="$socket" ping >/dev/null 2>&1 ; then
+	restart
+    fi
+}
+
+status () {
+   echo -n "Checking for service MySQL:"
+   checkproc mysqld
+   rc_status -v
+}  
+
+case "$1" in
+    start  ) start   ;;
+    stop   ) stop    ;;
+    restart) restart ;;
+    status ) status  ;;
+    condrestart        ) condrestart ;;
+    reload|force-reload) reload ;;
+
+    *) echo $"Usage: $0 {start|stop|restart|condrestart|status|reload|force-reload}"; exit 1 ;;
+esac
+
+rc_exit
+
+
+
+
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql.spec.in mysql-5.5-5.5.43/packaging/rpm-sles/mysql.spec.in
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql.spec.in	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/mysql.spec.in	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,1646 @@
+# Copyright (c) 2000, 2015, 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; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
+# MA  02110-1301  USA.
+
+
+%global mysql_vendor    Oracle and/or its affiliates
+%global mysqldatadir    /var/lib/mysql
+
+# By default, a build will include the bundeled "yaSSL" library for SSL.
+%{?with_ssl: %global ssl_option -DWITH_SSL=%{with_ssl}}
+
+# Regression tests may take a long time, override the default to skip them
+%{!?runselftest:%global runselftest 0}
+
+%{!?with_systemd:                %global systemd 0}
+%{!?with_debuginfo:              %global nodebuginfo 1}
+%{!?product_suffix:              %global product_suffix community}
+%{!?feature_set:                 %global feature_set community}
+%{!?compilation_comment_release: %global compilation_comment_release MySQL Community Server - (GPL)}
+%{!?compilation_comment_debug:   %global compilation_comment_debug MySQL Community Server - Debug (GPL)}
+%{!?src_base:                    %global src_base mysql}
+
+%global src_dir               %{src_base}-%{version}
+
+# multiarch
+%global multiarchs            ppc %{power64} %{ix86} x86_64 %{sparc}
+
+# No debuginfo for now, ships /usr/sbin/mysqld-debug and libmysqlcliet-debug.a
+%if 0%{?nodebuginfo}
+%global _enable_debug_package 0
+%global debug_package         %{nil}
+%global __os_install_post     /usr/lib/rpm/brp-compress %{nil}
+%endif
+
+%if 0%{?commercial}
+%global license_files_server  %{src_dir}/LICENSE.mysql
+%global license_type          Commercial
+%else
+%global license_files_server  %{src_dir}/COPYING %{src_dir}/README
+%global license_type          GPLv2
+%endif
+
+%if 0%{?sles_version} == 011
+%global dist                  .sles11
+%global sles11                1
+%endif
+
+Name:           mysql-%{product_suffix}
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Version:        @VERSION@
+Release:        2%{?commercial:.1}%{?dist}
+License:        Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{?license_type} license as shown in the Description field.
+Source0:        https://cdn.mysql.com/Downloads/MySQL-@MYSQL_BASE_VERSION@/%{src_dir}.tar.gz
+URL:            http://www.mysql.com/
+Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com>
+Vendor:         %{mysql_vendor}
+Source1:        mysql-systemd-start
+Source2:        mysqld.service
+Source3:        mysql.conf
+Source4:        my_config.h
+Source90:       filter-provides.sh
+Source91:       filter-requires.sh
+BuildRequires:  cmake
+BuildRequires:  perl
+BuildRequires:  libaio-devel
+BuildRequires:  ncurses-devel
+BuildRequires:  openssl-devel
+BuildRequires:  zlib-devel
+%if 0%{?systemd}
+BuildRequires:  systemd
+%endif
+BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
+
+%if 0%{?rhel} > 6
+# For rpm => 4.9 only: https://fedoraproject.org/wiki/Packaging:AutoProvidesAndRequiresFiltering
+%global __requires_exclude ^perl\\((GD|hostnames|lib::mtr|lib::v1|mtr_|My::)
+%global __provides_exclude_from ^(/usr/share/(mysql|mysql-test)/.*|%{_libdir}/mysql/plugin/.*\\.so)$
+%else
+# https://fedoraproject.org/wiki/EPEL:Packaging#Generic_Filtering_on_EPEL6
+%global __perl_provides %{SOURCE90}
+%global __perl_requires %{SOURCE91}
+%endif
+
+%description
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest
+news and information about the MySQL software. Also please see the
+documentation and the manual for more information.
+
+%package        server
+Summary:        A very fast and reliable SQL database server
+Group:          Applications/Databases
+Requires:       coreutils
+Requires:       grep
+Requires:       procps
+Requires:       shadow-utils
+Requires:       net-tools
+Requires:       perl-base
+%if 0%{?commercial}
+Provides:       MySQL-server-advanced = %{version}-%{release}
+Obsoletes:      MySQL-server-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-server < %{version}-%{release}
+Requires:       mysql-commercial-client = %{version}-%{release}
+Requires:       mysql-commercial-common = %{version}-%{release}
+%else
+Provides:       MySQL-server = %{version}-%{release}
+Requires:       mysql-community-client = %{version}-%{release}
+Requires:       mysql-community-common = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-server < %{version}-%{release}
+Obsoletes:      mysql < %{version}-%{release}
+Obsoletes:      mysql-tools < %{version}-%{release}
+Obsoletes:      mariadb-server
+Obsoletes:      mariadb-galera-server
+Provides:       mysql = %{version}-%{release}
+Provides:       mysql-tools = %{version}-%{release}
+%if 0%{?systemd}
+Requires(post):   systemd
+Requires(preun):  systemd
+Requires(postun): systemd
+%else
+PreReq:         insserv
+PreReq:         sed
+PreReq:         pwdutils
+%endif
+Conflicts:      otherproviders(mysql)
+Conflicts:      otherproviders(mysql-debug)
+Conflicts:      otherproviders(mysql-tools)
+
+%description    server
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest news and
+information about the MySQL software.  Also please see the documentation
+and the manual for more information.
+
+This package includes the MySQL server binary as well as related utilities
+to run and administer a MySQL server.
+
+%package        client
+Summary:        MySQL database client applications and tools
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-client-advanced = %{version}-%{release}
+Obsoletes:      MySQL-client-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-client < %{version}-%{release}
+Requires:       mysql-commercial-libs = %{version}-%{release}
+%else
+Provides:       MySQL-client = %{version}-%{release}
+Requires:       mysql-community-libs = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-client < %{version}-%{release}
+Provides:       mysql-client = %{version}-%{release}
+Obsoletes:      mysql-client < %{version}-%{release}
+Obsoletes:      mariadb
+Conflicts:      otherproviders(mysql-client)
+
+%description    client
+This package contains the standard MySQL clients and administration
+tools.
+
+%package        common
+Summary:        MySQL database common files for server and client libs
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-common < %{version}-%{release}
+%endif
+Provides:       mysql-common = %{version}-%{release}
+
+%description    common
+This packages contains common files needed by MySQL client library,
+MySQL database server, and MySQL embedded server.
+
+
+%package        test
+Summary:        Test suite for the MySQL database server
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-test-advanced = %{version}-%{release}
+Obsoletes:      MySQL-test-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-test < %{version}-%{release}
+Requires:       mysql-commercial-server = %{version}-%{release}
+%else
+Provides:       MySQL-test = %{version}-%{release}
+Requires:       mysql-community-server = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-test < %{version}-%{release}
+Obsoletes:      mysql-test < %{version}-%{release}
+Obsoletes:      mariadb-test
+Provides:       mysql-test = %{version}-%{release}
+Conflicts:      otherproviders(mysql-test)
+
+%description    test
+This package contains the MySQL regression test suite for MySQL
+database server.
+
+
+%package        bench
+Summary:        MySQL benchmark suite
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-bench < %{version}-%{release}
+Requires:       mysql-commercial-server = %{version}-%{release}
+%else
+Requires:       mysql-community-server = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-bench
+Obsoletes:      community-mysql-bench < %{version}-%{release}
+Obsoletes:      mysql-bench < %{version}-%{release}
+Provides:       mysql-bench = %{version}-%{release}
+Conflicts:      otherproviders(mysql-bench)
+
+%description    bench
+This package contains the MySQL Benchmark Suite for MySQL database
+server.
+
+%package        devel
+Summary:        Development header files and libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-devel-advanced = %{version}-%{release}
+Obsoletes:      MySQL-devel-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-devel < %{version}-%{release}
+Requires:       mysql-commercial-libs = %{version}-%{release}
+%else
+Provides:       MySQL-devel = %{version}-%{release}
+Requires:       mysql-community-libs = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-devel < %{version}-%{release}
+Obsoletes:      mysql-devel < %{version}-%{release}
+Obsoletes:      mariadb-devel
+Obsoletes:      libmysqlclient-devel
+Provides:       mysql-devel = %{version}-%{release}
+Provides:       libmysqlclient-devel = %{version}-%{release}
+
+%description    devel
+This package contains the development header files and libraries necessary
+to develop MySQL client applications.
+
+%package        libs
+Summary:        Shared libraries for MySQL database client applications
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-shared-advanced = %{version}-%{release}
+Obsoletes:      MySQL-shared-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-libs < %{version}-%{release}
+Requires:       mysql-commercial-common = %{version}-%{release}
+%else
+Provides:       MySQL-shared = %{version}-%{release}
+Requires:       mysql-community-common = %{version}-%{release}
+%endif
+Obsoletes:      MySQL-shared < %{version}-%{release}
+Obsoletes:      mysql-libs < %{version}-%{release}
+Obsoletes:      mariadb-libs
+Obsoletes:      libmysqlclient18 < %{version}-%{release}
+Obsoletes:      libmysqlclient_r18 < %{version}-%{release}
+Provides:       mysql-libs = %{version}-%{release}
+Provides:       libmysqlclient18 = %{version}-%{release}
+Provides:       libmysqlclient_r18 = %{version}-%{release}
+
+%description    libs
+This package contains the shared libraries for MySQL client
+applications.
+
+%package        embedded
+Summary:        MySQL embedded library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Provides:       MySQL-embedded-advanced = %{version}-%{release}
+Obsoletes:      MySQL-embedded-advanced < %{version}-%{release}
+Obsoletes:      mysql-community-embedded < %{version}-%{release}
+Requires:       mysql-commercial-common = %{version}-%{release}
+%else
+Provides:       MySQL-embedded = %{version}-%{release}
+Requires:       mysql-community-common = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-embedded
+Obsoletes:      MySQL-embedded < %{version}-%{release}
+Obsoletes:      mysql-embedded < %{version}-%{release}
+Provides:       mysql-embedded = %{version}-%{release}
+
+%description    embedded
+This package contains the MySQL server as an embedded library.
+
+The embedded MySQL server library makes it possible to run a full-featured
+MySQL server inside the client application. The main benefits are increased
+speed and more simple management for embedded applications.
+
+The API is identical for the embedded MySQL version and the
+client/server version.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+%package        embedded-devel
+Summary:        Development header files and libraries for MySQL as an embeddable library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      mysql-community-embedded-devel < %{version}-%{release}
+Requires:       mysql-commercial-devel = %{version}-%{release}
+Requires:       mysql-commercial-embedded = %{version}-%{release}
+%else
+Requires:       mysql-community-devel = %{version}-%{release}
+Requires:       mysql-community-embedded = %{version}-%{release}
+%endif
+Obsoletes:      mariadb-embedded-devel
+Obsoletes:      mysql-embedded-devel < %{version}-%{release}
+Provides:       mysql-embedded-devel = %{version}-%{release}
+
+%description    embedded-devel
+This package contains files needed for developing applications using
+the embedded version of the MySQL server.
+
+%prep
+%setup -q -T -a 0 -c -n %{src_dir}
+pushd %{src_dir}
+
+%build
+# Fail quickly and obviously if user tries to build as root
+%if 0%{?runselftest}
+if [ "x$(id -u)" = "x0" ] ; then
+   echo "The MySQL regression tests may fail if run as root."
+   echo "If you really need to build the RPM as root, use"
+   echo "--define='runselftest 0' to skip the regression tests."
+   exit 1
+fi
+%endif
+
+
+# Build debug versions of mysqld and libmysqld.a
+mkdir debug
+(
+  cd debug
+  # Attempt to remove any optimisation flags from the debug build
+  optflags=$(echo "%{optflags}" | sed -e 's/-O2 / /' -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /')
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=Debug \
+           -DENABLE_DTRACE=OFF \
+           -DCMAKE_C_FLAGS="$optflags" \
+           -DCMAKE_CXX_FLAGS="$optflags" \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
+           -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+# Build full release
+mkdir release
+(
+  cd release
+  cmake ../%{src_dir} \
+           -DBUILD_CONFIG=mysql_release \
+           -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DENABLE_DTRACE=OFF \
+           -DCMAKE_C_FLAGS="%{optflags}" \
+           -DCMAKE_CXX_FLAGS="%{optflags}" \
+           -DINSTALL_LIBDIR="%{_lib}/mysql" \
+           -DINSTALL_PLUGINDIR="%{_lib}/mysql/plugin" \
+           -DINSTALL_SQLBENCHDIR=share \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DWITH_EMBEDDED_SERVER=1 \
+           -DWITH_EMBEDDED_SHARED_LIBRARY=1 \
+           %{?ssl_option} \
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
+           -DMYSQL_SERVER_SUFFIX="%{?server_suffix}"
+  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
+  make %{?_smp_mflags} VERBOSE=1
+)
+
+%install
+MBD=$RPM_BUILD_DIR/%{src_dir}
+
+# Ensure that needed directories exists
+install -d -m 0755 %{buildroot}/var/lib/mysql
+install -d -m 0755 %{buildroot}/var/run/mysql
+install -d -m 0750 %{buildroot}/var/log/mysql
+
+# Install all binaries
+cd $MBD/release
+make DESTDIR=%{buildroot} install
+
+# Install logrotate and autostart
+install -D -m 0644 $MBD/release/support-files/mysql-log-rotate %{buildroot}%{_sysconfdir}/logrotate.d/mysql
+install -D -m 0644 $MBD/release/packaging/rpm-sles/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -d %{buildroot}%{_sysconfdir}/my.cnf.d
+%if 0%{?systemd}
+install -D -m 0755 %{SOURCE1} %{buildroot}%{_bindir}/mysql-systemd-start
+install -D -m 0644 %{SOURCE2} %{buildroot}%{_unitdir}/mysqld.service
+%else
+install -D -m 0755 $MBD/release/packaging/rpm-sles/mysql.init %{buildroot}%{_sysconfdir}/init.d/mysql
+%endif
+install -D -m 0644 %{SOURCE3} %{buildroot}%{_prefix}/lib/tmpfiles.d/mysql.conf
+
+# Make library links
+install -d -m 0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
+echo "%{_libdir}/mysql" > %{buildroot}%{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+
+# multiarch support
+%ifarch %{multiarchs}
+mv %{buildroot}/%{_includedir}/mysql/my_config.h \
+   %{buildroot}/%{_includedir}/mysql/my_config_%{_arch}.h
+install -p -m 0644 %{SOURCE4} %{buildroot}/%{_includedir}/mysql/my_config.h
+%endif
+
+# Remove files pages we explicitly do not want to package
+rm -rf %{buildroot}%{_infodir}/mysql.info*
+rm -rf %{buildroot}%{_datadir}/mysql/binary-configure
+rm -rf %{buildroot}%{_datadir}/mysql/mysql.server
+rm -rf %{buildroot}%{_datadir}/mysql/mysqld_multi.server
+rm -f  %{buildroot}%{_datadir}/mysql/{ndb-config-2-node,config*}.ini
+rm -f  %{buildroot}%{_datadir}/mysql/my-*.cnf
+%if 0%{?systemd}
+rm -rf %{buildroot}%{_sysconfdir}/init.d/mysql
+%endif
+rm -rf %{buildroot}%{_bindir}/mysql_embedded
+rm -rf %{buildroot}%{_bindir}/mysql_setpermission
+rm -rf %{buildroot}%{_mandir}/man1/mysql_setpermission.1*
+
+# rcmysql symlink
+install -d %{buildroot}%{_sbindir}
+ln -sf %{_initrddir}/mysql %{buildroot}%{_sbindir}/rcmysql
+
+%check
+%if 0%{?runselftest}
+pushd release
+make test VERBOSE=1
+export MTR_BUILD_THREAD=auto
+pushd mysql-test
+./mtr \
+    --mem --parallel=auto --force --retry=0 \
+    --mysqld=--binlog-format=mixed \
+    --suite-timeout=720 --testcase-timeout=30 \
+    --clean-vardir
+rm -r $(readlink var) var
+%endif
+
+%pre server
+/usr/sbin/groupadd -r mysql >/dev/null 2>&1 || :
+/usr/sbin/useradd -g mysql -o -r -d /var/lib/mysql -s /bin/false \
+    -c "MySQL Server" -u 60 mysql >/dev/null 2>&1 || :
+
+%post server
+datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+/bin/chmod 0755 "$datadir"
+/bin/touch /var/log/mysql/mysqld.log
+%if 0%{?systemd}
+%systemd_post mysqld.service
+/sbin/service mysqld enable >/dev/null 2>&1 || :
+%else
+/sbin/insserv /etc/init.d/mysql
+%endif
+
+%preun server
+%if 0%{?systemd}
+%systemd_preun mysqld.service
+%else
+if [ "$1" -eq 0 ]; then
+    /usr/sbin/rcmysql stop >/dev/null 2>&1 || :
+    /sbin/insserv /etc/init.d
+fi
+%endif
+
+%postun server
+%if 0%{?systemd}
+%systemd_postun_with_restart mysqld.service
+%else
+if [ $1 -ge 1 ]; then
+    /usr/sbin/rcmysql condrestart >/dev/null 2>&1 || :
+fi
+%endif
+
+%post libs -p /sbin/ldconfig
+
+%postun libs -p /sbin/ldconfig
+
+%if 0%{?compatlib}
+%post libs-compat -p /sbin/ldconfig
+
+%postun libs-compat -p /sbin/ldconfig
+%endif
+
+%post embedded -p /sbin/ldconfig
+
+%postun embedded -p /sbin/ldconfig
+
+%files server
+%defattr(-, root, root, -)
+%doc %{?license_files_server} %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
+%attr(644, root, root) %{_mandir}/man1/innochecksum.1*
+%attr(644, root, root) %{_mandir}/man1/my_print_defaults.1*
+%attr(644, root, root) %{_mandir}/man1/myisam_ftdump.1*
+%attr(644, root, root) %{_mandir}/man1/myisamchk.1*
+%attr(644, root, root) %{_mandir}/man1/myisamlog.1*
+%attr(644, root, root) %{_mandir}/man1/myisampack.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_convert_table_format.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_fix_extensions.1*
+%attr(644, root, root) %{_mandir}/man8/mysqld.8*
+%attr(644, root, root) %{_mandir}/man1/mysqld_multi.1*
+%attr(644, root, root) %{_mandir}/man1/mysqld_safe.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldumpslow.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_install_db.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_plugin.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_secure_installation.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_upgrade.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlhotcopy.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlman.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.server.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_zap.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbug.1*
+%attr(644, root, root) %{_mandir}/man1/perror.1*
+%attr(644, root, root) %{_mandir}/man1/replace.1*
+%attr(644, root, root) %{_mandir}/man1/resolve_stack_dump.1*
+%attr(644, root, root) %{_mandir}/man1/resolveip.1*
+
+%config(noreplace) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
+
+%attr(755, root, root) %{_bindir}/innochecksum
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/myisam_ftdump
+%attr(755, root, root) %{_bindir}/myisamchk
+%attr(755, root, root) %{_bindir}/myisamlog
+%attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_fix_extensions
+%attr(755, root, root) %{_bindir}/mysql_install_db
+%attr(755, root, root) %{_bindir}/mysql_plugin
+%attr(755, root, root) %{_bindir}/mysql_secure_installation
+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
+%attr(755, root, root) %{_bindir}/mysql_upgrade
+%attr(755, root, root) %{_bindir}/mysql_zap
+%attr(755, root, root) %{_bindir}/mysqlbug
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
+%attr(755, root, root) %{_bindir}/mysqldumpslow
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/perror
+%attr(755, root, root) %{_bindir}/replace
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
+%attr(755, root, root) %{_bindir}/resolveip
+%if 0%{?systemd}
+%attr(755, root, root) %{_bindir}/mysql-systemd-start
+%endif
+%attr(755, root, root) %{_sbindir}/mysqld
+%attr(755, root, root) %{_sbindir}/mysqld-debug
+%attr(755, root, root) %{_sbindir}/rcmysql
+
+%dir %{_libdir}/mysql/plugin
+%attr(755, root, root) %{_libdir}/mysql/plugin/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/semisync_slave.so
+%dir %{_libdir}/mysql/plugin/debug
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/adt_null.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_socket.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/mypluglib.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_master.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/semisync_slave.so
+%if 0%{?commercial}
+%attr(755, root, root) %{_libdir}/mysql/plugin/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/thread_pool.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/audit_log.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/authentication_pam.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/thread_pool.so
+%endif
+%attr(644, root, root) %{_datadir}/mysql/fill_help_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_system_tables_data.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql_test_data_timezone.sql
+%attr(644, root, root) %{_datadir}/mysql/mysql-log-rotate
+%attr(644, root, root) %{_datadir}/mysql/magic
+%attr(644, root, root) %{_prefix}/lib/tmpfiles.d/mysql.conf
+%if 0%{?systemd}
+%attr(644, root, root) %{_unitdir}/mysqld.service
+%else
+%attr(755, root, root) %{_sysconfdir}/init.d/mysql
+%endif
+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
+%dir %attr(755, mysql, mysql) /var/lib/mysql
+%dir %attr(755, mysql, mysql) /var/run/mysql
+%dir %attr(750, mysql, mysql) /var/log/mysql
+
+%files common
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%{_datadir}/mysql/charsets/
+%{_datadir}/mysql/errmsg-utf8.txt
+%{_datadir}/mysql/czech/
+%{_datadir}/mysql/danish/
+%{_datadir}/mysql/dutch/
+%{_datadir}/mysql/english/
+%{_datadir}/mysql/estonian/
+%{_datadir}/mysql/french/
+%{_datadir}/mysql/german/
+%{_datadir}/mysql/greek/
+%{_datadir}/mysql/hungarian/
+%{_datadir}/mysql/italian/
+%{_datadir}/mysql/japanese/
+%{_datadir}/mysql/korean/
+%{_datadir}/mysql/norwegian-ny/
+%{_datadir}/mysql/norwegian/
+%{_datadir}/mysql/polish/
+%{_datadir}/mysql/portuguese/
+%{_datadir}/mysql/romanian/
+%{_datadir}/mysql/russian/
+%{_datadir}/mysql/serbian/
+%{_datadir}/mysql/slovak/
+%{_datadir}/mysql/spanish/
+%{_datadir}/mysql/swedish/
+%{_datadir}/mysql/ukrainian/
+
+%files client
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(755, root, root) %{_bindir}/msql2mysql
+%attr(755, root, root) %{_bindir}/mysql
+%attr(755, root, root) %{_bindir}/mysql_find_rows
+%attr(755, root, root) %{_bindir}/mysql_waitpid
+%attr(755, root, root) %{_bindir}/mysqlaccess
+# XXX: This should be moved to %{_sysconfdir}
+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
+%attr(755, root, root) %{_bindir}/mysqladmin
+%attr(755, root, root) %{_bindir}/mysqlbinlog
+%attr(755, root, root) %{_bindir}/mysqlcheck
+%attr(755, root, root) %{_bindir}/mysqldump
+%attr(755, root, root) %{_bindir}/mysqlimport
+%attr(755, root, root) %{_bindir}/mysqlshow
+%attr(755, root, root) %{_bindir}/mysqlslap
+%attr(755, root, root) %{_bindir}/mysql_config
+
+%attr(644, root, root) %{_mandir}/man1/msql2mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_find_rows.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_waitpid.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlaccess.1*
+%attr(644, root, root) %{_mandir}/man1/mysqladmin.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlbinlog.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlcheck.1*
+%attr(644, root, root) %{_mandir}/man1/mysqldump.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlimport.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlshow.1*
+%attr(644, root, root) %{_mandir}/man1/mysqlslap.1*
+
+%files devel
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(644, root, root) %{_mandir}/man1/comp_err.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_config.1*
+%attr(755, root, root) %{_bindir}/mysql_config
+%{_includedir}/mysql
+%{_datadir}/aclocal/mysql.m4
+%{_libdir}/mysql/libmysqlclient.a
+%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libmysqlservices.a
+%{_libdir}/mysql/libmysqlclient_r.so
+%{_libdir}/mysql/libmysqlclient.so
+
+%files libs
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.18*
+%{_libdir}/mysql/libmysqlclient_r.so.18*
+
+%if 0%{?compatlib}
+%files libs-compat
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%{_libdir}/mysql/libmysqlclient.so.%{compatlib}
+%{_libdir}/mysql/libmysqlclient.so.%{compatlib}.0.0
+%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}
+%{_libdir}/mysql/libmysqlclient_r.so.%{compatlib}.0.0
+%endif
+
+%files test
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
+
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/auth_test_plugin.so
+%attr(644, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+%attr(755, root, root) %{_libdir}/mysql/plugin/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/qa_auth_server.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/auth_test_plugin.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/libdaemon_example.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_client.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_interface.so
+%attr(755, root, root) %{_libdir}/mysql/plugin/debug/qa_auth_server.so
+
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-stress-test.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql-test-run.pl.1*
+%attr(644, root, root) %{_mandir}/man1/mysql_client_test_embedded.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest.1*
+%attr(644, root, root) %{_mandir}/man1/mysqltest_embedded.1*
+
+%files bench
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%{_datadir}/sql-bench
+
+%files embedded
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%dir %attr(755, root, root) %{_libdir}/mysql
+%attr(644, root, root) %{_sysconfdir}/ld.so.conf.d/mysql-%{_arch}.conf
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so.*
+
+%files embedded-devel
+%defattr(-, root, root, -)
+%doc %{?license_files_server}
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
+%attr(755, root, root) %{_libdir}/mysql/libmysqld.so
+
+%changelog
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.5.41-1
+- Backport to 5.5.41
+
+* Mon Oct 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.6-0.2.m16
+- Include boost sources
+- Add license info in each subpackage
+
+* Tue Sep 02 2014 Bjorn Munch <bjorn.munch@oracle.com> - 5.7.6-0.1.m16
+- Updated for 5.7.6
+
+* Mon Sep 01 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.2.m15
+- Added openssl_udf.so plugin to commercial packages
+
+* Mon Jun 30 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.1.m15
+- Port to SLES
+
+* Thu Jun 26 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.3.m15
+- Resolve embedded-devel conflict issue
+
+* Wed Jun 25 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.2.m15
+- Add bench package
+- Enable dtrace 
+
+* Thu Apr 24 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.5-0.1.m15
+- Updated for 5.7.5
+
+* Mon Apr 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.5.m14
+- Fix Cflags for el7 
+
+* Mon Mar 31 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.4.m14
+- Support for enterprise packages
+- Upgrade from MySQL-* packages
+
+* Wed Mar 12 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.3.m14
+- Resolve conflict with mysql-libs-compat 
+
+* Thu Mar 06 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.2.m14
+- Resolve conflict issues during upgrade
+- Add ha_example.so plugin which is now included
+
+* Fri Feb 07 2014 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.4-0.1.m14
+- 5.7.4
+- Enable shared libmysqld by cmake option
+- Move mysqltest and test plugins to test subpackage
+
+* Mon Nov 18 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.3-0.3.m13
+- Fixed isa_bits error 
+
+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.7.3-0.1.m13
+- Initial 5.7 port
+
+* Fri Oct 25 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.15-1
+- Fixed uln advanced rpm libyassl.a error
+- Updated to 5.6.15
+
+* Wed Oct 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-3
+- Fixed mysql_install_db usage 
+- Improved handling of plugin directory 
+
+* Fri Sep 27 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-2
+- Refresh mysql-install patch and service renaming
+
+* Mon Sep 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.14-1
+- Updated to 5.6.14
+
+* Wed Sep 04 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-5
+- Support upgrade from 5.5 ULN packages to 5.6 
+
+* Tue Aug 27 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-4
+- Enhanced perl filtering 
+- Added openssl-devel to buildreq 
+
+* Wed Aug 21 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-3
+- Removed mysql_embedded binary to resolve multilib conflict issue
+
+* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-2 
+- Fixed Provides and Obsoletes issues in server, test packages 
+
+* Wed Aug 14 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.13-1
+- Updated to 5.6.13
+
+* Mon Aug 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-9
+- Added files list to embedded packages 
+
+* Thu Aug 01 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-8
+- Updated libmysqld.a with libmysqld.so in embedded package
+
+* Mon Jul 29 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-7
+- Updated test package dependency from client to server
+
+* Wed Jul 24 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-6
+- Added libs-compat dependency under libs package to resolve server
+  installation conflicts issue.
+ 
+* Wed Jul 17 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-5
+- Removed libmysqlclient.so.16 from libs package
+ 
+* Fri Jul 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-4
+- Adjusted to work on OEL6
+
+* Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-3
+- Move libs to mysql/
+- Basic multi arch support
+- Fix changelog dates
+
+* Thu Jun 20 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-2
+- Major cleanup
+
+* Tue Jun 04 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com> - 5.6.12-1
+- Updated to 5.6.12
+
+* Mon Nov 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Allow to override the default to use the bundled yaSSL by an option like
+      --define="with_ssl /path/to/ssl"
+
+* Wed Oct 10 2012 Bjorn Munch <bjorn.munch@oracle.com>
+
+- Replace old my-*.cnf config file examples with template my-default.cnf
+
+* Fri Oct 05 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the installation use the new option "--random-passwords" of "mysql_install_db".
+  (Bug# 12794345 Ensure root password)
+- Fix an inconsistency: "new install" vs "upgrade" are told from the (non)existence
+  of "$mysql_datadir/mysql" (holding table "mysql.user" and other system stuff).
+
+* Tue Jul 24 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add a macro "runselftest":
+  if set to 1 (default), the test suite will be run during the RPM build;
+  this can be oveeridden via the command line by adding
+      --define "runselftest 0"
+  Failures of the test suite will NOT make the RPM build fail!
+
+* Mon Jul 16 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the man page for the "mysql_config_editor".
+
+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+
+* Wed Feb 29 2012 Brajmohan Saxena <brajmohan.saxena@oracle.com>
+
+- Removal all traces of the readline library from mysql (BUG 13738013)
+
+* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
+  it is better to keep alphabetic order in the files list (merging!).
+
+* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
+  the RPMs of any configuration (of the current or the preceding release series)
+  by the new ones. This is done by not using the implicitly generated capabilities
+  (which include the configuration name) and relying on more generic ones which
+  just list the function ("server", "client", ...).
+  The implicit generation cannot be prevented, so all these capabilities must be
+  explicitly listed in "Obsoletes:"
+
+* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to
+  changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
+  this necessitated a move of the libmygcc.a installation to the install
+  phase, which is probably where it belonged in the first place.
+
+* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
+
+* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Add mysql_plugin man page.
+
+* Tue Aug 30 2011 Tor Didriksen <tor.didriksen@oracle.com>
+
+- Set CXX=g++ by default to add a dependency on libgcc/libstdc++.
+  Also, remove the use of the -fno-exceptions and -fno-rtti flags.
+  TODO: update distro_buildreq/distro_requires
+
+* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the manual page for "mysql_plugin" to the server package.
+
+* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Null-upmerge the fix of bug#37165: This spec file is not affected.
+- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}".
+
+* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Source plugin library files list from cmake-generated file.
+
+* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
+
+- Added the mysql_plugin client - enables or disables plugins.
+
+* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
+
+- Fix bug#12561297: Added the MySQL embedded binary
+
+* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#45415: "rpm upgrade recreates test database"
+  Let the creation of the "test" database happen only during a new installation,
+  not in an RPM upgrade.
+  This affects both the "mkdir" and the call of "mysql_install_db".
+
+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#56581: If an installation deviates from the default file locations
+  ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
+  should still work, and use these locations.
+  The problem was that the fix for bug#27072 did not check for local settings.
+
+* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
+
+* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too
+- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
+  a '-j' argument to make.
+
+* Mon Nov 1 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added test authentication (WL#1054) plugin binaries
+
+* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added example external authentication (WL#1054) plugin binaries
+
+* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
+  Reflect that in the "Obsoletes" specifications.
+- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
+- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
+
+* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change the behaviour on installation and upgrade:
+  On installation, do not autostart the server.
+  *Iff* the server was stopped before the upgrade is started, this is taken as a
+  sign the administrator is handling that manually, and so the new server will
+  not be started automatically at the end of the upgrade.
+  The start/stop scripts will still be installed, so the server will be started
+  on the next machine boot.
+  This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
+
+* Tue Jun 1 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Implement SELinux checks from distribution-specific spec file.
+
+* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Large number of changes to build using CMake
+- Introduce distribution-specific RPMs
+- Drop debuginfo, build all binaries with debug/symbols
+- Remove __os_install_post, use native macro
+- Remove _unpackaged_files_terminate_build, make it an error to have
+  unpackaged files
+- Remove cluster RPMs
+
+* Wed Mar 24 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Add "--with-perfschema" to the configure options.
+
+* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64",
+  mask "rmdir" return code 1.
+- Remove "ha_example.*" files from the list, they aren't built.
+
+* Wed Mar 17 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix a wrong path name in handling the debug plugins.
+
+* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Take the result of the debug plugin build and put it into the optimized tree,
+  so that it becomes part of the final installation;
+  include the files in the packlist. Part of the fixes for bug#49022.
+
+* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
+  accept upgrading from packages showing MySQL or Sun as vendor.
+
+* Fri Feb 12 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Formatting changes:
+  Have a consistent structure of separator lines and of indentation
+  (8 leading blanks => tab).
+- Introduce the variable "src_dir".
+- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence
+  over "CC" ("CXX").
+- Drop the old "with_static" argument analysis, this is not supported
+  in 5.1 since ages.
+- Introduce variables to control the handlers individually, as well
+  as other options.
+- Use the new "--with-plugin" notation for the table handlers.
+- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql"
+  was done back in 2002 already.
+- Make "--with-zlib-dir=bundled" the default, add an option to disable it.
+- Add missing manual pages to the file list.
+- Improve the runtime check for "libgcc.a", protect it against being tried
+  with the Intel compiler "icc".
+
+* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change RPM file naming:
+  - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
+  - Release counts from 1, not 0.
+
+* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- The "semisync" plugin file name has lost its introductory "lib",
+  adapt the file lists for the subpackages.
+  This is a part missing from the fix for bug#48351.
+- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
+  (and likely, the whole script will go, too).
+
+* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix some problems with the directives around "tcmalloc" (experimental),
+  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+
+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
+
+- Removed mysql_fix_privilege_tables
+
+* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
+
+- "mysqlmanager" got removed from version 5.4, all references deleted.
+
+* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
+
+* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- This version does not contain the "Instance manager", "mysqlmanager":
+  Remove it from the spec file so that packaging succeeds.
+
+* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Add conditionals for bundled zlib and innodb plugin
+
+* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Install plugin libraries in appropriate packages.
+- Disable libdaemon_example and ftexample plugins.
+
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Update variable used for mysql-test suite location to match source.
+
+* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Correct yesterday's fix, so that it also works for the last flag,
+  and fix a wrong quoting: un-quoted quote marks must not be escaped.
+
+* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
+
+- Removed "mysql_upgrade_shell"
+- Removed some copy/paste between debug and normal build
+
+* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
+  This should cover both gcc and icc flags.  Fixes bug#40546.
+
+* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
+
+- Removed the "Federated" storage engine option, and enabled in all
+
+* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
+  Some generated files aren't needed in RPMs:
+  - the "sql-bench/" subdirectory
+  Some files were missing:
+  - /usr/share/aclocal/mysql.m4  ("devel" subpackage)
+  - Manual "mysqlbug" ("server" subpackage)
+  - Program "innochecksum" and its manual ("server" subpackage)
+  - Manual "mysql_find_rows" ("client" subpackage)
+  - Script "mysql_upgrade_shell" ("client" subpackage)
+  - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
+  - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
+
+* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
+
+- Made the "Federated" storage engine an option
+- Made the "Cluster" storage engine and sub packages an option
+
+* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Add the man pages for "ndbd" and "ndb_mgmd".
+
+* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
+
+- Require a manual upgrade if the alread-installed mysql-server is
+  from another vendor, or is of a different major version.
+
+* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- "ndb_size.tmpl" is not needed any more,
+  "man1/mysql_install_db.1" lacked the trailing '*'.
+
+* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
+
+- Removed man page for "mysql_create_system_tables"
+
+* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
+
+- Add debug server.
+
+* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
+
+- Remove Max RPMs; the server RPMs contain a mysqld compiled with all
+  features that previously only were built into Max.
+
+* Fri Mar 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- Add several man pages for NDB which are now created.
+
+* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
+
+- Put back "libmygcc.a", found no real reason it was removed.
+
+- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
+  correct "libgcc.a" path is returned for the 32/64 bit architecture.
+
+* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
+
+* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
+  in the server RPM.
+- The "mysqlmanager" man page got moved from section 1 to 8.
+
+* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Call "make install" using "benchdir_root=%%{_datadir}",
+  because that is affecting the regression test suite as well.
+
+* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
+  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
+  (bug#22081).
+
+* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Add "--with-partition" t 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use the Perl script to run the tests, because it will automatically check
+  whether the server is configured with SSL.
+
+* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
+
+- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
+
+- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
+  there are some more aspects which need to be solved before this is possible.
+  For now, just ensure the binary "mysql_upgrade" is delivered and installysql.com>
+
+- To run "mysql_upgrade", we need a running server;
+  start it in isolation and skip password checks.
+
+* Sat May 20 2006 Kent Boortz <kent@mysql.com>
+
+- Always compile for PIC, position independent code.
+
+* Wed May 10 2006 Kent Boortz <kent@mysql.com>
+
+- Use character set "all" when compiling with Cluster, to make Cluster
+  nodes independent on the character set directory, and the problem
+  that two RPM sub packages both wants to install this directory.
+
+* Mon May 01 2006 Kent Boortz <kent@mysql.com>
+
+- Use "./libtool --mode=execute" instead of searching for the
+  executable in current directory and ".libs".
+
+* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
+
+- Install and run "mysql_upgrade"
+
+* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove sql-bench, and MySQL-bench RPM (will be built as an independent
+  project from the mysql-bench repository)
+
+* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove old mysqltestmanager and related programs
+* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
+
+- Changed product name from "Community Edition" to "Community Server"
+
+* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
+
+- Fast mutexes is now disabled by default, but should be
+  used in Linux builds.
+
+* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
+
+- Reintroduced a max build
+- Limited testing of 'debug' and 'max' servers
+- Berkeley DB only in 'max'
+
+* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use "-i" on "make test-force";
+  this is essential for later evaluation of this log file.
+
+* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
+
+- Pass '-static' to libtool, link static with our own libraries, dynamic
+  with system libraries.  Link with the bundled zlib.
+
+* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>
+
+- Modified RPM spec to match new 5.1 debug+max combined community packaging.
+
+* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
+
+- Added "client/mysqlslap"
+
+* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
+
+- Added zlib to the list of (static) libraries installed
+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
+- Compile MySQL with bundled zlib
+- Fixed %%packager name to "MySQL Production Engineering Team"
+
+* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Avoid using the "bundled" zlib on "shared" builds:
+  As it is not installed (on the build system), this gives dependency
+  problems with "libtool" causing the build to fail.
+  (Change was done on Nov 11, but left uncommented.)
+
+* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Extend the file existence check for "init.d/mysql" on un-install
+  to also guard the call to "insserv"/"chkconfig".
+
+* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
+
+- added more man pages
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Made yaSSL support an option (off by default)
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Enabled yaSSL support
+
+* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
+
+- Give mode arguments the same way in all places
+lenz@mysql.com>
+
+- fixed the removing of the RPM_BUILD_ROOT in the %%clean section (the
+  $RBR variable did not get expanded, thus leaving old build roots behind)
+
+* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the creation of the mysql user group account in the postinstall
+  section (BUG 12348)
+- Fixed enabling the Archive storage engine in the Max binary
+
+* Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the Requires: tag for the server RPM (BUG 12233)
+
+* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
+
+- create a "mysql" user group and assign the mysql user account to that group
+  in the server postinstall section. (BUG 10984)
+
+* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Do not build statically on i386 by default, only when adding either "--with
+  static" or "--define '_with_static 1'" to the RPM build options. Static
+  linking really only makes sense when linking against the specially patched
+  glibc 2.2.5.
+
+* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_client_test to the "bench" subpackage (BUG 10676)
+- added the libndbclient static and shared libraries (BUG 10676)
+
+* Wed Jun 01 2005 Lenz Grimmer <lenz@mysql.com>
+
+- use "mysqldatadir" variable instead of hard-coding the path multiple times
+- use the "mysqld_user" variable on all occasions a user name is referenced
+- removed (incomplete) Brazilian translations
+- removed redundant release tags from the subpackage descriptions
+
+* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Added a "make clean" between separate calls to "BuildMySQL".
+
+* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
+
+- Removed the mysql_tableinfo script made obsolete by the information schema
+
+* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Enabled the "blackhole" storage engine for the Max RPM
+
+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+  from the MySQL sources and are now available seperately.
+
+* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
+
+- old mysqlmanager, mysq* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
+
+- enabled the "Ndbcluster" storage engine for the max binary
+- added extra make install in ndb subdir after Max build to get ndb binaries
+- added packages for ndbcluster storage engine
+
+* Fri Jan 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
+
+* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Federated" storage engine for the max binary
+
+* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
+
+- ISAM and merge storage engines were purged. As well as appropriate
+  tools and manpages (isamchk and isamlog)
+
+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Archive" storage engine for the max binary
+- enabled the "CSV" storage engine for the max binary
+- enabled the "Example" storage engine for the max binary
+
+* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
+
+* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
+
+- do not link statically on IA64/AMD64 as these systems do not have
+  a patched glibc installed
+
+* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added libmygcc.a to the devel subpackage (required to link applications
+  against the the embedded server libmysqld.a) (BUG 4921)
+
+* Mon Aug 09 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added EXCEPTIONS-CLIENT to the "devel" package
+
+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
+
+- disabled OpenSSL in the Max binaries again (the RPM packages were the
+  only exception to this anyway) (BUG 1043)
+
+* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
+
+- fixed server postinstall (mysql_install_db was called with the wrong
+  parameter)
+
+* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_tzinfo_to_sql to the server subpackage
+- run "make clean" instead of "make distclean"
+
+* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added ncurses-devel to the build prerequisites (BUG 3377)
+
+* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
+
+- when using gcc, _always_ use CXX=gcc
+- replaced Copyright with License field (Copyright is obsolete)
+
+* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added myisam_ftdump to the Server package
+
+* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
+
+- link the mysql client against libreadline instead of libedit (BUG 2289)
+
+* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
+
+- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
+
+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
+
+- fixed file permissions (BUG 1672)
+
+* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- made testing for gcc3 a bit more robust
+
+* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_create_system_tables to the server subpackage
+
+* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed dependency on MySQL-client from the MySQL-devel subpackage
+  as it is not really required. (BUG 1610)
+
+* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 1162 (removed macro names from the changelog)
+- Really fixed BUG 998 (disable the checking for installed but
+  unpackaged files)
+
+* Tue Aug 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 959 (libmysqld not being compiled properly)
+- Fixed BUG 998 (RPM build errors): added missing files to the
+  distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
+  mysql_fix_privilege_tables.1), removed "-n" from install section.
+
+* Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed the GIF Icon (file was not included in the sources anyway)
+- removed unused variable shared_lib_version
+- do not run automake before building the standard binary
+  (should not be necessary)
+- add server suffix '-standard' to standard binary (to be in line
+  with the binary tarball distributions)
+- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
+  _datadir, _includedir) throughout the spec file.
+- allow overriding CC and CXX (required when building with other compilers)
+
+* Fri May 16 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-enabled RAID again
+
+* Wed Apr 30 2003 Lenz Grimmer <lenz@mysql.com>
+
+- disabled MyISAM RAID (--with-raid)- it throws an assertion which
+  needs to be investigated first.
+
+* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_secure_installation to server subpackage
+  (BUG 141)
+
+* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-added missing pre- and post(un)install scripts to server subpackage
+- added config file /etc/my.cnf to the file list (just for completeness)
+- make sure to create the datadir with 755 permissions
+
+* Mon Jan 27 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed unusedql.com>
+
+- Reworked the build steps a little bit: the Max binary is supposed
+  to include OpenSSL, which cannot be linked statically, thus trying
+  to statically link against a special glibc is futile anyway
+- because of this, it is not required to make yet another build run
+  just to compile the shared libs (saves a lot of time)
+- updated package description of the Max subpackage
+- clean up the BuildRoot directory afterwards
+
+* Mon Jul 15 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Updated Packager information
+- Fixed the build options: the regular package is supposed to
+  include InnoDB and linked statically, while the Max package
+  should include BDB and SSL support
+
+* Fri May 03 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Use more RPM macros (e.g. infodir, mandir) to make the spec
+  file more portable
+- reorganized the installation of documentation files: let RPM
+  take care of this
+- reorganized the file list: actually install man pages along
+  with the binaries of the respective subpackage
+- do not include libmysqld.a in the devel subpackage as well, if we
+  have a special "embedded" subpackage
+- reworked the package descriptions
+
+* Mon Oct  8 2001 Monty
+
+- Added embedded server as a separate RPM
+
+* Fri Apr 13 2001 Monty
+
+- Added mysqld-max to the distribution
+
+* Tue Jan 2  2001  Monty
+
+- Added mysql-test to the bench package
+
+* Fri Aug 18 2000 Tim Smith <tim@mysql.com>
+
+- Added separate libmysql_r directory; now both a threaded
+  and non-threaded library is shipped.
+
+* Tue Sep 28 1999 David Axmark <davida@mysql.com>
+
+- Added the support-files/my-example.cnf to the docs directory.
+
+- Removed devel dependency on base since it is about client
+  development.
+
+* Wed Sep 8 1999 David Axmark <davida@mysql.com>
+
+- Cleaned up some for 3.23.
+
+* Thu Jul 1 1999 David Axmark <davida@mysql.com>
+
+- Added support for shared libraries in a separate sub
+  package. Original fix by David Fox (dsfox@cogsci.ucsd.edu)
+
+- The --enable-assembler switch is now automatically disables on
+  platforms there assembler code is unavailable. This should allow
+  building this RPM on non i386 systems.
+
+* Mon Feb 22 1999 David Axmark <david@detron.se>
+
+- Removed unportable cc switches from the spec file. The defaults can
+  now be overridden with environment variables. This feature is used
+  to compile the official RPM with optimal (but compiler version
+  specific) switches.
+
+- Removed the repetitive description parts for the sub rpms. Maybe add
+  again if RPM gets a multiline macro capability.
+
+- Added support for a pt_BR translation. Translation contributed by
+  Jorge Godoy <jorge@bestway.com.br>.
+
+* Wed Nov 4 1998 David Axmark <david@detron.se>
+
+- A lot of changes in all the rpm and install scripts. This may even
+  be a working RPM :-)
+
+* Sun Aug 16 1998 David Axmark <david@detron.se>
+
+- A developers changelog for MySQL is available in the source RPM. And
+  there is a history of major user visible changed in the Reference
+  Manual.  Only RPM specific changes will be documented here.
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql-systemd-start mysql-5.5-5.5.43/packaging/rpm-sles/mysql-systemd-start
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-sles/mysql-systemd-start	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-sles/mysql-systemd-start	2015-02-27 08:30:34.000000000 +0000
@@ -0,0 +1,66 @@
+#! /bin/bash
+#
+# Scripts to run by MySQL systemd service
+# 
+# Needed argument: pre | post
+# 
+# pre mode  :  try to run mysql_install_db and fix perms and SELinux contexts
+# post mode :  ping server until answer is received
+# 
+
+install_db () {    
+    # Note: something different than datadir=/var/lib/mysql requires SELinux policy changes (in enforcing mode)
+    datadir=$(/usr/bin/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p')
+    
+    # Restore log, dir, perms and SELinux contexts
+    [ -d "$datadir" ] || install -d -m 0755 -omysql -gmysql "$datadir" || exit 1
+    log=/var/log/mysqld.log
+    [ -e $log ] || touch $log
+    chmod 0640 $log
+    chown mysql:mysql $log || exit 1
+    if [ -x /usr/sbin/restorecon ]; then
+        /usr/sbin/restorecon "$datadir"
+        /usr/sbin/restorecon $log
+    fi
+
+    # If special mysql dir is in place, skip db install 
+    [ -d "$datadir/mysql" ] && exit 0
+
+    # Create initial db
+    /usr/bin/mysql_install_db --rpm --datadir="$datadir" --user=mysql
+
+    # Create a file to trigger execution of mysql_secure_installation
+    # after server has started
+    touch  "$datadir"/.phase_two_required
+
+    exit 0
+}
+
+pinger () {
+    # Wait for ping to answer to signal startup completed,
+    # might take a while in case of e.g. crash recovery
+    # MySQL systemd service will timeout script if no answer
+    ret=1
+    while /bin/true ; do
+        sleep 1
+        mysqladmin ping >/dev/null 2>&1 && ret=0 && break
+    done
+
+    # If server has been started successfully and file created in
+    # install_db step is present we run mysql_secure_installation
+    if [ $ret -eq 0 -a -e "$datadir"/.phase_two_required -a -x /usr/bin/mysql_secure_installation ] ; then
+	/usr/bin/mysql_secure_installation --use-default --defaults-file=/etc/my.cnf
+	rm -f "$datadir"/.phase_two_required
+    fi
+
+    exit 0
+}
+
+# main
+case $1 in
+    "pre") install_db ;;
+    "post") pinger ;;
+esac
+
+exit 0
+
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/CMakeLists.txt mysql-5.5-5.5.43/packaging/rpm-uln/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,38 +0,0 @@
-# Copyright (c) 2012, 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
-
-
-IF(UNIX)
-  SET(prefix ${CMAKE_INSTALL_PREFIX})
-
-  SET(SPECFILENAME "mysql.${VERSION}.spec")
-  IF("${VERSION}" MATCHES "-ndb-")
-    STRING(REGEX REPLACE "^.*-ndb-" "" NDBVERSION "${VERSION}")
-    SET(SPECFILENAME "mysql-cluster-${NDBVERSION}.spec")
-  ENDIF()
-
-  # Left in current directory, to be taken during build
-  CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/${SPECFILENAME} @ONLY)
-
-  FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
-          mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
-          mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
-          mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
-          mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c
-          README.mysql-docs)
-    CONFIGURE_FILE(${ulnfile} ${CMAKE_CURRENT_BINARY_DIR}/${ulnfile} COPYONLY)
-  ENDFOREACH()
-ENDIF()
-
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/filter-requires-mysql.sh mysql-5.5-5.5.43/packaging/rpm-uln/filter-requires-mysql.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/filter-requires-mysql.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/filter-requires-mysql.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-/usr/lib/rpm/perl.req $* | grep -v -e "perl(th" -e "perl(lib::mtr" -e "perl(mtr"
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/generate-tarball.sh mysql-5.5-5.5.43/packaging/rpm-uln/generate-tarball.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/generate-tarball.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/generate-tarball.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-#!/bin/sh
-
-VERSION=$1
-
-rm -rf mysql-$VERSION
-
-tar xfz mysql-$VERSION.tar.gz || exit 1
-
-rm mysql-$VERSION/Docs/mysql.info
-
-tar cfz mysql-$VERSION-nodocs.tar.gz mysql-$VERSION || exit 1
-
-rm -rf mysql-$VERSION
-
-exit 0
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/my.cnf mysql-5.5-5.5.43/packaging/rpm-uln/my.cnf
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/my.cnf	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/my.cnf	1970-01-01 00:00:00.000000000 +0000
@@ -1,10 +0,0 @@
-[mysqld]
-datadir=/var/lib/mysql
-socket=/var/lib/mysql/mysql.sock
-user=mysql
-# Disabling symbolic-links is recommended to prevent assorted security risks
-symbolic-links=0
-
-[mysqld_safe]
-log-error=/var/log/mysqld.log
-pid-file=/var/run/mysqld/mysqld.pid
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/my_config.h mysql-5.5-5.5.43/packaging/rpm-uln/my_config.h
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/my_config.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/my_config.h	1970-01-01 00:00:00.000000000 +0000
@@ -1,29 +0,0 @@
-/*
- * Kluge to support multilib installation of both 32- and 64-bit RPMS:
- * we need to arrange that header files that appear in both RPMs are
- * identical.  Hence, this file is architecture-independent and calls
- * in an arch-dependent file that will appear in just one RPM.
- *
- * To avoid breaking arches not explicitly supported by Red Hat, we
- * use this indirection file *only* on known multilib arches.
- *
- * Note: this may well fail if user tries to use gcc's -I- option.
- * But that option is deprecated anyway.
- */
-#if defined(__x86_64__)
-#include "my_config_x86_64.h"
-#elif defined(__i386__)
-#include "my_config_i386.h"
-#elif defined(__ppc64__) || defined(__powerpc64__)
-#include "my_config_ppc64.h"
-#elif defined(__ppc__) || defined(__powerpc__)
-#include "my_config_ppc.h"
-#elif defined(__s390x__)
-#include "my_config_s390x.h"
-#elif defined(__s390__)
-#include "my_config_s390.h"
-#elif defined(__sparc__) && defined(__arch64__)
-#include "my_config_sparc64.h"
-#elif defined(__sparc__)
-#include "my_config_sparc.h"
-#endif
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-errno.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-errno.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-errno.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-errno.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-"extern int errno" is just a really bad idea.
-
-
-diff -Naur mysql-5.1.32.orig/include/my_sys.h mysql-5.1.32/include/my_sys.h
---- mysql-5.1.32.orig/include/my_sys.h	2009-02-13 19:52:19.000000000 -0500
-+++ mysql-5.1.32/include/my_sys.h	2009-03-04 18:08:40.000000000 -0500
-@@ -199,13 +199,8 @@
- #define my_afree(PTR) my_free(PTR)
- #endif /* HAVE_ALLOCA */
- 
--#ifndef errno				/* did we already get it? */
--#ifdef HAVE_ERRNO_AS_DEFINE
- #include <errno.h>			/* errno is a define */
--#else
--extern int errno;			/* declare errno */
--#endif
--#endif					/* #ifndef errno */
-+
- extern char *home_dir;			/* Home directory for user */
- extern const char *my_progname;		/* program-name (printed in errors) */
- extern char curr_dir[];		/* Current directory for user */
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-fix-tests.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-fix-tests.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-fix-tests.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-fix-tests.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,34 +0,0 @@
-Adapt tests (where needed) to RedHat conventions.
-
-1) The RedHat convention uses the package name "mysql*" whereas upstream uses "MySQL*".
-   Test "file_contents" constructs path names and needs to be adapted.
-
-=== modified file 'mysql-test/t/file_contents.test'
---- mysql-5.5.17-orig/mysql-test/t/file_contents.test	2011-10-10 12:03:29 +0000
-+++ mysql-5.5.17/mysql-test/t/file_contents.test	2011-11-16 18:07:55 +0000
-@@ -17,20 +17,20 @@ if ($dir_bin =~ m|/usr/|) {
-   $dir_docs =~ s|/lib|/share/doc|;
-   if(-d "$dir_docs/packages") {
-     # SuSE: "packages/" in the documentation path
--    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/packages/mysql-server*";
-   } else {
-     # RedHat: version number in directory name
--    $dir_docs = glob "$dir_docs/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/mysql-server*";
-   }
- } elsif ($dir_bin =~ m|/usr$|) {
-   # RPM build during development
-   $dir_docs = "$dir_bin/share/doc";
-   if(-d "$dir_docs/packages") {
-     # SuSE: "packages/" in the documentation path
--    $dir_docs = glob "$dir_docs/packages/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/packages/mysql-server*";
-   } else {
-     # RedHat: version number in directory name
--    $dir_docs = glob "$dir_docs/MySQL-server*";
-+    $dir_docs = glob "$dir_docs/mysql-server*";
-   }
- } else {
-   # tar.gz package, Windows, or developer work (in BZR)
-
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-libdir.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-libdir.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-libdir.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-libdir.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,28 +0,0 @@
-The RPMs built by MySQL AB (-> Sun -> Oracle) put the libraries into "/usr/lib".
-Those built by RedHat put them into "/usr/lib/mysql".
-This patch is to modify the cmake files to follow the RedHat convention.
-Similar, the server is now in "/usr/libexec" (formerly "/usr/sbin").
-
-
-diff -Naur mysql-5.5.17.orig/cmake/install_layout.cmake mysql-5.5.17/cmake/install_layout.cmake
---- mysql-5.5.17.orig/cmake/install_layout.cmake	2011-06-30 15:46:53 +0000
-+++ mysql-5.5.17/cmake/install_layout.cmake	2011-10-27 16:40:10 +0000
-@@ -140,14 +140,14 @@ SET(INSTALL_SBINDIR_RPM                 
- # be applied at build time via "rpmbuild".
- #
- SET(INSTALL_BINDIR_RPM                  "bin")
--SET(INSTALL_SBINDIR_RPM                 "sbin")
-+SET(INSTALL_SBINDIR_RPM                 "libexec")
- SET(INSTALL_SCRIPTDIR_RPM               "bin")
- #
- IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
--  SET(INSTALL_LIBDIR_RPM                "lib64")
-+  SET(INSTALL_LIBDIR_RPM                "lib64/mysql")
-   SET(INSTALL_PLUGINDIR_RPM             "lib64/mysql/plugin")
- ELSE()
--  SET(INSTALL_LIBDIR_RPM                "lib")
-+  SET(INSTALL_LIBDIR_RPM                "lib/mysql")
-   SET(INSTALL_PLUGINDIR_RPM             "lib/mysql/plugin")
- ENDIF()
- #
-
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-mtr1.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-mtr1.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-mtr1.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-mtr1.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,25 +0,0 @@
-Drop support for version 1 of "mysql-test-run.pl" from the RPMs:
-
-1) The auto-generation of Perl dependencies will mishandle that code,
-   probably because its run directory differs from its storage location.
-2) It does not provide several variables which are used in tests of MySQL 5.5
-
-If you really need it, take it from the source tarball.
-
-=== modified file 'mysql-test/mysql-test-run.pl'
---- mysql-5.5.17-orig/mysql-test/mysql-test-run.pl	2011-10-03 11:16:40 +0000
-+++ mysql-5.5.17/mysql-test/mysql-test-run.pl	2011-11-16 19:06:38 +0000
-@@ -58,10 +58,9 @@ BEGIN {
-   if ( $version == 1 )
-   {
-     print "=======================================================\n";
--    print "  WARNING: Using mysql-test-run.pl version 1!  \n";
-+    print "  ERROR: Support for version 1 is dropped in this distribution!  \n";
-     print "=======================================================\n";
--    # Should use exec() here on *nix but this appears not to work on Windows
--    exit(system($^X, "lib/v1/mysql-test-run.pl", @ARGV) >> 8);
-+    exit(1);
-   }
-   elsif ( $version == 2 )
-   {
-
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-stack-guard.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-stack-guard.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-stack-guard.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-stack-guard.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,140 +0,0 @@
-mysql is not accounting for the "guard page" when setting thread stack size
-requests.  This is fatal on PPC systems, which may use guard pages as large
-as 64K.  This patch also documents the IA64 situation a bit better.
-
-Note: there are quite a few other setstacksize calls besides the two in
-mysqld.cc; is it important to fix any of the others?
-
-Filed upstream at http://bugs.mysql.com/bug.php?id=35019
-
-
-diff -Naur mysql-5.1.30.orig/sql/mysqld.cc mysql-5.1.30/sql/mysqld.cc
---- mysql-5.1.30.orig/sql/mysqld.cc	2008-11-14 11:37:13.000000000 -0500
-+++ mysql-5.1.30/sql/mysqld.cc	2009-01-13 12:08:35.000000000 -0500
-@@ -2653,6 +2653,70 @@
- }
- 
- 
-+/* pthread_attr_setstacksize without so much platform-dependency */
-+/* returns the actual stack size if possible */
-+static size_t my_setstacksize(pthread_attr_t *attr, size_t stacksize)
-+{
-+  size_t guard_size = 0;
-+
-+#if defined(__ia64__) || defined(__ia64)
-+  /*
-+    On IA64, half of the requested stack size is used for "normal stack"
-+    and half for "register stack".  The space measured by check_stack_overrun
-+    is the "normal stack", so double the request to make sure we have the
-+    caller-expected amount of normal stack.
-+
-+    NOTE: there is no guarantee that the register stack can't grow faster
-+    than normal stack, so it's very unclear that we won't dump core due to
-+    stack overrun despite check_stack_overrun's efforts.  Experimentation
-+    shows that in the execution_constants test, the register stack grows
-+    less than half as fast as normal stack, but perhaps other scenarios are
-+    less forgiving.  If it turns out that more space is needed for the
-+    register stack, that could be forced (rather inefficiently) by using a
-+    multiplier higher than 2 here.
-+  */
-+  stacksize *= 2;
-+#endif
-+
-+  /*
-+    On many machines, the "guard space" is subtracted from the requested
-+    stack size, and that space is quite large on some platforms.  So add
-+    it to our request, if we can find out what it is.
-+
-+    FIXME: autoconfiscate use of pthread_attr_getguardsize
-+  */
-+  if (pthread_attr_getguardsize(attr, &guard_size))
-+    guard_size = 0;		/* if can't find it out, treat as 0 */
-+
-+  pthread_attr_setstacksize(attr, stacksize + guard_size);
-+
-+  /* Retrieve actual stack size if possible */
-+#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
-+  {
-+    size_t real_stack_size= 0;
-+    /* We must ignore real_stack_size = 0 as Solaris 2.9 can return 0 here */
-+    if (pthread_attr_getstacksize(attr, &real_stack_size) == 0 &&
-+	real_stack_size > guard_size)
-+    {
-+      real_stack_size -= guard_size;
-+      if (real_stack_size < stacksize)
-+      {
-+	if (global_system_variables.log_warnings)
-+	  sql_print_warning("Asked for %ld thread stack, but got %ld",
-+			    (long) stacksize, (long) real_stack_size);
-+	stacksize= real_stack_size;
-+      }
-+    }
-+  }
-+#endif
-+
-+#if defined(__ia64__) || defined(__ia64)
-+  stacksize /= 2;
-+#endif
-+  return stacksize;
-+}
-+
-+
- static void start_signal_handler(void)
- {
-   int error;
-@@ -2663,15 +2727,7 @@
- #if !defined(HAVE_DEC_3_2_THREADS)
-   pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_SYSTEM);
-   (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
--#if defined(__ia64__) || defined(__ia64)
--  /*
--    Peculiar things with ia64 platforms - it seems we only have half the
--    stack size in reality, so we have to double it here
--  */
--  pthread_attr_setstacksize(&thr_attr,my_thread_stack_size*2);
--#else
--  pthread_attr_setstacksize(&thr_attr,my_thread_stack_size);
--#endif
-+  (void) my_setstacksize(&thr_attr,my_thread_stack_size);
- #endif
- 
-   mysql_mutex_lock(&LOCK_thread_count);
-@@ -4445,37 +4501,7 @@
-     unireg_abort(1);				// Will do exit
-
-   init_signals();
--#if defined(__ia64__) || defined(__ia64)
--  /*
--    Peculiar things with ia64 platforms - it seems we only have half the
--    stack size in reality, so we have to double it here
--  */
--  pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size*2);
--#else
--  pthread_attr_setstacksize(&connection_attrib,my_thread_stack_size);
--#endif
--#ifdef HAVE_PTHREAD_ATTR_GETSTACKSIZE
--  {
--    /* Retrieve used stack size;  Needed for checking stack overflows */
--    size_t stack_size= 0;
--    pthread_attr_getstacksize(&connection_attrib, &stack_size);
--#if defined(__ia64__) || defined(__ia64)
--    stack_size/= 2;
--#endif
--    /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
--    if (stack_size && stack_size < my_thread_stack_size)
--    {
--      if (global_system_variables.log_warnings)
--	sql_print_warning("Asked for %lu thread stack, but got %ld",
--			  my_thread_stack_size, (long) stack_size);
--#if defined(__ia64__) || defined(__ia64)
--      my_thread_stack_size= stack_size*2;
--#else
--      my_thread_stack_size= stack_size;
--#endif
--    }
--  }
--#endif
-+  my_thread_stack_size = my_setstacksize(&connection_attrib,my_thread_stack_size);
- 
-   (void) thr_setconcurrency(concurrency);	// 10 by default
- 
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-testing.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-testing.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-5.5-testing.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-5.5-testing.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,23 +0,0 @@
-Hack the top-level Makefile to enable the openssl regression tests.
-(Why doesn't this happen automatically given the configure option??)
-
-Also, increase the overall timeout for the regression tests to 12 hours,
-because on a slow or heavily-loaded build machine sometimes the default of
-5 hours isn't enough.  (This has been demonstrated to fail in mass-rebuild
-scenarios, which aren't that uncommon for Fedora.)  Similarly increase the
-per-testcase timeout to 30 minutes, since the default of 15 hasn't got a
-great deal of headroom either.
-
-
-diff -Naur mysql-5.1.32.orig/Makefile.am mysql-5.1.32/Makefile.am
---- mysql-5.1.32.orig/Makefile.am	2009-02-13 19:51:56.000000000 -0500
-+++ mysql-5.1.32/Makefile.am	2009-03-04 18:12:36.000000000 -0500
-@@ -98,7 +98,7 @@
- 
- test-ns:
- 	cd mysql-test ; \
--	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --mysqld=--binlog-format=mixed
-+	    @PERL@ ./mysql-test-run.pl $(force) $(mem) --ssl --mysqld=--binlog-format=mixed --suite-timeout=720 --testcase-timeout=30
- 
- test-binlog-statement:
- 	cd mysql-test ; \
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-chain-certs.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-chain-certs.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-chain-certs.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-chain-certs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,45 +0,0 @@
-Fix things so that chains of certificates work in the server and client
-certificate files.
-
-This only really works for OpenSSL-based builds, as yassl is unable to read
-multiple certificates from a file.  The patch below to yassl/src/ssl.cpp
-doesn't fix that, but just arranges that the viosslfactories.c patch won't
-have any ill effects in a yassl build.  Since we don't use yassl in Red Hat/
-Fedora builds, I'm not feeling motivated to try to fix yassl for this.
-
-See RH bug #598656.  Filed upstream at http://bugs.mysql.com/bug.php?id=54158
-
-   ===
-
-Joerg Bruehe, MySQL Build Team at Oracle: First patch adapted to code changes in MySQL 5.5
-
-
-diff -Naur mysql-5.5.29.orig/vio/viosslfactories.c mysql-5.5.29/vio/viosslfactories.c
---- mysql-5.5.29.orig/vio/viosslfactories.c	2010-05-06 11:28:07.000000000 -0400
-+++ mysql-5.5.29/vio/viosslfactories.c	2010-05-26 23:23:46.000000000 -0400
-@@ -106,7 +106,7 @@
-     key_file= cert_file;
- 
-   if (cert_file &&
--      SSL_CTX_use_certificate_file(ctx, cert_file, SSL_FILETYPE_PEM) <= 0)
-+      SSL_CTX_use_certificate_chain_file(ctx, cert_file) <= 0)
-   {
-     *error= SSL_INITERR_CERT;
-     DBUG_PRINT("error",("%s from file '%s'", sslGetErrString(*error), cert_file));
-diff -Naur mysql-5.1.47.orig/extra/yassl/src/ssl.cpp mysql-5.1.47/extra/yassl/src/ssl.cpp
---- mysql-5.1.47.orig/extra/yassl/src/ssl.cpp	2010-05-06 11:24:26.000000000 -0400
-+++ mysql-5.1.47/extra/yassl/src/ssl.cpp	2010-05-26 23:29:13.000000000 -0400
-@@ -1606,10 +1606,10 @@
-     }
- 
- 
--    int SSL_CTX_use_certificate_chain_file(SSL_CTX*, const char*)
-+    int SSL_CTX_use_certificate_chain_file(SSL_CTX* ctx, const char* file)
-     {
--        // TDOD:
--        return SSL_SUCCESS;
-+        // For the moment, treat like use_certificate_file
-+        return read_file(ctx, file, SSL_FILETYPE_PEM, Cert);
-     }
- 
- 
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-embedded-check.c mysql-5.5-5.5.43/packaging/rpm-uln/mysql-embedded-check.c
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-embedded-check.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-embedded-check.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,26 +0,0 @@
-/* simple test program to see if we can link the embedded server library */
-
-#include <stdio.h>
-#include <stdlib.h>
-#include <stdarg.h>
-
-#include "mysql.h"
-
-MYSQL *mysql;
-
-static char *server_options[] = \
-       { "mysql_test", "--defaults-file=my.cnf", NULL };
-int num_elements = (sizeof(server_options) / sizeof(char *)) - 1;
-
-static char *server_groups[] = { "libmysqld_server", 
-                                 "libmysqld_client", NULL };
-
-int main(int argc, char **argv)
-{
-   mysql_library_init(num_elements, server_options, server_groups);
-   mysql = mysql_init(NULL);
-   mysql_close(mysql);
-   mysql_library_end();
-
-   return 0;
-}
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-expired-certs.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-expired-certs.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-expired-certs.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-expired-certs.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,555 +0,0 @@
-Upstream insists on generating SSL testing certificates with relatively short
-lifespan, which has repeatedly caused problems (ie, one day the regression
-tests suddenly stop working).  Replace them with certificates with 20-year
-lifespan.  We should periodically regenerate these, too, but at least not
-very often.
-
-
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/cacert.pem mysql-5.1.50/mysql-test/std_data/cacert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/cacert.pem	2010-08-03 13:55:04.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/cacert.pem	2010-08-27 23:42:05.751428144 -0400
-@@ -1,17 +1,22 @@
- -----BEGIN CERTIFICATE-----
--MIICrTCCAhagAwIBAgIJAMI7xZKjhrDbMA0GCSqGSIb3DQEBBAUAMEQxCzAJBgNV
-+MIIDsjCCApqgAwIBAgIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUAMEQxCzAJBgNV
- BAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxhMREwDwYD
--VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkxMTQ3MTBaFw0xNTAxMjgxMTQ3MTBaMEQx
-+VQQKEwhNeVNRTCBBQjAeFw0xMDAxMjkwNTU5NTNaFw0xNTAxMjgwNTU5NTNaMEQx
- CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBzYWxh
--MREwDwYDVQQKEwhNeVNRTCBBQjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA
--wQYsOEfrN4ESP3FjsI8cghE+tZVuyK2gck61lwieVxjgFMtBd65mI5a1y9pmlOI1
--yM4SB2Ppqcuw7/e1CdV1y7lvHrGNt5yqEHbN4QX1gvsN8TQauP/2WILturk4R4Hq
--rKg0ZySu7f1Xhl0ed9a48LpaEHD17IcxWEGMMJwAxF0CAwEAAaOBpjCBozAMBgNV
--HRMEBTADAQH/MB0GA1UdDgQWBBSvktYQ0ahLnyxyVKqty+WpBbBrDTB0BgNVHSME
--bTBrgBSvktYQ0ahLnyxyVKqty+WpBbBrDaFIpEYwRDELMAkGA1UEBhMCU0UxEDAO
--BgNVBAgTB1VwcHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FM
--IEFCggkAwjvFkqOGsNswDQYJKoZIhvcNAQEEBQADgYEAdKN1PjwMHAKG2Ww1145g
--JQGBnKxSFOUaoSvkBi/4ntTM+ysnViWh7WvxyWjR9zU9arfr7aqsDeQxm0XDOqzj
--AQ/cQIla2/Li8tXyfc06bisH/IHRaSc2zWqioTKbEwMdVOdrvq4a8V8ic3xYyIWn
--7F4WeS07J8LKardSvM0+hOA=
-+MREwDwYDVQQKEwhNeVNRTCBBQjCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC
-+ggEBAL6kNN4peX7uhK9rb06W/QbPEpVuejmdWdl2PqMshP/eSuXXw7kwVgfpxx9R
-+vC000CKQQSG9MCoZjtqPnFRsetmWLZgApRpEalGXTXJqq9sEbCfoFizg94U8G7d2
-+u5XJjLVmcG34ru36KoBgVx1zeH1puBAf8dOzrE4L7Y+ZQBFzFohjh8C2LqWC4nM5
-+qsLmOkDWMipGqYU5DvkKjIbTbwTyRNRgZHWSPfVDDPUIUOsY4BGUp2DpgeGY9aEv
-+lIs57Ev9JqlIUCV65lOhhDkG+xwmkHKHA+ECEU9cALI8+uXbh48MB9XpMOuk408X
-+/lX89aZwD0/G9kmObVGnE2G+H5UCAwEAAaOBpjCBozAdBgNVHQ4EFgQUsft+d7VA
-+jWgRftkR5cPG2k2sUbAwdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbCh
-+SKRGMEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdV
-+cHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMAwGA1UdEwQFMAMB
-+Af8wDQYJKoZIhvcNAQEFBQADggEBALRUOAmdL8R8sl1y8kiEiFgDatdXK5RDqWai
-+8yZChfmwTIToHhmQsOEshJe2e8hky3huUj+33VyXjINoMbebIwMuXPwEkbJal8RZ
-+nSJmF0jN1Qz7J/jFffwK9xmejWZJx49Kt2+Qwrwp6kDeq9TLFqQOoVczgyJPYsTL
-+NAOib5WqTud3XWvCwxrhqmWu7JZq6sp1fomP/uunprb8y2miWfLESZN2mKAhm44Q
-+Lws867LT8v2lskEjq2dT1LutD5+R66XcdjgSr0uDziDs64jZwCD6ea94hVFM7ej0
-+ZOXYeSEZJ56FjUxu632e9fY8NyMh30yKjjmQf1mM9PuGJvdvsWU=
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/client-cert.pem mysql-5.1.50/mysql-test/std_data/client-cert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/client-cert.pem	2010-08-03 13:55:04.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/client-cert.pem	2010-08-27 23:42:05.752428395 -0400
-@@ -1,46 +1,69 @@
- Certificate:
-     Data:
--        Version: 1 (0x0)
--        Serial Number: 1048577 (0x100001)
--        Signature Algorithm: md5WithRSAEncryption
-+        Version: 3 (0x2)
-+        Serial Number: 6 (0x6)
-+        Signature Algorithm: sha1WithRSAEncryption
-         Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-         Validity
--            Not Before: Jan 29 11:50:22 2010 GMT
--            Not After : Jan 28 11:50:22 2015 GMT
-+            Not Before: Feb 20 03:03:26 2010 GMT
-+            Not After : Sep  3 03:03:26 2030 GMT
-         Subject: C=SE, ST=Uppsala, O=MySQL AB
-         Subject Public Key Info:
-             Public Key Algorithm: rsaEncryption
--                Public-Key: (1024 bit)
--                Modulus:
--                    00:cc:9a:37:49:13:66:dc:cf:e3:0b:13:a1:23:ed:
--                    78:db:4e:bd:11:f6:8c:0d:76:f9:a3:32:56:9a:f8:
--                    a1:21:6a:55:4e:4d:3f:e6:67:9d:26:99:b2:cd:a4:
--                    9a:d2:2b:59:5c:d7:8a:d3:60:68:f8:18:bd:c5:be:
--                    15:e1:2a:3c:a3:d4:61:cb:f5:11:94:17:81:81:f7:
--                    87:8c:f6:6a:d2:ee:d8:e6:77:f6:62:66:4d:2e:16:
--                    8d:08:81:4a:c9:c6:4b:31:e5:b9:c7:8a:84:96:48:
--                    a7:47:8c:0d:26:90:56:4e:e6:a5:6e:8c:b3:f2:9f:
--                    fc:3d:78:9b:49:6e:86:83:77
-+            RSA Public Key: (1024 bit)
-+                Modulus (1024 bit):
-+                    00:c2:e7:20:cf:89:59:2f:67:cb:4c:9f:e8:11:f2:
-+                    23:e5:f1:b1:ee:3f:66:5f:c3:f5:fd:1e:31:ee:8f:
-+                    4c:2a:bd:c0:4a:a5:9f:c8:44:d5:77:8f:15:1b:4d:
-+                    78:6e:b2:a2:48:a5:24:33:05:40:02:b3:c1:87:8d:
-+                    59:3c:1a:07:aa:86:f0:04:e1:9c:20:4b:22:32:c4:
-+                    51:9e:40:e4:31:c3:57:f5:98:bf:2e:b1:fd:2c:56:
-+                    bf:49:d9:9b:e7:17:cc:95:5f:b5:08:19:5e:9d:df:
-+                    65:22:39:2c:48:fb:69:96:31:7a:35:4d:de:60:b4:
-+                    c1:60:19:5f:96:56:7e:55:19
-                 Exponent: 65537 (0x10001)
--    Signature Algorithm: md5WithRSAEncryption
--        5e:1f:a3:53:5f:24:13:1c:f8:28:32:b0:7f:69:69:f3:0e:c0:
--        34:87:10:03:7d:da:15:8b:bd:19:b8:1a:56:31:e7:85:49:81:
--        c9:7f:45:20:74:3e:89:c0:e0:26:84:51:cc:04:16:ce:69:99:
--        01:e1:26:99:b3:e3:f5:bd:ec:5f:a0:84:e4:38:da:75:78:7b:
--        89:9c:d2:cd:60:95:20:ba:8e:e3:7c:e6:df:76:3a:7c:89:77:
--        02:94:86:11:3a:c4:61:7d:6f:71:83:21:8a:17:fb:17:e2:ee:
--        02:6b:61:c1:b4:52:63:d7:d8:46:b2:c5:9c:6f:38:91:8a:35:
--        32:0b
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: 
-+                CA:FALSE
-+            X509v3 Subject Key Identifier: 
-+                8D:10:67:91:33:76:9C:02:E5:78:5D:D8:C5:EF:25:96:B2:D7:FA:1F
-+            X509v3 Authority Key Identifier: 
-+                keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-+                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+                serial:BE:58:AD:4C:1F:3D:25:95
-+
-+    Signature Algorithm: sha1WithRSAEncryption
-+        a9:88:10:3e:5d:2a:47:29:c8:03:27:7a:31:5a:8e:10:03:bc:
-+        b5:4e:37:1d:12:7b:eb:5f:50:71:70:b1:a3:8e:93:0e:77:17:
-+        6c:47:b6:c9:a4:4d:2a:c4:38:f0:61:55:b2:7f:28:ba:06:79:
-+        ee:67:11:7d:d4:c9:7f:0a:18:c8:c1:cb:d0:2c:f9:63:0f:bb:
-+        45:ca:de:ea:bb:ac:00:01:52:48:36:2b:07:2b:c8:46:c7:b1:
-+        21:81:bd:77:39:e7:4c:39:aa:bd:ac:60:d8:a7:bf:cf:14:98:
-+        4a:0b:a1:40:55:06:8d:6f:35:a9:39:a0:71:a9:97:ba:7c:73:
-+        3c:41:ba:c5:1c:11:4b:2b:43:1d:2d:ba:7b:5f:14:b5:3d:64:
-+        62:15:36:b4:16:bd:78:c8:43:8d:f9:1c:a5:d2:ac:a1:58:74:
-+        e1:99:de:ad:04:19:43:a8:bd:0a:fd:19:9b:50:44:46:6d:18:
-+        55:4d:bf:b4:5b:a4:93:62:c7:64:91:6c:54:34:d1:f8:f3:ff:
-+        12:6d:5f:85:e7:35:9e:5c:42:81:5e:fb:c8:bb:44:51:98:b2:
-+        ef:1b:9f:5a:22:77:28:7d:da:fb:08:c2:94:9a:0f:42:08:93:
-+        54:10:1e:ad:f2:4f:fc:62:98:51:e9:9b:b9:3a:93:d9:e4:1f:
-+        1d:c4:76:d0
- -----BEGIN CERTIFICATE-----
--MIIB5zCCAVACAxAAATANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
--A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
--QUIwHhcNMTAwMTI5MTE1MDIyWhcNMTUwMTI4MTE1MDIyWjAyMQswCQYDVQQGEwJT
--RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJKoZI
--hvcNAQEBBQADgY0AMIGJAoGBAMyaN0kTZtzP4wsToSPteNtOvRH2jA12+aMyVpr4
--oSFqVU5NP+ZnnSaZss2kmtIrWVzXitNgaPgYvcW+FeEqPKPUYcv1EZQXgYH3h4z2
--atLu2OZ39mJmTS4WjQiBSsnGSzHluceKhJZIp0eMDSaQVk7mpW6Ms/Kf/D14m0lu
--hoN3AgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAXh+jU18kExz4KDKwf2lp8w7ANIcQ
--A33aFYu9GbgaVjHnhUmByX9FIHQ+icDgJoRRzAQWzmmZAeEmmbPj9b3sX6CE5Dja
--dXh7iZzSzWCVILqO43zm33Y6fIl3ApSGETrEYX1vcYMhihf7F+LuAmthwbRSY9fY
--RrLFnG84kYo1Mgs=
-+MIIDETCCAfmgAwIBAgIBBjANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMTAwMjIwMDMwMzI2WhcNMzAwOTAzMDMwMzI2WjAyMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIwgZ8wDQYJ
-+KoZIhvcNAQEBBQADgY0AMIGJAoGBAMLnIM+JWS9ny0yf6BHyI+Xxse4/Zl/D9f0e
-+Me6PTCq9wEqln8hE1XePFRtNeG6yokilJDMFQAKzwYeNWTwaB6qG8AThnCBLIjLE
-+UZ5A5DHDV/WYvy6x/SxWv0nZm+cXzJVftQgZXp3fZSI5LEj7aZYxejVN3mC0wWAZ
-+X5ZWflUZAgMBAAGjgaMwgaAwCQYDVR0TBAIwADAdBgNVHQ4EFgQUjRBnkTN2nALl
-+eF3Yxe8llrLX+h8wdAYDVR0jBG0wa4AUsft+d7VAjWgRftkR5cPG2k2sUbChSKRG
-+MEQxCzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMRAwDgYDVQQHEwdVcHBz
-+YWxhMREwDwYDVQQKEwhNeVNRTCBBQoIJAL5YrUwfPSWVMA0GCSqGSIb3DQEBBQUA
-+A4IBAQCpiBA+XSpHKcgDJ3oxWo4QA7y1TjcdEnvrX1BxcLGjjpMOdxdsR7bJpE0q
-+xDjwYVWyfyi6BnnuZxF91Ml/ChjIwcvQLPljD7tFyt7qu6wAAVJINisHK8hGx7Eh
-+gb13OedMOaq9rGDYp7/PFJhKC6FAVQaNbzWpOaBxqZe6fHM8QbrFHBFLK0MdLbp7
-+XxS1PWRiFTa0Fr14yEON+Ryl0qyhWHThmd6tBBlDqL0K/RmbUERGbRhVTb+0W6ST
-+YsdkkWxUNNH48/8SbV+F5zWeXEKBXvvIu0RRmLLvG59aIncofdr7CMKUmg9CCJNU
-+EB6t8k/8YphR6Zu5OpPZ5B8dxHbQ
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/client-key.pem mysql-5.1.50/mysql-test/std_data/client-key.pem
---- mysql-5.1.50.orig/mysql-test/std_data/client-key.pem	2010-08-03 13:55:05.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/client-key.pem	2010-08-27 23:42:05.752428395 -0400
-@@ -1,15 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIICXQIBAAKBgQDMmjdJE2bcz+MLE6Ej7XjbTr0R9owNdvmjMlaa+KEhalVOTT/m
--Z50mmbLNpJrSK1lc14rTYGj4GL3FvhXhKjyj1GHL9RGUF4GB94eM9mrS7tjmd/Zi
--Zk0uFo0IgUrJxksx5bnHioSWSKdHjA0mkFZO5qVujLPyn/w9eJtJboaDdwIDAQAB
--AoGASqk/4We2En+93y3jkIO4pXafIe3w/3zZ7caRue1ehx4RUQh5d+95djuB9u7J
--HEZ7TpjM7QNyao5EueL6gvbxt0LXFvqAMni7yM9tt/HUYtHHPqYiRtUny9bKYFTm
--l8szCCMal/wD9GZU9ByHDNHm7tHUMyMhARNTYSgx+SERFmECQQD/6jJocC4SXf6f
--T3LqimWR02lbJ7qCoDgRglsUXh0zjrG+IIiAyE+QOCCx1GMe3Uw6bsIuYwdHT6as
--WcdPs04xAkEAzKulvEvLVvN5zfa/DTYRTV7jh6aDleOxjsD5oN/oJXoACnPzVuUL
--qQQMNtuAXm6Q1QItrRxpQsSKbY0UQka6JwJBAOSgoNoG5lIIYTKIMvzwGV+XBLeo
--HYsXgh+6Wo4uql3mLErUG78ZtWL9kc/tE4R+ZdyKGLaCR/1gXmH5bwN4B/ECQEBb
--uUH8k3REG4kojesZlVc+/00ojzgS4UKCa/yqa9VdB6ZBz8MDQydinnShkTwgiGpy
--xOoqhO753o2UT0qH8wECQQC99IEJWUnwvExVMkLaZH5NjAFJkb22sjkmuT11tAgU
--RQgOMoDOm6driojnOnDWOkx1r1Gy9NgMLooduja4v6cx
-+MIICWwIBAAKBgQDC5yDPiVkvZ8tMn+gR8iPl8bHuP2Zfw/X9HjHuj0wqvcBKpZ/I
-+RNV3jxUbTXhusqJIpSQzBUACs8GHjVk8GgeqhvAE4ZwgSyIyxFGeQOQxw1f1mL8u
-+sf0sVr9J2ZvnF8yVX7UIGV6d32UiOSxI+2mWMXo1Td5gtMFgGV+WVn5VGQIDAQAB
-+AoGARXcXLKDpVooJ3W+IyQyiWsw//IhANpWjUOm4JiyQmxMyO+i4ACr4Yjpu7WI5
-+MEseqAGj20NdwxjKO0PXsCIe5LmrGZ+SI8+CSERFOWXWRtCWz7y7SG30i1k6suvM
-+mwqWom0tJLwn93uA1lm/WSwKQwUrJRahRQd3EaZqrl7DP5kCQQD/8gbuYAT5pxQe
-+ULLGM0RvEsXxDYbEDxNbY5wrBazfklBwpumxZpFl6jEAT++7Kh2Ns3A7kB1oUNlA
-+FPYr+dYPAkEAwvHEwRtoyUr8jqoqVVJWI76CDmBjEOzVeMKW97ztqbs2LxZW8dYI
-+iOh/myFGpdoUwgu0U8w9MmXcj3ZeZCYKVwJALyQ+AJPw9qa+fuLwOq9gsHCtwrty
-+EhSQxSlwrz/pWniRll439vPkXfgntF4E0t1r+hiN2Hqv3/HcQgBaYzkuIwJAG023
-+bACFxaOuCeFFepvEms8E8jSHy4gQQhCnCl24v8wLw76SQN7kZSCDNtwLRBFuVNtE
-+z3PMonFn2eQPRmGZkwJAP1c1BHprMQx/ruafdscROILv3JrH40C1bR6KVVBKt1dK
-+Qpnpgi7hK5rUQjDF8k3bn9ugTt06jyeHe/QhAml0kg==
- -----END RSA PRIVATE KEY-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server-cert.pem mysql-5.1.50/mysql-test/std_data/server-cert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server-cert.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server-cert.pem	2010-08-27 23:42:05.753428361 -0400
-@@ -1,41 +1,69 @@
- Certificate:
-     Data:
--        Version: 1 (0x0)
--        Serial Number: 1048578 (0x100002)
--        Signature Algorithm: md5WithRSAEncryption
-+        Version: 3 (0x2)
-+        Serial Number: 4 (0x4)
-+        Signature Algorithm: sha1WithRSAEncryption
-         Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-         Validity
--            Not Before: Jan 29 11:56:49 2010 GMT
--            Not After : Jan 28 11:56:49 2015 GMT
-+            Not Before: Feb 20 02:55:06 2010 GMT
-+            Not After : Sep  3 02:55:06 2030 GMT
-         Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=localhost
-         Subject Public Key Info:
-             Public Key Algorithm: rsaEncryption
--                Public-Key: (512 bit)
--                Modulus:
--                    00:cd:e4:87:51:9d:72:11:a0:d1:fa:f3:92:8b:13:
--                    1c:eb:f7:e2:9a:2f:72:a8:d6:65:48:d1:69:af:1b:
--                    c0:4c:13:e5:60:60:51:41:e9:ab:a6:bc:13:bb:0c:
--                    5e:32:7c:d9:6c:9e:cd:05:24:84:78:db:80:91:2e:
--                    d8:88:2b:c2:ed
-+            RSA Public Key: (1024 bit)
-+                Modulus (1024 bit):
-+                    00:e3:7d:4f:c2:23:77:a9:3a:2c:d2:69:59:a0:2f:
-+                    4e:d1:51:4c:ae:8d:f5:17:cc:ce:58:9c:83:4f:0b:
-+                    a3:bb:29:a2:b8:1d:3e:1b:04:f9:a9:3e:e2:61:d0:
-+                    e6:7b:b9:7c:12:d8:1f:86:c9:53:b5:04:dd:df:26:
-+                    e9:c0:2b:de:4a:96:2e:f3:23:6f:79:6d:a9:d2:4e:
-+                    17:af:2f:de:8b:68:44:ae:de:a3:e2:c4:37:1c:04:
-+                    ad:73:4b:85:f9:83:ac:fe:b7:c1:54:47:2e:96:d4:
-+                    31:96:85:94:69:d6:5a:63:24:04:99:89:19:1d:56:
-+                    8a:d1:77:aa:87:fb:38:cd:b7
-                 Exponent: 65537 (0x10001)
--    Signature Algorithm: md5WithRSAEncryption
--        73:ce:9c:6e:39:46:b4:14:be:da:3f:f3:1b:ba:90:bc:23:43:
--        d7:82:2a:70:4e:a6:d9:5a:65:5c:b7:df:71:df:75:77:c5:80:
--        a4:af:fa:d2:59:e2:fd:c9:9c:f0:98:95:8e:69:a9:8c:7c:d8:
--        6f:48:d2:e3:36:e0:cd:ff:3f:d1:a5:e6:ab:75:09:c4:50:10:
--        c4:96:dd:bf:3b:de:32:46:da:ca:4a:f1:d6:52:8a:33:2f:ab:
--        f5:2e:70:3f:d4:9c:be:00:c8:03:f9:39:8a:df:5b:70:3c:40:
--        ef:03:be:7c:3d:1d:32:32:f3:51:81:e2:83:30:6e:3d:38:9b:
--        fb:3c
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: 
-+                CA:FALSE
-+            X509v3 Subject Key Identifier: 
-+                CC:8C:71:40:D0:0F:BF:D1:99:79:3F:1B:E9:10:76:19:67:36:0F:A3
-+            X509v3 Authority Key Identifier: 
-+                keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-+                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+                serial:BE:58:AD:4C:1F:3D:25:95
-+
-+    Signature Algorithm: sha1WithRSAEncryption
-+        6f:ad:5e:59:fa:84:3a:be:e2:72:b1:e8:66:2a:4e:f8:73:19:
-+        11:06:11:92:78:56:3e:d6:e8:68:29:90:8b:59:d2:fe:aa:ae:
-+        25:59:c7:e9:99:bb:4a:06:43:dd:40:bd:cb:f4:ae:79:95:7d:
-+        8e:90:ef:58:d2:a8:fc:bf:07:f3:37:b2:9b:bd:da:e6:8c:56:
-+        dd:5e:c6:4a:70:7c:3e:3d:a1:e8:35:06:b8:a7:7b:ac:26:85:
-+        54:5d:09:a2:7b:77:b4:17:7f:72:31:cb:ff:cc:67:6d:e6:3e:
-+        c6:dc:96:eb:4a:0a:ae:e9:48:ae:8a:e0:d6:73:57:6e:32:4c:
-+        00:dc:28:da:55:b3:9f:9f:d8:98:cc:d9:f1:b6:b3:14:67:2e:
-+        a1:47:1e:51:11:cf:70:9f:31:8f:ba:59:29:f2:d0:88:0b:e2:
-+        51:6b:f8:31:ed:6d:ac:00:5e:d3:78:4c:95:97:02:cc:74:2b:
-+        3b:c6:28:e6:2a:c3:30:99:35:b4:4d:31:46:d4:90:f2:47:ed:
-+        64:85:1a:75:2a:72:0a:2f:c6:3a:2f:d2:ac:6b:31:cc:e5:a8:
-+        07:c2:d6:22:f3:c6:0f:bf:67:d9:d6:b2:79:cd:48:b5:c3:e0:
-+        e3:18:7f:b5:74:c9:43:19:fb:c4:93:29:ca:cc:90:2b:1b:6f:
-+        45:f6:25:f9
- -----BEGIN CERTIFICATE-----
--MIIBtzCCASACAxAAAjANBgkqhkiG9w0BAQQFADBEMQswCQYDVQQGEwJTRTEQMA4G
--A1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwg
--QUIwHhcNMTAwMTI5MTE1NjQ5WhcNMTUwMTI4MTE1NjQ5WjBGMQswCQYDVQQGEwJT
--RTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNVBAMT
--CWxvY2FsaG9zdDBcMA0GCSqGSIb3DQEBAQUAA0sAMEgCQQDN5IdRnXIRoNH685KL
--Exzr9+KaL3Ko1mVI0WmvG8BME+VgYFFB6aumvBO7DF4yfNlsns0FJIR424CRLtiI
--K8LtAgMBAAEwDQYJKoZIhvcNAQEEBQADgYEAc86cbjlGtBS+2j/zG7qQvCND14Iq
--cE6m2VplXLffcd91d8WApK/60lni/cmc8JiVjmmpjHzYb0jS4zbgzf8/0aXmq3UJ
--xFAQxJbdvzveMkbaykrx1lKKMy+r9S5wP9ScvgDIA/k5it9bcDxA7wO+fD0dMjLz
--UYHigzBuPTib+zw=
-+MIIDJTCCAg2gAwIBAgIBBDANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMTAwMjIwMDI1NTA2WhcNMzAwOTAzMDI1NTA2WjBGMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxEjAQBgNV
-+BAMTCWxvY2FsaG9zdDCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEA431PwiN3
-+qTos0mlZoC9O0VFMro31F8zOWJyDTwujuymiuB0+GwT5qT7iYdDme7l8EtgfhslT
-+tQTd3ybpwCveSpYu8yNveW2p0k4Xry/ei2hErt6j4sQ3HAStc0uF+YOs/rfBVEcu
-+ltQxloWUadZaYyQEmYkZHVaK0Xeqh/s4zbcCAwEAAaOBozCBoDAJBgNVHRMEAjAA
-+MB0GA1UdDgQWBBTMjHFA0A+/0Zl5PxvpEHYZZzYPozB0BgNVHSMEbTBrgBSx+353
-+tUCNaBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1Vw
-+cHNhbGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlit
-+TB89JZUwDQYJKoZIhvcNAQEFBQADggEBAG+tXln6hDq+4nKx6GYqTvhzGREGEZJ4
-+Vj7W6GgpkItZ0v6qriVZx+mZu0oGQ91Avcv0rnmVfY6Q71jSqPy/B/M3spu92uaM
-+Vt1exkpwfD49oeg1Brine6wmhVRdCaJ7d7QXf3Ixy//MZ23mPsbclutKCq7pSK6K
-+4NZzV24yTADcKNpVs5+f2JjM2fG2sxRnLqFHHlERz3CfMY+6WSny0IgL4lFr+DHt
-+bawAXtN4TJWXAsx0KzvGKOYqwzCZNbRNMUbUkPJH7WSFGnUqcgovxjov0qxrMczl
-+qAfC1iLzxg+/Z9nWsnnNSLXD4OMYf7V0yUMZ+8STKcrMkCsbb0X2Jfk=
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server-key.pem mysql-5.1.50/mysql-test/std_data/server-key.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server-key.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server-key.pem	2010-08-27 23:42:05.754428433 -0400
-@@ -1,9 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIIBOwIBAAJBAM3kh1GdchGg0frzkosTHOv34povcqjWZUjRaa8bwEwT5WBgUUHp
--q6a8E7sMXjJ82WyezQUkhHjbgJEu2Igrwu0CAwEAAQJBAJuwhFbF3NzRpBbEmnqJ
--4GPa1UJMQMLFJF+04tqj/HxJcAIVhOJhGmmtYNw1yjz/ZsPnfJCMz4eFOtdjvGtf
--peECIQDmFFg2WLvYo+2m9w9V7z4ZIkg7ixYkI/ObUUctfZkPOQIhAOUWnrvjFrAX
--bIvYT/YR50+3ZDLEc51XxNgJnWqWYl1VAiEAnTOFWgyivFC1DgF8PvDp8u5TgCt2
--A1d1GMgd490O+TECIC/WMl0/hTxOF9930vKqOGf//o9PUGkZq8QE9fcM4gtlAiAE
--iOcFpnLjtWj57jrhuw214ucnB5rklkQQe+AtcARNkg==
-+MIICXgIBAAKBgQDjfU/CI3epOizSaVmgL07RUUyujfUXzM5YnINPC6O7KaK4HT4b
-+BPmpPuJh0OZ7uXwS2B+GyVO1BN3fJunAK95Kli7zI295banSThevL96LaESu3qPi
-+xDccBK1zS4X5g6z+t8FURy6W1DGWhZRp1lpjJASZiRkdVorRd6qH+zjNtwIDAQAB
-+AoGAUb0o91y/FjMs/72S0pes/lDz+JRRSGfyjKxQEgrgndNsADOhqRu0iTdrKDJj
-+XnlbN3ooecnFJfnFrvTQcJhSmlS30j6VrBw6LXpCBK3dvjYgJ9LOne7WK+dF1+vS
-+FMQtsP04C56Sxy6HJDpMyWJ6oS3Bu169ygG2AxKo+Fk+E6ECQQD38w/MzmrARz2Z
-+AGeEPDUnVZPYgtmXkmks95S0/2jSoLhmgpvJimzxwpYwVG/BG8dSDVuTDu5kp05D
-+3bZIp3EzAkEA6uAwJsCZPtHXlWU3wYZJsA697rUNjPaCQOIaZ/lnh5RUHTmUiw1h
-+Oj/VORqKB0kXqcDfawwLjZEvh1Xli+H5bQJBANTmhw2TvEPnp/OFTl1UGUvyBmXl
-+TRMB639qAu07VfVtfYi/4ya1zn/0VmOfTOoigQ5qW9Q1AOu6YNCTQl62L9MCQQDc
-+YfEsW2kvNYxYJHoVfuBjbuGuOnn1e1Oqd70ZND59S6NFLMMBWlORaVWzWACNZ3rp
-+kAzSj6HDeqgjD2jsQONdAkEAt7S1YHUn8F760bRn4AnAto2TVOYdArtTP/wYjd4o
-+9rJREO/d8AYkYJ96APLvF0SZ4n3t1pLwQRsKKN8ZGTmzLA==
- -----END RSA PRIVATE KEY-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server8k-cert.pem mysql-5.1.50/mysql-test/std_data/server8k-cert.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server8k-cert.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server8k-cert.pem	2010-08-27 23:43:00.005366270 -0400
-@@ -1,51 +1,69 @@
-+Certificate:
-+    Data:
-+        Version: 3 (0x2)
-+        Serial Number: 5 (0x5)
-+        Signature Algorithm: sha1WithRSAEncryption
-+        Issuer: C=SE, ST=Uppsala, L=Uppsala, O=MySQL AB
-+        Validity
-+            Not Before: Feb 20 03:00:54 2010 GMT
-+            Not After : Sep  3 03:00:54 2030 GMT
-+        Subject: C=SE, ST=Uppsala, O=MySQL AB, CN=server
-+        Subject Public Key Info:
-+            Public Key Algorithm: rsaEncryption
-+            RSA Public Key: (1024 bit)
-+                Modulus (1024 bit):
-+                    00:c5:da:44:95:06:77:16:21:af:a0:c4:3c:e9:f8:
-+                    1d:2d:95:f9:63:90:8c:3f:86:ba:77:76:4a:52:4b:
-+                    6b:af:29:f5:1c:aa:d4:3f:3e:42:9f:6d:46:ba:86:
-+                    90:b1:2d:cc:db:c6:33:15:a3:f4:af:53:33:4f:a1:
-+                    56:d1:aa:3b:26:10:f7:64:b5:f9:bf:1b:b1:47:8e:
-+                    cc:a6:d6:0d:aa:4a:77:e3:a3:63:9d:2a:dc:65:f4:
-+                    7f:91:17:38:2d:d6:cd:4e:8d:53:52:97:6e:87:fc:
-+                    64:60:a6:a1:00:ac:96:6c:e4:42:94:75:17:46:6f:
-+                    91:b5:dd:06:47:ed:05:e3:db
-+                Exponent: 65537 (0x10001)
-+        X509v3 extensions:
-+            X509v3 Basic Constraints: 
-+                CA:FALSE
-+            X509v3 Subject Key Identifier: 
-+                6E:60:3F:29:13:60:99:ED:0C:F7:15:B5:DB:7B:1C:FB:6F:60:19:ED
-+            X509v3 Authority Key Identifier: 
-+                keyid:B1:FB:7E:77:B5:40:8D:68:11:7E:D9:11:E5:C3:C6:DA:4D:AC:51:B0
-+                DirName:/C=SE/ST=Uppsala/L=Uppsala/O=MySQL AB
-+                serial:BE:58:AD:4C:1F:3D:25:95
-+
-+    Signature Algorithm: sha1WithRSAEncryption
-+        63:2e:0f:07:14:06:cf:74:90:3d:37:42:f2:48:70:60:21:bc:
-+        34:52:31:f1:87:70:d2:b2:fb:ff:13:38:dc:f0:5e:43:d7:ee:
-+        a7:c7:1f:ac:aa:d2:8c:4f:fa:3c:4c:73:f6:b6:c2:0c:a0:ea:
-+        a2:c9:e2:73:61:c3:2e:78:40:0f:2a:d3:63:50:9b:b8:f9:89:
-+        40:ed:98:08:97:c3:07:24:17:34:b5:78:89:0a:bb:83:4c:e2:
-+        5c:2e:13:d6:21:30:ad:30:48:b5:70:12:ff:4a:6f:42:f0:f8:
-+        9f:b1:4b:bd:89:2b:f0:9d:e2:49:2b:35:69:18:1f:76:40:b4:
-+        76:bd:cb:dd:27:2f:c0:c1:e2:33:3e:6e:df:68:54:19:92:8a:
-+        bb:13:9c:cf:d6:17:56:da:bf:0d:64:70:3a:45:b7:aa:5f:e3:
-+        f5:96:ae:34:f2:17:37:27:d0:4b:e8:30:4a:c0:02:42:e2:d2:
-+        30:eb:eb:c7:d7:ec:d8:df:5c:43:58:e2:6f:b7:58:54:0d:c4:
-+        01:71:2d:59:8f:44:c7:a1:6c:0b:41:28:fa:b7:63:a7:68:d3:
-+        4f:c3:0f:17:9e:b2:32:50:e6:0b:87:3d:e2:39:47:c0:d8:0a:
-+        3b:f6:af:50:68:0f:9d:ef:6e:34:0d:3a:07:94:f8:a4:d7:24:
-+        86:32:d3:b4
- -----BEGIN CERTIFICATE-----
--MIIJFDCCBPwCAQEwDQYJKoZIhvcNAQEEBQAwTjELMAkGA1UEBhMCU0UxEDAOBgNV
--BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMQ0wCwYDVQQLEwRUZXN0MQsw
--CQYDVQQDEwJDQTAeFw0xMDA3MjgxNDA3MjhaFw0xODEwMTQxNDA3MjhaMFIxCzAJ
--BgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBBQjEN
--MAsGA1UECxMEVGVzdDEPMA0GA1UEAxMGc2VydmVyMIIEIjANBgkqhkiG9w0BAQEF
--AAOCBA8AMIIECgKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSEC
--PgxNNcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+Lr
--hXIqCz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2
--DA7kvMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5
--hACbfU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09
--Gh/GwmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33
--aGsZ5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4
--PRd31qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2
--OaIwFjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83
--psQ6R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCc
--HSFu07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs
--+LFdt4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS
--9+LB+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1P
--sZi4UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUd
--NhXxi/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfV
--JTt8Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwx
--UADgR0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1
--kOE7GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQ
--uw4qVKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRY
--nTIywUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PT
--trohFSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFT
--d33ZDke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABMA0GCSqGSIb3DQEB
--BAUAA4IEAQCc9RBhRbuWlmRZPZkqIdi5/+enyjoMmOa6ryJPxFSP8D2jrlHgQsk1
--+GsJmPFT3rwWfoGAQu/aeSX4sp8OhKVJtqNA6MJrGYnZIMolgYa1wZPbkjJsdEfi
--UsZdIB0n2+KA0xwEdGPdkGCfNPBtOg557DkcyEvsIZ9ELp4Pp2XzWRhyFGasJZc4
--YwgD/3K2rpOPZoMkBKeKqV19j41OfLKGBVyuaqzitbu9+KT4RU1ibr2a+UuFCwdT
--oqyN7bfWXjcjXOMkxCsOmLfKmqQxs7TEOVrYPTdYjamDxLy/e5g5FgoCxGY8iil0
--+YFLZyH6eEx/Os9DlG/M3O1MeRD9U97CdsphbDVZIDyWw5xeX8qQHJe0KSprAgiG
--TLhTZHeyrKujQCQS1oFFmNy4gSqXt0j1/6/9T80j6HeyjiiYEaEQK9YLTAjRoA7W
--VN8wtHI5F3RlNOVQEJks/bjdlpLL3VhaWtfewGh/mXRGcow84cgcsejMexmhreHm
--JfTUl9+X1IFFxGq2/606A9ROQ7kN/s4rXu7/TiMODXI/kZijoWd2SCc7Z0YWoNo7
--IRKkmZtrsflJbObEuK2Jk59uqzSxyQOBId8qtbPo8qJJyHGV5GCp34g4x67BxJBo
--h1iyVMamBAS5Ip1ejghuROrB8Hit8NhAZApXju62btJeXLX+mQayXb/wC/IXNJJD
--83tXiLfZgs6GzLAq7+KW/64sZSvj87CPiNtxkvjchAvyr+fhbBXCrf4rlOjJE6SH
--Je2/Jon7uqijncARGLBeYUT0Aa6k1slpXuSKxDNt7EIkP21kDZ5/OJ0Y1u587KVB
--dEhuDgNf2/8ij7gAQBwBoZMe1DrwddrxgLLBlyHpAZetNYFZNT+Cs/OlpqI0Jm59
--kK9pX0BY4AGOd23XM3K/uLawdmf67kkftim7aVaqXFHPiWsJVtlzmidKvNSmbmZe
--dOmMXp6PBoqcdusFVUS7vjd3KAes5wUX/CaTyOOPRu0LMSnpwEnaL76IC9x4Jd6d
--7QqY/OFTjpPH8nP57LwouiT6MgSUCWGaOkPuBJ9w9sENSbbINpgJJ42iAe2kE+R7
--qEIvf/2ETCTseeQUqm2nWiSPLkNagEh6kojmEoKrGyrv3YjrSXSOY1a70tDVy43+
--ueQDQzNZm3Q7inpke2ZKvWyY0LQmLzP2te+tnNBcdLyKJx7emPRTuMUlEdK7cLbt
--V3Sy9IKtyAXqqd66fPFj4NhJygyncj8M6CSqhG5L0GhDbkA8UJ8yK/gfKm3h5xe2
--utULK5VMtAhQt6cVahO59A9t/OI17y45bmlIgdlEQISzVFe9ZbIUJW44zBfPx74k
--/w8pMRr8gEuRqpL2WdJiKGG6lhMHLVFo
-+MIIDIjCCAgqgAwIBAgIBBTANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJTRTEQ
-+MA4GA1UECBMHVXBwc2FsYTEQMA4GA1UEBxMHVXBwc2FsYTERMA8GA1UEChMITXlT
-+UUwgQUIwHhcNMTAwMjIwMDMwMDU0WhcNMzAwOTAzMDMwMDU0WjBDMQswCQYDVQQG
-+EwJTRTEQMA4GA1UECBMHVXBwc2FsYTERMA8GA1UEChMITXlTUUwgQUIxDzANBgNV
-+BAMTBnNlcnZlcjCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEAxdpElQZ3FiGv
-+oMQ86fgdLZX5Y5CMP4a6d3ZKUktrryn1HKrUPz5Cn21GuoaQsS3M28YzFaP0r1Mz
-+T6FW0ao7JhD3ZLX5vxuxR47MptYNqkp346NjnSrcZfR/kRc4LdbNTo1TUpduh/xk
-+YKahAKyWbORClHUXRm+Rtd0GR+0F49sCAwEAAaOBozCBoDAJBgNVHRMEAjAAMB0G
-+A1UdDgQWBBRuYD8pE2CZ7Qz3FbXbexz7b2AZ7TB0BgNVHSMEbTBrgBSx+353tUCN
-+aBF+2RHlw8baTaxRsKFIpEYwRDELMAkGA1UEBhMCU0UxEDAOBgNVBAgTB1VwcHNh
-+bGExEDAOBgNVBAcTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCggkAvlitTB89
-+JZUwDQYJKoZIhvcNAQEFBQADggEBAGMuDwcUBs90kD03QvJIcGAhvDRSMfGHcNKy
-++/8TONzwXkPX7qfHH6yq0oxP+jxMc/a2wgyg6qLJ4nNhwy54QA8q02NQm7j5iUDt
-+mAiXwwckFzS1eIkKu4NM4lwuE9YhMK0wSLVwEv9Kb0Lw+J+xS72JK/Cd4kkrNWkY
-+H3ZAtHa9y90nL8DB4jM+bt9oVBmSirsTnM/WF1bavw1kcDpFt6pf4/WWrjTyFzcn
-+0EvoMErAAkLi0jDr68fX7NjfXENY4m+3WFQNxAFxLVmPRMehbAtBKPq3Y6do00/D
-+DxeesjJQ5guHPeI5R8DYCjv2r1BoD53vbjQNOgeU+KTXJIYy07Q=
- -----END CERTIFICATE-----
-diff -Naur mysql-5.1.50.orig/mysql-test/std_data/server8k-key.pem mysql-5.1.50/mysql-test/std_data/server8k-key.pem
---- mysql-5.1.50.orig/mysql-test/std_data/server8k-key.pem	2010-08-03 13:55:08.000000000 -0400
-+++ mysql-5.1.50/mysql-test/std_data/server8k-key.pem	2010-08-27 23:43:10.165365998 -0400
-@@ -1,99 +1,15 @@
- -----BEGIN RSA PRIVATE KEY-----
--MIISKQIBAAKCBAEA6h3v1OWb9I9U/Z8diBu/xYGS8NCTD3ZESboHxVI2qSECPgxN
--NcG8Lh0ktQdgYcOe64MnDTZX0Bibm47hoDldrAlTSffFxQhylqBBoXxDF+LrhXIq
--Cz7K0PsK+bYusL9ezJ7PETDnCT7oy95q4GXbKsutbNsm9if4ZE41gs2KnoU2DA7k
--vMmkKojrMIL4+BqTXA20LLo0iSbgvUTvpSJw4u96BeyzMNnxK2wP5vvTtUo5hACb
--fU87YjaSKs+q2VXCzfyYGZk1L1xk5GUI0bP+jutf1dDzNttW2/q2Nf5rxx09Gh/G
--wmOnEk1O7cOZ8VQCsOHirIM39NuSARsY6Y3G5XM4k2W4nxyR/RtdG9bvs/33aGsZ
--5V5yp7WSs8s9HHwaCPSsUiLKckQ7uA0TTRgbeweMrrLKovG57jsbBBB8pQD4PRd3
--1qgxCdstWXHiWwRyI8vOLWENPXPFqA/rJwwqNdWTogy38aqVXxGYR8PIwjA2OaIw
--FjwGZcsPNLqw6bgAN8O2UBqZHWiMF8mi7brvioDvAIufZuqa2SqT/At45H83psQ6
--R4FsxZt6SAK7EsdPo8OYTrY1i4iPZd/eKhnEu2srEZgsKRwY5H1mvDH5fWCcHSFu
--07sWmlmK6Or65Fsa0IaKLJiQDVVETd6xrI0wkM4AOcbKDrS7aywJ426dopbs+LFd
--t4N0cdII4gBgJAfLuuA2yrDXRq4P6cgpVMy0R+0dEYE8zzm8zf1a+Ud273LS9+LB
--+LJKwqbW8nOPBoiekimIKfJYoOA4+C/mAjsYl1sVjjEhXJAs9S9L2UvnUk1PsZi4
--UKHI6eAIEl7VM1sQ4GbdZ0px2dF2Ax7pGkhD+DLpYyYkCprharKZdmuUNLUdNhXx
--i/HSEiE+Uy+o8RIzmH7LuROl/ZgnfHjJEiBLt2qPvwrwYd4c3XuXWs4YsWfVJTt8
--Mx2ihgVcdGy9//shCSmgJwR1oWrhgC10AEL2fKeRnYUal1i+IxFPp7nb8uwxUADg
--R0cY4A3qR/JP489QFIcxBTVs65De+Bq3ecnujk6yeGpD9iptonq4Y8uNZMc1kOE7
--GiFGwR4EufT5SEMh+tUkjth2r+842vmZZuxrVQaohDiATmIJA07W51zKH+nQuw4q
--VKnAhPaDLCLc7YMIH9JcmkeQX0nf8/S2O2WYDH8glVDi5hfW08tCmV647vRYnTIy
--wUTO0lFpz7M+VyMNaJ6yXU6biBV5hLAI8C5ldr/SWI789W2+ebBaJ9gfK+PTtroh
--FSK37GcoSH4V6qSLJHCBASEsiddqHIHMLJZRYD+B6J3tLhjVUM43u+MEGbFTd33Z
--Dke/WzLTExWkaOv36e67gDBmgDuj9yroq3wGfwIDAQABAoIEAQCSt6YoZqigz/50
--XvYT6Uf6T6S1lBDFXNmY1qOuDkLBJTWRiwYMDViQEaWCaZgGTKDYeT3M8uR/Phyu
--lRFi5vCEMufmcAeZ3hxptw7KU+R8ILJ207/zgit6YglTys9h5txTIack39+6FJmx
--wbZ64HpETJZnpMO6+fuZaMXyLjuT8mmXjvHcOgXOvjWeFkZOveDhjJkAesUXuqyX
--EI+ajoXuQiPXeKonkD2qd7NTjzfy4gw/ZF4NXs0ZVJeviqtIPo2xp33udOw2vRFh
--bMvlF4cNLAbIKYVyOG0ruOfd2I7Unsc/CvD1u5vlRVuUd8OO0JZLIZR7hlRX+A58
--8O1g2H/wJZAsF1BnLnFzDGYCX2WjCCK3Zn85FkKGRa0lTdYDduad/C/N3Y2/pHFE
--e7U/2D7IkEei59tD2HcsDBB3MJnckkn/hyiL9qWcxqWZ61vurE+XjU6tc6fnfhk9
--pJQ6yU3epPU7Vfsk0UGA7bbgKpsyzyH8Zl76YC2mN2ZVJjZekfhY+ibT9odEPdOl
--yLB5iXA6/WhKkDWaOqZGOH+7MblWgT9wHINlcn+nKzOr00JHl26ac6aMlXXi9vbe
--4jgJbFK1HYlFIndyX/BdqRTsFemDoDrVqrEYsaONoVYDd9c5qrqYOeh34DhOksQW
--hNwWBfmMlfzgOGtCYhMeK+AajqTtUbMYQA6qp47KJd/Oa5Dvi3ZCpvZh3Ll5iIau
--rqCtmojsWCqmpWSu7P+Wu4+O3XkUMPdQUuQ5rJFESEBB3yEJcxqk/RItTcKNElNC
--PASrPrMD9cli7S/pJ+frbhu1Gna1ArXzXQE9pMozPaBpjCig7+15R0lL3pmOKO6e
--WK3dgSwrnW6TQdLPlSD4lbRoiIdTHVBczztDeUqVvFiV3/cuaEi1nvaVdAYLqjuL
--ogK4HwE/FQ54S0ijAsP52n25usoH6OTU3bSd/7NTp0vZCy3yf10x7HUdsh2DvhRO
--3+TSK5t0yz0Nt7hNwcI6pLmWUIYcZgpFc/WsiiGscTfhy8rh3kRHI8ylGq53KNF+
--yCVmjqnBRWs91ArxmeF1ctX2t3w5p7gf65hJWqoX/2DiSi5FBsr6HLxa5sUi4wRZ
--136aCNt5Wu7w+AzPDbQW6qKUGSyfHJAw4JZasZcaZLise5IWb1ks0DtFbWWdT3ux
--8r2AM7IO1WopnekrYCnx/aBvBAv4NjWozVA517ztVttPERt3AGb4nm387nYt5R2U
--NO2GBWcDyT8JQLKmffE1AkWolCR1GsvcNLQfLCbnNppgsnsLE/viTG4mq1wjnd8O
--2Q8nH1SVTuyGFREMp/zsiAEaGfdd0hI2r1J7OdNPBBCtmhITsy9ZYHqm5vrGvy3s
--vi2GuB2RAoICAQD/oWUsg4eTJxHifTJLz/tVSTXnw7DhfbFVa1K1rUV63/MRQAFW
--pabN4T6Yfp3CpdRkljCA8KPJZj7euwhm4OEg1ulpOouA+cfWlE9RFE8wyOK5SYwM
--k+nk31P9MUC866pZg/ghzBGDub91OW1+ZGEtqnLI/n/LhiAIWt0hJvgZclTc1cAL
--xffHVlFwoSyNl/nc3ueZCC95nOLst2XcuxZLLbOFtZCmDYsp49q/Jn6EFjn4Ge2o
--qp38z6eZgDMP1F4lb9nDqXPHfUSt2jxKlmpfXS+IPKdba67+EjhbtmUYzaR4EoPI
--zh+o6SrVWT6Yve7KGiYv06fuRz1m/lLQO/Arbd9ntSjgn+ZEXGOkbhnHUX3DJ4ny
--/6XEGB9NLQjern4uNTn0AaV+uvhncapFMaIBnVfq0Cw8eog0136PBYRaVX7T44j5
--HwIyGXWtYGA/SzDEQoksD0Y/T61BEGnLZaKeavNd82WwFvcYHZtE0J4aQGjCEE7N
--+nijzCy+j5ETmme9KJvQHpEyXP3N4RBko1eWvyTwFZDdIXtoa6TTEI51lm+FXJ/b
--Y+BzMr6KRo29FB+7//1ptUoMvn5hzL0PwOv2ZSTQuoG5hLDEbxWXLNhd1VHcfznF
--3EZHwfD2F8aGQ3kz+fkMTNfK955KorDrmLgvmV9eZZ5yQxGZrs5H5YfKpwKCAgEA
--6nSUbzfSdVFUH89NM5FmEJgkD06vqCgHl2mpyF+VmDGcay4K06eA4QbRO5kns13+
--n6PcBl/YVW/rNE8iFi+WxfqUpAjdR1HlShvTuTRVqtFTfuN8XhbYU6VMjKyuE0kd
--LKe3KRdwubjVNhXRZLBknU+3Y/4hnIR7mcE3/M5Zv5hjb7XnwWg/SzxV9WojCKiu
--vQ7cXhH5/o7EuKcl1d6vueGhWsRylCG9RimwgViR2H7zD9kpkOc0nNym9cSpb0Gv
--Lui4cf/fVwIt2HfNEGBjbM/83e2MH6b8Xp1fFAy0aXCdRtOo4LVOzJVAxn5dERMX
--4JJ4d5cSFbssDN1bITOKzuytfBqRIQGNkOfizgQNWUiaFI0MhEN/icymjm1ybOIh
--Gc9tzqKI4wP2X9g+u3+Oof1QaBcZ4UbZEU9ITN87Pa6XVJmpNx7A81BafWoEPFeE
--ahoO4XDwlHZazDuSlOseEShxXcVwaIiqySy7OBEPBVuYdEd2Qw/z3JTx9Kw8MKnf
--hu+ar5tz5dPnJIsvLeYCcJDe/K6loiZuHTtPbWEy9p6It7qubQNPBvTSBN5eVDKc
--Q2bTQNCx8SAAA9C5gJiwWoQKsXJzbRFRY77P9JjuGpua3YJ2nYBHEJmF+fp1R33c
--uHIyMphPMkKC4GC3/43kkMr6tck8kZbXGSYsLsBr2GkCggIBAJvvrjILQianzKcm
--zAmnI6AQ+ssYesvyyrxaraeZvSqJdlLtgmOCxVANuQt5IW9djUSWwZvGL4Np1aw0
--15k6UNqhftzsE7FnrVneOsww4WXXBUcV8FKz4Bf3i9qFswILmGzmrfSf8YczRfGS
--SJKzVPxwX3jwlrBmbx/pnb7dcLbFIbNcyLvl1ZJJu4BDMVRmgssTRp/5eExtQZg4
--//A4SA8wH7TO3yAMXvn8vrGgH8kfbdlEp88d1SYk3g4rP/rGB3A63NIYikIEzmJn
--ICQ3wUfPJnGq3kRMWgEuyCZaCy2oNE3yrWVPJ8z3/2MJ/79ZDVNHxEeki2o1FuW+
--+nGAPq+fZIp03iy4HdVRro7dgugtc9QaSHJtNId8V4vSjviX5Oz3FxUb9AJst58S
--nVV8Q2FMxBa/SlzSOkhRtCg2q1gXkzhaMnIVUleRZFGQ2uWBToxKMjcoUifIyN1J
--z999bkfI4hBLq5pRSAXz+YVu5SMKa10GaawIwJLat+i+1zboF6QyI2o/Wz8nrsNq
--KX/ajFGu5C94WFgsVoWKNI90KBLe48Ssje9c68waBlV/WHMg1YLvU3yqVDOV+K5c
--IHB9tPMnG+AgBYZPxSzuvnLrrkj/GeKx0WI7TrvzOLRGKJo6irMEJ8IzFegASRUq
--TVZKYQDYRG7m+lKlSxU+pyMAh2c9AoICAE4kavCip1eIssQjYLTGSkFPo/0iGbOv
--G9CgXAE3snFWX67tWphupKrbjdMSWcQTmPD2OTg6q6zWL4twsIi6dcMooHAHsFC7
--//LyUV/SDJdxSyXohiQJ8zH1zwy35RDydnHSuF5OvLh53T44iWDI1dAEqLgAFI3J
--LjTxzEpLMGiGTuYFt+ejai0WQAQayvBw4ESM9m+4CB2K0hBFTXv5y5HlnNTW0uWC
--VUZUUMrbjUieDz8B/zOXi9aYSGFzmZFGUDAPSqJcSMEELemPDF7f8WNr8vi42tIV
--4tlaFD1nep4F9bWMiCXU6B2RxVQi+7vcJEIqL1KUnGd3ydfD00K+ng4Xnj7Vz/cz
--QE7CqrpFaXmPlCMzW6+dm51/AyhHXDLkL2od05hiXcNkJ7KMLWRqwExHVIxM3shR
--x7lYNl3ArUsCrNd6m4aOjnrKFk7kjeLavHxskPccoGKrC9o0JMfTkWLgmuBJFQ0S
--N/HzIbcvIFWF0Ms4ojb50yp6ziXhXfJOO/0KUQEki71XIhvw89mVZszDzD5lqzjf
--HCZMBU4MbmL6NdEevFIDH0zPPkx3HPNtJt3kIJbit9wI8VhUMe+ldGnGxpWb8tKw
--SfM3vrHkYr+lizk26XfXMFhdAuVtT7dzQKSNEyP/1a2Hs307Xzgiv8JulJ8QIkrX
--/nsYWPOAGLG5AoICABmdW9Ppkvuhb1AEcjTWb+XCyopoBc6vit/uQWD9uO+CeX7a
--cfzq+iH01CAjyVMc4E1JDc5Lpi106U+GRGcAAaPJB2Sp5NznoxaOVrb71blu4Q4x
--bNjtKM/P/DXpO+yJYoOPdKtaSDhtnfNDM7H/jztJ3XIrOltKA7CcRDohbBWIx8Q0
--0uEpvfFpZZBco3yVmjP0RLgIVYn/ZDj9wGhSvFWIJ5vv6GXmtDrcHGMLxcfv7t76
--UVcMW/Yy4mYJRCzGOrWagyVijJ6MTVNciqadWcH1KcbB3EGoMFYMn61or2qJABPM
--xz89IlhnROU1Re3X/QRx5t86cw6oa+FqrWMOhSs31I0dNWSuS/xDympG27YIYSDd
--mv5seT78GjFmMJC5pPOLoXsbTPB0HpsX2/UL/w/eRAfilTOef/Cf9VE5MP/C2YR7
--NBxUU7/+21D6WvdtBTcZbrXWGroAo8zPP+PwX0+c6WoAvqDJvCPndp8xZhSgEJN/
--0kScptezi8n3ZHI95EA9U5mAHxHz0IhDDVzWw/z1f1SBPxKVX3+By3zaa3lrD2ch
--cHq7nBkX72veEevnHUY8Z2rHE2G2jdmRfOtwm4sjL0VBV9fRRoxzJWRduKyeOtDL
--EhhBhUoTrT48UnfW9hxnbNLB9P/hh+UJu9HrS2uAwHoGE1+8gcyundupGDBn
-+MIICXgIBAAKBgQDF2kSVBncWIa+gxDzp+B0tlfljkIw/hrp3dkpSS2uvKfUcqtQ/
-+PkKfbUa6hpCxLczbxjMVo/SvUzNPoVbRqjsmEPdktfm/G7FHjsym1g2qSnfjo2Od
-+Ktxl9H+RFzgt1s1OjVNSl26H/GRgpqEArJZs5EKUdRdGb5G13QZH7QXj2wIDAQAB
-+AoGBAJLCjh7Q9eLnx+QDzH9s+Q/IcH4nSbERmh1lFEopAc6j29qQ6PGkmDy0DUPs
-+70VOCOh5A4mo3aZzm9sUfVb24/nRtmyTP/AtMuIVGCsUqzI28dJRGvRlY0aSQG/C
-+ILqMP69kiMNGBvuyEIiJhisOmMvDFEp7HrrXHJM9qcc217DpAkEA4nzJ9yyy2e4O
-+r6/D711hdfcU/F+ktXw+pL77kSSdTABUap92Uv2RL36UA4q5h8RNvq/GrzMNm6Ye
-+u2IMvBCiTQJBAN+iRbiMJCSitTg5YVMluVbT87co7jbTqk7LN1ujyIFEklm4xlHG
-+DLJNgEoDR7QJtAkL++FyogC4zsQsey5voscCQQCp54trTbDuI9QIoAaQrrDKWgz4
-+NpfNPeOQm2UFQT5vIWAyjGWrZGViB8bp0UvVOcJI5nxaOiZfOYOcdrWu75uRAkAn
-+67zMc9/j1lPJRJz2Dc7nDBD+ikTz7pcBV897AWLCiK4jbBOi91q+3YzgKXO8VNsZ
-+nlUJasA2psbqSBJ5OJ5zAkEA2UxoMju54hASjT54Z92IzraVw4Vo8CYwOcw5fr7z
-++m5xg1mmWdLBclmZ+WjARzDuTHIW6u/WCxNGg42AykWzfw==
- -----END RSA PRIVATE KEY-----
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql.init mysql-5.5-5.5.43/packaging/rpm-uln/mysql.init
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql.init	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,209 +0,0 @@
-#!/bin/sh
-#
-# mysqld	This shell script takes care of starting and stopping
-#		the MySQL subsystem (mysqld).
-#
-# chkconfig: - 64 36
-# description:	MySQL database server.
-# processname: mysqld
-# config: /etc/my.cnf
-# pidfile: /var/run/mysqld/mysqld.pid
-
-# Source function library.
-. /etc/rc.d/init.d/functions
-
-# Source networking configuration.
-. /etc/sysconfig/network
-
-
-exec="/usr/bin/mysqld_safe"
-prog="mysqld"
-
-# Set timeouts here so they can be overridden from /etc/sysconfig/mysqld
-STARTTIMEOUT=120
-STOPTIMEOUT=60
-
-[ -e /etc/sysconfig/$prog ] && . /etc/sysconfig/$prog
-
-lockfile=/var/lock/subsys/$prog
-
-
-# extract value of a MySQL option from config files
-# Usage: get_mysql_option SECTION VARNAME DEFAULT
-# result is returned in $result
-# We use my_print_defaults which prints all options from multiple files,
-# with the more specific ones later; hence take the last match.
-get_mysql_option(){
-	result=`/usr/bin/my_print_defaults "$1" | sed -n "s/^--$2=//p" | tail -n 1`
-	if [ -z "$result" ]; then
-	    # not found, use default
-	    result="$3"
-	fi
-}
-
-get_mysql_option mysqld datadir "/var/lib/mysql"
-datadir="$result"
-get_mysql_option mysqld socket "$datadir/mysql.sock"
-socketfile="$result"
-get_mysql_option mysqld_safe log-error "/var/log/mysqld.log"
-errlogfile="$result"
-get_mysql_option mysqld_safe pid-file "/var/run/mysqld/mysqld.pid"
-mypidfile="$result"
-
-
-start(){
-    [ -x $exec ] || exit 5
-    # check to see if it's already running
-    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1`
-    if [ $? = 0 ]; then
-	# already running, do nothing
-	action $"Starting $prog: " /bin/true
-	ret=0
-    elif echo "$RESPONSE" | grep -q "Access denied for user"
-    then
-	# already running, do nothing
-	action $"Starting $prog: " /bin/true
-	ret=0
-    else
-    	# prepare for start
-	touch "$errlogfile"
-	chown mysql:mysql "$errlogfile" 
-	chmod 0640 "$errlogfile"
-	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
-	if [ ! -d "$datadir/mysql" ] ; then
-	    # First, make sure $datadir is there with correct permissions
-	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
-	    then
-		mkdir -p "$datadir" || exit 1
-	    fi
-	    chown mysql:mysql "$datadir"
-	    chmod 0755 "$datadir"
-	    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
-	    # Now create the database
-	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
-	    ret=$?
-	    chown -R mysql:mysql "$datadir"
-	    if [ $ret -ne 0 ] ; then
-		return $ret
-	    fi
-	fi
-	chown mysql:mysql "$datadir"
-	chmod 0755 "$datadir"
-	# Pass all the options determined above, to ensure consistent behavior.
-	# In many cases mysqld_safe would arrive at the same conclusions anyway
-	# but we need to be sure.  (An exception is that we don't force the
-	# log-error setting, since this script doesn't really depend on that,
-	# and some users might prefer to configure logging to syslog.)
-	# Note: set --basedir to prevent probes that might trigger SELinux
-	# alarms, per bug #547485
-	$exec   --datadir="$datadir" --socket="$socketfile" \
-		--pid-file="$mypidfile" \
-		--basedir=/usr --user=mysql >/dev/null 2>&1 &
-	safe_pid=$!
-	# Spin for a maximum of N seconds waiting for the server to come up;
-	# exit the loop immediately if mysqld_safe process disappears.
-	# Rather than assuming we know a valid username, accept an "access
-	# denied" response as meaning the server is functioning.
-	ret=0
-	TIMEOUT="$STARTTIMEOUT"
-	while [ $TIMEOUT -gt 0 ]; do
-	    RESPONSE=`/usr/bin/mysqladmin --socket="$socketfile" --user=UNKNOWN_MYSQL_USER ping 2>&1` && break
-	    echo "$RESPONSE" | grep -q "Access denied for user" && break
-	    if ! /bin/kill -0 $safe_pid 2>/dev/null; then
-		echo "MySQL Daemon failed to start."
-		ret=1
-		break
-	    fi
-	    sleep 1
-	    let TIMEOUT=${TIMEOUT}-1
-	done
-	if [ $TIMEOUT -eq 0 ]; then
-	    echo "Timeout error occurred trying to start MySQL Daemon."
-	    ret=1
-	fi
-	if [ $ret -eq 0 ]; then
-	    action $"Starting $prog: " /bin/true
-	    touch $lockfile
-	else
-	    action $"Starting $prog: " /bin/false
-	fi
-    fi
-    return $ret
-}
-
-stop(){
-	if [ ! -f "$mypidfile" ]; then
-	    # not running; per LSB standards this is "ok"
-	    action $"Stopping $prog: " /bin/true
-	    return 0
-	fi
-	MYSQLPID=`cat "$mypidfile"`
-	if [ -n "$MYSQLPID" ]; then
-	    /bin/kill "$MYSQLPID" >/dev/null 2>&1
-	    ret=$?
-	    if [ $ret -eq 0 ]; then
-		TIMEOUT="$STOPTIMEOUT"
-		while [ $TIMEOUT -gt 0 ]; do
-		    /bin/kill -0 "$MYSQLPID" >/dev/null 2>&1 || break
-		    sleep 1
-		    let TIMEOUT=${TIMEOUT}-1
-		done
-		if [ $TIMEOUT -eq 0 ]; then
-		    echo "Timeout error occurred trying to stop MySQL Daemon."
-		    ret=1
-		    action $"Stopping $prog: " /bin/false
-		else
-		    rm -f $lockfile
-		    rm -f "$socketfile"
-		    action $"Stopping $prog: " /bin/true
-		fi
-	    else
-		action $"Stopping $prog: " /bin/false
-	    fi
-	else
-	    # failed to read pidfile, probably insufficient permissions
-	    action $"Stopping $prog: " /bin/false
-	    ret=4
-	fi
-	return $ret
-}
- 
-restart(){
-    stop
-    start
-}
-
-condrestart(){
-    [ -e $lockfile ] && restart || :
-}
-
-
-# See how we were called.
-case "$1" in
-  start)
-    start
-    ;;
-  stop)
-    stop
-    ;;
-  status)
-    status -p "$mypidfile" $prog
-    ;;
-  restart)
-    restart
-    ;;
-  condrestart|try-restart)
-    condrestart
-    ;;
-  reload)
-    exit 3
-    ;;
-  force-reload)
-    restart
-    ;;
-  *)
-    echo $"Usage: $0 {start|stop|status|restart|condrestart|try-restart|reload|force-reload}"
-    exit 2
-esac
-
-exit $?
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-install-test.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-install-test.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-install-test.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-install-test.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,33 +0,0 @@
-Improve the documentation that will be installed in the mysql-test RPM.
-
-
-diff -Naur mysql-5.1.43.orig/mysql-test/README mysql-5.1.43/mysql-test/README
---- mysql-5.1.43.orig/mysql-test/README	2010-01-15 12:14:43.000000000 -0500
-+++ mysql-5.1.43/mysql-test/README	2010-02-13 21:18:06.000000000 -0500
-@@ -6,6 +6,16 @@
- actually have a co-existing MySQL installation. The tests will not
- conflict with it.
- 
-+For use in Red Hat distributions, you should run the script as user mysql,
-+so the best bet is something like
-+	cd /usr/share/mysql-test
-+	sudo -u mysql ./mysql-test-run
-+This will use the installed mysql executables, but will run a private copy
-+of the server process (using data files within /usr/share/mysql-test),
-+so you need not start the mysqld service beforehand.
-+To clean up afterwards, remove the created "var" subdirectory, eg
-+	sudo -u mysql rm -rf /usr/share/mysql-test/var
-+
- All tests must pass. If one or more of them fail on your system, please
- read the following manual section for instructions on how to report the
- problem:
-@@ -25,7 +35,8 @@
- 
- With no test cases named on the command line, mysql-test-run falls back
- to the normal "non-extern" behavior. The reason for this is that some
--tests cannot run with an external server.
-+tests cannot run with an external server (because they need to control the
-+options with which the server is started).
- 
- 
- You can create your own test cases. To create a test case, create a new
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql.spec.sh mysql-5.5-5.5.43/packaging/rpm-uln/mysql.spec.sh
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql.spec.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql.spec.sh	1970-01-01 00:00:00.000000000 +0000
@@ -1,1991 +0,0 @@
-#
-#   This file was modified by Oracle in 2011 and later.
-#   Details of the modifications are described in the "changelog" section.
-#
-#   Modifications copyright (c) 2011, 2012, 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; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
-# MA  02110-1301  USA.
-
-##############################################################################
-# Some common macro definitions
-##############################################################################
-
-# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
-# change these, has to be exactly as is.
-# %define mysql_old_vendor        MySQL AB               # Applies to traditional MySQL RPMs only.
-# %define mysql_vendor_2          Sun Microsystems, Inc.
-%define mysql_vendor            Oracle and/or its affiliates
-
-%define mysql_version   @VERSION@
-
-%define mysqldatadir    /var/lib/mysql
-
-%define release         1
-
-##############################################################################
-# Command line handling
-##############################################################################
-#
-# To set options:
-#
-#   $ rpmbuild --define="option <x>" ...
-#
-
-# ----------------------------------------------------------------------------
-# Commercial builds
-# ----------------------------------------------------------------------------
-%if %{undefined commercial}
-%define commercial 0
-%endif
-
-# ----------------------------------------------------------------------------
-# Source name
-# ----------------------------------------------------------------------------
-%if %{undefined src_base}
-%define src_base mysql
-%endif
-%define src_dir %{src_base}-%{mysql_version}
-
-# ----------------------------------------------------------------------------
-# Feature set (storage engines, options).  Default to community (everything)
-# ----------------------------------------------------------------------------
-%if %{undefined feature_set}
-%define feature_set community
-%endif
-
-# ----------------------------------------------------------------------------
-# Server comment strings
-# ----------------------------------------------------------------------------
-%if %{undefined compilation_comment_debug}
-%define compilation_comment_debug       MySQL Community Server - Debug (GPL)
-%endif
-%if %{undefined compilation_comment_release}
-%define compilation_comment_release     MySQL Community Server (GPL)
-%endif
-
-# ----------------------------------------------------------------------------
-# Product and server suffixes
-# ----------------------------------------------------------------------------
-%if %{undefined product_suffix}
-  %if %{defined short_product_tag}
-    %define product_suffix      -%{short_product_tag}
-  %else
-    %define product_suffix      %{nil}
-  %endif
-%endif
-
-%if %{undefined server_suffix}
-%define server_suffix   %{nil}
-%endif
-
-# ----------------------------------------------------------------------------
-# Distribution support
-# ----------------------------------------------------------------------------
-%if %{undefined distro_specific}
-%define distro_specific 0
-%endif
-%if %{distro_specific}
-    %if %(test -f /etc/oracle-release && echo 1 || echo 0)
-      %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-      %if "%elver" == "6"
-        %define distro_description      Oracle Linux 6
-        %define distro_releasetag       el6
-        %define distro_buildreq         gcc-c++ ncurses-devel perl readline-devel time zlib-devel
-        %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
-      %else
-        %{error:Oracle Linux %{elver} is unsupported}
-      %endif
-    %else
-      %if %(test -f /etc/redhat-release && echo 1 || echo 0)
-        %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-          %if "%rhelver" == "5"
-            %define distro_description    Red Hat Enterprise Linux 5
-            %define distro_releasetag     rhel5
-            %define distro_buildreq       gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
-            %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
-          %else
-            %if "%rhelver" == "6"
-              %define distro_description    Red Hat Enterprise Linux 6
-              %define distro_releasetag     rhel6
-              %define distro_buildreq       gcc-c++ ncurses-devel perl readline-devel time zlib-devel
-              %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
-            %else
-              %{error:Red Hat Enterprise Linux %{rhelver} is unsupported}
-            %endif
-          %endif
-      %else
-        %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
-          %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1)
-          %if "%susever" == "10"
-            %define distro_description    SUSE Linux Enterprise Server 10
-            %define distro_releasetag     sles10
-            %define distro_buildreq       gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel
-            %define distro_requires       aaa_base coreutils grep procps pwdutils
-          %else
-            %if "%susever" == "11"
-              %define distro_description  SUSE Linux Enterprise Server 11
-              %define distro_releasetag   sles11
-              %define distro_buildreq     gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel
-              %define distro_requires     aaa_base coreutils grep procps pwdutils
-            %else
-              %{error:SuSE %{susever} is unsupported}
-            %endif
-          %endif
-        %else
-          %{error:Unsupported distribution}
-        %endif
-      %endif
-    %endif
-%else
-  %define generic_kernel %(uname -r | cut -d. -f1-2)
-  %define distro_description            Generic Linux (kernel %{generic_kernel})
-  %define distro_releasetag             linux%{generic_kernel}
-  %define distro_buildreq               gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
-  %define distro_requires               coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
-%endif
-
-# Avoid debuginfo RPMs, leaves binaries unstripped
-%define debug_package   %{nil}
-
-# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted
-# test for __debug_package
-%define __strip         /bin/true
-
-# ----------------------------------------------------------------------------
-# Support optional "tcmalloc" library (experimental)
-# ----------------------------------------------------------------------------
-%if %{defined malloc_lib_target}
-%define WITH_TCMALLOC 1
-%else
-%define WITH_TCMALLOC 0
-%endif
-
-##############################################################################
-# Configuration based upon above user input, not to be set directly
-##############################################################################
-
-%if %{commercial}
-%define license_files_server    %{src_dir}/LICENSE.mysql
-%define license_type            Commercial
-%else
-%define license_files_server    %{src_dir}/COPYING %{src_dir}/README
-%define license_type            GPL
-%endif
-
-##############################################################################
-# Main spec file section
-##############################################################################
-
-Name: mysql%{product_suffix}
-Summary: MySQL client programs and shared libraries
-Group: Applications/Databases
-Version: @MYSQL_RPM_VERSION@
-Release: %{release}%{?distro_releasetag:.%{distro_releasetag}}
-# exceptions allow client libraries to be linked with most open source SW,
-# not only GPL code.
-License: Copyright (c) 2000, @MYSQL_COPYRIGHT_YEAR@, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
-URL: http://www.mysql.com/
-Packager: MySQL Release Engineering <mysql-build@oss.oracle.com>
-Vendor:         %{mysql_vendor}
-
-# Regression tests may take a long time, override the default to skip them 
-%{!?runselftest:%global runselftest 1}
-
-# Upstream has a mirror redirector for downloads, so the URL is hard to
-# represent statically.  You can get the tarball by following a link from
-# http://dev.mysql.com/downloads/mysql/
-Source0: %{src_dir}.tar.gz
-# The upstream tarball includes non-free documentation that only the
-# copyright holder (MySQL -> Sun -> Oracle) may ship.
-# To remove the non-free documentation, run this script after downloading
-# the tarball into the current directory:
-# ./generate-tarball.sh $VERSION
-# Then, source name changes:
-#   Source0: mysql-%{version}-nodocs.tar.gz
-%if %{commercial}
-NoSource: 0
-%endif
-Source1: generate-tarball.sh
-Source2: mysql.init
-Source3: my.cnf
-Source4: scriptstub.c
-Source5: my_config.h
-# The below is only needed for packages built outside MySQL -> Sun -> Oracle:
-Source6: README.mysql-docs
-Source9: mysql-embedded-check.c
-# Working around perl dependency checking bug in rpm FTTB. Remove later.
-Source999: filter-requires-mysql.sh
-
-# Patch1: mysql-ssl-multilib.patch           Not needed by MySQL (yaSSL), will not work in 5.5 (cmake)
-Patch2: mysql-5.5-errno.patch
-Patch4: mysql-5.5-testing.patch
-Patch5: mysql-install-test.patch
-Patch6: mysql-5.5-stack-guard.patch
-# Patch7: mysql-disable-test.patch           Already fixed in current 5.1
-# Patch8: mysql-setschedparam.patch          Will not work in 5.5 (cmake)
-# Patch9: mysql-no-docs.patch                Will not work in 5.5 (cmake)
-Patch10: mysql-strmov.patch
-       # Not used by MySQL
-# Patch12: mysql-cve-2008-7247.patch         Already fixed in 5.5
-Patch13: mysql-expired-certs.patch
-       # Will not be used by MySQL
-# Patch14: mysql-missing-string-code.patch   Undecided, will not work in 5.5 (cmake)
-# Patch15: mysql-lowercase-bug.patch         Fixed in MySQL 5.1.54 and 5.5.9
-Patch16: mysql-chain-certs.patch
-Patch17: mysql-5.5-libdir.patch
-Patch18: mysql-5.5-fix-tests.patch
-Patch19: mysql-5.5-mtr1.patch
-
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
-BuildRequires:  %{distro_buildreq}
-BuildRequires: gawk
-# make test requires time and ps
-BuildRequires: procps
-# Socket and Time::HiRes are needed to run regression tests
-BuildRequires: perl(Socket), perl(Time::HiRes)
-
-Requires: %{distro_requires}
-Requires: fileutils
-Requires: mysql-libs%{product_suffix} = %{version}-%{release}
-Requires: bash
-
-# If %%{product_suffix} is non-empty, the auto-generated capability is insufficient:
-# We want all dependency handling to use the generic name only.
-# Similar in other sub-packages
-Provides: mysql
-
-# MySQL (with caps) is upstream's spelling of their own RPMs for mysql
-Obsoletes: MySQL
-# mysql-cluster used to be built from this SRPM, but no more
-Obsoletes: mysql-cluster < 5.1.44
-# We need cross-product "Obsoletes:" to allow cross-product upgrades:
-Obsoletes: mysql < %{version}-%{release} 
-Obsoletes: mysql-advanced < %{version}-%{release}
-
-# Working around perl dependency checking bug in rpm FTTB. Remove later.
-%global __perl_requires %{SOURCE999}
-
-%description -n mysql%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
-client/server implementation consisting of a server daemon (mysqld)
-and many different client programs and libraries. The base package
-contains the standard MySQL client programs and generic MySQL files.
-
-The MySQL software has Dual Licensing, which means you can use the MySQL
-software free of charge under the GNU General Public License
-(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
-licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
-the GPL. See the chapter "Licensing and Support" in the manual for
-further info.
-
-%package -n mysql-libs%{product_suffix}
-
-Summary: The shared libraries required for MySQL clients
-Group: Applications/Databases
-Requires: /sbin/ldconfig
-Obsoletes: mysql-libs < %{version}-%{release}  
-Obsoletes: mysql-libs-advanced < %{version}-%{release}
-Provides: mysql-libs
-
-%description -n mysql-libs%{product_suffix}
-The mysql-libs package provides the essential shared libraries for any 
-MySQL client program or interface. You will need to install this package
-to use any other MySQL package or any clients that need to connect to a
-MySQL server.
-
-%package -n mysql-server%{product_suffix}
-
-Summary: The MySQL server and related files
-Group: Applications/Databases
-Requires: mysql%{product_suffix} = %{version}-%{release}
-Requires: sh-utils
-Requires(pre): /usr/sbin/useradd
-Requires(post): chkconfig
-Requires(preun): chkconfig
-# This is for /sbin/service
-Requires(preun): initscripts
-Requires(postun): initscripts
-# mysqlhotcopy needs DBI/DBD support
-Requires: perl-DBI, perl-DBD-MySQL
-Obsoletes: MySQL-server
-Obsoletes: mysql-server < %{version}-%{release}
-Obsoletes: mysql-server-advanced < %{version}-%{release}
-Provides: mysql-server
-
-%description -n mysql-server%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. MySQL is a
-client/server implementation consisting of a server daemon (mysqld)
-and many different client programs and libraries. This package contains
-the MySQL server and some accompanying files and directories.
-
-%package -n mysql-devel%{product_suffix}
-
-Summary: Files for development of MySQL applications
-Group: Applications/Databases
-Requires: mysql%{product_suffix} = %{version}-%{release}
-Requires: openssl-devel
-Obsoletes: MySQL-devel
-Obsoletes: mysql-devel < %{version}-%{release}
-Obsoletes: mysql-devel-advanced < %{version}-%{release}
-Provides: mysql-devel
-
-%description -n mysql-devel%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains the libraries and header files that are needed for
-developing MySQL client applications.
-
-%package -n mysql-embedded%{product_suffix}
-
-Summary: MySQL as an embeddable library
-Group: Applications/Databases
-Obsoletes: mysql-embedded < %{version}-%{release}
-Obsoletes: mysql-embedded-advanced < %{version}-%{release}
-Provides: mysql-embedded
-
-%description -n mysql-embedded%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains a version of the MySQL server that can be embedded
-into a client application instead of running as a separate process,
-as well as a command line client with such an embedded server.
-
-%package -n mysql-embedded-devel%{product_suffix}
-
-Summary: Development files for MySQL as an embeddable library
-Group: Applications/Databases
-Requires: mysql-embedded%{product_suffix} = %{version}-%{release}
-Requires: mysql-devel%{product_suffix} = %{version}-%{release}
-Obsoletes: mysql-embedded-devel < %{version}-%{release}
-Obsoletes: mysql-embedded-devel-advanced < %{version}-%{release}
-Provides: mysql-embedded-devel
-
-%description -n mysql-embedded-devel%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains files needed for developing and testing with
-the embedded version of the MySQL server.
-
-%package -n mysql-test%{product_suffix}
-
-Summary: The test suite distributed with MySQL
-Group: Applications/Databases
-Requires: mysql%{product_suffix} = %{version}-%{release}
-Requires: mysql-server%{product_suffix} = %{version}-%{release}
-Obsoletes: MySQL-test
-Obsoletes: mysql-test < %{version}-%{release}
-Obsoletes: mysql-test-advanced < %{version}-%{release}
-Provides: mysql-test
-
-%description -n mysql-test%{product_suffix}
-MySQL is a multi-user, multi-threaded SQL database server. This
-package contains the regression test suite distributed with
-the MySQL sources.
-
-%prep
-%setup -T -a 0 -c -n %{src_dir}
-
-cd %{src_dir} # read about "%setup -n"
-# %patch1 -p1
-%patch2 -p1
-# %patch4 -p1  TODO / FIXME: if wanted, needs to be adapted to new mysql-test-run setup
-%patch5 -p1
-%patch6 -p1
-# %patch8 -p1
-# %patch9 -p1
-# %patch10 -p1
-# %patch13 -p1
-# %patch14 -p1
-%patch16 -p1
-%patch17 -p1
-%patch18 -p1
-%patch19 -p1
-
-# workaround for upstream bug #56342
-rm -f mysql-test/t/ssl_8k_key-master.opt
-
-%build
-
-# Fail quickly and obviously if user tries to build as root
-%if %runselftest
-	if [ x"`id -u`" = x0 ]; then
-		echo "The MySQL regression tests may fail if run as root."
-		echo "If you really need to build the RPM as root, use"
-		echo "--define='runselftest 0' to skip the regression tests."
-		exit 1
-	fi
-%endif
-
-# Be strict about variables, bail at earliest opportunity, etc.
-set -eu
-
-# Optional package files
-touch optional-files-devel
-
-#
-# Set environment in order of preference, MYSQL_BUILD_* first, then variable
-# name, finally a default.  RPM_OPT_FLAGS is assumed to be a part of the
-# default RPM build environment.
-#
-# We set CXX=gcc by default to support so-called 'generic' binaries, where we
-# do not have a dependancy on libgcc/libstdc++.  This only works while we do
-# not require C++ features such as exceptions, and may need to be removed at
-# a later date.
-#
-
-# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break
-# the compile in cmd-line-utils/readline - needs investigation, but for now
-# we simply unset it and use those specified directly in cmake.
-%if "%{_arch}" == "ia64"
-RPM_OPT_FLAGS=
-%endif
-
-# This goes in sync with Patch19. "rm" is faster than "patch" for this.
-rm -rf %{src_dir}/mysql-test/lib/v1
-
-export PATH=${MYSQL_BUILD_PATH:-$PATH}
-export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
-export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-# Following "%ifarch" developed by RedHat, MySQL/Oracle does not support/maintain Linux/Sparc:
-# gcc seems to have some bugs on sparc as of 4.4.1, back off optimization
-# submitted as bz #529298
-%ifarch sparc sparcv9 sparc64
-CFLAGS=`echo $CFLAGS| sed -e "s|-O2|-O1|g" `
-%endif
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
-export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
-export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
-export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-%{?_smp_mflags}}
-
-# Build debug mysqld and libmysqld.a
-mkdir debug
-(
-  cd debug
-  # Attempt to remove any optimisation flags from the debug build
-  CFLAGS=`echo " ${CFLAGS} " | \
-            sed -e 's/ -O[0-9]* / /' \
-                -e 's/ -unroll2 / /' \
-                -e 's/ -ip / /' \
-                -e 's/^ //' \
-                -e 's/ $//'`
-  CXXFLAGS=`echo " ${CXXFLAGS} " | \
-              sed -e 's/ -O[0-9]* / /' \
-                  -e 's/ -unroll2 / /' \
-                  -e 's/ -ip / /' \
-                  -e 's/^ //' \
-                  -e 's/ $//'`
-  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
-  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-           -DCMAKE_BUILD_TYPE=Debug \
-           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-           -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
-  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
-  make ${MAKE_JFLAG} VERBOSE=1
-)
-# Build full release
-mkdir release
-(
-  cd release
-  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
-  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-           -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
-  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
-  make ${MAKE_JFLAG} VERBOSE=1
-)
-
-# TODO / FIXME: Do we need "scriptstub"?
-gcc $CFLAGS $LDFLAGS -o scriptstub "-DLIBDIR=\"%{_libdir}/mysql\"" %{SOURCE4}
-
-# TODO / FIXME: "libmysqld.so" should have been produced above
-# regular build will make libmysqld.a but not libmysqld.so :-(
-cd release
-mkdir libmysqld/work
-cd libmysqld/work
-# "libmysqld" provides the same ABI as "libmysqlclient", but it implements the server:
-# The shared object is identified by the full version,
-# for linkage selection the first two levels are sufficient so that upgrades are possible
-# (see "man ld", option "-soname").
-SO_FULL='%{mysql_version}'
-SO_USE=`echo $SO_FULL | sed -e 's/\([0-9]\.[0-9]\)\.[0-9]*/\1/'`
-# These two modules should pull everything else which is needed:
-ar -x ../libmysqld.a client.c.o signal_handler.cc.o
-gcc $CFLAGS $LDFLAGS -shared -Wl,-soname,libmysqld.so.$SO_USE -o libmysqld.so.$SO_FULL \
-	*.o ../libmysqld.a \
-	-lpthread -lcrypt -laio -lnsl -lssl -lcrypto -lz -lrt -lstdc++ -lm -lc
-# this is to check that we built a complete library
-cp %{SOURCE9} .
-PROGNAME=`basename %{SOURCE9} .c`
-ln -s libmysqld.so.$SO_FULL libmysqld.so.$SO_USE
-gcc -I../../include -I../../../%{src_dir}/include $CFLAGS -o $PROGNAME %{SOURCE9} libmysqld.so.$SO_USE
-LD_LIBRARY_PATH=. ldd $PROGNAME
-cd ../..
-cd ..
-
-# TODO / FIXME: autotools only?
-# make check
-
-# TODO / FIXME: Test suite is run elsewhere in release builds -
-#               do we need this for users who want to build from source?
-# Also, check whether MTR_BUILD_THREAD=auto would solve all issues
-%if %runselftest
-  # hack to let 32- and 64-bit tests run concurrently on same build machine
-  case `uname -m` in
-    ppc64 | s390x | x86_64 | sparc64 )
-      MTR_BUILD_THREAD=7
-      ;;
-    *)
-      MTR_BUILD_THREAD=11
-      ;;
-  esac
-  export MTR_BUILD_THREAD
-
-  # if you want to change which tests are run, look at mysql-5.5-testing.patch too.
-  (cd release && make test-bt-fast )
-%endif
-
-%install
-RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/%{src_dir}
-[ -n "$RPM_BUILD_ROOT" -a  "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-# Ensure that needed directories exists
-# TODO / FIXME: needed ?  install -d $RBR%{mysqldatadir}/mysql
-# TODO / FIXME: needed ?  install -d $RBR%{_datadir}/mysql-test
-# TODO / FIXME: needed ?  install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
-# TODO / FIXME: needed ?  install -d $RBR%{_includedir}
-# TODO / FIXME: needed ?  install -d $RBR%{_libdir}
-# TODO / FIXME: needed ?  install -d $RBR%{_mandir}
-# TODO / FIXME: needed ?  install -d $RBR%{_sbindir}
-
-# Install all binaries
-(
-  cd $MBD/release
-  make DESTDIR=$RBR install
-)
-
-# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  Do
-# this in a sub-shell to ensure we don't pollute the install environment
-# with compiler bits.
-(
-  PATH=${MYSQL_BUILD_PATH:-$PATH}
-  CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-  CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-  if "${CC}" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1; then
-    libgcc=`${CC} ${CFLAGS} --print-libgcc-file`
-    if [ -f ${libgcc} ]; then
-      mkdir -p $RBR%{_libdir}/mysql
-      install -m 644 ${libgcc} $RBR%{_libdir}/mysql/libmygcc.a
-      echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
-    fi
-  fi
-)
-
-# multilib header hacks
-# we only apply this to known Red Hat multilib arches, per bug #181335
-case `uname -i` in
-  i386 | x86_64 | ppc | ppc64 | s390 | s390x | sparc | sparc64 )
-    mv $RPM_BUILD_ROOT/usr/include/mysql/my_config.h $RPM_BUILD_ROOT/usr/include/mysql/my_config_`uname -i`.h
-    install -m 644 %{SOURCE5} $RPM_BUILD_ROOT/usr/include/mysql/
-    ;;
-  *)
-    ;;
-esac
-
-mkdir -p $RPM_BUILD_ROOT/var/log
-touch $RPM_BUILD_ROOT/var/log/mysqld.log
-
-# List the installed tree for RPM package maintenance purposes.
-find $RPM_BUILD_ROOT -print | sed "s|^$RPM_BUILD_ROOT||" | sort > ROOTFILES
-
-mkdir -p $RPM_BUILD_ROOT/etc/rc.d/init.d
-mkdir -p $RPM_BUILD_ROOT/var/run/mysqld
-install -m 0755 -d $RPM_BUILD_ROOT/var/lib/mysql
-install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/etc/rc.d/init.d/mysqld
-install -m 0644 %{SOURCE3} $RPM_BUILD_ROOT/etc/my.cnf
-# obsolete: mv $RPM_BUILD_ROOT/usr/sql-bench $RPM_BUILD_ROOT%{_datadir}/sql-bench   # 'sql-bench' is dropped
-# obsolete: mv $RPM_BUILD_ROOT/usr/mysql-test $RPM_BUILD_ROOT%{_datadir}/mysql-test  # 'mysql-test' is there already
-# 5.1.32 forgets to install the mysql-test README file
-# obsolete: install -m 0644 mysql-test/README $RPM_BUILD_ROOT%{_datadir}/mysql-test/README  # 'README' is there already
-
-mv ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysqlbug
-install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysqlbug
-mv ${RPM_BUILD_ROOT}%{_bindir}/mysql_config ${RPM_BUILD_ROOT}%{_libdir}/mysql/mysql_config
-install -m 0755 scriptstub ${RPM_BUILD_ROOT}%{_bindir}/mysql_config
-
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.a
-SO_FULL='%{mysql_version}'
-SO_USE=`echo $SO_FULL | sed -e 's/\([0-9]\.[0-9]\)\.[0-9]*/\1/'`
-install -m 0755 release/libmysqld/work/libmysqld.so.$SO_FULL ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.$SO_FULL
-ln -s libmysqld.so.$SO_FULL ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so.$SO_USE
-ln -s libmysqld.so.$SO_USE  ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqld.so
-
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/comp_err
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/comp_err.1*
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_binary_distribution
-rm -f ${RPM_BUILD_ROOT}%{_bindir}/make_win_src_distribution
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_bin_dist.1*
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/make_win_src_distribution.1*
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/libmysqlclient*.la
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/*.a
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.la
-rm -f ${RPM_BUILD_ROOT}%{_libdir}/mysql/plugin/*.a
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/binary-configure
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_binary_distribution
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/make_sharedlib_distribution
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mi_test_all*
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ndb-config-2-node.ini
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql.server
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysqld_multi.server
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/MySQL-shared-compat.spec
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/*.plist
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/preinstall
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/postinstall
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-*.spec
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/mysql-log-rotate
-rm -f ${RPM_BUILD_ROOT}%{_datadir}/mysql/ChangeLog
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-stress-test.pl.1*
-rm -f ${RPM_BUILD_ROOT}%{_mandir}/man1/mysql-test-run.pl.1*
-rm -rf ${RPM_BUILD_ROOT}%{_datadir}/mysql/solaris
-
-mkdir -p $RPM_BUILD_ROOT/etc/ld.so.conf.d
-echo "%{_libdir}/mysql" > $RPM_BUILD_ROOT/etc/ld.so.conf.d/%{name}-%{_arch}.conf
-
-# The below *only* applies to builds not done by MySQL / Sun / Oracle:
-# copy additional docs into build tree so %%doc will find them
-# cp %{SOURCE6} README.mysql-docs
-
-%clean
-[ -n "$RPM_BUILD_ROOT" -a  "$RPM_BUILD_ROOT" != "/" ] && rm -rf $RPM_BUILD_ROOT
-
-%pre -n mysql-server%{product_suffix}
-
-# Check if we can safely upgrade.  An upgrade is only safe if it's from one
-# of our RPMs in the same version family.
-
-# Handle both ways of spelling the capability.
-installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
-if [ $? -ne 0 -o -z "$installed" ]; then
-  installed=`rpm -q --whatprovides MySQL-server 2> /dev/null`
-fi
-if [ $? -eq 0 -a -n "$installed" ]; then
-  installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names
-  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
-  version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
-  myvendor='%{mysql_vendor}'
-  myversion='%{mysql_version}'
-
-  old_family=`echo $version \
-    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
-  new_family=`echo $myversion \
-    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
-
-  [ -z "$vendor" ] && vendor='<unknown>'
-  [ -z "$old_family" ] && old_family="<unrecognized version $version>"
-  [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
-
-  error_text=
-  if [ "$vendor" != "$myvendor" ]; then
-    error_text="$error_text
-The current MySQL server package is provided by a different
-vendor ($vendor) than $myvendor.
-Some files may be installed to different locations, including log
-files and the service startup script in %{_sysconfdir}/init.d/.
-"
-  fi
-
-  if [ "$old_family" != "$new_family" ]; then
-    error_text="$error_text
-Upgrading directly from MySQL $old_family to MySQL $new_family may not
-be safe in all cases.  A manual dump and restore using mysqldump is
-recommended.  It is important to review the MySQL manual's Upgrading
-section for version-specific incompatibilities.
-"
-  fi
-
-  if [ -n "$error_text" ]; then
-    cat <<HERE >&2
-
-******************************************************************
-A MySQL server package ($installed) is installed.
-$error_text
-A manual upgrade is required.
-
-- Ensure that you have a complete, working backup of your data and my.cnf
-  files
-- Shut down the MySQL server cleanly
-- Remove the existing MySQL packages.  Usually this command will
-  list the packages you should remove:
-  rpm -qa | grep -i '^mysql-'
-
-  You may choose to use 'rpm --nodeps -ev <package-name>' to remove
-  the package which contains the mysqlclient shared library.  The
-  library will be reinstalled by the MySQL-shared-compat package.
-- Install the new MySQL packages supplied by $myvendor
-- Ensure that the MySQL server is started
-- Run the 'mysql_upgrade' program
-
-This is a brief description of the upgrade process.  Important details
-can be found in the MySQL manual, in the Upgrading section.
-******************************************************************
-HERE
-    exit 1
-  fi
-fi
-
-/usr/sbin/groupadd -g 27 -o -r mysql >/dev/null 2>&1 || :
-/usr/sbin/useradd -M -N -g mysql -o -r -d /var/lib/mysql -s /bin/bash \
-	-c "MySQL Server" -u 27 mysql >/dev/null 2>&1 || :
-
-%post -n mysql-libs%{product_suffix}
-/sbin/ldconfig
-
-%post -n mysql-server%{product_suffix}
-if [ $1 = 1 ]; then
-    /sbin/chkconfig --add mysqld
-fi
-/bin/chmod 0755 /var/lib/mysql
-/bin/touch /var/log/mysqld.log
-
-%preun -n mysql-server%{product_suffix}
-if [ $1 = 0 ]; then
-    /sbin/service mysqld stop >/dev/null 2>&1
-    /sbin/chkconfig --del mysqld
-fi
-
-%postun -n mysql-libs%{product_suffix}
-if [ $1 = 0 ] ; then
-    /sbin/ldconfig
-fi
-
-%postun -n mysql-server%{product_suffix}
-if [ $1 -ge 1 ]; then
-    /sbin/service mysqld condrestart >/dev/null 2>&1 || :
-fi
-
-
-%files -n mysql%{product_suffix}
-%defattr(-,root,root)
-%doc %{license_files_server}
-
-# The below file *only* applies to builds not done by MySQL / Sun / Oracle:
-# %doc README.mysql-docs
-
-%{_bindir}/msql2mysql
-%{_bindir}/mysql
-%{_bindir}/mysql_config
-%{_bindir}/mysql_find_rows
-%{_bindir}/mysql_waitpid
-%{_bindir}/mysqlaccess
-%{_bindir}/mysqlaccess.conf
-%{_bindir}/mysqladmin
-%{_bindir}/mysqlbinlog
-%{_bindir}/mysqlcheck
-%{_bindir}/mysqldump
-%{_bindir}/mysqlimport
-%{_bindir}/mysqlshow
-%{_bindir}/mysqlslap
-%{_bindir}/my_print_defaults
-
-%{_mandir}/man1/mysql.1*
-%{_mandir}/man1/mysql_config.1*
-%{_mandir}/man1/mysql_find_rows.1*
-%{_mandir}/man1/mysql_waitpid.1*
-%{_mandir}/man1/mysqlaccess.1*
-%{_mandir}/man1/mysqladmin.1*
-%{_mandir}/man1/mysqldump.1*
-%{_mandir}/man1/mysqlshow.1*
-%{_mandir}/man1/mysqlslap.1*
-%{_mandir}/man1/my_print_defaults.1*
-
-%{_libdir}/mysql/mysqlbug
-%{_libdir}/mysql/mysql_config
-
-%files -n mysql-libs%{product_suffix}
-%defattr(-,root,root)
-%doc %{license_files_server}
-# although the default my.cnf contains only server settings, we put it in the
-# libs package because it can be used for client settings too.
-%config(noreplace) /etc/my.cnf
-%dir %{_libdir}/mysql
-%{_libdir}/mysql/libmysqlclient*.so.*
-/etc/ld.so.conf.d/*
-
-%dir %{_datadir}/mysql
-%{_datadir}/mysql/english
-%lang(cs) %{_datadir}/mysql/czech
-%lang(da) %{_datadir}/mysql/danish
-%lang(nl) %{_datadir}/mysql/dutch
-%lang(et) %{_datadir}/mysql/estonian
-%lang(fr) %{_datadir}/mysql/french
-%lang(de) %{_datadir}/mysql/german
-%lang(el) %{_datadir}/mysql/greek
-%lang(hu) %{_datadir}/mysql/hungarian
-%lang(it) %{_datadir}/mysql/italian
-%lang(ja) %{_datadir}/mysql/japanese
-%lang(ko) %{_datadir}/mysql/korean
-%lang(no) %{_datadir}/mysql/norwegian
-%lang(no) %{_datadir}/mysql/norwegian-ny
-%lang(pl) %{_datadir}/mysql/polish
-%lang(pt) %{_datadir}/mysql/portuguese
-%lang(ro) %{_datadir}/mysql/romanian
-%lang(ru) %{_datadir}/mysql/russian
-%lang(sr) %{_datadir}/mysql/serbian
-%lang(sk) %{_datadir}/mysql/slovak
-%lang(es) %{_datadir}/mysql/spanish
-%lang(sv) %{_datadir}/mysql/swedish
-%lang(uk) %{_datadir}/mysql/ukrainian
-%{_datadir}/mysql/charsets
-
-%files -n mysql-server%{product_suffix} -f release/support-files/plugins.files
-%defattr(-,root,root)
-%doc release/support-files/*.cnf
-%if 0%{?commercial}
- %doc %{_datadir}/info/mysql.info*
-%endif
-%doc %{src_dir}/Docs/ChangeLog
-%doc %{src_dir}/Docs/INFO_SRC*
-%doc release/Docs/INFO_BIN*
-
-%{_bindir}/myisamchk
-%{_bindir}/myisam_ftdump
-%{_bindir}/myisamlog
-%{_bindir}/myisampack
-%{_bindir}/mysql_convert_table_format
-%{_bindir}/mysql_fix_extensions
-%{_bindir}/mysql_install_db
-%{_bindir}/mysql_plugin
-%{_bindir}/mysql_secure_installation
-%if %{commercial}
-%else
-%{_bindir}/mysql_setpermission
-%endif
-%{_bindir}/mysql_tzinfo_to_sql
-%{_bindir}/mysql_upgrade
-%{_bindir}/mysql_zap
-%{_bindir}/mysqlbug
-%{_bindir}/mysqldumpslow
-%{_bindir}/mysqld_multi
-%{_bindir}/mysqld_safe
-%{_bindir}/mysqlhotcopy
-%{_bindir}/mysqltest
-%{_bindir}/innochecksum
-%{_bindir}/perror
-%{_bindir}/replace
-%{_bindir}/resolve_stack_dump
-%{_bindir}/resolveip
-
-/usr/libexec/mysqld
-/usr/libexec/mysqld-debug
-%{_libdir}/mysql/plugin/daemon_example.ini
-
-%if %{WITH_TCMALLOC}
-%{_libdir}/mysql/%{malloc_lib_target}
-%endif
-
-# obsolete by "-f release/support-files/plugins.files" above
-# %{_libdir}/mysql/plugin
-
-%{_mandir}/man1/msql2mysql.1*
-%{_mandir}/man1/myisamchk.1*
-%{_mandir}/man1/myisamlog.1*
-%{_mandir}/man1/myisampack.1*
-%{_mandir}/man1/mysql_convert_table_format.1*
-%{_mandir}/man1/myisam_ftdump.1*
-%{_mandir}/man1/mysql.server.1*
-%{_mandir}/man1/mysql_fix_extensions.1*
-%{_mandir}/man1/mysql_install_db.1*
-%{_mandir}/man1/mysql_plugin.1*
-%{_mandir}/man1/mysql_secure_installation.1*
-%{_mandir}/man1/mysql_upgrade.1*
-%{_mandir}/man1/mysql_zap.1*
-%{_mandir}/man1/mysqlbug.1*
-%{_mandir}/man1/mysqldumpslow.1*
-%{_mandir}/man1/mysqlbinlog.1*
-%{_mandir}/man1/mysqlcheck.1*
-%{_mandir}/man1/mysqld_multi.1*
-%{_mandir}/man1/mysqld_safe.1*
-%{_mandir}/man1/mysqlhotcopy.1*
-%{_mandir}/man1/mysqlimport.1*
-%{_mandir}/man1/mysqlman.1*
-%if %{commercial}
-%else
-%{_mandir}/man1/mysql_setpermission.1*
-%endif
-%{_mandir}/man1/mysqltest.1*
-%{_mandir}/man1/innochecksum.1*
-%{_mandir}/man1/perror.1*
-%{_mandir}/man1/replace.1*
-%{_mandir}/man1/resolve_stack_dump.1*
-%{_mandir}/man1/resolveip.1*
-%{_mandir}/man1/mysql_tzinfo_to_sql.1*
-%{_mandir}/man8/mysqld.8*
-
-%{_datadir}/mysql/errmsg-utf8.txt
-%{_datadir}/mysql/fill_help_tables.sql
-%{_datadir}/mysql/magic
-%{_datadir}/mysql/mysql_system_tables.sql
-%{_datadir}/mysql/mysql_system_tables_data.sql
-%{_datadir}/mysql/mysql_test_data_timezone.sql
-%{_datadir}/mysql/my-*.cnf
-%{_datadir}/mysql/config.*.ini
-
-/etc/rc.d/init.d/mysqld
-%attr(0755,mysql,mysql) %dir /var/run/mysqld
-%attr(0755,mysql,mysql) %dir /var/lib/mysql
-%attr(0640,mysql,mysql) %config(noreplace) %verify(not md5 size mtime) /var/log/mysqld.log
-
-# TODO / FIXME: Do we need "libmygcc.a"? If yes, append "-f optional-files-devel"
-#               and fix the "rm -f" list in the "install" section.
-%files -n mysql-devel%{product_suffix}
-%defattr(-,root,root)
-/usr/include/mysql
-/usr/share/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient*.so
-
-%files -n mysql-embedded%{product_suffix}
-%defattr(-,root,root)
-%doc %{license_files_server}
-%{_libdir}/mysql/libmysqld.so.*
-%{_bindir}/mysql_embedded
-
-%files -n mysql-embedded-devel%{product_suffix}
-%defattr(-,root,root)
-%{_libdir}/mysql/libmysqld.so
-%{_bindir}/mysql_client_test_embedded
-%{_bindir}/mysqltest_embedded
-%{_mandir}/man1/mysql_client_test_embedded.1*
-%{_mandir}/man1/mysqltest_embedded.1*
-
-%files -n mysql-test%{product_suffix}
-%defattr(-,root,root)
-%{_bindir}/mysql_client_test
-%attr(-,mysql,mysql) %{_datadir}/mysql-test
-
-%{_mandir}/man1/mysql_client_test.1*
-
-%changelog
-* Tue Nov 05 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Removed non gpl file mysql.info from community packages
-
-* Wed Jul 10 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Removed directory  /usr/share/mysql/solaris/postinstall-solaris to resolve build
-  error
- 
-* Thu Dec  7 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Change the way in which "libmysqld.so" is created: Using all object modules
-  was wrong, gcc / ld can resolve the dependencies from "libmysqld.a".
-  Also, identify the ".so" version from the MySQL version, "0.0.1" was wrong.
-  Bug#15972480
-
-* Tue Sep 18 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Restrict the vendor check to Oracle: There is no history here
-  which we have to allow for.
-
-* Thu Jul 26 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Add the vendor and release series checks from the traditional MySQL RPM
-  spec file, to protect against errors happening during upgrades.
-- Do some code alignment with the traditional MySQL RPM spec file,
-  to make synchronous maintenance (and possibly even integration?) easier.
-
-* Mon Feb 13 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Add "Provides:" lines for the generic names of the subpackages,
-  independent of "product_suffix".
-
-* Tue Feb  7 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Make "mysql_setpermission" and its man page appear in GPL builds only.
-
-* Thu Nov 24 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Add two patches (#18 + #19) regarding the test suite;
-  version 1 of "mysql-test-run.pl" had to go because the auto-detection
-  of Perl dependencies does not handle differences between run directory
-  and delivery location.
-
-* Thu Nov  3 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-- Adapt from MySQL 5.1 to 5.5, tested using 5.5.17:
-  - Done by the MySQL Build Team at Oracle:
-    set as packager, set copyright owner and related info;
-  - handle command line options, allowing different configurations, platforms, ...
-    - configurations will show up in the file name as "product_suffix",
-    - use "-n" for all subpackage specifications,
-    - license may be GPL or commercial, mention that in the description,
-      the license output and the included license files will vary,
-    - commercial is "nosource",
-    - improve "requires" listings for different platforms,
-    - explicitly use "product_suffix" in the "requires" entries;
-  - adapt to 5.5 changes in features and function:
-    - remove "mysql-bench" package (files are outdated, not maintained),
-    - no InnoDB plugin,
-    - the set of plugins will vary by configuration, to control the "server"
-      package contents use "-f release/support-files/plugins.files" in the
-      "files" section,
-    - remove "mysqlmanager", "mysql_fix_privilege_tables",
-    - add "mysql_embedded", "mysql-plugin", "mysqlaccess.conf", "magic",
-    - "errmsg.txt" is now in UTF8: "errmsg-utf8.txt",
-    - adapt patches to changed code where needed, rename these to include "5.5",
-    - stop using patches which are not applicable to 5.5;
-  - 5.5 uses a different way of building:
-    - autotools are replaced by cmake,
-    - both a "release" and a "debug" server are built in separate subtrees
-      ("out of source"!), this also affects path names in further handling,
-    - the debug server is added to the "server" subpackage,
-    - add "mysql-5.5-libdir.patch" to handle file placement at user site.
-
-* Mon Dec 20 2010 Tom Lane <tgl@redhat.com> 5.1.52-1.1
-- Update to MySQL 5.1.52, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-52.html
-  including numerous small security issues
-Resolves: #652553
-- Sync with current Fedora package; this includes:
-- Duplicate COPYING and EXCEPTIONS-CLIENT in -libs and -embedded subpackages,
-  to ensure they are available when any subset of mysql RPMs are installed,
-  per revised packaging guidelines
-- Allow init script's STARTTIMEOUT/STOPTIMEOUT to be overridden from sysconfig
-
-* Thu Jul 15 2010 Tom Lane <tgl@redhat.com> 5.1.47-4
-- Add backported patch for CVE-2010-2008 (upstream bug 53804)
-Resolves: #614215
-- Add BuildRequires perl(Time::HiRes) ... seems to no longer be installed
-  by just pulling in perl.
-
-* Mon Jun 28 2010 Tom Lane <tgl@redhat.com> 5.1.47-3
-- Add -p "$mypidfile" to initscript's status call to improve corner cases.
-  (Note: can't be fixed in Fedora until 595597 is fixed there.)
-Resolves: #596008
-
-* Mon Jun  7 2010 Tom Lane <tgl@redhat.com> 5.1.47-2
-- Add back "partition" storage engine
-Resolves: #598585
-- Fix broken "federated" storage engine plugin
-Resolves: #587170
-- Read all certificates in SSL certificate files, to support chained certs
-Resolves: #598656
-
-* Mon May 24 2010 Tom Lane <tgl@redhat.com> 5.1.47-1
-- Update to MySQL 5.1.47, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-47.html
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-46.html
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-45.html
-  including fixes for CVE-2010-1621, CVE-2010-1626,
-  CVE-2010-1848, CVE-2010-1849, CVE-2010-1850
-Resolves: #590598
-- Create mysql group explicitly in pre-server script, to ensure correct GID
-
-* Mon Mar  8 2010 Tom Lane <tgl@redhat.com> 5.1.44-2
-- Update to MySQL 5.1.44, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-44.html
-Resolves: #565554
-- Remove mysql.info, which is not freely redistributable
-Related: #560181
-- Revert broken upstream fix for their bug 45058
-Related: #566547
-- Bring init script into some modicum of compliance with Fedora/LSB standards
-Resolves: #557711
-Resolves: #562749
-
-* Mon Feb 15 2010 Tom Lane <tgl@redhat.com> 5.1.43-2
-- Update to MySQL 5.1.43, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-43.html
-Resolves: #565554
-- Remove mysql-cluster, which is no longer supported by upstream in this
-  source distribution.  If we want it we'll need a separate SRPM for it.
-Resolves: #565210
-
-* Fri Jan 29 2010 Tom Lane <tgl@redhat.com> 5.1.42-7
-- Add backported patch for CVE-2008-7247 (upstream bug 39277)
-Resolves: #549329
-- Use non-expired certificates for SSL testing (upstream bug 50702)
-
-* Tue Jan 26 2010 Tom Lane <tgl@redhat.com> 5.1.42-6
-- Emit explicit error message if user tries to build RPM as root
-Resolves: #558915
-
-* Wed Jan 20 2010 Tom Lane <tgl@redhat.com> 5.1.42-5
-- Correct Source0: tag and comment to reflect how to get the tarball
-
-* Fri Jan  8 2010 Tom Lane <tgl@redhat.com> 5.1.42-4
-- Sync with current Fedora build, including:
-- Update to MySQL 5.1.42, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-42.html
-- Disable symbolic links by default in /etc/my.cnf
-Resolves: #553653
-- Remove static libraries (.a files) from package, per packaging guidelines
-- Change %%define to %%global, per packaging guidelines
-- Disable building the innodb plugin; it tickles assorted gcc bugs and
-  doesn't seem entirely ready for prime time anyway.
-Resolves: #553632
-- Start mysqld_safe with --basedir=/usr, to avoid unwanted SELinux messages
-  (see 547485)
-- Stop waiting during "service mysqld start" if mysqld_safe exits
-Resolves: #544095
-
-* Mon Nov 23 2009 Tom Lane <tgl@redhat.com> 5.1.41-1
-- Update to MySQL 5.1.41, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-41.html
-  including fixes for CVE-2009-4019
-Resolves: #549327
-- Don't set old_passwords=1; we aren't being bug-compatible with 3.23 anymore
-Resolves: #540735
-
-* Tue Nov 10 2009 Tom Lane <tgl@redhat.com> 5.1.40-1
-- Update to MySQL 5.1.40, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html
-- Do not force the --log-error setting in mysqld init script
-Resolves: #533736
-
-* Sat Oct 17 2009 Tom Lane <tgl@redhat.com> 5.1.39-4
-- Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)
-
-* Thu Oct 15 2009 Tom Lane <tgl@redhat.com> 5.1.39-3
-- Work around two different compiler bugs on sparc, one by backing off
-  optimization from -O2 to -O1, and the other with a klugy patch
-Related: #529298, #529299
-- Clean up bogosity in multilib stub header support: ia64 should not be
-  listed (it's not multilib), sparc and sparc64 should be
-
-* Wed Sep 23 2009 Tom Lane <tgl@redhat.com> 5.1.39-2
-- Work around upstream bug 46895 by disabling outfile_loaddata test
-
-* Tue Sep 22 2009 Tom Lane <tgl@redhat.com> 5.1.39-1
-- Update to MySQL 5.1.39, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-39.html
-
-* Mon Aug 31 2009 Tom Lane <tgl@redhat.com> 5.1.37-5
-- Work around unportable assumptions about stpcpy(); re-enable main.mysql test
-- Clean up some obsolete parameters to the configure script
-
-* Sat Aug 29 2009 Tom Lane <tgl@redhat.com> 5.1.37-4
-- Remove one misguided patch; turns out I was chasing a glibc bug
-- Temporarily disable "main.mysql" test; there's something broken there too,
-  but we need to get mysql built in rawhide for dependency reasons
-
-* Fri Aug 21 2009 Tomas Mraz <tmraz@redhat.com> - 5.1.37-3
-- rebuilt with new openssl
-
-* Fri Aug 14 2009 Tom Lane <tgl@redhat.com> 5.1.37-2
-- Add a couple of patches to improve the probability of the regression tests
-  completing in koji builds
-
-* Sun Aug  2 2009 Tom Lane <tgl@redhat.com> 5.1.37-1
-- Update to MySQL 5.1.37, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-37.html
-
-* Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.36-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
-
-* Fri Jul 10 2009 Tom Lane <tgl@redhat.com> 5.1.36-1
-- Update to MySQL 5.1.36, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-36.html
-
-* Sat Jun  6 2009 Tom Lane <tgl@redhat.com> 5.1.35-1
-- Update to MySQL 5.1.35, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html
-- Ensure that /var/lib/mysql is created with the right SELinux context
-Resolves: #502966
-
-* Fri May 15 2009 Tom Lane <tgl@redhat.com> 5.1.34-1
-- Update to MySQL 5.1.34, for various fixes described at
-  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-34.html
-- Increase startup timeout per bug #472222
-
-* Wed Apr 15 2009 Tom Lane <tgl@redhat.com> 5.1.33-2
-- Increase stack size of ndbd threads for safety's sake.
-Related: #494631
-
-* Tue Apr  7 2009 Tom Lane <tgl@redhat.com> 5.1.33-1
-- Update to MySQL 5.1.33.
-- Disable use of pthread_setschedparam; doesn't work the way code expects.
-Related: #477624
-
-* Wed Mar  4 2009 Tom Lane <tgl@redhat.com> 5.1.32-1
-- Update to MySQL 5.1.32.
-
-* Wed Feb 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.1.31-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
-
-* Fri Feb 13 2009 Tom Lane <tgl@redhat.com> 5.1.31-1
-- Update to MySQL 5.1.31.
-
-* Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.30-2
-- hm, apparently --with-innodb and --with-ndbcluster are still needed
-  even though no longer documented ...
-
-* Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.30-1
-- Update to MySQL 5.1.30.  Note that this includes an ABI break for
-  libmysqlclient (it's now got .so major version 16).
-- This also updates mysql for new openssl build
-
-* Wed Oct  1 2008 Tom Lane <tgl@redhat.com> 5.0.67-2
-- Build the "embedded server" library, and package it in a new sub-RPM
-  mysql-embedded, along with mysql-embedded-devel for devel support files.
-Resolves: #149829
-
-* Sat Aug 23 2008 Tom Lane <tgl@redhat.com> 5.0.67-1
-- Update to mysql version 5.0.67
-- Move mysql_config's man page to base package, again (apparently I synced
-  that change the wrong way while importing specfile changes for ndbcluster)
-
-* Sun Jul 27 2008 Tom Lane <tgl@redhat.com> 5.0.51a-2
-- Enable ndbcluster support
-Resolves: #163758
-- Suppress odd crash messages during package build, caused by trying to
-  build dbug manual (which we don't install anyway) with dbug disabled
-Resolves: #437053
-- Improve mysql.init to pass configured datadir to mysql_install_db,
-  and to force user=mysql for both mysql_install_db and mysqld_safe.
-Related: #450178
-
-* Mon Mar  3 2008 Tom Lane <tgl@redhat.com> 5.0.51a-1
-- Update to mysql version 5.0.51a
-
-* Mon Mar  3 2008 Tom Lane <tgl@redhat.com> 5.0.45-11
-- Fix mysql-stack-guard patch to work correctly on IA64
-- Fix mysql.init to wait correctly when socket is not in default place
-Related: #435494
-
-* Mon Mar 03 2008 Dennis Gilmore <dennis@ausil.us> 5.0.45-10
-- add sparc64 to 64 bit arches for test suite checking
-- add sparc, sparcv9 and sparc64 to multilib handling
-
-* Thu Feb 28 2008 Tom Lane <tgl@redhat.com> 5.0.45-9
-- Fix the stack overflow problem encountered in January.  It seems the real
-issue is that the buildfarm machines were moved to RHEL5, which uses 64K not
-4K pages on PPC, and because RHEL5 takes the guard area out of the requested
-thread stack size we no longer had enough headroom.
-Related: #435337
-
-* Tue Feb 19 2008 Fedora Release Engineering <rel-eng@fedoraproject.org> - 5.0.45-8
-- Autorebuild for GCC 4.3
-
-* Tue Jan  8 2008 Tom Lane <tgl@redhat.com> 5.0.45-7
-- Unbelievable ... upstream still thinks that it's a good idea to have a
-  regression test that is guaranteed to begin failing come January 1.
-- ... and it seems we need to raise STACK_MIN_SIZE again too.
-
-* Thu Dec 13 2007 Tom Lane <tgl@redhat.com> 5.0.45-6
-- Back-port upstream fixes for CVE-2007-5925, CVE-2007-5969, CVE-2007-6303.
-Related: #422211
-
-* Wed Dec  5 2007 Tom Lane <tgl@redhat.com> 5.0.45-5
-- Rebuild for new openssl
-
-* Sat Aug 25 2007 Tom Lane <tgl@redhat.com> 5.0.45-4
-- Seems we need explicit BuildRequires on gawk and procps now
-- Rebuild to fix Fedora toolchain issues
-
-* Sun Aug 12 2007 Tom Lane <tgl@redhat.com> 5.0.45-3
-- Recent perl changes in rawhide mean we need a more specific BuildRequires
-
-* Thu Aug  2 2007 Tom Lane <tgl@redhat.com> 5.0.45-2
-- Update License tag to match code.
-- Work around recent Fedora change that makes "open" a macro name.
-
-* Sun Jul 22 2007 Tom Lane <tgl@redhat.com> 5.0.45-1
-- Update to MySQL 5.0.45
-Resolves: #246535
-- Move mysql_config's man page to base package
-Resolves: #245770
-- move my_print_defaults to base RPM, for consistency with Stacks packaging
-- mysql user is no longer deleted at RPM uninstall
-Resolves: #241912
-
-* Thu Mar 29 2007 Tom Lane <tgl@redhat.com> 5.0.37-2
-- Use a less hacky method of getting default values in initscript
-Related: #233771, #194596
-- Improve packaging of mysql-libs per suggestions from Remi Collet
-Resolves: #233731
-- Update default /etc/my.cnf ([mysql.server] has been bogus for a long time)
-
-* Mon Mar 12 2007 Tom Lane <tgl@redhat.com> 5.0.37-1
-- Update to MySQL 5.0.37
-Resolves: #231838
-- Put client library into a separate mysql-libs RPM to reduce dependencies
-Resolves: #205630
-
-* Fri Feb  9 2007 Tom Lane <tgl@redhat.com> 5.0.33-1
-- Update to MySQL 5.0.33
-- Install band-aid fix for "view" regression test designed to fail after 2006
-- Don't chmod -R the entire database directory tree on every startup
-Related: #221085
-- Fix unsafe use of install-info
-Resolves: #223713
-- Cope with new automake in F7
-Resolves: #224171
-
-* Thu Nov  9 2006 Tom Lane <tgl@redhat.com> 5.0.27-1
-- Update to MySQL 5.0.27 (see CVE-2006-4031, CVE-2006-4226, CVE-2006-4227)
-Resolves: #202247, #202675, #203427, #203428, #203432, #203434, #208641
-- Fix init script to return status 1 on server start timeout
-Resolves: #203910
-- Move mysqldumpslow from base package to mysql-server
-Resolves: #193559
-- Adjust link options for BDB module
-Resolves: #199368
-
-* Wed Jul 12 2006 Jesse Keating <jkeating@redhat.com> - 5.0.22-2.1
-- rebuild
-
-* Sat Jun 10 2006 Tom Lane <tgl@redhat.com> 5.0.22-2
-- Work around brew's tendency not to clean up failed builds completely,
-  by adding code in mysql-testing.patch to kill leftover mysql daemons.
-
-* Thu Jun  8 2006 Tom Lane <tgl@redhat.com> 5.0.22-1
-- Update to MySQL 5.0.22 (fixes CVE-2006-2753)
-- Install temporary workaround for gcc bug on s390x (bz #193912)
-
-* Tue May  2 2006 Tom Lane <tgl@redhat.com> 5.0.21-2
-- Fix bogus perl Requires for mysql-test
-
-* Mon May  1 2006 Tom Lane <tgl@redhat.com> 5.0.21-1
-- Update to MySQL 5.0.21
-
-* Mon Mar 27 2006 Tom Lane <tgl@redhat.com> 5.0.18-4
-- Modify multilib header hack to not break non-RH arches, per bug #181335
-- Remove logrotate script, per bug #180639.
-- Add a new mysql-test RPM to carry the regression test files;
-  hack up test scripts as needed to make them run in /usr/share/mysql-test.
-
-* Fri Feb 10 2006 Jesse Keating <jkeating@redhat.com> - 5.0.18-2.1
-- bump again for double-long bug on ppc(64)
-
-* Thu Feb  9 2006 Tom Lane <tgl@redhat.com> 5.0.18-2
-- err-log option has been renamed to log-error, fix my.cnf and initscript
-
-* Tue Feb 07 2006 Jesse Keating <jkeating@redhat.com> - 5.0.18-1.1
-- rebuilt for new gcc4.1 snapshot and glibc changes
-
-* Thu Jan  5 2006 Tom Lane <tgl@redhat.com> 5.0.18-1
-- Update to MySQL 5.0.18
-
-* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-4
-- fix my_config.h for ppc platforms
-
-* Thu Dec 15 2005 Tom Lane <tgl@redhat.com> 5.0.16-3
-- my_config.h needs to guard against 64-bit platforms that also define the
-  32-bit symbol
-
-* Wed Dec 14 2005 Tom Lane <tgl@redhat.com> 5.0.16-2
-- oops, looks like we want uname -i not uname -m
-
-* Mon Dec 12 2005 Tom Lane <tgl@redhat.com> 5.0.16-1
-- Update to MySQL 5.0.16
-- Add EXCEPTIONS-CLIENT license info to the shipped documentation
-- Make my_config.h architecture-independent for multilib installs;
-  put the original my_config.h into my_config_$ARCH.h
-- Add -fwrapv to CFLAGS so that gcc 4.1 doesn't break it
-
-* Fri Dec 09 2005 Jesse Keating <jkeating@redhat.com>
-- rebuilt
-
-* Mon Nov 14 2005 Tom Lane <tgl@redhat.com> 5.0.15-3
-- Make stop script wait for daemon process to disappear (bz#172426)
-
-* Wed Nov  9 2005 Tom Lane <tgl@redhat.com> 5.0.15-2
-- Rebuild due to openssl library update.
-
-* Thu Nov  3 2005 Tom Lane <tgl@redhat.com> 5.0.15-1
-- Update to MySQL 5.0.15 (scratch build for now)
-
-* Wed Oct  5 2005 Tom Lane <tgl@redhat.com> 4.1.14-1
-- Update to MySQL 4.1.14
-
-* Tue Aug 23 2005 Tom Lane <tgl@redhat.com> 4.1.12-3
-- Use politically correct patch name.
-
-* Tue Jul 12 2005 Tom Lane <tgl@redhat.com> 4.1.12-2
-- Fix buffer overflow newly exposed in isam code; it's the same issue
-  previously found in myisam, and not very exciting, but I'm tired of
-  seeing build warnings.
-
-* Mon Jul 11 2005 Tom Lane <tgl@redhat.com> 4.1.12-1
-- Update to MySQL 4.1.12 (includes a fix for bz#158688, bz#158689)
-- Extend mysql-test-ssl.patch to solve rpl_openssl test failure (bz#155850)
-- Update mysql-lock-ssl.patch to match the upstream committed version
-- Add --with-isam to re-enable the old ISAM table type, per bz#159262
-- Add dependency on openssl-devel per bz#159569
-- Remove manual.txt, as upstream decided not to ship it anymore;
-  it was redundant with the mysql.info file anyway.
-
-* Mon May  9 2005 Tom Lane <tgl@redhat.com> 4.1.11-4
-- Include proper locking for OpenSSL in the server, per bz#155850
-
-* Mon Apr 25 2005 Tom Lane <tgl@redhat.com> 4.1.11-3
-- Enable openssl tests during build, per bz#155850
-- Might as well turn on --disable-dependency-tracking
-
-* Fri Apr  8 2005 Tom Lane <tgl@redhat.com> 4.1.11-2
-- Avoid dependency on <asm/atomic.h>, cause it won't build anymore on ia64.
-  This is probably a cleaner solution for bz#143537, too.
-
-* Thu Apr  7 2005 Tom Lane <tgl@redhat.com> 4.1.11-1
-- Update to MySQL 4.1.11 to fix bz#152911 as well as other issues
-- Move perl-DBI, perl-DBD-MySQL dependencies to server package (bz#154123)
-- Override configure thread library test to suppress HAVE_LINUXTHREADS check
-- Fix BDB failure on s390x (bz#143537)
-- At last we can enable "make test" on all arches
-
-* Fri Mar 11 2005 Tom Lane <tgl@redhat.com> 4.1.10a-1
-- Update to MySQL 4.1.10a to fix security vulnerabilities (bz#150868,
-  for CAN-2005-0711, and bz#150871 for CAN-2005-0709, CAN-2005-0710).
-
-* Sun Mar  6 2005 Tom Lane <tgl@redhat.com> 4.1.10-3
-- Fix package Requires: interdependencies.
-
-* Sat Mar  5 2005 Tom Lane <tgl@redhat.com> 4.1.10-2
-- Need -fno-strict-aliasing in at least one place, probably more.
-- Work around some C spec violations in mysql.
-
-* Fri Feb 18 2005 Tom Lane <tgl@redhat.com> 4.1.10-1
-- Update to MySQL 4.1.10.
-
-* Sat Jan 15 2005 Tom Lane <tgl@redhat.com> 4.1.9-1
-- Update to MySQL 4.1.9.
-
-* Wed Jan 12 2005 Tom Lane <tgl@redhat.com> 4.1.7-10
-- Don't assume /etc/my.cnf will specify pid-file (bz#143724)
-
-* Wed Jan 12 2005 Tim Waugh <twaugh@redhat.com> 4.1.7-9
-- Rebuilt for new readline.
-
-* Tue Dec 21 2004 Tom Lane <tgl@redhat.com> 4.1.7-8
-- Run make test on all archs except s390x (which seems to have a bdb issue)
-
-* Mon Dec 13 2004 Tom Lane <tgl@redhat.com> 4.1.7-7
-- Suppress someone's silly idea that libtool overhead can be skipped
-
-* Sun Dec 12 2004 Tom Lane <tgl@redhat.com> 4.1.7-6
-- Fix init script to not need a valid username for startup check (bz#142328)
-- Fix init script to honor settings appearing in /etc/my.cnf (bz#76051)
-- Enable SSL (bz#142032)
-
-* Thu Dec  2 2004 Tom Lane <tgl@redhat.com> 4.1.7-5
-- Add a restorecon to keep the mysql.log file in the right context (bz#143887)
-
-* Tue Nov 23 2004 Tom Lane <tgl@redhat.com> 4.1.7-4
-- Turn off old_passwords in default /etc/my.cnf file, for better compatibility
-  with mysql 3.x clients (per suggestion from Joe Orton).
-
-* Fri Oct 29 2004 Tom Lane <tgl@redhat.com> 4.1.7-3
-- Handle ldconfig more cleanly (put a file in /etc/ld.so.conf.d/).
-
-* Thu Oct 28 2004 Tom Lane <tgl@redhat.com> 4.1.7-2
-- rebuild in devel branch
-
-* Wed Oct 27 2004 Tom Lane <tgl@redhat.com> 4.1.7-1
-- Update to MySQL 4.1.x.
-
-* Tue Oct 12 2004 Tom Lane <tgl@redhat.com> 3.23.58-13
-- fix security issues CAN-2004-0835, CAN-2004-0836, CAN-2004-0837
-  (bugs #135372, 135375, 135387)
-- fix privilege escalation on GRANT ALL ON `Foo\_Bar` (CAN-2004-0957)
-
-* Wed Oct 06 2004 Tom Lane <tgl@redhat.com> 3.23.58-12
-- fix multilib problem with mysqlbug and mysql_config
-- adjust chkconfig priority per bug #128852
-- remove bogus quoting per bug #129409 (MySQL 4.0 has done likewise)
-- add sleep to mysql.init restart(); may or may not fix bug #133993
-
-* Tue Oct 05 2004 Tom Lane <tgl@redhat.com> 3.23.58-11
-- fix low-priority security issues CAN-2004-0388, CAN-2004-0381, CAN-2004-0457
-  (bugs #119442, 125991, 130347, 130348)
-- fix bug with dropping databases under recent kernels (bug #124352)
-
-* Tue Jun 15 2004 Elliot Lee <sopwith@redhat.com> 3.23.58-10
-- rebuilt
-
-* Sat Apr 17 2004 Warren Togami <wtogami@redhat.com> 3.23.58-9
-- remove redundant INSTALL-SOURCE, manual.*
-- compress manual.txt.bz2
-- BR time
-
-* Tue Mar 16 2004 Tom Lane <tgl@redhat.com> 3.23.58-8
-- repair logfile attributes in %%files, per bug #102190
-- repair quoting problem in mysqlhotcopy, per bug #112693
-- repair missing flush in mysql_setpermission, per bug #113960
-- repair broken error message printf, per bug #115165
-- delete mysql user during uninstall, per bug #117017
-- rebuilt
-
-* Tue Mar 02 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Feb 24 2004 Tom Lane <tgl@redhat.com>
-- fix chown syntax in mysql.init
-- rebuild
-
-* Fri Feb 13 2004 Elliot Lee <sopwith@redhat.com>
-- rebuilt
-
-* Tue Nov 18 2003 Kim Ho <kho@redhat.com> 3.23.58-5
-- update mysql.init to use anonymous user (UNKNOWN_MYSQL_USER) for
-  pinging mysql server (#108779)
-
-* Mon Oct 27 2003 Kim Ho <kho@redhat.com> 3.23.58-4
-- update mysql.init to wait (max 10 seconds) for mysql server to 
-  start (#58732)
-
-* Mon Oct 27 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-3
-- re-enable Berkeley DB support (#106832)
-- re-enable ia64 testing
-
-* Fri Sep 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-2
-- rebuilt
-
-* Mon Sep 15 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.58-1
-- upgrade to 3.23.58 for security fix
-
-* Tue Aug 26 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-2
-- rebuilt
-
-* Wed Jul 02 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.57-1
-- revert to prior version of MySQL due to license incompatibilities 
-  with packages that link against the client.  The MySQL folks are
-  looking into the issue.
-
-* Wed Jun 18 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-4
-- restrict test on ia64 (temporary)
-
-* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com> 4.0.13-3
-- rebuilt
-
-* Thu May 29 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-2
-- fix filter-requires-mysql.sh with less restrictive for mysql-bench 
-
-* Wed May 28 2003 Patrick Macdonald <patrickm@redhat.com> 4.0.13-1
-- update for MySQL 4.0
-- back-level shared libraries available in mysqlclient10 package
-
-* Fri May 09 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-2
-- add sql-bench package (#90110) 
-
-* Wed Mar 19 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.56-1
-- upgrade to 3.23.56 for security fixes
-- remove patch for double-free (included in 3.23.56) 
-
-* Tue Feb 18 2003 Patrick Macdonald <patrickm@redhat.com> 3.23.54a-11
-- enable thread safe client
-- add patch for double free fix
-
-* Wed Jan 22 2003 Tim Powers <timp@redhat.com>
-- rebuilt
-
-* Mon Jan 13 2003 Karsten Hopp <karsten@redhat.de> 3.23.54a-9
-- disable checks on s390x
-
-* Sat Jan  4 2003 Jeff Johnson <jbj@redhat.com> 3.23.54a-8
-- use internal dep generator.
-
-* Wed Jan  1 2003 Bill Nottingham <notting@redhat.com> 3.23.54a-7
-- fix mysql_config on hammer
-
-* Sun Dec 22 2002 Tim Powers <timp@redhat.com> 3.23.54a-6
-- don't use rpms internal dep generator
-
-* Tue Dec 17 2002 Elliot Lee <sopwith@redhat.com> 3.23.54a-5
-- Push it into the build system
-
-* Mon Dec 16 2002 Joe Orton <jorton@redhat.com> 3.23.54a-4
-- upgrade to 3.23.54a for safe_mysqld fix
-
-* Thu Dec 12 2002 Joe Orton <jorton@redhat.com> 3.23.54-3
-- upgrade to 3.23.54 for latest security fixes
-
-* Tue Nov 19 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-5
-- Always include <errno.h> for errno
-- Remove unpackaged files
-
-* Tue Nov 12 2002 Florian La Roche <Florian.LaRoche@redhat.de>
-- do not prereq userdel, not used at all
-
-* Mon Sep  9 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-4
-- Use %%{_libdir}
-- Add patch for x86-64
-
-* Wed Sep  4 2002 Jakub Jelinek <jakub@redhat.com> 3.23.52-3
-- rebuilt with gcc-3.2-7
-
-* Thu Aug 29 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-2
-- Add --enable-local-infile to configure - a new option
-  which doesn't default to the old behaviour (#72885)
-
-* Fri Aug 23 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.52-1
-- 3.23.52. Fixes a minor security problem, various bugfixes.
-
-* Sat Aug 10 2002 Elliot Lee <sopwith@redhat.com> 3.23.51-5
-- rebuilt with gcc-3.2 (we hope)
-
-* Mon Jul 22 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-4
-- rebuild
-
-* Thu Jul 18 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-3
-- Fix #63543 and #63542 
-
-* Thu Jul 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-2
-- Turn off bdb on PPC(#68591)
-- Turn off the assembly optimizations, for safety. 
-
-* Wed Jun 26 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.51-1
-- Work around annoying auto* thinking this is a crosscompile
-- 3.23.51
-
-* Fri Jun 21 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Mon Jun 10 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.50-2
-- Add dependency on perl-DBI and perl-DBD-MySQL (#66349)
-
-* Thu May 30 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.50-1
-- 3.23.50
-
-* Thu May 23 2002 Tim Powers <timp@redhat.com>
-- automated rebuild
-
-* Mon May 13 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-4
-- Rebuild
-- Don't set CXX to gcc, it doesn't work anymore
-- Exclude Alpha
-
-* Mon Apr  8 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-3
-- Add the various .cnf examples as doc files to mysql-server (#60349)
-- Don't include manual.ps, it's just 200 bytes with a URL inside (#60349)
-- Don't include random files in /usr/share/mysql (#60349)
-- langify (#60349)
-
-* Thu Feb 21 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-2
-- Rebuild
-
-* Sun Feb 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.49-1
-- 3.23.49
-
-* Thu Feb 14 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.48-2
-- work around perl dependency bug.
-
-* Mon Feb 11 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.48-1
-- 3.23.48
-
-* Thu Jan 17 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-4
-- Use kill, not mysqladmin, to flush logs and shut down. Thus, 
-  an admin password can be set with no problems.
-- Remove reload from init script
-
-* Wed Jan 16 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-3
-- remove db3-devel from buildrequires, 
-  MySQL has had its own bundled copy since the mid thirties
-
-* Sun Jan  6 2002 Trond Eivind Glomsrd <teg@redhat.com> 3.23.47-1
-- 3.23.47
-- Don't build for alpha, toolchain immature.
-
-* Mon Dec  3 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.46-1
-- 3.23.46
-- use -fno-rtti and -fno-exceptions, and set CXX to increase stability. 
-  Recommended by mysql developers.
-
-* Sun Nov 25 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.45-1
-- 3.23.45
-
-* Wed Nov 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.44-2
-- centralize definition of datadir in the initscript (#55873)
-
-* Fri Nov  2 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.44-1
-- 3.23.44
-
-* Thu Oct  4 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.43-1
-- 3.23.43
-
-* Mon Sep 10 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.42-1
-- 3.23.42
-- reenable innodb
-
-* Tue Aug 14 2001 Trond Eivind Glomsrd <teg@redhat.com> 3.23.41-1
-- 3.23.41 bugfix release
-- disable innodb, to avoid the broken updates
-- Use "mysqladmin flush_logs" instead of kill -HUP in logrotate 
-  script (#51711)
-
-* Sat Jul 21 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.40, bugfix release
-- Add zlib-devel to buildrequires:
-
-* Fri Jul 20 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- BuildRequires-tweaking
-
-* Thu Jun 28 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- Reenable test, but don't run them for s390, s390x or ia64
-- Make /etc/my.cnf config(noplace). Same for /etc/logrotate.d/mysqld
-
-* Thu Jun 14 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.29
-- enable innodb
-- enable assembly again
-- disable tests for now...
-
-* Tue May 15 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.38
-- Don't use BDB on Alpha - no fast mutexes
-
-* Tue Apr 24 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.37
-- Add _GNU_SOURCE to the compile flags
-
-* Wed Mar 28 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- Make it obsolete our 6.2 PowerTools packages
-- 3.23.36 bugfix release - fixes some security issues
-  which didn't apply to our standard configuration
-- Make "make test" part of the build process, except on IA64
-  (it fails there)
-
-* Tue Mar 20 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.35 bugfix release
-- Don't delete the mysql user on uninstall
-
-* Tue Mar 13 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.34a bugfix release
-
-* Wed Feb  7 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- added readline-devel to BuildRequires:
-
-* Tue Feb  6 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- small i18n-fixes to initscript (action needs $)
-
-* Tue Jan 30 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- make it shut down and rotate logs without using mysqladmin 
-  (from #24909)
-
-* Mon Jan 29 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- conflict with "MySQL"
-
-* Tue Jan 23 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- improve gettextizing
-
-* Mon Jan 22 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.32
-- fix logrotate script (#24589)
-
-* Wed Jan 17 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- gettextize
-- move the items in Requires(post): to Requires: in preparation
-  for an errata for 7.0 when 3.23.31 is released
-- 3.23.31
-
-* Tue Jan 16 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- add the log file to the rpm database, and make it 0640
-  (#24116)
-- as above in logrotate script
-- changes to the init sequence - put most of the data
-  in /etc/my.cnf instead of hardcoding in the init script
-- use /var/run/mysqld/mysqld.pid instead of 
-  /var/run/mysqld/pid
-- use standard safe_mysqld
-- shut down cleaner
-
-* Mon Jan 08 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.30
-- do an explicit chmod on /var/lib/mysql in post, to avoid 
-  any problems with broken permissons. There is a report
-  of rm not changing this on its own (#22989)
-
-* Mon Jan 01 2001 Trond Eivind Glomsrd <teg@redhat.com>
-- bzipped source
-- changed from 85 to 78 in startup, so it starts before
-  apache (which can use modules requiring mysql)
-
-* Wed Dec 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.29a
-
-* Tue Dec 19 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- add requirement for new libstdc++, build for errata
-
-* Mon Dec 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.29
-
-* Mon Nov 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.28 (gamma)
-- remove old patches, as they are now upstreamed
-
-* Thu Nov 14 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- Add a requirement for a new glibc (#20735)
-- build on IA64
-
-* Wed Nov  1 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- disable more assembly
-
-* Wed Nov  1 2000 Jakub Jelinek <jakub@redhat.com>
-- fix mysql on SPARC (#20124)
-
-* Tue Oct 31 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.27
-
-* Wed Oct 25 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- add patch for fixing bogus aliasing in mysql from Jakub,
-  which should fix #18905 and #18620
-
-* Mon Oct 23 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- check for negative niceness values, and negate it
-  if present (#17899)
-- redefine optflags on IA32 FTTB
-
-* Wed Oct 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.26, which among other fixes now uses mkstemp()
-  instead of tempnam().
-- revert changes made yesterday, the problem is now
-  isolated
- 
-* Tue Oct 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- use the compat C++ compiler FTTB. Argh.
-- add requirement of ncurses4 (see above)
-
-* Sun Oct 01 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.25
-- fix shutdown problem (#17956)
-
-* Tue Sep 26 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- Don't try to include no-longer-existing PUBLIC file
-  as doc (#17532)
-
-* Thu Sep 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- rename config file to /etc/my.cnf, which is what
-  mysqld wants... doh. (#17432)
-- include a changed safe_mysqld, so the pid file option
-  works. 
-- make mysql dir world readable to they can access the 
-  mysql socket. (#17432)
-- 3.23.24
-
-* Wed Sep 06 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.23
-
-* Sun Aug 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- Add "|| :" to condrestart to avoid non-zero exit code
-
-* Thu Aug 24 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- it's mysql.com, not mysql.org and use correct path to 
-  source (#16830)
-
-* Wed Aug 16 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- source file from /etc/rc.d, not /etc/rd.d. Doh.
-
-* Sun Aug 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- don't run ldconfig -n, it doesn't update ld.so.cache
-  (#16034)
-- include some missing binaries
-- use safe_mysqld to start the server (request from
-  mysql developers)
-
-* Sat Aug 05 2000 Bill Nottingham <notting@redhat.com>
-- condrestart fixes
-
-* Mon Aug 01 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.22. Disable the old patches, they're now in.
-
-* Thu Jul 27 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- bugfixes in the initscript
-- move the .so link to the devel package
-
-* Wed Jul 19 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- rebuild due to glibc changes
-
-* Tue Jul 18 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- disable compiler patch
-- don't include info directory file
-
-* Mon Jul 17 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- move back to /etc/rc.d/init.d
-
-* Fri Jul 14 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- more cleanups in initscript
-
-* Thu Jul 13 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- add a patch to work around compiler bug 
-  (from monty@mysql.com) 
-
-* Wed Jul 12 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- don't build the SQL daemon statically (glibc problems)
-- fix the logrotate script - only flush log if mysql
-  is running
-- change the reloading procedure 
-- remove icon - glint is obsolete a long time ago
-
-* Wed Jul 12 2000 Prospector <bugzilla@redhat.com>
-- automatic rebuild
-
-* Mon Jul 10 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- try the new compiler again
-- build the SQL daemon statically
-- add compile time support for complex charsets
-- enable assembler
-- more cleanups in initscript
-
-* Sun Jul 09 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- use old C++ compiler
-- Exclusivearch x86
-
-* Sat Jul 08 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- move .so files to devel package
-- more cleanups
-- exclude sparc for now
-
-* Wed Jul 05 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- 3.23.21
-- remove file from /etc/sysconfig
-- Fix initscript a bit - initialization of databases doesn't
-  work yet
-- specify the correct licenses
-- include a /etc/my.conf (empty, FTTB)
-- add conditional restart to spec file
-
-* Tue Jul  2 2000 Jakub Jelinek <jakub@redhat.com>
-- Rebuild with new C++
-
-* Fri Jun 30 2000 Trond Eivind Glomsrd <teg@redhat.com>
-- update to 3.23.20
-- use %%configure, %%makeinstall, %%{_tmppath}, %%{_mandir},
-  %%{_infodir}, /etc/init.d
-- remove the bench package
-- change some of the descriptions a little bit
-- fix the init script
-- some compile fixes
-- specify mysql user
-- use mysql uid 27 (postgresql is 26)
-- don't build on ia64
-
-* Sat Feb 26 2000 Jos Vos <jos@xos.nl>
-- Version 3.22.32 release XOS.1 for LinuX/OS 1.8.0
-- Upgrade from version 3.22.27 to 3.22.32.
-- Do "make install" instead of "make install-strip", because "install -s"
-  now appears to fail on various scripts.  Afterwards, strip manually.
-- Reorganize subpackages, according to common Red Hat packages: the client
-  program and shared library become the base package and the server and
-  some accompanying files are now in a separate server package.  The
-  server package implicitly requires the base package (shared library),
-  but we have added a manual require tag anyway (because of the shared
-  config file, and more).
-- Rename the mysql-benchmark subpackage to mysql-bench.
-
-* Mon Jan 31 2000 Jos Vos <jos@xos.nl>
-- Version 3.22.27 release XOS.2 for LinuX/OS 1.7.1
-- Add post(un)install scripts for updating ld.so.conf (client subpackage).
-
-* Sun Nov 21 1999 Jos Vos <jos@xos.nl>
-- Version 3.22.27 release XOS.1 for LinuX/OS 1.7.0
-- Initial version.
-- Some ideas borrowed from Red Hat Powertools 6.1, although this spec
-  file is a full rewrite from scratch.
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-strmov.patch mysql-5.5-5.5.43/packaging/rpm-uln/mysql-strmov.patch
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/mysql-strmov.patch	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/mysql-strmov.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-Remove overly optimistic definition of strmov() as stpcpy().
-
-mysql uses this macro with overlapping source and destination strings,
-which is verboten per spec, and fails on some Red Hat platforms.
-Deleting the definition is sufficient to make it fall back to a
-byte-at-a-time copy loop, which should consistently give the
-expected behavior.
-
-Note: the particular case that prompted this patch is reported and fixed
-at http://bugs.mysql.com/bug.php?id=48864.  However, my faith in upstream's
-ability to detect this type of error is low, and I also see little evidence
-of any real performance gain from optimizing these calls.  So I'm keeping
-this patch.
-
-
-diff -Naur mysql-5.1.37.orig/include/m_string.h mysql-5.1.37/include/m_string.h
---- mysql-5.1.37.orig/include/m_string.h	2009-07-13 19:08:50.000000000 -0400
-+++ mysql-5.1.37/include/m_string.h	2009-08-31 21:49:49.000000000 -0400
-@@ -81,13 +81,6 @@
- extern void *(*my_str_malloc)(size_t);
- extern void (*my_str_free)(void *);
- 
--#if defined(HAVE_STPCPY)
--#define strmov(A,B) stpcpy((A),(B))
--#ifndef stpcpy
--extern char *stpcpy(char *, const char *);	/* For AIX with gcc 2.95.3 */
--#endif
--#endif
--
- /* Declared in int2str() */
- extern char NEAR _dig_vec_upper[];
- extern char NEAR _dig_vec_lower[];
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/README.mysql-docs mysql-5.5-5.5.43/packaging/rpm-uln/README.mysql-docs
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/README.mysql-docs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/README.mysql-docs	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-The official MySQL documentation is not freely redistributable, so we cannot
-include it in RHEL or Fedora.  You can find it on-line at
-
-http://dev.mysql.com/doc/
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/README-ULN mysql-5.5-5.5.43/packaging/rpm-uln/README-ULN
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/README-ULN	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/README-ULN	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-In order to have RPMs of MySQL which are distributed via ULN for Oracle Linux
-to be as closely compatible to such RPMs built and distributed by RedHat,
-this directory contains additional files which originated at RedHat
-and are used only for such RPMs intended for distribution via ULN.
-
-Especially, this directory contains the spec file used to build these RPMs,
-named "mysql.spec".  Please regard the following note:
-
-    You are receiving a copy of the Red Hat spec file.
-    The terms of the Oracle license do NOT apply to the Red Hat spec file;
-    it is licensed under the
-          GNU GENERAL PUBLIC LICENSE Version 2, June 1991
-    separately from the Oracle programs you receive.
-
-
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/scriptstub.c mysql-5.5-5.5.43/packaging/rpm-uln/scriptstub.c
--- mysql-5.5-5.5.35+dfsg/packaging/rpm-uln/scriptstub.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/rpm-uln/scriptstub.c	1970-01-01 00:00:00.000000000 +0000
@@ -1,32 +0,0 @@
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-
-/* Translate call of myself into call of same-named script in LIBDIR */
-/* The macro LIBDIR must be defined as a double-quoted string */
-
-int main (int argc, char **argv)
-{
-  char *basename;
-  char *fullname;
-  char **newargs;
-  int i;
-
-  basename = strrchr(argv[0], '/');
-  if (basename)
-    basename++;
-  else
-    basename = argv[0];
-  fullname = malloc(strlen(LIBDIR) + strlen(basename) + 2);
-  sprintf(fullname, "%s/%s", LIBDIR, basename);
-  newargs = malloc((argc+1) * sizeof(char *));
-  newargs[0] = fullname;
-  for (i = 1; i < argc; i++)
-    newargs[i] = argv[i];
-  newargs[argc] = NULL;
-
-  execvp(fullname, newargs);
-
-  return 1;
-}
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/solaris/CMakeLists.txt mysql-5.5-5.5.43/packaging/solaris/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/packaging/solaris/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/solaris/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, 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
@@ -17,6 +17,10 @@
 # Any files in this directory are auxiliary files for Solaris "pkg" packages.
 # They will be configured during "pkg" creation, not during (binary) build.
 
+IF(NOT CMAKE_SYSTEM_NAME MATCHES "SunOS")
+  RETURN()
+ENDIF()
+
 # Currently, this expands to "support-files/" in most layouts,
 # but to "/usr/share/mysql/" in a RPM.
 # It is important not to pollute "/usr/bin".
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/WiX/CPackWixConfig.cmake mysql-5.5-5.5.43/packaging/WiX/CPackWixConfig.cmake
--- mysql-5.5-5.5.35+dfsg/packaging/WiX/CPackWixConfig.cmake	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/WiX/CPackWixConfig.cmake	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 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 -Nru mysql-5.5-5.5.35+dfsg/packaging/WiX/custom_ui.wxs mysql-5.5-5.5.43/packaging/WiX/custom_ui.wxs
--- mysql-5.5-5.5.35+dfsg/packaging/WiX/custom_ui.wxs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/WiX/custom_ui.wxs	2015-02-27 08:30:34.000000000 +0000
@@ -2,7 +2,7 @@
          xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 2015, 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
@@ -30,7 +30,7 @@
       <Control Id="Back" Type="PushButton" X="156" Y="243" Width="56" Height="17" Text="!(loc.WixUIBack)" Disabled="yes" />
       <Control Id="Description" Type="Text" X="135" Y="80" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgDescription)" />
       <Control Id="Title" Type="Text" X="135" Y="20" Width="220" Height="60" Transparent="yes" NoPrefix="yes" Text="!(loc.WelcomeDlgTitle)" />
-      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved." />
+      <Control Id="CopyrightText" Type="Text" X="135" Y="200" Width="220" Height="40" Transparent="yes" Text="Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved." />
       <Control Id="Bitmap" Type="Bitmap" X="0" Y="0" Width="370" Height="234" TabSkip="no" Text="!(loc.WelcomeDlgBitmap)" />
       <Control Id="BottomLine" Type="Line" X="0" Y="234" Width="370" Height="0" />
     </Dialog>
diff -Nru mysql-5.5-5.5.35+dfsg/packaging/WiX/mysql_server.wxs.in mysql-5.5-5.5.43/packaging/WiX/mysql_server.wxs.in
--- mysql-5.5-5.5.35+dfsg/packaging/WiX/mysql_server.wxs.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/packaging/WiX/mysql_server.wxs.in	2015-02-27 08:30:34.000000000 +0000
@@ -2,7 +2,7 @@
       xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
 
 <!--
-   Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2010, 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 -Nru mysql-5.5-5.5.35+dfsg/plugin/auth/CMakeLists.txt mysql-5.5-5.5.43/plugin/auth/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/plugin/auth/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/plugin/auth/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -28,7 +28,9 @@
   MODULE_ONLY)
 
 CHECK_CXX_SOURCE_COMPILES(
-"#define _GNU_SOURCE
+"#ifndef _GNU_SOURCE
+#define _GNU_SOURCE
+#endif
 #include <sys/socket.h>
 int main() {
   struct ucred cred;
diff -Nru mysql-5.5-5.5.35+dfsg/plugin/semisync/semisync.cc mysql-5.5-5.5.43/plugin/semisync/semisync.cc
--- mysql-5.5-5.5.35+dfsg/plugin/semisync/semisync.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/plugin/semisync/semisync.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /* Copyright (C) 2007 Google Inc.
    Copyright (C) 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/plugin/semisync/semisync.h mysql-5.5-5.5.43/plugin/semisync/semisync.h
--- mysql-5.5-5.5.35+dfsg/plugin/semisync/semisync.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/plugin/semisync/semisync.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /* Copyright (C) 2007 Google Inc.
    Copyright (C) 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/plugin/semisync/semisync_slave_plugin.cc mysql-5.5-5.5.43/plugin/semisync/semisync_slave_plugin.cc
--- mysql-5.5-5.5.35+dfsg/plugin/semisync/semisync_slave_plugin.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/plugin/semisync/semisync_slave_plugin.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /* Copyright (C) 2007 Google Inc.
    Copyright (C) 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/README mysql-5.5-5.5.43/README
--- mysql-5.5-5.5.35+dfsg/README	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/README	2015-02-27 08:30:34.000000000 +0000
@@ -5,7 +5,7 @@
 is released under the version 2 of the GNU General Public License. 
 MySQL is brought to you by Oracle.
 
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the COPYING file.
 
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/CMakeLists.txt mysql-5.5-5.5.43/scripts/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/scripts/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -88,16 +88,20 @@
 
 IF(CMAKE_GENERATOR MATCHES "Makefiles")
   # Strip maintainer mode options if necessary
-  STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  STRING(REPLACE "${MY_C_WARNING_FLAGS}" "" CFLAGS
+    "${CMAKE_C_FLAGS} ${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  STRING(REPLACE "${MY_CXX_WARNING_FLAGS}" "" CXXFLAGS
+    "${CMAKE_CXX_FLAGS} ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
   FOREACH(ARCH ${CMAKE_OSX_ARCHITECTURES})
     SET(CFLAGS   "${CFLAGS} -arch ${ARCH}")
     SET(CXXFLAGS "${CXXFLAGS} -arch ${ARCH}")
   ENDFOREACH()
 ELSE()
   # Strip maintainer mode options if necessary
-  STRING(REPLACE "${MY_MAINTAINER_C_WARNINGS}" "" CFLAGS "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
-  STRING(REPLACE "${MY_MAINTAINER_CXX_WARNINGS}" "" CXXFLAGS "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
+  STRING(REPLACE "${MY_C_WARNING_FLAGS}" "" CFLAGS
+    "${CMAKE_C_FLAGS_RELWITHDEBINFO}")
+  STRING(REPLACE "${MY_CXX_WARNING_FLAGS}" "" CXXFLAGS
+    "${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
 ENDIF()
 
 IF(UNIX)
@@ -223,11 +227,17 @@
 SET(scriptdir ${prefix}/${INSTALL_BINDIR})
 SET(datadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
 SET(pkgdatadir ${prefix}/${INSTALL_MYSQLSHAREDIR})
+SET(libsubdir  ${INSTALL_LIBDIR})
 SET(pkgincludedir ${prefix}/${INSTALL_INCLUDEDIR})
 SET(pkglibdir ${prefix}/${INSTALL_LIBDIR})
 SET(pkgplugindir ${prefix}/${INSTALL_PLUGINDIR})
 SET(localstatedir ${MYSQL_DATADIR})
 
+SET(RPATH_OPTION "")
+IF(CMAKE_SYSTEM_NAME STREQUAL "SunOS")
+  SET(RPATH_OPTION "-R$pkglibdir")
+ENDIF()
+
 # some scripts use  @TARGET_LINUX@
 IF(CMAKE_SYSTEM_NAME MATCHES "Linux")
   SET(TARGET_LINUX "true")
@@ -312,6 +322,9 @@
     INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file}.pl COMPONENT Server_Scripts)
   ENDFOREACH()
 ELSE()
+  # Configure this one, for testing, but do not install it.
+  CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_config.pl.in
+    ${CMAKE_CURRENT_BINARY_DIR}/mysql_config.pl ESCAPE_QUOTES @ONLY)
   # On Unix, most of the files end up in the bin directory
   SET(mysql_config_COMPONENT COMPONENT Development)
   SET(BIN_SCRIPTS
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/comp_sql.c mysql-5.5-5.5.43/scripts/comp_sql.c
--- mysql-5.5-5.5.35+dfsg/scripts/comp_sql.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/comp_sql.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/fill_help_tables.sql mysql-5.5-5.5.43/scripts/fill_help_tables.sql
--- mysql-5.5-5.5.35+dfsg/scripts/fill_help_tables.sql	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/fill_help_tables.sql	2015-02-27 08:30:42.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2003, 2015, 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
@@ -13,11 +13,13 @@
 -- along with this program; if not, write to the Free Software
 -- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
--- DO NOT EDIT THIS FILE. It is generated automatically.
+-- DO NOT EDIT THIS FILE. It is generated automatically by the MySQL docs
+-- team. If you require changes to the format of this file, contact the
+-- docs team.
 
--- File generation date: 2013-11-04
+-- File generation date: 2015-02-26
 -- MySQL series: 5.5
--- Document repository revision: 36597
+-- Document repository revision: 41792
 
 -- To use this file, load its contents into the mysql database. For example,
 -- with the mysql client program, process the file like this, where
@@ -25,2079 +27,2090 @@
 
 --     mysql -u root -p mysql < file_name
 
-set names 'utf8';
+SET NAMES 'utf8';
 
-delete from help_topic;
-delete from help_category;
-delete from help_keyword;
-delete from help_relation;
+TRUNCATE TABLE help_topic;
+TRUNCATE TABLE help_category;
+TRUNCATE TABLE help_keyword;
+TRUNCATE TABLE help_relation;
 
-insert into help_category (help_category_id,name,parent_category_id,url) values (1,'Geographic',0,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (2,'Polygon properties',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (3,'WKT',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (4,'Numeric Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (5,'Plugins',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (6,'MBR',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (7,'Control flow functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (8,'Transactions',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (9,'Help Metadata',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (10,'Account Management',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (11,'Point properties',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (12,'Encryption Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (13,'LineString properties',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (14,'Miscellaneous Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (15,'Logical operators',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (16,'Functions and Modifiers for Use with GROUP BY',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (17,'Information Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (18,'Storage Engines',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (19,'Comparison operators',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (20,'Bit Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (21,'Table Maintenance',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (22,'User-Defined Functions',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (23,'Data Types',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (24,'Compound Statements',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (25,'Geometry constructors',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (26,'GeometryCollection properties',1,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (27,'Administration',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (28,'Data Manipulation',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (29,'Utility',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (30,'Language Structure',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (31,'Geometry relations',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (32,'Date and Time Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (33,'WKB',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (34,'Procedures',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (35,'Geographic Features',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (36,'Contents',0,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (37,'Geometry properties',35,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (38,'String Functions',39,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (39,'Functions',36,'');
-insert into help_category (help_category_id,name,parent_category_id,url) values (40,'Data Definition',36,'');
+START TRANSACTION;
 
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (0,16,'MIN','Syntax:\nMIN([DISTINCT] expr)\n\nReturns the minimum value of expr. MIN() may take a string argument; in\nsuch cases, it returns the minimum string value. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html. The DISTINCT\nkeyword can be used to find the minimum of the distinct values of expr,\nhowever, this produces the same result as omitting DISTINCT.\n\nMIN() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name, MIN(test_score), MAX(test_score)\n    ->        FROM student\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (1,28,'JOIN','MySQL supports the following JOIN syntaxes for the table_references\npart of SELECT statements and multiple-table DELETE and UPDATE\nstatements:\n\ntable_references:\n    escaped_table_reference [, escaped_table_reference] ...\n\nescaped_table_reference:\n    table_reference\n  | { OJ table_reference }\n\ntable_reference:\n    table_factor\n  | join_table\n\ntable_factor:\n    tbl_name [[AS] alias] [index_hint_list]\n  | table_subquery [AS] alias\n  | ( table_references )\n\njoin_table:\n    table_reference [INNER | CROSS] JOIN table_factor [join_condition]\n  | table_reference STRAIGHT_JOIN table_factor\n  | table_reference STRAIGHT_JOIN table_factor ON conditional_expr\n  | table_reference {LEFT|RIGHT} [OUTER] JOIN table_reference join_condition\n  | table_reference NATURAL [{LEFT|RIGHT} [OUTER]] JOIN table_factor\n\njoin_condition:\n    ON conditional_expr\n  | USING (column_list)\n\nindex_hint_list:\n    index_hint [, index_hint] ...\n\nindex_hint:\n    USE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] ([index_list])\n  | IGNORE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n  | FORCE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n\nindex_list:\n    index_name [, index_name] ...\n\nA table reference is also known as a join expression.\n\nThe syntax of table_factor is extended in comparison with the SQL\nStandard. The latter accepts only table_reference, not a list of them\ninside a pair of parentheses.\n\nThis is a conservative extension if we consider each comma in a list of\ntable_reference items as equivalent to an inner join. For example:\n\nSELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n                 ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nis equivalent to:\n\nSELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n                 ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nIn MySQL, JOIN, CROSS JOIN, and INNER JOIN are syntactic equivalents\n(they can replace each other). In standard SQL, they are not\nequivalent. INNER JOIN is used with an ON clause, CROSS JOIN is used\notherwise.\n\nIn general, parentheses can be ignored in join expressions containing\nonly inner join operations. MySQL also supports nested joins (see\nhttp://dev.mysql.com/doc/refman/5.5/en/nested-join-optimization.html).\n\nIndex hints can be specified to affect how the MySQL optimizer makes\nuse of indexes. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/index-hints.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/join.html\n\n','SELECT left_tbl.*\n  FROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\n  WHERE right_tbl.id IS NULL;\n','http://dev.mysql.com/doc/refman/5.5/en/join.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (2,38,'HEX','Syntax:\nHEX(str), HEX(N)\n\nFor a string argument str, HEX() returns a hexadecimal string\nrepresentation of str where each character in str is converted to two\nhexadecimal digits. The inverse of this operation is performed by the\nUNHEX() function.\n\nFor a numeric argument N, HEX() returns a hexadecimal string\nrepresentation of the value of N treated as a longlong (BIGINT) number.\nThis is equivalent to CONV(N,10,16). The inverse of this operation is\nperformed by CONV(HEX(N),16,10).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT 0x616263, HEX(\'abc\'), UNHEX(HEX(\'abc\'));\n        -> \'abc\', 616263, \'abc\'\nmysql> SELECT HEX(255), CONV(HEX(255),16,10);\n        -> \'FF\', 255\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (3,28,'REPLACE','Syntax:\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name [(col_name,...)]\n    {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    SET col_name={expr | DEFAULT}, ...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name [(col_name,...)]\n    SELECT ...\n\nREPLACE works exactly like INSERT, except that if an old row in the\ntable has the same value as a new row for a PRIMARY KEY or a UNIQUE\nindex, the old row is deleted before the new row is inserted. See [HELP\nINSERT].\n\nREPLACE is a MySQL extension to the SQL standard. It either inserts, or\ndeletes and inserts. For another MySQL extension to standard SQL---that\neither inserts or updates---see\nhttp://dev.mysql.com/doc/refman/5.5/en/insert-on-duplicate.html.\n\nNote that unless the table has a PRIMARY KEY or UNIQUE index, using a\nREPLACE statement makes no sense. It becomes equivalent to INSERT,\nbecause there is no index to be used to determine whether a new row\nduplicates another.\n\nValues for all columns are taken from the values specified in the\nREPLACE statement. Any missing columns are set to their default values,\njust as happens for INSERT. You cannot refer to values from the current\nrow and use them in the new row. If you use an assignment such as SET\ncol_name = col_name + 1, the reference to the column name on the right\nhand side is treated as DEFAULT(col_name), so the assignment is\nequivalent to SET col_name = DEFAULT(col_name) + 1.\n\nTo use REPLACE, you must have both the INSERT and DELETE privileges for\nthe table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/replace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/replace.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (4,31,'CONTAINS','Contains(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 completely contains g2. This\ntests the opposite relationship as Within().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (5,37,'SRID','SRID(g)\n\nReturns an integer indicating the Spatial Reference System ID for the\ngeometry value g.\n\nIn MySQL, the SRID value is just an integer associated with the\ngeometry value. All calculations are done assuming Euclidean (planar)\ngeometry.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SELECT SRID(GeomFromText(\'LineString(1 1,2 2)\',101));\n+-----------------------------------------------+\n| SRID(GeomFromText(\'LineString(1 1,2 2)\',101)) |\n+-----------------------------------------------+\n|                                           101 |\n+-----------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (6,32,'CURRENT_TIMESTAMP','Syntax:\nCURRENT_TIMESTAMP, CURRENT_TIMESTAMP()\n\nCURRENT_TIMESTAMP and CURRENT_TIMESTAMP() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (7,27,'SHOW CONTRIBUTORS','Syntax:\nSHOW CONTRIBUTORS\n\nThe SHOW CONTRIBUTORS statement displays information about the people\nwho contribute to MySQL source or to causes that we support. For each\ncontributor, it displays Name, Location, and Comment values.\n\nThis statement is deprecated as of MySQL 5.5.29 and is removed in MySQL\n5.6.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-contributors.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-contributors.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (8,16,'VARIANCE','Syntax:\nVARIANCE(expr)\n\nReturns the population standard variance of expr. This is an extension\nto standard SQL. The standard SQL function VAR_POP() can be used\ninstead.\n\nVARIANCE() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (9,40,'DROP SERVER','Syntax:\nDROP SERVER [ IF EXISTS ] server_name\n\nDrops the server definition for the server named server_name. The\ncorresponding row in the mysql.servers table is deleted. This statement\nrequires the SUPER privilege.\n\nDropping a server for a table does not affect any FEDERATED tables that\nused this connection information when they were created. See [HELP\nCREATE SERVER].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-server.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-server.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (10,27,'SHOW AUTHORS','Syntax:\nSHOW AUTHORS\n\nThe SHOW AUTHORS statement displays information about the people who\nwork on MySQL. For each author, it displays Name, Location, and Comment\nvalues.\n\nThis statement is deprecated as of MySQL 5.5.29 and is removed in MySQL\n5.6.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-authors.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-authors.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (11,16,'VAR_SAMP','Syntax:\nVAR_SAMP(expr)\n\nReturns the sample variance of expr. That is, the denominator is the\nnumber of rows minus one.\n\nVAR_SAMP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (12,38,'CONCAT','Syntax:\nCONCAT(str1,str2,...)\n\nReturns the string that results from concatenating the arguments. May\nhave one or more arguments. If all arguments are nonbinary strings, the\nresult is a nonbinary string. If the arguments include any binary\nstrings, the result is a binary string. A numeric argument is converted\nto its equivalent string form. This is a nonbinary string as of MySQL\n5.5.3. Before 5.5.3, it is a binary string; to to avoid that and\nproduce a nonbinary string, you can use an explicit type cast, as in\nthis example:\n\nSELECT CONCAT(CAST(int_col AS CHAR), char_col);\n\nCONCAT() returns NULL if any argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT CONCAT(\'My\', \'S\', \'QL\');\n        -> \'MySQL\'\nmysql> SELECT CONCAT(\'My\', NULL, \'QL\');\n        -> NULL\nmysql> SELECT CONCAT(14.3);\n        -> \'14.3\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (13,35,'GEOMETRY HIERARCHY','Geometry is the base class. It is an abstract class. The instantiable\nsubclasses of Geometry are restricted to zero-, one-, and\ntwo-dimensional geometric objects that exist in two-dimensional\ncoordinate space. All instantiable geometry classes are defined so that\nvalid instances of a geometry class are topologically closed (that is,\nall defined geometries include their boundary).\n\nThe base Geometry class has subclasses for Point, Curve, Surface, and\nGeometryCollection:\n\no Point represents zero-dimensional objects.\n\no Curve represents one-dimensional objects, and has subclass\n  LineString, with sub-subclasses Line and LinearRing.\n\no Surface is designed for two-dimensional objects and has subclass\n  Polygon.\n\no GeometryCollection has specialized zero-, one-, and two-dimensional\n  collection classes named MultiPoint, MultiLineString, and\n  MultiPolygon for modeling geometries corresponding to collections of\n  Points, LineStrings, and Polygons, respectively. MultiCurve and\n  MultiSurface are introduced as abstract superclasses that generalize\n  the collection interfaces to handle Curves and Surfaces.\n\nGeometry, Curve, Surface, MultiCurve, and MultiSurface are defined as\nnoninstantiable classes. They define a common set of methods for their\nsubclasses and are included for extensibility.\n\nPoint, LineString, Polygon, GeometryCollection, MultiPoint,\nMultiLineString, and MultiPolygon are instantiable classes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-geometry-class-hierarchy.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-geometry-class-hierarchy.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (14,38,'CHAR FUNCTION','Syntax:\nCHAR(N,... [USING charset_name])\n\nCHAR() interprets each argument N as an integer and returns a string\nconsisting of the characters given by the code values of those\nintegers. NULL values are skipped.\nBy default, CHAR() returns a binary string. To produce a string in a\ngiven character set, use the optional USING clause:\n\nmysql> SELECT CHARSET(CHAR(0x65)), CHARSET(CHAR(0x65 USING utf8));\n+---------------------+--------------------------------+\n| CHARSET(CHAR(0x65)) | CHARSET(CHAR(0x65 USING utf8)) |\n+---------------------+--------------------------------+\n| binary              | utf8                           |\n+---------------------+--------------------------------+\n\nIf USING is given and the result string is illegal for the given\ncharacter set, a warning is issued. Also, if strict SQL mode is\nenabled, the result from CHAR() becomes NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT CHAR(77,121,83,81,\'76\');\n        -> \'MySQL\'\nmysql> SELECT CHAR(77,77.3,\'77.3\');\n        -> \'MMM\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (15,23,'DATETIME','DATETIME\n\nA date and time combination. The supported range is \'1000-01-01\n00:00:00\' to \'9999-12-31 23:59:59\'. MySQL displays DATETIME values in\n\'YYYY-MM-DD HH:MM:SS\' format, but permits assignment of values to\nDATETIME columns using either strings or numbers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (16,27,'SHOW CREATE TRIGGER','Syntax:\nSHOW CREATE TRIGGER trigger_name\n\nThis statement shows the CREATE TRIGGER statement that creates the\nnamed trigger.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-create-trigger.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (17,27,'SHOW CREATE PROCEDURE','Syntax:\nSHOW CREATE PROCEDURE proc_name\n\nThis statement is a MySQL extension. It returns the exact string that\ncan be used to re-create the named stored procedure. A similar\nstatement, SHOW CREATE FUNCTION, displays information about stored\nfunctions (see [HELP SHOW CREATE FUNCTION]).\n\nBoth statements require that you be the owner of the routine or have\nSELECT access to the mysql.proc table. If you do not have privileges\nfor the routine itself, the value displayed for the Create Procedure or\nCreate Function field will be NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-procedure.html\n\n','mysql> SHOW CREATE PROCEDURE test.simpleproc\\G\n*************************** 1. row ***************************\n           Procedure: simpleproc\n            sql_mode:\n    Create Procedure: CREATE PROCEDURE `simpleproc`(OUT param1 INT)\n                      BEGIN\n                      SELECT COUNT(*) INTO param1 FROM t;\n                      END\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n\nmysql> SHOW CREATE FUNCTION test.hello\\G\n*************************** 1. row ***************************\n            Function: hello\n            sql_mode:\n     Create Function: CREATE FUNCTION `hello`(s CHAR(20))\n                      RETURNS CHAR(50)\n                      RETURN CONCAT(\'Hello, \',s,\'!\')\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-procedure.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (18,24,'OPEN','Syntax:\nOPEN cursor_name\n\nThis statement opens a previously declared cursor. For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/open.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/open.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (19,23,'INTEGER','INTEGER[(M)] [UNSIGNED] [ZEROFILL]\n\nThis type is a synonym for INT.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (20,38,'LOWER','Syntax:\nLOWER(str)\n\nReturns the string str with all characters changed to lowercase\naccording to the current character set mapping. The default is latin1\n(cp1252 West European).\n\nmysql> SELECT LOWER(\'QUADRATICALLY\');\n        -> \'quadratically\'\n\nLOWER() (and UPPER()) are ineffective when applied to binary strings\n(BINARY, VARBINARY, BLOB). To perform lettercase conversion, convert\nthe string to a nonbinary string:\n\nmysql> SET @str = BINARY \'New York\';\nmysql> SELECT LOWER(@str), LOWER(CONVERT(@str USING latin1));\n+-------------+-----------------------------------+\n| LOWER(@str) | LOWER(CONVERT(@str USING latin1)) |\n+-------------+-----------------------------------+\n| New York    | new york                          |\n+-------------+-----------------------------------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (21,27,'SHOW COLUMNS','Syntax:\nSHOW [FULL] COLUMNS {FROM | IN} tbl_name [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW COLUMNS displays information about the columns in a given table.\nIt also works for views. The LIKE clause, if present, indicates which\ncolumn names to match. The WHERE clause can be given to select rows\nusing more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nSHOW COLUMNS displays information only for those columns for which you\nhave some privilege.\n\nmysql> SHOW COLUMNS FROM City;\n+------------+----------+------+-----+---------+----------------+\n| Field      | Type     | Null | Key | Default | Extra          |\n+------------+----------+------+-----+---------+----------------+\n| Id         | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name       | char(35) | NO   |     |         |                |\n| Country    | char(3)  | NO   | UNI |         |                |\n| District   | char(20) | YES  | MUL |         |                |\n| Population | int(11)  | NO   |     | 0       |                |\n+------------+----------+------+-----+---------+----------------+\n5 rows in set (0.00 sec)\n\nIf the data types differ from what you expect them to be based on a\nCREATE TABLE statement, note that MySQL sometimes changes data types\nwhen you create or alter a table. The conditions under which this\noccurs are described in\nhttp://dev.mysql.com/doc/refman/5.5/en/silent-column-changes.html.\n\nThe FULL keyword causes the output to include the column collation and\ncomments, as well as the privileges you have for each column.\n\nYou can use db_name.tbl_name as an alternative to the tbl_name FROM\ndb_name syntax. In other words, these two statements are equivalent:\n\nmysql> SHOW COLUMNS FROM mytable FROM mydb;\nmysql> SHOW COLUMNS FROM mydb.mytable;\n\nSHOW COLUMNS displays the following values for each table column:\n\nField indicates the column name.\n\nType indicates the column data type.\n\nCollation indicates the collation for nonbinary string columns, or NULL\nfor other columns. This value is displayed only if you use the FULL\nkeyword.\n\nThe Null field contains YES if NULL values can be stored in the column,\nNO if not.\n\nThe Key field indicates whether the column is indexed:\n\no If Key is empty, the column either is not indexed or is indexed only\n  as a secondary column in a multiple-column, nonunique index.\n\no If Key is PRI, the column is a PRIMARY KEY or is one of the columns\n  in a multiple-column PRIMARY KEY.\n\no If Key is UNI, the column is the first column of a UNIQUE index. (A\n  UNIQUE index permits multiple NULL values, but you can tell whether\n  the column permits NULL by checking the Null field.)\n\no If Key is MUL, the column is the first column of a nonunique index in\n  which multiple occurrences of a given value are permitted within the\n  column.\n\nIf more than one of the Key values applies to a given column of a\ntable, Key displays the one with the highest priority, in the order\nPRI, UNI, MUL.\n\nA UNIQUE index may be displayed as PRI if it cannot contain NULL values\nand there is no PRIMARY KEY in the table. A UNIQUE index may display as\nMUL if several columns form a composite UNIQUE index; although the\ncombination of the columns is unique, each column can still hold\nmultiple occurrences of a given value.\n\nThe Default field indicates the default value that is assigned to the\ncolumn. This is NULL if the column has an explicit default of NULL, or\nif the column definition has no DEFAULT clause.\n\nThe Extra field contains any additional information that is available\nabout a given column. The value is nonempty in these cases:\nauto_increment for columns that have the AUTO_INCREMENT attribute; on\nupdate CURRENT_TIMESTAMP for TIMESTAMP columns that have the ON UPDATE\nCURRENT_TIMESTAMP attribute.\n\nPrivileges indicates the privileges you have for the column. This value\nis displayed only if you use the FULL keyword.\n\nComment indicates any comment the column has. This value is displayed\nonly if you use the FULL keyword.\n\nSHOW FIELDS is a synonym for SHOW COLUMNS. You can also list a table\'s\ncolumns with the mysqlshow db_name tbl_name command.\n\nThe DESCRIBE statement provides information similar to SHOW COLUMNS.\nSee http://dev.mysql.com/doc/refman/5.5/en/describe.html.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-columns.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-columns.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (22,40,'CREATE TRIGGER','Syntax:\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    TRIGGER trigger_name\n    trigger_time trigger_event\n    ON tbl_name FOR EACH ROW\n    trigger_body\n\ntrigger_time: { BEFORE | AFTER }\n\ntrigger_event: { INSERT | UPDATE | DELETE }\n\nThis statement creates a new trigger. A trigger is a named database\nobject that is associated with a table, and that activates when a\nparticular event occurs for the table. The trigger becomes associated\nwith the table named tbl_name, which must refer to a permanent table.\nYou cannot associate a trigger with a TEMPORARY table or a view.\n\nTrigger names exist in the schema namespace, meaning that all triggers\nmust have unique names within a schema. Triggers in different schemas\ncan have the same name.\n\nThis section describes CREATE TRIGGER syntax. For additional\ndiscussion, see\nhttp://dev.mysql.com/doc/refman/5.5/en/trigger-syntax.html.\n\nCREATE TRIGGER requires the TRIGGER privilege for the table associated\nwith the trigger. The statement might also require the SUPER privilege,\ndepending on the DEFINER value, as described later in this section. If\nbinary logging is enabled, CREATE TRIGGER might require the SUPER\nprivilege, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-logging.html.\n\nThe DEFINER clause determines the security context to be used when\nchecking access privileges at trigger activation time, as described\nlater in this section.\n\ntrigger_time is the trigger action time. It can be BEFORE or AFTER to\nindicate that the trigger activates before or after each row to be\nmodified.\n\ntrigger_event indicates the kind of operation that activates the\ntrigger. These trigger_event values are permitted:\n\no INSERT: The trigger activates whenever a new row is inserted into the\n  table; for example, through INSERT, LOAD DATA, and REPLACE\n  statements.\n\no UPDATE: The trigger activates whenever a row is modified; for\n  example, through UPDATE statements.\n\no DELETE: The trigger activates whenever a row is deleted from the\n  table; for example, through DELETE and REPLACE statements. DROP TABLE\n  and TRUNCATE TABLE statements on the table do not activate this\n  trigger, because they do not use DELETE. Dropping a partition does\n  not activate DELETE triggers, either.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-trigger.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (23,32,'MONTH','Syntax:\nMONTH(date)\n\nReturns the month for date, in the range 1 to 12 for January to\nDecember, or 0 for dates such as \'0000-00-00\' or \'2008-00-00\' that have\na zero month part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MONTH(\'2008-02-03\');\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (24,23,'TINYINT','TINYINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA very small integer. The signed range is -128 to 127. The unsigned\nrange is 0 to 255.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (25,27,'SHOW TRIGGERS','Syntax:\nSHOW TRIGGERS [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TRIGGERS lists the triggers currently defined for tables in a\ndatabase (the default database unless a FROM clause is given). This\nstatement returns results only for databases and tables for which you\nhave the TRIGGER privilege. The LIKE clause, if present, indicates\nwhich table names to match (not trigger names) and causes the statement\nto display triggers for those tables. The WHERE clause can be given to\nselect rows using more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nFor the trigger ins_sum as defined in\nhttp://dev.mysql.com/doc/refman/5.5/en/triggers.html, the output of\nthis statement is as shown here:\n\nmysql> SHOW TRIGGERS LIKE \'acc%\'\\G\n*************************** 1. row ***************************\n             Trigger: ins_sum\n               Event: INSERT\n               Table: account\n           Statement: SET @sum = @sum + NEW.amount\n              Timing: BEFORE\n             Created: NULL\n            sql_mode:\n             Definer: myname@localhost\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-triggers.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-triggers.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (26,13,'ISCLOSED','IsClosed(ls)\n\nReturns 1 if the LineString value ls is closed (that is, its\nStartPoint() and EndPoint() values are the same) and is simple (does\nnot pass through the same point more than once). Returns 0 if ls is not\nclosed, and -1 if it is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @ls1 = \'LineString(1 1,2 2,3 3,2 2)\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SET @ls2 = \'LineString(1 1,2 2,3 3,1 1)\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT IsClosed(GeomFromText(@ls1));\n+------------------------------+\n| IsClosed(GeomFromText(@ls1)) |\n+------------------------------+\n|                            0 |\n+------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT IsClosed(GeomFromText(@ls2));\n+------------------------------+\n| IsClosed(GeomFromText(@ls2)) |\n+------------------------------+\n|                            1 |\n+------------------------------+\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (27,14,'MASTER_POS_WAIT','Syntax:\nMASTER_POS_WAIT(log_name,log_pos[,timeout])\n\nThis function is useful for control of master/slave synchronization. It\nblocks until the slave has read and applied all updates up to the\nspecified position in the master log. The return value is the number of\nlog events the slave had to wait for to advance to the specified\nposition. The function returns NULL if the slave SQL thread is not\nstarted, the slave\'s master information is not initialized, the\narguments are incorrect, or an error occurs. It returns -1 if the\ntimeout has been exceeded. If the slave SQL thread stops while\nMASTER_POS_WAIT() is waiting, the function returns NULL. If the slave\nis past the specified position, the function returns immediately.\n\nIf a timeout value is specified, MASTER_POS_WAIT() stops waiting when\ntimeout seconds have elapsed. timeout must be greater than 0; a zero or\nnegative timeout means no timeout.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (28,38,'REGEXP','Syntax:\nexpr REGEXP pat, expr RLIKE pat\n\nPerforms a pattern match of a string expression expr against a pattern\npat. The pattern can be an extended regular expression. The syntax for\nregular expressions is discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/regexp.html. Returns 1 if expr\nmatches pat; otherwise it returns 0. If either expr or pat is NULL, the\nresult is NULL. RLIKE is a synonym for REGEXP, provided for mSQL\ncompatibility.\n\nThe pattern need not be a literal string. For example, it can be\nspecified as a string expression or table column.\n\n*Note*: Because MySQL uses the C escape syntax in strings (for example,\n"\\n" to represent the newline character), you must double any "\\" that\nyou use in your REGEXP strings.\n\nREGEXP is not case sensitive, except when used with binary strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/regexp.html\n\n','mysql> SELECT \'Monty!\' REGEXP \'.*\';\n        -> 1\nmysql> SELECT \'new*\\n*line\' REGEXP \'new\\\\*.\\\\*line\';\n        -> 1\nmysql> SELECT \'a\' REGEXP \'A\', \'a\' REGEXP BINARY \'A\';\n        -> 1  0\nmysql> SELECT \'a\' REGEXP \'^[a-d]\';\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/regexp.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (29,24,'IF STATEMENT','Syntax:\nIF search_condition THEN statement_list\n    [ELSEIF search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND IF\n\nThe IF statement for stored programs implements a basic conditional\nconstruct.\n\n*Note*: There is also an IF() function, which differs from the IF\nstatement described here. See\nhttp://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html. The\nIF statement can have THEN, ELSE, and ELSEIF clauses, and it is\nterminated with END IF.\n\nIf the search_condition evaluates to true, the corresponding THEN or\nELSEIF clause statement_list executes. If no search_condition matches,\nthe ELSE clause statement_list executes.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/if.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/if.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (30,20,'^','Syntax:\n^\n\nBitwise XOR:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 1 ^ 1;\n        -> 0\nmysql> SELECT 1 ^ 0;\n        -> 1\nmysql> SELECT 11 ^ 3;\n        -> 8\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (31,40,'DROP VIEW','Syntax:\nDROP VIEW [IF EXISTS]\n    view_name [, view_name] ...\n    [RESTRICT | CASCADE]\n\nDROP VIEW removes one or more views. You must have the DROP privilege\nfor each view. If any of the views named in the argument list do not\nexist, MySQL returns an error indicating by name which nonexisting\nviews it was unable to drop, but it also drops all of the views in the\nlist that do exist.\n\nThe IF EXISTS clause prevents an error from occurring for views that\ndon\'t exist. When this clause is given, a NOTE is generated for each\nnonexistent view. See [HELP SHOW WARNINGS].\n\nRESTRICT and CASCADE, if given, are parsed and ignored.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-view.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (32,31,'WITHIN','Within(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 is spatially within g2. This\ntests the opposite relationship as Contains().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (33,32,'WEEK','Syntax:\nWEEK(date[,mode])\n\nThis function returns the week number for date. The two-argument form\nof WEEK() enables you to specify whether the week starts on Sunday or\nMonday and whether the return value should be in the range from 0 to 53\nor from 1 to 53. If the mode argument is omitted, the value of the\ndefault_week_format system variable is used. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT WEEK(\'2008-02-20\');\n        -> 7\nmysql> SELECT WEEK(\'2008-02-20\',0);\n        -> 7\nmysql> SELECT WEEK(\'2008-02-20\',1);\n        -> 8\nmysql> SELECT WEEK(\'2008-12-31\',1);\n        -> 53\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (34,27,'SHOW PLUGINS','Syntax:\nSHOW PLUGINS\n\nSHOW PLUGINS displays information about server plugins. Plugin\ninformation is also available in the INFORMATION_SCHEMA.PLUGINS table.\nSee http://dev.mysql.com/doc/refman/5.5/en/plugins-table.html.\n\nExample of SHOW PLUGINS output:\n\nmysql> SHOW PLUGINS\\G\n*************************** 1. row ***************************\n   Name: binlog\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 2. row ***************************\n   Name: CSV\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 3. row ***************************\n   Name: MEMORY\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 4. row ***************************\n   Name: MyISAM\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n...\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-plugins.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-plugins.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (35,22,'DROP FUNCTION UDF','Syntax:\nDROP FUNCTION function_name\n\nThis statement drops the user-defined function (UDF) named\nfunction_name.\n\nTo drop a function, you must have the DELETE privilege for the mysql\ndatabase. This is because DROP FUNCTION removes a row from the\nmysql.func system table that records the function\'s name, type, and\nshared library name.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-function-udf.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-function-udf.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (36,8,'PREPARE','Syntax:\nPREPARE stmt_name FROM preparable_stmt\n\nThe PREPARE statement prepares a SQL statement and assigns it a name,\nstmt_name, by which to refer to the statement later. The prepared\nstatement is executed with EXECUTE and released with DEALLOCATE\nPREPARE. For examples, see\nhttp://dev.mysql.com/doc/refman/5.5/en/sql-syntax-prepared-statements.h\ntml.\n\nStatement names are not case sensitive. preparable_stmt is either a\nstring literal or a user variable that contains the text of the SQL\nstatement. The text must represent a single statement, not multiple\nstatements. Within the statement, ? characters can be used as parameter\nmarkers to indicate where data values are to be bound to the query\nlater when you execute it. The ? characters should not be enclosed\nwithin quotation marks, even if you intend to bind them to string\nvalues. Parameter markers can be used only where data values should\nappear, not for SQL keywords, identifiers, and so forth.\n\nIf a prepared statement with the given name already exists, it is\ndeallocated implicitly before the new statement is prepared. This means\nthat if the new statement contains an error and cannot be prepared, an\nerror is returned and no statement with the given name exists.\n\nThe scope of a prepared statement is the session within which it is\ncreated, which as several implications:\n\no A prepared statement created in one session is not available to other\n  sessions.\n\no When a session ends, whether normally or abnormally, its prepared\n  statements no longer exist. If auto-reconnect is enabled, the client\n  is not notified that the connection was lost. For this reason,\n  clients may wish to disable auto-reconnect. See\n  http://dev.mysql.com/doc/refman/5.5/en/auto-reconnect.html.\n\no A prepared statement created within a stored program continues to\n  exist after the program finishes executing and can be executed\n  outside the program later.\n\no A statement prepared in stored program context cannot refer to stored\n  procedure or function parameters or local variables because they go\n  out of scope when the program ends and would be unavailable were the\n  statement to be executed later outside the program. As a workaround,\n  refer instead to user-defined variables, which also have session\n  scope; see\n  http://dev.mysql.com/doc/refman/5.5/en/user-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/prepare.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/prepare.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (37,8,'LOCK','Syntax:\nLOCK TABLES\n    tbl_name [[AS] alias] lock_type\n    [, tbl_name [[AS] alias] lock_type] ...\n\nlock_type:\n    READ [LOCAL]\n  | [LOW_PRIORITY] WRITE\n\nUNLOCK TABLES\n\nMySQL enables client sessions to acquire table locks explicitly for the\npurpose of cooperating with other sessions for access to tables, or to\nprevent other sessions from modifying tables during periods when a\nsession requires exclusive access to them. A session can acquire or\nrelease locks only for itself. One session cannot acquire locks for\nanother session or release locks held by another session.\n\nLocks may be used to emulate transactions or to get more speed when\nupdating tables. This is explained in more detail later in this\nsection.\n\nLOCK TABLES explicitly acquires table locks for the current client\nsession. Table locks can be acquired for base tables or views. You must\nhave the LOCK TABLES privilege, and the SELECT privilege for each\nobject to be locked.\n\nFor view locking, LOCK TABLES adds all base tables used in the view to\nthe set of tables to be locked and locks them automatically. If you\nlock a table explicitly with LOCK TABLES, any tables used in triggers\nare also locked implicitly, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/lock-tables-and-triggers.html.\n\nUNLOCK TABLES explicitly releases any table locks held by the current\nsession. LOCK TABLES implicitly releases any table locks held by the\ncurrent session before acquiring new locks.\n\nAnother use for UNLOCK TABLES is to release the global read lock\nacquired with the FLUSH TABLES WITH READ LOCK statement, which enables\nyou to lock all tables in all databases. See [HELP FLUSH]. (This is a\nvery convenient way to get backups if you have a file system such as\nVeritas that can take snapshots in time.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/lock-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/lock-tables.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (38,38,'UPDATEXML','Syntax:\nUpdateXML(xml_target, xpath_expr, new_xml)\n\nThis function replaces a single portion of a given fragment of XML\nmarkup xml_target with a new XML fragment new_xml, and then returns the\nchanged XML. The portion of xml_target that is replaced matches an\nXPath expression xpath_expr supplied by the user. In MySQL 5.5, the\nXPath expression can contain at most 127 characters. (This limitation\nis lifted in MySQL 5.6.)\n\nIf no expression matching xpath_expr is found, or if multiple matches\nare found, the function returns the original xml_target XML fragment.\nAll three arguments should be strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html\n\n','mysql> SELECT\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/a\', \'<e>fff</e>\') AS val1,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/b\', \'<e>fff</e>\') AS val2,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'//b\', \'<e>fff</e>\') AS val3,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/a/d\', \'<e>fff</e>\') AS val4,\n    ->   UpdateXML(\'<a><d></d><b>ccc</b><d></d></a>\', \'/a/d\', \'<e>fff</e>\') AS val5\n    -> \\G\n\n*************************** 1. row ***************************\nval1: <e>fff</e>\nval2: <a><b>ccc</b><d></d></a>\nval3: <a><e>fff</e><d></d></a>\nval4: <a><b>ccc</b><e>fff</e></a>\nval5: <a><d></d><b>ccc</b><d></d></a>\n','http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (39,8,'RESET SLAVE','Syntax:\nRESET SLAVE [ALL]\n\nRESET SLAVE makes the slave forget its replication position in the\nmaster\'s binary log. This statement is meant to be used for a clean\nstart: It deletes the master.info and relay-log.info files, all the\nrelay log files, and starts a new relay log file. To use RESET SLAVE,\nthe slave replication threads must be stopped (use STOP SLAVE if\nnecessary).\n\n*Note*: All relay log files are deleted, even if they have not been\ncompletely executed by the slave SQL thread. (This is a condition\nlikely to exist on a replication slave if you have issued a STOP SLAVE\nstatement or if the slave is highly loaded.)\n\nIn MySQL 5.5 (unlike the case in MySQL 5.1 and earlier), RESET SLAVE\ndoes not change any replication connection parameters such as master\nhost, master port, master user, or master password, which are retained\nin memory. This means that START SLAVE can be issued without requiring\na CHANGE MASTER TO statement following RESET SLAVE.\n\nConnection parameters are reset if the slave mysqld is shut down\nfollowing RESET SLAVE. In MySQL 5.5.16 and later, you can instead use\nRESET SLAVE ALL to reset these connection parameters (Bug #11809016).\n\nIf the slave SQL thread was in the middle of replicating temporary\ntables when it was stopped, and RESET SLAVE is issued, these replicated\ntemporary tables are deleted on the slave.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/reset-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/reset-slave.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (40,27,'SHOW BINARY LOGS','Syntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [HELP PURGE BINARY LOGS], that shows\nhow to determine which logs can be purged.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+\n| Log_name      | File_size |\n+---------------+-----------+\n| binlog.000015 |    724935 |\n| binlog.000016 |    733481 |\n+---------------+-----------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-binary-logs.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-binary-logs.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (41,25,'POLYGON','Polygon(ls1,ls2,...)\n\nConstructs a Polygon value from a number of LineString or WKB\nLineString arguments. If any argument does not represent a LinearRing\n(that is, not a closed and simple LineString), the return value is\nNULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (42,32,'MINUTE','Syntax:\nMINUTE(time)\n\nReturns the minute for time, in the range 0 to 59.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MINUTE(\'2008-02-03 10:05:03\');\n        -> 5\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (43,32,'DAY','Syntax:\nDAY(date)\n\nDAY() is a synonym for DAYOFMONTH().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (44,38,'MID','Syntax:\nMID(str,pos,len)\n\nMID(str,pos,len) is a synonym for SUBSTRING(str,pos,len).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (45,14,'UUID','Syntax:\nUUID()\n\nReturns a Universal Unique Identifier (UUID) generated according to\n"DCE 1.1: Remote Procedure Call" (Appendix A) CAE (Common Applications\nEnvironment) Specifications published by The Open Group in October 1997\n(Document Number C706,\nhttp://www.opengroup.org/public/pubs/catalog/c706.htm).\n\nA UUID is designed as a number that is globally unique in space and\ntime. Two calls to UUID() are expected to generate two different\nvalues, even if these calls are performed on two separate computers\nthat are not connected to each other.\n\nA UUID is a 128-bit number represented by a utf8 string of five\nhexadecimal numbers in aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee format:\n\no The first three numbers are generated from a timestamp.\n\no The fourth number preserves temporal uniqueness in case the timestamp\n  value loses monotonicity (for example, due to daylight saving time).\n\no The fifth number is an IEEE 802 node number that provides spatial\n  uniqueness. A random number is substituted if the latter is not\n  available (for example, because the host computer has no Ethernet\n  card, or we do not know how to find the hardware address of an\n  interface on your operating system). In this case, spatial uniqueness\n  cannot be guaranteed. Nevertheless, a collision should have very low\n  probability.\n\n  Currently, the MAC address of an interface is taken into account only\n  on FreeBSD and Linux. On other operating systems, MySQL uses a\n  randomly generated 48-bit number.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID();\n        -> \'6ccd780c-baba-1026-9564-0040f4311e29\'\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (46,25,'LINESTRING','LineString(pt1,pt2,...)\n\nConstructs a LineString value from a number of Point or WKB Point\narguments. If the number of arguments is less than two, the return\nvalue is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (47,14,'SLEEP','Syntax:\nSLEEP(duration)\n\nSleeps (pauses) for the number of seconds given by the duration\nargument, then returns 0. If SLEEP() is interrupted, it returns 1. The\nduration may have a fractional part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (48,17,'CONNECTION_ID','Syntax:\nCONNECTION_ID()\n\nReturns the connection ID (thread ID) for the connection. Every\nconnection has an ID that is unique among the set of currently\nconnected clients.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT CONNECTION_ID();\n        -> 23786\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (49,40,'CREATE LOGFILE GROUP','Syntax:\nCREATE LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'undo_file\'\n    [INITIAL_SIZE [=] initial_size]\n    [UNDO_BUFFER_SIZE [=] undo_buffer_size]\n    [REDO_BUFFER_SIZE [=] redo_buffer_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] comment_text]\n    ENGINE [=] engine_name\n\nThis statement creates a new log file group named logfile_group having\na single UNDO file named \'undo_file\'. A CREATE LOGFILE GROUP statement\nhas one and only one ADD UNDOFILE clause. For rules covering the naming\nof log file groups, see\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nIn MySQL Cluster NDB 7.2, you can have only one log file group per\nCluster at any given time. (See Bug #16386)\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size;\nif not specified, it defaults to 128M (128 megabytes). The optional\nUNDO_BUFFER_SIZE parameter sets the size used by the UNDO buffer for\nthe log file group; The default value for UNDO_BUFFER_SIZE is 8M (eight\nmegabytes); this value cannot exceed the amount of system memory\navailable. Both of these parameters are specified in bytes. You may\noptionally follow either or both of these with a one-letter\nabbreviation for an order of magnitude, similar to those used in\nmy.cnf. Generally, this is one of the letters M (for megabytes) or G\n(for gigabytes).\n\nThe memory used for both INITIAL_SIZE and UNDO_BUFFER_SIZE comes from\nthe global pool whose size is determined by the value of the\nSharedGlobalMemory data node configuration parameter. This includes any\ndefault value implied for these options by the setting of the\nInitialLogFileGroup data node configuration parameter.\n\nThe maximum permitted for UNDO_BUFFER_SIZE is 600M.\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is 4G.\n\nThe minimum permitted value for INITIAL_SIZE is 1M.\n\nThe ENGINE option determines the storage engine to be used by this log\nfile group, with engine_name being the name of the storage engine. In\nMySQL 5.5, this must be NDB (or NDBCLUSTER). If ENGINE is not set,\nMySQL tries to use the engine specified by the default_storage_engine\nserver system variable (formerly storage_engine). In any case, if the\nengine is not specified as NDB or NDBCLUSTER, the CREATE LOGFILE GROUP\nstatement appears to succeed but actually fails to create the log file\ngroup, as shown here:\n\nmysql> CREATE LOGFILE GROUP lg1 \n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+-------+------+------------------------------------------------------------------------------------------------+\n| Level | Code | Message                                                                                        |\n+-------+------+------------------------------------------------------------------------------------------------+\n| Error | 1478 | Table storage engine \'InnoDB\' does not support the create option \'TABLESPACE or LOGFILE GROUP\' |\n+-------+------+------------------------------------------------------------------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> DROP LOGFILE GROUP lg1 ENGINE = NDB;              \nERROR 1529 (HY000): Failed to drop LOGFILE GROUP\n\nmysql> CREATE LOGFILE GROUP lg1 \n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M\n    ->     ENGINE = NDB;\nQuery OK, 0 rows affected (2.97 sec)\n\nThe fact that the CREATE LOGFILE GROUP statement does not actually\nreturn an error when a non-NDB storage engine is named, but rather\nappears to succeed, is a known issue which we hope to address in a\nfuture release of MySQL Cluster.\n\nREDO_BUFFER_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but ignored,\nand so have no effect in MySQL 5.5. These options are intended for\nfuture expansion.\n\nWhen used with ENGINE [=] NDB, a log file group and associated UNDO log\nfile are created on each Cluster data node. You can verify that the\nUNDO files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, LOGFILE_GROUP_NUMBER, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE FILE_NAME = \'undo_10.dat\';\n+--------------------+----------------------+----------------+\n| LOGFILE_GROUP_NAME | LOGFILE_GROUP_NUMBER | EXTRA          |\n+--------------------+----------------------+----------------+\n| lg_3               |                   11 | CLUSTER_NODE=3 |\n| lg_3               |                   11 | CLUSTER_NODE=4 |\n+--------------------+----------------------+----------------+\n2 rows in set (0.06 sec)\n\nCREATE LOGFILE GROUP is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-logfile-group.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (50,28,'DELETE','Syntax:\nSingle-table syntax:\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE] FROM tbl_name\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nMultiple-table syntax:\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    tbl_name[.*] [, tbl_name[.*]] ...\n    FROM table_references\n    [WHERE where_condition]\n\nOr:\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    FROM tbl_name[.*] [, tbl_name[.*]] ...\n    USING table_references\n    [WHERE where_condition]\n\nFor the single-table syntax, the DELETE statement deletes rows from\ntbl_name and returns a count of the number of deleted rows. This count\ncan be obtained by calling the ROW_COUNT() function (see\nhttp://dev.mysql.com/doc/refman/5.5/en/information-functions.html). The\nWHERE clause, if given, specifies the conditions that identify which\nrows to delete. With no WHERE clause, all rows are deleted. If the\nORDER BY clause is specified, the rows are deleted in the order that is\nspecified. The LIMIT clause places a limit on the number of rows that\ncan be deleted.\n\nFor the multiple-table syntax, DELETE deletes from each tbl_name the\nrows that satisfy the conditions. In this case, ORDER BY and LIMIT\ncannot be used.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe deleted. It is specified as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nCurrently, you cannot delete from a table and select from the same\ntable in a subquery.\n\nYou need the DELETE privilege on a table to delete rows from it. You\nneed only the SELECT privilege for any columns that are only read, such\nas those named in the WHERE clause.\n\nAs stated, a DELETE statement with no WHERE clause deletes all rows. A\nfaster way to do this, when you do not need to know the number of\ndeleted rows, is to use TRUNCATE TABLE. However, within a transaction\nor if you have a lock on the table, TRUNCATE TABLE cannot be used\nwhereas DELETE can. See [HELP TRUNCATE TABLE], and [HELP LOCK].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/delete.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/delete.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (51,4,'ROUND','Syntax:\nROUND(X), ROUND(X,D)\n\nRounds the argument X to D decimal places. The rounding algorithm\ndepends on the data type of X. D defaults to 0 if not specified. D can\nbe negative to cause D digits left of the decimal point of the value X\nto become zero.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ROUND(-1.23);\n        -> -1\nmysql> SELECT ROUND(-1.58);\n        -> -2\nmysql> SELECT ROUND(1.58);\n        -> 2\nmysql> SELECT ROUND(1.298, 1);\n        -> 1.3\nmysql> SELECT ROUND(1.298, 0);\n        -> 1\nmysql> SELECT ROUND(23.298, -1);\n        -> 20\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (52,7,'NULLIF','Syntax:\nNULLIF(expr1,expr2)\n\nReturns NULL if expr1 = expr2 is true, otherwise returns expr1. This is\nthe same as CASE WHEN expr1 = expr2 THEN NULL ELSE expr1 END.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT NULLIF(1,1);\n        -> NULL\nmysql> SELECT NULLIF(1,2);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (53,24,'CLOSE','Syntax:\nCLOSE cursor_name\n\nThis statement closes a previously opened cursor. For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nAn error occurs if the cursor is not open.\n\nIf not closed explicitly, a cursor is closed at the end of the BEGIN\n... END block in which it was declared.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/close.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/close.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (54,8,'STOP SLAVE','Syntax:\nSTOP SLAVE [thread_types]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nStops the slave threads. STOP SLAVE requires the SUPER privilege.\nRecommended best practice is to execute STOP SLAVE on the slave before\nstopping the slave server (see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-shutdown.html, for more\ninformation).\n\nWhen using the row-based logging format: You should execute STOP SLAVE\non the slave prior to shutting down the slave server if you are\nreplicating any tables that use a nontransactional storage engine (see\nthe Note later in this section). In MySQL 5.5.9 and later, you can also\nuse STOP SLAVE SQL_THREAD for this purpose.\n\nLike START SLAVE, this statement may be used with the IO_THREAD and\nSQL_THREAD options to name the thread or threads to be stopped.\n\n*Note*: In MySQL 5.5, STOP SLAVE waits until the current replication\nevent group affecting one or more nontransactional tables has finished\nexecuting (if there is any such replication group), or until the user\nissues a KILL QUERY or KILL CONNECTION statement. (Bug #319, Bug\n#38205)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/stop-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/stop-slave.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (55,32,'TIMEDIFF','Syntax:\nTIMEDIFF(expr1,expr2)\n\nTIMEDIFF() returns expr1 - expr2 expressed as a time value. expr1 and\nexpr2 are time or date-and-time expressions, but both must be of the\nsame type.\n\nThe result returned by TIMEDIFF() is limited to the range allowed for\nTIME values. Alternatively, you can use either of the functions\nTIMESTAMPDIFF() and UNIX_TIMESTAMP(), both of which return integers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMEDIFF(\'2000:01:01 00:00:00\',\n    ->                 \'2000:01:01 00:00:00.000001\');\n        -> \'-00:00:00.000001\'\nmysql> SELECT TIMEDIFF(\'2008-12-31 23:59:59.000001\',\n    ->                 \'2008-12-30 01:01:01.000002\');\n        -> \'46:58:57.999999\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (56,38,'REPLACE FUNCTION','Syntax:\nREPLACE(str,from_str,to_str)\n\nReturns the string str with all occurrences of the string from_str\nreplaced by the string to_str. REPLACE() performs a case-sensitive\nmatch when searching for from_str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT REPLACE(\'www.mysql.com\', \'w\', \'Ww\');\n        -> \'WwWwWw.mysql.com\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (57,29,'USE','Syntax:\nUSE db_name\n\nThe USE db_name statement tells MySQL to use the db_name database as\nthe default (current) database for subsequent statements. The database\nremains the default until the end of the session or another USE\nstatement is issued:\n\nUSE db1;\nSELECT COUNT(*) FROM mytable;   # selects from db1.mytable\nUSE db2;\nSELECT COUNT(*) FROM mytable;   # selects from db2.mytable\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/use.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/use.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (58,3,'LINEFROMTEXT','LineFromText(wkt[,srid]), LineStringFromText(wkt[,srid])\n\nConstructs a LINESTRING value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (59,7,'CASE OPERATOR','Syntax:\nCASE value WHEN [compare_value] THEN result [WHEN [compare_value] THEN\nresult ...] [ELSE result] END\n\nCASE WHEN [condition] THEN result [WHEN [condition] THEN result ...]\n[ELSE result] END\n\nThe first version returns the result where value=compare_value. The\nsecond version returns the result for the first condition that is true.\nIf there was no matching result value, the result after ELSE is\nreturned, or NULL if there is no ELSE part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT CASE 1 WHEN 1 THEN \'one\'\n    ->     WHEN 2 THEN \'two\' ELSE \'more\' END;\n        -> \'one\'\nmysql> SELECT CASE WHEN 1>0 THEN \'true\' ELSE \'false\' END;\n        -> \'true\'\nmysql> SELECT CASE BINARY \'B\'\n    ->     WHEN \'a\' THEN 1 WHEN \'b\' THEN 2 END;\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (60,27,'SHOW MASTER STATUS','Syntax:\nSHOW MASTER STATUS\n\nThis statement provides status information about the binary log files\nof the master. It requires either the SUPER or REPLICATION CLIENT\nprivilege.\n\nExample:\n\nmysql> SHOW MASTER STATUS;\n+---------------+----------+--------------+------------------+\n| File          | Position | Binlog_Do_DB | Binlog_Ignore_DB |\n+---------------+----------+--------------+------------------+\n| mysql-bin.003 | 73       | test         | manual,mysql     |\n+---------------+----------+--------------+------------------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-master-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-master-status.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (61,32,'ADDTIME','Syntax:\nADDTIME(expr1,expr2)\n\nADDTIME() adds expr2 to expr1 and returns the result. expr1 is a time\nor datetime expression, and expr2 is a time expression.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT ADDTIME(\'2007-12-31 23:59:59.999999\', \'1 1:1:1.000002\');\n        -> \'2008-01-02 01:01:01.000001\'\nmysql> SELECT ADDTIME(\'01:00:00.999999\', \'02:00:00.999998\');\n        -> \'03:00:01.999997\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (62,35,'SPATIAL','For MyISAM tables, MySQL can create spatial indexes using syntax\nsimilar to that for creating regular indexes, but extended with the\nSPATIAL keyword. Currently, columns in spatial indexes must be declared\nNOT NULL. The following examples demonstrate how to create spatial\nindexes:\n\no With CREATE TABLE:\n\nCREATE TABLE geom (g GEOMETRY NOT NULL, SPATIAL INDEX(g)) ENGINE=MyISAM;\n\no With ALTER TABLE:\n\nALTER TABLE geom ADD SPATIAL INDEX(g);\n\no With CREATE INDEX:\n\nCREATE SPATIAL INDEX sp_index ON geom (g);\n\nFor MyISAM tables, SPATIAL INDEX creates an R-tree index. For storage\nengines that support nonspatial indexing of spatial columns, the engine\ncreates a B-tree index. A B-tree index on spatial values will be useful\nfor exact-value lookups, but not for range scans.\n\nFor more information on indexing spatial columns, see [HELP CREATE\nINDEX].\n\nTo drop spatial indexes, use ALTER TABLE or DROP INDEX:\n\no With ALTER TABLE:\n\nALTER TABLE geom DROP INDEX g;\n\no With DROP INDEX:\n\nDROP INDEX sp_index ON geom;\n\nExample: Suppose that a table geom contains more than 32,000\ngeometries, which are stored in the column g of type GEOMETRY. The\ntable also has an AUTO_INCREMENT column fid for storing object ID\nvalues.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-indexes.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-indexes.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (63,32,'TO_SECONDS','Syntax:\nTO_SECONDS(expr)\n\nGiven a date or datetime expr, returns a the number of seconds since\nthe year 0. If expr is not a valid date or datetime value, returns\nNULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TO_SECONDS(950501);\n        -> 62966505600\nmysql> SELECT TO_SECONDS(\'2009-11-29\');\n        -> 63426672000\nmysql> SELECT TO_SECONDS(\'2009-11-29 13:43:32\');\n        -> 63426721412\nmysql> SELECT TO_SECONDS( NOW() );\n        -> 63426721458\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (64,32,'TIMESTAMPDIFF','Syntax:\nTIMESTAMPDIFF(unit,datetime_expr1,datetime_expr2)\n\nReturns datetime_expr2 - datetime_expr1, where datetime_expr1 and\ndatetime_expr2 are date or datetime expressions. One expression may be\na date and the other a datetime; a date value is treated as a datetime\nhaving the time part \'00:00:00\' where necessary. The unit for the\nresult (an integer) is given by the unit argument. The legal values for\nunit are the same as those listed in the description of the\nTIMESTAMPADD() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMESTAMPDIFF(MONTH,\'2003-02-01\',\'2003-05-01\');\n        -> 3\nmysql> SELECT TIMESTAMPDIFF(YEAR,\'2002-05-01\',\'2001-01-01\');\n        -> -1\nmysql> SELECT TIMESTAMPDIFF(MINUTE,\'2003-02-01\',\'2003-05-01 12:05:55\');\n        -> 128885\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (65,38,'UPPER','Syntax:\nUPPER(str)\n\nReturns the string str with all characters changed to uppercase\naccording to the current character set mapping. The default is latin1\n(cp1252 West European).\n\nmysql> SELECT UPPER(\'Hej\');\n        -> \'HEJ\'\n\nSee the description of LOWER() for information that also applies to\nUPPER(), such as information about how to perform lettercase conversion\nof binary strings (BINARY, VARBINARY, BLOB) for which these functions\nare ineffective.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (66,32,'FROM_UNIXTIME','Syntax:\nFROM_UNIXTIME(unix_timestamp), FROM_UNIXTIME(unix_timestamp,format)\n\nReturns a representation of the unix_timestamp argument as a value in\n\'YYYY-MM-DD HH:MM:SS\' or YYYYMMDDHHMMSS.uuuuuu format, depending on\nwhether the function is used in a string or numeric context. The value\nis expressed in the current time zone. unix_timestamp is an internal\ntimestamp value such as is produced by the UNIX_TIMESTAMP() function.\n\nIf format is given, the result is formatted according to the format\nstring, which is used the same way as listed in the entry for the\nDATE_FORMAT() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_UNIXTIME(1196440219);\n        -> \'2007-11-30 10:30:19\'\nmysql> SELECT FROM_UNIXTIME(1196440219) + 0;\n        -> 20071130103019.000000\nmysql> SELECT FROM_UNIXTIME(UNIX_TIMESTAMP(),\n    ->                      \'%Y %D %M %h:%i:%s %x\');\n        -> \'2007 30th November 10:30:59 2007\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (67,23,'MEDIUMBLOB','MEDIUMBLOB\n\nA BLOB column with a maximum length of 16,777,215 (224 - 1) bytes. Each\nMEDIUMBLOB value is stored using a 3-byte length prefix that indicates\nthe number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (68,12,'SHA2','Syntax:\nSHA2(str, hash_length)\n\nCalculates the SHA-2 family of hash functions (SHA-224, SHA-256,\nSHA-384, and SHA-512). The first argument is the cleartext string to be\nhashed. The second argument indicates the desired bit length of the\nresult, which must have a value of 224, 256, 384, 512, or 0 (which is\nequivalent to 256). If either argument is NULL or the hash length is\nnot one of the permitted values, the return value is NULL. Otherwise,\nthe function result is a hash value containing the desired number of\nbits. See the notes at the beginning of this section about storing hash\nvalues efficiently.\n\nAs of MySQL 5.5.6, the return value is a nonbinary string in the\nconnection character set. Before 5.5.6, the return value is a binary\nstring; see the notes at the beginning of this section about using the\nvalue as a nonbinary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT SHA2(\'abc\', 224);\n        -> \'23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (69,7,'IFNULL','Syntax:\nIFNULL(expr1,expr2)\n\nIf expr1 is not NULL, IFNULL() returns expr1; otherwise it returns\nexpr2. IFNULL() returns a numeric or string value, depending on the\ncontext in which it is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT IFNULL(1,0);\n        -> 1\nmysql> SELECT IFNULL(NULL,10);\n        -> 10\nmysql> SELECT IFNULL(1/0,10);\n        -> 10\nmysql> SELECT IFNULL(1/0,\'yes\');\n        -> \'yes\'\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (70,27,'SHOW FUNCTION CODE','Syntax:\nSHOW FUNCTION CODE func_name\n\nThis statement is similar to SHOW PROCEDURE CODE but for stored\nfunctions. See [HELP SHOW PROCEDURE CODE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-function-code.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-function-code.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (71,27,'SHOW ERRORS','Syntax:\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW COUNT(*) ERRORS\n\nSHOW ERRORS is a diagnostic statement that is similar to SHOW WARNINGS,\nexcept that it displays information only for errors, rather than for\nerrors, warnings, and notes.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nThe SHOW COUNT(*) ERRORS statement displays the number of errors. You\ncan also retrieve this number from the error_count variable:\n\nSHOW COUNT(*) ERRORS;\nSELECT @@error_count;\n\nSHOW ERRORS and error_count apply only to errors, not warnings or\nnotes. In other respects, they are similar to SHOW WARNINGS and\nwarning_count. In particular, SHOW ERRORS cannot display information\nfor more than max_error_count messages, and error_count can exceed the\nvalue of max_error_count if the number of errors exceeds\nmax_error_count.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-errors.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-errors.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (72,19,'LEAST','Syntax:\nLEAST(value1,value2,...)\n\nWith two or more arguments, returns the smallest (minimum-valued)\nargument. The arguments are compared using the following rules:\n\no If any argument is NULL, the result is NULL. No comparison is needed.\n\no If the return value is used in an INTEGER context or all arguments\n  are integer-valued, they are compared as integers.\n\no If the return value is used in a REAL context or all arguments are\n  real-valued, they are compared as reals.\n\no If the arguments comprise a mix of numbers and strings, they are\n  compared as numbers.\n\no If any argument is a nonbinary (character) string, the arguments are\n  compared as nonbinary strings.\n\no In all other cases, the arguments are compared as binary strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT LEAST(2,0);\n        -> 0\nmysql> SELECT LEAST(34.0,3.0,5.0,767.0);\n        -> 3.0\nmysql> SELECT LEAST(\'B\',\'A\',\'C\');\n        -> \'A\'\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (73,19,'=','=\n\nEqual:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 = 0;\n        -> 0\nmysql> SELECT \'0\' = 0;\n        -> 1\nmysql> SELECT \'0.0\' = 0;\n        -> 1\nmysql> SELECT \'0.01\' = 0;\n        -> 0\nmysql> SELECT \'.01\' = 0.01;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (74,38,'REVERSE','Syntax:\nREVERSE(str)\n\nReturns the string str with the order of the characters reversed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT REVERSE(\'abc\');\n        -> \'cba\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (75,19,'ISNULL','Syntax:\nISNULL(expr)\n\nIf expr is NULL, ISNULL() returns 1, otherwise it returns 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT ISNULL(1+1);\n        -> 0\nmysql> SELECT ISNULL(1/0);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (76,23,'BINARY','BINARY(M)\n\nThe BINARY type is similar to the CHAR type, but stores binary byte\nstrings rather than nonbinary character strings. M represents the\ncolumn length in bytes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (77,23,'BLOB DATA TYPE','A BLOB is a binary large object that can hold a variable amount of\ndata. The four BLOB types are TINYBLOB, BLOB, MEDIUMBLOB, and LONGBLOB.\nThese differ only in the maximum length of the values they can hold.\nThe four TEXT types are TINYTEXT, TEXT, MEDIUMTEXT, and LONGTEXT. These\ncorrespond to the four BLOB types and have the same maximum lengths and\nstorage requirements. See\nhttp://dev.mysql.com/doc/refman/5.5/en/storage-requirements.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/blob.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/blob.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (78,37,'BOUNDARY','Boundary(g)\n\nReturns a geometry that is the closure of the combinatorial boundary of\nthe geometry value g.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (79,10,'CREATE USER','Syntax:\nCREATE USER user_specification\n    [, user_specification] ...\n\nuser_specification:\n    user\n    [\n        IDENTIFIED BY [PASSWORD] \'password\'\n      | IDENTIFIED WITH auth_plugin [AS \'auth_string\']\n    ]\n\nThe CREATE USER statement creates new MySQL accounts. To use it, you\nmust have the global CREATE USER privilege or the INSERT privilege for\nthe mysql database. For each account, CREATE USER creates a new row in\nthe mysql.user table and assigns the account no privileges. An error\noccurs if the account already exists.\n\nEach account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nThe user specification may indicate how the user should authenticate\nwhen connecting to the server:\n\no To enable the user to connect with no password (which is insecure),\n  include no IDENTIFIED BY clause:\n\nCREATE USER \'jeffrey\'@\'localhost\';\n\n  In this case, the account uses built-in authentication and clients\n  must provide no password.\n\no To assign a password, use IDENTIFIED BY with the literal plaintext\n  password value:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\n\n  The account uses built-in authentication and clients must match the\n  given password.\n\no To avoid specifying the plaintext password if you know its hash value\n  (the value that PASSWORD() would return for the password), specify\n  the hash value preceded by the keyword PASSWORD:\n\nCREATE USER \'jeffrey\'@\'localhost\'\nIDENTIFIED BY PASSWORD \'*90E462C37378CED12064BB3388827D2BA3A9B689\';\n\n  The account uses built-in authentication and clients must match the\n  given password.\n\no To authenticate the account using a specific authentication plugin,\n  use IDENTIFIED WITH, where auth_plugin is the plugin name. It can be\n  an unquoted name or a quoted string literal. \'auth_string\' is an\n  optional quoted string literal to pass to the plugin. The plugin\n  interprets the meaning of the string, so its format is plugin\n  specific. Consult the documentation for a given plugin for\n  information about the authentication string values it accepts.\n\nCREATE USER \'jeffrey\'@\'localhost\'\nIDENTIFIED WITH my_auth_plugin;\n\n  For connections that use this account, the server invokes the named\n  plugin and clients must provide credentials as required for the\n  authentication method that the plugin implements. If the server\n  cannot find the plugin, either at account-creation time or connect\n  time, an error occurs. IDENTIFIED WITH can be used as of MySQL 5.5.7.\n\nThe IDENTIFIED BY and IDENTIFIED WITH clauses are mutually exclusive,\nso at most one of them can be specified for a given user.\n\nFor additional information about setting passwords, see\nhttp://dev.mysql.com/doc/refman/5.5/en/assigning-passwords.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-user.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-user.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (80,25,'POINT','Point(x,y)\n\nConstructs a Point using its coordinates.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (81,17,'CURRENT_USER','Syntax:\nCURRENT_USER, CURRENT_USER()\n\nReturns the user name and host name combination for the MySQL account\nthat the server used to authenticate the current client. This account\ndetermines your access privileges. The return value is a string in the\nutf8 character set.\n\nThe value of CURRENT_USER() can differ from the value of USER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT USER();\n        -> \'davida@localhost\'\nmysql> SELECT * FROM mysql.user;\nERROR 1044: Access denied for user \'\'@\'localhost\' to\ndatabase \'mysql\'\nmysql> SELECT CURRENT_USER();\n        -> \'@localhost\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (82,38,'LCASE','Syntax:\nLCASE(str)\n\nLCASE() is a synonym for LOWER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (83,19,'<=','Syntax:\n<=\n\nLess than or equal:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 0.1 <= 2;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (84,27,'SHOW PROFILES','Syntax:\nSHOW PROFILES\n\nThe SHOW PROFILES statement, together with SHOW PROFILE, displays\nprofiling information that indicates resource usage for statements\nexecuted during the course of the current session. For more\ninformation, see [HELP SHOW PROFILE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-profiles.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-profiles.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (85,28,'UPDATE','Syntax:\nSingle-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_reference\n    SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ...\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nMultiple-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_references\n    SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ...\n    [WHERE where_condition]\n\nFor the single-table syntax, the UPDATE statement updates columns of\nexisting rows in the named table with new values. The SET clause\nindicates which columns to modify and the values they should be given.\nEach value can be given as an expression, or the keyword DEFAULT to set\na column explicitly to its default value. The WHERE clause, if given,\nspecifies the conditions that identify which rows to update. With no\nWHERE clause, all rows are updated. If the ORDER BY clause is\nspecified, the rows are updated in the order that is specified. The\nLIMIT clause places a limit on the number of rows that can be updated.\n\nFor the multiple-table syntax, UPDATE updates rows in each table named\nin table_references that satisfy the conditions. In this case, ORDER BY\nand LIMIT cannot be used.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe updated. For expression syntax, see\nhttp://dev.mysql.com/doc/refman/5.5/en/expressions.html.\n\ntable_references and where_condition are specified as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nYou need the UPDATE privilege only for columns referenced in an UPDATE\nthat are actually updated. You need only the SELECT privilege for any\ncolumns that are read but not modified.\n\nThe UPDATE statement supports the following modifiers:\n\no With the LOW_PRIORITY keyword, execution of the UPDATE is delayed\n  until no other clients are reading from the table. This affects only\n  storage engines that use only table-level locking (such as MyISAM,\n  MEMORY, and MERGE).\n\no With the IGNORE keyword, the update statement does not abort even if\n  errors occur during the update. Rows for which duplicate-key\n  conflicts occur are not updated. Rows for which columns are updated\n  to values that would cause data conversion errors are updated to the\n  closest valid values instead.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/update.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/update.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (86,19,'IS NOT NULL','Syntax:\nIS NOT NULL\n\nTests whether a value is not NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NOT NULL, 0 IS NOT NULL, NULL IS NOT NULL;\n        -> 1, 1, 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (87,24,'CASE STATEMENT','Syntax:\nCASE case_value\n    WHEN when_value THEN statement_list\n    [WHEN when_value THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nOr:\n\nCASE\n    WHEN search_condition THEN statement_list\n    [WHEN search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nThe CASE statement for stored programs implements a complex conditional\nconstruct.\n\n*Note*: There is also a CASE expression, which differs from the CASE\nstatement described here. See\nhttp://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html. The\nCASE statement cannot have an ELSE NULL clause, and it is terminated\nwith END CASE instead of END.\n\nFor the first syntax, case_value is an expression. This value is\ncompared to the when_value expression in each WHEN clause until one of\nthem is equal. When an equal when_value is found, the corresponding\nTHEN clause statement_list executes. If no when_value is equal, the\nELSE clause statement_list executes, if there is one.\n\nThis syntax cannot be used to test for equality with NULL because NULL\n= NULL is false. See\nhttp://dev.mysql.com/doc/refman/5.5/en/working-with-null.html.\n\nFor the second syntax, each WHEN clause search_condition expression is\nevaluated until one is true, at which point its corresponding THEN\nclause statement_list executes. If no search_condition is equal, the\nELSE clause statement_list executes, if there is one.\n\nIf no when_value or search_condition matches the value tested and the\nCASE statement contains no ELSE clause, a Case not found for CASE\nstatement error results.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nTo handle situations where no value is matched by any WHEN clause, use\nan ELSE containing an empty BEGIN ... END block, as shown in this\nexample. (The indentation used here in the ELSE clause is for purposes\nof clarity only, and is not otherwise significant.)\n\nDELIMITER |\n\nCREATE PROCEDURE p()\n  BEGIN\n    DECLARE v INT DEFAULT 1;\n\n    CASE v\n      WHEN 2 THEN SELECT v;\n      WHEN 3 THEN SELECT 0;\n      ELSE\n        BEGIN\n        END;\n    END CASE;\n  END;\n  |\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/case.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/case.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (88,8,'EXECUTE STATEMENT','Syntax:\nEXECUTE stmt_name\n    [USING @var_name [, @var_name] ...]\n\nAfter preparing a statement with PREPARE, you execute it with an\nEXECUTE statement that refers to the prepared statement name. If the\nprepared statement contains any parameter markers, you must supply a\nUSING clause that lists user variables containing the values to be\nbound to the parameters. Parameter values can be supplied only by user\nvariables, and the USING clause must name exactly as many variables as\nthe number of parameter markers in the statement.\n\nYou can execute a given prepared statement multiple times, passing\ndifferent variables to it or setting the variables to different values\nbefore each execution.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/execute.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/execute.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (89,40,'DROP INDEX','Syntax:\nDROP [ONLINE|OFFLINE] INDEX index_name ON tbl_name\n\nDROP INDEX drops the index named index_name from the table tbl_name.\nThis statement is mapped to an ALTER TABLE statement to drop the index.\nSee [HELP ALTER TABLE].\n\nTo drop a primary key, the index name is always PRIMARY, which must be\nspecified as a quoted identifier because PRIMARY is a reserved word:\n\nDROP INDEX `PRIMARY` ON t;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-index.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (90,38,'MATCH AGAINST','Syntax:\nMATCH (col1,col2,...) AGAINST (expr [search_modifier])\n\nMySQL has support for full-text indexing and searching:\n\no A full-text index in MySQL is an index of type FULLTEXT.\n\no Full-text indexes can be used only with MyISAM tables. (In MySQL 5.6\n  and up, they can also be used with InnoDB tables.) Full-text indexes\n  can be created only for CHAR, VARCHAR, or TEXT columns.\n\no A FULLTEXT index definition can be given in the CREATE TABLE\n  statement when a table is created, or added later using ALTER TABLE\n  or CREATE INDEX.\n\no For large data sets, it is much faster to load your data into a table\n  that has no FULLTEXT index and then create the index after that, than\n  to load data into a table that has an existing FULLTEXT index.\n\nFull-text searching is performed using MATCH() ... AGAINST syntax.\nMATCH() takes a comma-separated list that names the columns to be\nsearched. AGAINST takes a string to search for, and an optional\nmodifier that indicates what type of search to perform. The search\nstring must be a string value that is constant during query evaluation.\nThis rules out, for example, a table column because that can differ for\neach row.\n\nThere are three types of full-text searches:\n\no A natural language search interprets the search string as a phrase in\n  natural human language (a phrase in free text). There are no special\n  operators. The stopword list applies. In addition, words that are\n  present in 50% or more of the rows are considered common and do not\n  match.\n\n  Full-text searches are natural language searches if the IN NATURAL\n  LANGUAGE MODE modifier is given or if no modifier is given. For more\n  information, see\n  http://dev.mysql.com/doc/refman/5.5/en/fulltext-natural-language.html\n  .\n\no A boolean search interprets the search string using the rules of a\n  special query language. The string contains the words to search for.\n  It can also contain operators that specify requirements such that a\n  word must be present or absent in matching rows, or that it should be\n  weighted higher or lower than usual. Common words such as "some" or\n  "then" are stopwords and do not match if present in the search\n  string. The IN BOOLEAN MODE modifier specifies a boolean search. For\n  more information, see\n  http://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html.\n\no A query expansion search is a modification of a natural language\n  search. The search string is used to perform a natural language\n  search. Then words from the most relevant rows returned by the search\n  are added to the search string and the search is done again. The\n  query returns the rows from the second search. The IN NATURAL\n  LANGUAGE MODE WITH QUERY EXPANSION or WITH QUERY EXPANSION modifier\n  specifies a query expansion search. For more information, see\n  http://dev.mysql.com/doc/refman/5.5/en/fulltext-query-expansion.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/fulltext-search.html\n\n','mysql> SELECT id, body, MATCH (title,body) AGAINST\n    -> (\'Security implications of running MySQL as root\'\n    -> IN NATURAL LANGUAGE MODE) AS score\n    -> FROM articles WHERE MATCH (title,body) AGAINST\n    -> (\'Security implications of running MySQL as root\'\n    -> IN NATURAL LANGUAGE MODE);\n+----+-------------------------------------+-----------------+\n| id | body                                | score           |\n+----+-------------------------------------+-----------------+\n|  4 | 1. Never run mysqld as root. 2. ... | 1.5219271183014 |\n|  6 | When configured properly, MySQL ... | 1.3114095926285 |\n+----+-------------------------------------+-----------------+\n2 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/fulltext-search.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (91,40,'CREATE EVENT','Syntax:\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    EVENT\n    [IF NOT EXISTS]\n    event_name\n    ON SCHEDULE schedule\n    [ON COMPLETION [NOT] PRESERVE]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'comment\']\n    DO event_body;\n\nschedule:\n    AT timestamp [+ INTERVAL interval] ...\n  | EVERY interval\n    [STARTS timestamp [+ INTERVAL interval] ...]\n    [ENDS timestamp [+ INTERVAL interval] ...]\n\ninterval:\n    quantity {YEAR | QUARTER | MONTH | DAY | HOUR | MINUTE |\n              WEEK | SECOND | YEAR_MONTH | DAY_HOUR | DAY_MINUTE |\n              DAY_SECOND | HOUR_MINUTE | HOUR_SECOND | MINUTE_SECOND}\n\nThis statement creates and schedules a new event. The event will not\nrun unless the Event Scheduler is enabled. For information about\nchecking Event Scheduler status and enabling it if necessary, see\nhttp://dev.mysql.com/doc/refman/5.5/en/events-configuration.html.\n\nCREATE EVENT requires the EVENT privilege for the schema in which the\nevent is to be created. It might also require the SUPER privilege,\ndepending on the DEFINER value, as described later in this section.\n\nThe minimum requirements for a valid CREATE EVENT statement are as\nfollows:\n\no The keywords CREATE EVENT plus an event name, which uniquely\n  identifies the event in a database schema.\n\no An ON SCHEDULE clause, which determines when and how often the event\n  executes.\n\no A DO clause, which contains the SQL statement to be executed by an\n  event.\n\nThis is an example of a minimal CREATE EVENT statement:\n\nCREATE EVENT myevent\n    ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR\n    DO\n      UPDATE myschema.mytable SET mycol = mycol + 1;\n\nThe previous statement creates an event named myevent. This event\nexecutes once---one hour following its creation---by running an SQL\nstatement that increments the value of the myschema.mytable table\'s\nmycol column by 1.\n\nThe event_name must be a valid MySQL identifier with a maximum length\nof 64 characters. Event names are not case sensitive, so you cannot\nhave two events named myevent and MyEvent in the same schema. In\ngeneral, the rules governing event names are the same as those for\nnames of stored routines. See\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\nAn event is associated with a schema. If no schema is indicated as part\nof event_name, the default (current) schema is assumed. To create an\nevent in a specific schema, qualify the event name with a schema using\nschema_name.event_name syntax.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-event.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-event.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (92,4,'ABS','Syntax:\nABS(X)\n\nReturns the absolute value of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ABS(2);\n        -> 2\nmysql> SELECT ABS(-32);\n        -> 32\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (93,33,'POLYFROMWKB','PolyFromWKB(wkb[,srid]), PolygonFromWKB(wkb[,srid])\n\nConstructs a POLYGON value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (94,38,'NOT LIKE','Syntax:\nexpr NOT LIKE pat [ESCAPE \'escape_char\']\n\nThis is the same as NOT (expr LIKE pat [ESCAPE \'escape_char\']).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (95,38,'SPACE','Syntax:\nSPACE(N)\n\nReturns a string consisting of N space characters.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SPACE(6);\n        -> \'      \'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (96,6,'MBR DEFINITION','Its MBR (Minimum Bounding Rectangle), or Envelope. This is the bounding\ngeometry, formed by the minimum and maximum (X,Y) coordinates:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-class-geometry.html\n\n','((MINX MINY, MAXX MINY, MAXX MAXY, MINX MAXY, MINX MINY))\n','http://dev.mysql.com/doc/refman/5.5/en/gis-class-geometry.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (97,25,'GEOMETRYCOLLECTION','GeometryCollection(g1,g2,...)\n\nConstructs a GeometryCollection.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (98,16,'MAX','Syntax:\nMAX([DISTINCT] expr)\n\nReturns the maximum value of expr. MAX() may take a string argument; in\nsuch cases, it returns the maximum string value. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html. The DISTINCT\nkeyword can be used to find the maximum of the distinct values of expr,\nhowever, this produces the same result as omitting DISTINCT.\n\nMAX() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name, MIN(test_score), MAX(test_score)\n    ->        FROM student\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (99,22,'CREATE FUNCTION UDF','Syntax:\nCREATE [AGGREGATE] FUNCTION function_name RETURNS {STRING|INTEGER|REAL|DECIMAL}\n    SONAME shared_library_name\n\nA user-defined function (UDF) is a way to extend MySQL with a new\nfunction that works like a native (built-in) MySQL function such as\nABS() or CONCAT().\n\nfunction_name is the name that should be used in SQL statements to\ninvoke the function. The RETURNS clause indicates the type of the\nfunction\'s return value. DECIMAL is a legal value after RETURNS, but\ncurrently DECIMAL functions return string values and should be written\nlike STRING functions.\n\nshared_library_name is the basename of the shared object file that\ncontains the code that implements the function. The file must be\nlocated in the plugin directory. This directory is given by the value\nof the plugin_dir system variable. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/udf-compiling.html.\n\nTo create a function, you must have the INSERT privilege for the mysql\ndatabase. This is necessary because CREATE FUNCTION adds a row to the\nmysql.func system table that records the function\'s name, type, and\nshared library name. If you do not have this table, you should run the\nmysql_upgrade command to create it. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-upgrade.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-function-udf.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-function-udf.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (100,4,'*','Syntax:\n*\n\nMultiplication:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3*5;\n        -> 15\nmysql> SELECT 18014398509481984*18014398509481984.0;\n        -> 324518553658426726783156020576256.0\nmysql> SELECT 18014398509481984*18014398509481984;\n        -> out-of-range error\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (101,23,'TIMESTAMP','TIMESTAMP\n\nA timestamp. The range is \'1970-01-01 00:00:01\' UTC to \'2038-01-19\n03:14:07\' UTC. TIMESTAMP values are stored as the number of seconds\nsince the epoch (\'1970-01-01 00:00:00\' UTC). A TIMESTAMP cannot\nrepresent the value \'1970-01-01 00:00:00\' because that is equivalent to\n0 seconds from the epoch and the value 0 is reserved for representing\n\'0000-00-00 00:00:00\', the "zero" TIMESTAMP value.\n\nUnless specified otherwise, the first TIMESTAMP column in a table is\ndefined to be automatically set to the date and time of the most recent\nmodification if not explicitly assigned a value. This makes TIMESTAMP\nuseful for recording the timestamp of an INSERT or UPDATE operation.\nYou can also set any TIMESTAMP column to the current date and time by\nassigning it a NULL value, unless it has been defined with the NULL\nattribute to permit NULL values. The automatic initialization and\nupdating to the current date and time can be specified using DEFAULT\nCURRENT_TIMESTAMP and ON UPDATE CURRENT_TIMESTAMP clauses, as described\nin\nhttp://dev.mysql.com/doc/refman/5.5/en/timestamp-initialization.html.\n\n*Note*: The TIMESTAMP format that was used prior to MySQL 4.1 is not\nsupported in MySQL 5.5; see MySQL 3.23, 4.0, 4.1 Reference Manual for\ninformation regarding the old format.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (102,12,'DES_DECRYPT','Syntax:\nDES_DECRYPT(crypt_str[,key_str])\n\nDecrypts a string encrypted with DES_ENCRYPT(). If an error occurs,\nthis function returns NULL.\n\nThis function works only if MySQL has been configured with SSL support.\nSee http://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html.\n\nIf no key_str argument is given, DES_DECRYPT() examines the first byte\nof the encrypted string to determine the DES key number that was used\nto encrypt the original string, and then reads the key from the DES key\nfile to decrypt the message. For this to work, the user must have the\nSUPER privilege. The key file can be specified with the --des-key-file\nserver option.\n\nIf you pass this function a key_str argument, that string is used as\nthe key for decrypting the message.\n\nIf the crypt_str argument does not appear to be an encrypted string,\nMySQL returns the given crypt_str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (103,27,'CACHE INDEX','Syntax:\nCACHE INDEX\n  tbl_index_list [, tbl_index_list] ...\n  [PARTITION (partition_list | ALL)]\n  IN key_cache_name\n\ntbl_index_list:\n  tbl_name [[INDEX|KEY] (index_name[, index_name] ...)]\n\npartition_list:\n  partition_name[, partition_name][, ...]\n\nThe CACHE INDEX statement assigns table indexes to a specific key\ncache. It is used only for MyISAM tables. After the indexes have been\nassigned, they can be preloaded into the cache if desired with LOAD\nINDEX INTO CACHE.\n\nThe following statement assigns indexes from the tables t1, t2, and t3\nto the key cache named hot_cache:\n\nmysql> CACHE INDEX t1, t2, t3 IN hot_cache;\n+---------+--------------------+----------+----------+\n| Table   | Op                 | Msg_type | Msg_text |\n+---------+--------------------+----------+----------+\n| test.t1 | assign_to_keycache | status   | OK       |\n| test.t2 | assign_to_keycache | status   | OK       |\n| test.t3 | assign_to_keycache | status   | OK       |\n+---------+--------------------+----------+----------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cache-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/cache-index.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (104,13,'ENDPOINT','EndPoint(ls)\n\nReturns the Point that is the endpoint of the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(EndPoint(GeomFromText(@ls)));\n+-------------------------------------+\n| AsText(EndPoint(GeomFromText(@ls))) |\n+-------------------------------------+\n| POINT(3 3)                          |\n+-------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (105,12,'COMPRESS','Syntax:\nCOMPRESS(string_to_compress)\n\nCompresses a string and returns the result as a binary string. This\nfunction requires MySQL to have been compiled with a compression\nlibrary such as zlib. Otherwise, the return value is always NULL. The\ncompressed string can be uncompressed with UNCOMPRESS().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT LENGTH(COMPRESS(REPEAT(\'a\',1000)));\n        -> 21\nmysql> SELECT LENGTH(COMPRESS(\'\'));\n        -> 0\nmysql> SELECT LENGTH(COMPRESS(\'a\'));\n        -> 13\nmysql> SELECT LENGTH(COMPRESS(REPEAT(\'a\',16)));\n        -> 15\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (106,28,'INSERT','Syntax:\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name [(col_name,...)]\n    {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n    [ ON DUPLICATE KEY UPDATE\n      col_name=expr\n        [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    SET col_name={expr | DEFAULT}, ...\n    [ ON DUPLICATE KEY UPDATE\n      col_name=expr\n        [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name [(col_name,...)]\n    SELECT ...\n    [ ON DUPLICATE KEY UPDATE\n      col_name=expr\n        [, col_name=expr] ... ]\n\nINSERT inserts new rows into an existing table. The INSERT ... VALUES\nand INSERT ... SET forms of the statement insert rows based on\nexplicitly specified values. The INSERT ... SELECT form inserts rows\nselected from another table or tables. INSERT ... SELECT is discussed\nfurther in [HELP INSERT SELECT].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/insert.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/insert.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (107,16,'COUNT','Syntax:\nCOUNT(expr)\n\nReturns a count of the number of non-NULL values of expr in the rows\nretrieved by a SELECT statement. The result is a BIGINT value.\n\nCOUNT() returns 0 if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student.student_name,COUNT(*)\n    ->        FROM student,course\n    ->        WHERE student.student_id=course.student_id\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (108,28,'HANDLER','Syntax:\nHANDLER tbl_name OPEN [ [AS] alias]\n\nHANDLER tbl_name READ index_name { = | <= | >= | < | > } (value1,value2,...)\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ index_name { FIRST | NEXT | PREV | LAST }\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ { FIRST | NEXT }\n    [ WHERE where_condition ] [LIMIT ... ]\n\nHANDLER tbl_name CLOSE\n\nThe HANDLER statement provides direct access to table storage engine\ninterfaces. It is available for InnoDB and MyISAM tables.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/handler.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/handler.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (109,3,'MLINEFROMTEXT','MLineFromText(wkt[,srid]), MultiLineStringFromText(wkt[,srid])\n\nConstructs a MULTILINESTRING value using its WKT representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (110,33,'GEOMCOLLFROMWKB','GeomCollFromWKB(wkb[,srid]), GeometryCollectionFromWKB(wkb[,srid])\n\nConstructs a GEOMETRYCOLLECTION value using its WKB representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (111,9,'HELP_DATE','This help information was generated from the MySQL 5.5 Reference Manual\non: 2013-11-04\n','','');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (112,40,'RENAME TABLE','Syntax:\nRENAME TABLE tbl_name TO new_tbl_name\n    [, tbl_name2 TO new_tbl_name2] ...\n\nThis statement renames one or more tables.\n\nThe rename operation is done atomically, which means that no other\nsession can access any of the tables while the rename is running. For\nexample, if you have an existing table old_table, you can create\nanother table new_table that has the same structure but is empty, and\nthen replace the existing table with the empty one as follows (assuming\nthat backup_table does not already exist):\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/rename-table.html\n\n','CREATE TABLE new_table (...);\nRENAME TABLE old_table TO backup_table, new_table TO old_table;\n','http://dev.mysql.com/doc/refman/5.5/en/rename-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (113,23,'BOOLEAN','BOOL, BOOLEAN\n\nThese types are synonyms for TINYINT(1). A value of zero is considered\nfalse. Nonzero values are considered true:\n\nmysql> SELECT IF(0, \'true\', \'false\');\n+------------------------+\n| IF(0, \'true\', \'false\') |\n+------------------------+\n| false                  |\n+------------------------+\n\nmysql> SELECT IF(1, \'true\', \'false\');\n+------------------------+\n| IF(1, \'true\', \'false\') |\n+------------------------+\n| true                   |\n+------------------------+\n\nmysql> SELECT IF(2, \'true\', \'false\');\n+------------------------+\n| IF(2, \'true\', \'false\') |\n+------------------------+\n| true                   |\n+------------------------+\n\nHowever, the values TRUE and FALSE are merely aliases for 1 and 0,\nrespectively, as shown here:\n\nmysql> SELECT IF(0 = FALSE, \'true\', \'false\');\n+--------------------------------+\n| IF(0 = FALSE, \'true\', \'false\') |\n+--------------------------------+\n| true                           |\n+--------------------------------+\n\nmysql> SELECT IF(1 = TRUE, \'true\', \'false\');\n+-------------------------------+\n| IF(1 = TRUE, \'true\', \'false\') |\n+-------------------------------+\n| true                          |\n+-------------------------------+\n\nmysql> SELECT IF(2 = TRUE, \'true\', \'false\');\n+-------------------------------+\n| IF(2 = TRUE, \'true\', \'false\') |\n+-------------------------------+\n| false                         |\n+-------------------------------+\n\nmysql> SELECT IF(2 = FALSE, \'true\', \'false\');\n+--------------------------------+\n| IF(2 = FALSE, \'true\', \'false\') |\n+--------------------------------+\n| false                          |\n+--------------------------------+\n\nThe last two statements display the results shown because 2 is equal to\nneither 1 nor 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (114,14,'DEFAULT','Syntax:\nDEFAULT(col_name)\n\nReturns the default value for a table column. An error results if the\ncolumn has no default value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> UPDATE t SET i = DEFAULT(i)+1 WHERE id < 100;\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (115,4,'MOD','Syntax:\nMOD(N,M), N % M, N MOD M\n\nModulo operation. Returns the remainder of N divided by M.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT MOD(234, 10);\n        -> 4\nmysql> SELECT 253 % 7;\n        -> 1\nmysql> SELECT MOD(29,9);\n        -> 2\nmysql> SELECT 29 MOD 9;\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (116,23,'TINYTEXT','TINYTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 255 (28 - 1) characters. The\neffective maximum length is less if the value contains multi-byte\ncharacters. Each TINYTEXT value is stored using a 1-byte length prefix\nthat indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (117,21,'OPTIMIZE TABLE','Syntax:\nOPTIMIZE [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n    tbl_name [, tbl_name] ...\n\nReorganizes the physical storage of table data and associated index\ndata, to reduce storage space and improve I/O efficiency when accessing\nthe table. The exact changes made to each table depend on the storage\nengine used by that table.\n\nUse OPTIMIZE TABLE in these cases, depending on the type of table:\n\no After doing substantial insert, update, or delete operations on an\n  InnoDB table that has its own .ibd file because it was created with\n  the innodb_file_per_table option enabled. The table and indexes are\n  reorganized, and disk space can be reclaimed for use by the operating\n  system.\n\no After deleting a large part of a MyISAM or ARCHIVE table, or making\n  many changes to a MyISAM or ARCHIVE table with variable-length rows\n  (tables that have VARCHAR, VARBINARY, BLOB, or TEXT columns). Deleted\n  rows are maintained in a linked list and subsequent INSERT operations\n  reuse old row positions. You can use OPTIMIZE TABLE to reclaim the\n  unused space and to defragment the data file. After extensive changes\n  to a table, this statement may also improve performance of statements\n  that use the table, sometimes significantly.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nOPTIMIZE TABLE is also supported for partitioned tables. For\ninformation about using this statement with partitioned tables and\ntable partitions, see\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/optimize-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/optimize-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (118,12,'DECODE','Syntax:\nDECODE(crypt_str,pass_str)\n\nDecrypts the encrypted string crypt_str using pass_str as the password.\ncrypt_str should be a string returned from ENCODE().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (119,19,'<=>','Syntax:\n<=>\n\nNULL-safe equal. This operator performs an equality comparison like the\n= operator, but returns 1 rather than NULL if both operands are NULL,\nand 0 rather than NULL if one operand is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 <=> 1, NULL <=> NULL, 1 <=> NULL;\n        -> 1, 1, 0\nmysql> SELECT 1 = 1, NULL = NULL, 1 = NULL;\n        -> 1, NULL, NULL\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (120,29,'HELP STATEMENT','Syntax:\nHELP \'search_string\'\n\nThe HELP statement returns online information from the MySQL Reference\nmanual. Its proper operation requires that the help tables in the mysql\ndatabase be initialized with help topic information (see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-side-help-support.html).\n\nThe HELP statement searches the help tables for the given search string\nand displays the result of the search. The search string is not case\nsensitive.\n\nThe search string can contain the the wildcard characters "%" and "_".\nThese have the same meaning as for pattern-matching operations\nperformed with the LIKE operator. For example, HELP \'rep%\' returns a\nlist of topics that begin with rep.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/help.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/help.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (121,27,'RESET','Syntax:\nRESET reset_option [, reset_option] ...\n\nThe RESET statement is used to clear the state of various server\noperations. You must have the RELOAD privilege to execute RESET.\n\nRESET acts as a stronger version of the FLUSH statement. See [HELP\nFLUSH].\n\nThe RESET statement causes an implicit commit. See\nhttp://dev.mysql.com/doc/refman/5.5/en/implicit-commit.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/reset.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/reset.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (122,14,'GET_LOCK','Syntax:\nGET_LOCK(str,timeout)\n\nTries to obtain a lock with a name given by the string str, using a\ntimeout of timeout seconds. Returns 1 if the lock was obtained\nsuccessfully, 0 if the attempt timed out (for example, because another\nclient has previously locked the name), or NULL if an error occurred\n(such as running out of memory or the thread was killed with mysqladmin\nkill). If you have a lock obtained with GET_LOCK(), it is released when\nyou execute RELEASE_LOCK(), execute a new GET_LOCK(), or your\nconnection terminates (either normally or abnormally). Locks obtained\nwith GET_LOCK() do not interact with transactions. That is, committing\na transaction does not release any such locks obtained during the\ntransaction.\n\nThis function can be used to implement application locks or to simulate\nrecord locks. Names are locked on a server-wide basis. If a name has\nbeen locked by one client, GET_LOCK() blocks any request by another\nclient for a lock with the same name. This enables clients that agree\non a given lock name to use the name to perform cooperative advisory\nlocking. But be aware that it also enables a client that is not among\nthe set of cooperating clients to lock a name, either inadvertently or\ndeliberately, and thus prevent any of the cooperating clients from\nlocking that name. One way to reduce the likelihood of this is to use\nlock names that are database-specific or application-specific. For\nexample, use lock names of the form db_name.str or app_name.str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT GET_LOCK(\'lock1\',10);\n        -> 1\nmysql> SELECT IS_FREE_LOCK(\'lock2\');\n        -> 1\nmysql> SELECT GET_LOCK(\'lock2\',10);\n        -> 1\nmysql> SELECT RELEASE_LOCK(\'lock2\');\n        -> 1\nmysql> SELECT RELEASE_LOCK(\'lock1\');\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (123,38,'UCASE','Syntax:\nUCASE(str)\n\nUCASE() is a synonym for UPPER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (124,27,'SHOW BINLOG EVENTS','Syntax:\nSHOW BINLOG EVENTS\n   [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nShows the events in the binary log. If you do not specify \'log_name\',\nthe first binary log is displayed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-binlog-events.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-binlog-events.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (125,33,'MPOLYFROMWKB','MPolyFromWKB(wkb[,srid]), MultiPolygonFromWKB(wkb[,srid])\n\nConstructs a MULTIPOLYGON value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (126,24,'ITERATE','Syntax:\nITERATE label\n\nITERATE can appear only within LOOP, REPEAT, and WHILE statements.\nITERATE means "start the loop again."\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/iterate.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/iterate.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (127,28,'DO','Syntax:\nDO expr [, expr] ...\n\nDO executes the expressions but does not return any results. In most\nrespects, DO is shorthand for SELECT expr, ..., but has the advantage\nthat it is slightly faster when you do not care about the result.\n\nDO is useful primarily with functions that have side effects, such as\nRELEASE_LOCK().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/do.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/do.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (128,32,'CURTIME','Syntax:\nCURTIME()\n\nReturns the current time as a value in \'HH:MM:SS\' or HHMMSS.uuuuuu\nformat, depending on whether the function is used in a string or\nnumeric context. The value is expressed in the current time zone.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT CURTIME();\n        -> \'23:50:26\'\nmysql> SELECT CURTIME() + 0;\n        -> 235026.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (129,38,'CHAR_LENGTH','Syntax:\nCHAR_LENGTH(str)\n\nReturns the length of the string str, measured in characters. A\nmulti-byte character counts as a single character. This means that for\na string containing five 2-byte characters, LENGTH() returns 10,\nwhereas CHAR_LENGTH() returns 5.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (130,23,'BIGINT','BIGINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA large integer. The signed range is -9223372036854775808 to\n9223372036854775807. The unsigned range is 0 to 18446744073709551615.\n\nSERIAL is an alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (131,27,'SET','Syntax:\nSET variable_assignment [, variable_assignment] ...\n\nvariable_assignment:\n      user_var_name = expr\n    | [GLOBAL | SESSION] system_var_name = expr\n    | [@@global. | @@session. | @@]system_var_name = expr\n\nThe SET statement assigns values to different types of variables that\naffect the operation of the server or your client. Older versions of\nMySQL employed SET OPTION, but this syntax is deprecated in favor of\nSET without OPTION.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-statement.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-statement.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (132,28,'LOAD XML','Syntax:\nLOAD XML [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE [db_name.]tbl_name\n    [CHARACTER SET charset_name]\n    [ROWS IDENTIFIED BY \'<tagname>\']\n    [IGNORE number {LINES | ROWS}]\n    [(column_or_user_var,...)]\n    [SET col_name = expr,...]\n\nThe LOAD XML statement reads data from an XML file into a table. The\nfile_name must be given as a literal string. The tagname in the\noptional ROWS IDENTIFIED BY clause must also be given as a literal\nstring, and must be surrounded by angle brackets (< and >).\n\nLOAD XML acts as the complement of running the mysql client in XML\noutput mode (that is, starting the client with the --xml option). To\nwrite data from a table to an XML file, use a command such as the\nfollowing one from the system shell:\n\nshell> mysql --xml -e \'SELECT * FROM mytable\' > file.xml\n\nTo read the file back into a table, use LOAD XML INFILE. By default,\nthe <row> element is considered to be the equivalent of a database\ntable row; this can be changed using the ROWS IDENTIFIED BY clause.\n\nThis statement supports three different XML formats:\n\no Column names as attributes and column values as attribute values:\n\n<row column1="value1" column2="value2" .../>\n\no Column names as tags and column values as the content of these tags:\n\n<row>\n  <column1>value1</column1>\n  <column2>value2</column2>\n</row>\n\no Column names are the name attributes of <field> tags, and values are\n  the contents of these tags:\n\n<row>\n  <field name=\'column1\'>value1</field>\n  <field name=\'column2\'>value2</field>\n</row>\n\n  This is the format used by other MySQL tools, such as mysqldump.\n\nAll 3 formats can be used in the same XML file; the import routine\nautomatically detects the format for each row and interprets it\ncorrectly. Tags are matched based on the tag or attribute name and the\ncolumn name.\n\nThe following clauses work essentially the same way for LOAD XML as\nthey do for LOAD DATA:\n\no LOW_PRIORITY or CONCURRENT\n\no LOCAL\n\no REPLACE or IGNORE\n\no CHARACTER SET\n\no (column_or_user_var,...)\n\no SET\n\nSee [HELP LOAD DATA], for more information about these clauses.\n\nThe IGNORE number LINES or IGNORE number ROWS clause causes the first\nnumber rows in the XML file to be skipped. It is analogous to the LOAD\nDATA statement\'s IGNORE ... LINES clause.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/load-xml.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/load-xml.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (133,4,'CONV','Syntax:\nCONV(N,from_base,to_base)\n\nConverts numbers between different number bases. Returns a string\nrepresentation of the number N, converted from base from_base to base\nto_base. Returns NULL if any argument is NULL. The argument N is\ninterpreted as an integer, but may be specified as an integer or a\nstring. The minimum base is 2 and the maximum base is 36. If to_base is\na negative number, N is regarded as a signed number. Otherwise, N is\ntreated as unsigned. CONV() works with 64-bit precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT CONV(\'a\',16,2);\n        -> \'1010\'\nmysql> SELECT CONV(\'6E\',18,8);\n        -> \'172\'\nmysql> SELECT CONV(-17,10,-18);\n        -> \'-H\'\nmysql> SELECT CONV(10+\'10\'+\'10\'+0xa,10,10);\n        -> \'40\'\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (134,23,'DATE','DATE\n\nA date. The supported range is \'1000-01-01\' to \'9999-12-31\'. MySQL\ndisplays DATE values in \'YYYY-MM-DD\' format, but permits assignment of\nvalues to DATE columns using either strings or numbers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (135,15,'ASSIGN-VALUE','Syntax:\n:=\n\nAssignment operator. Causes the user variable on the left hand side of\nthe operator to take on the value to its right. The value on the right\nhand side may be a literal value, another variable storing a value, or\nany legal expression that yields a scalar value, including the result\nof a query (provided that this value is a scalar value). You can\nperform multiple assignments in the same SET statement. You can perform\nmultiple assignments in the same statement-\n\nUnlike =, the := operator is never interpreted as a comparison\noperator. This means you can use := in any valid SQL statement (not\njust in SET statements) to assign a value to a variable.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n        -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n        -> 1, 1\nmysql> SELECT @var1, @var2;\n        -> 1, 1\n\nmysql> SELECT @var1:=COUNT(*) FROM t1;\n        -> 4\nmysql> SELECT @var1;\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (136,27,'SHOW OPEN TABLES','Syntax:\nSHOW OPEN TABLES [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW OPEN TABLES lists the non-TEMPORARY tables that are currently open\nin the table cache. See\nhttp://dev.mysql.com/doc/refman/5.5/en/table-cache.html. The FROM\nclause, if present, restricts the tables shown to those present in the\ndb_name database. The LIKE clause, if present, indicates which table\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-open-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-open-tables.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (137,32,'EXTRACT','Syntax:\nEXTRACT(unit FROM date)\n\nThe EXTRACT() function uses the same kinds of unit specifiers as\nDATE_ADD() or DATE_SUB(), but extracts parts from the date rather than\nperforming date arithmetic.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT EXTRACT(YEAR FROM \'2009-07-02\');\n       -> 2009\nmysql> SELECT EXTRACT(YEAR_MONTH FROM \'2009-07-02 01:02:03\');\n       -> 200907\nmysql> SELECT EXTRACT(DAY_MINUTE FROM \'2009-07-02 01:02:03\');\n       -> 20102\nmysql> SELECT EXTRACT(MICROSECOND\n    ->                FROM \'2003-01-02 10:30:00.000123\');\n        -> 123\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (138,12,'ENCRYPT','Syntax:\nENCRYPT(str[,salt])\n\nEncrypts str using the Unix crypt() system call and returns a binary\nstring. The salt argument must be a string with at least two characters\nor the result will be NULL. If no salt argument is given, a random\nvalue is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT ENCRYPT(\'hello\');\n        -> \'VxuFAJXVARROc\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (139,27,'SHOW STATUS','Syntax:\nSHOW [GLOBAL | SESSION] STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW STATUS provides server status information. This information also\ncan be obtained using the mysqladmin extended-status command. The LIKE\nclause, if present, indicates which variable names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in http://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\nThis statement does not require any privilege. It requires only the\nability to connect to the server.\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern:\n\nmysql> SHOW STATUS LIKE \'Key%\';\n+--------------------+----------+\n| Variable_name      | Value    |\n+--------------------+----------+\n| Key_blocks_used    | 14955    |\n| Key_read_requests  | 96854827 |\n| Key_reads          | 162040   |\n| Key_write_requests | 7589728  |\n| Key_writes         | 3813196  |\n+--------------------+----------+\n\nWith the GLOBAL modifier, SHOW STATUS displays the status values for\nall connections to MySQL. With SESSION, it displays the status values\nfor the current connection. If no modifier is present, the default is\nSESSION. LOCAL is a synonym for SESSION.\n\nSome status variables have only a global value. For these, you get the\nsame value for both GLOBAL and SESSION. The scope for each status\nvariable is listed at\nhttp://dev.mysql.com/doc/refman/5.5/en/server-status-variables.html.\n\nEach invocation of the SHOW STATUS statement uses an internal temporary\ntable and increments the global Created_tmp_tables value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-status.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (140,38,'EXTRACTVALUE','Syntax:\nExtractValue(xml_frag, xpath_expr)\n\nExtractValue() takes two string arguments, a fragment of XML markup\nxml_frag and an XPath expression xpath_expr (also known as a locator);\nit returns the text (CDATA) of the first text node which is a child of\nthe elements or elements matched by the XPath expression. In MySQL 5.5,\nthe XPath expression can contain at most 127 characters. (This\nlimitation is lifted in MySQL 5.6.)\n\nUsing this function is the equivalent of performing a match using the\nxpath_expr after appending /text(). In other words,\nExtractValue(\'<a><b>Sakila</b></a>\', \'/a/b\') and\nExtractValue(\'<a><b>Sakila</b></a>\', \'/a/b/text()\') produce the same\nresult.\n\nIf multiple matches are found, the content of the first child text node\nof each matching element is returned (in the order matched) as a\nsingle, space-delimited string.\n\nIf no matching text node is found for the expression (including the\nimplicit /text())---for whatever reason, as long as xpath_expr is\nvalid, and xml_frag consists of elements which are properly nested and\nclosed---an empty string is returned. No distinction is made between a\nmatch on an empty element and no match at all. This is by design.\n\nIf you need to determine whether no matching element was found in\nxml_frag or such an element was found but contained no child text\nnodes, you should test the result of an expression that uses the XPath\ncount() function. For example, both of these statements return an empty\nstring, as shown here:\n\nmysql> SELECT ExtractValue(\'<a><b/></a>\', \'/a/b\');\n+-------------------------------------+\n| ExtractValue(\'<a><b/></a>\', \'/a/b\') |\n+-------------------------------------+\n|                                     |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT ExtractValue(\'<a><c/></a>\', \'/a/b\');\n+-------------------------------------+\n| ExtractValue(\'<a><c/></a>\', \'/a/b\') |\n+-------------------------------------+\n|                                     |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nHowever, you can determine whether there was actually a matching\nelement using the following:\n\nmysql> SELECT ExtractValue(\'<a><b/></a>\', \'count(/a/b)\');\n+-------------------------------------+\n| ExtractValue(\'<a><b/></a>\', \'count(/a/b)\') |\n+-------------------------------------+\n| 1                                   |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT ExtractValue(\'<a><c/></a>\', \'count(/a/b)\');\n+-------------------------------------+\n| ExtractValue(\'<a><c/></a>\', \'count(/a/b)\') |\n+-------------------------------------+\n| 0                                   |\n+-------------------------------------+\n1 row in set (0.01 sec)\n\n*Important*: ExtractValue() returns only CDATA, and does not return any\ntags that might be contained within a matching tag, nor any of their\ncontent (see the result returned as val1 in the following example).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html\n\n','mysql> SELECT\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/a\') AS val1,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/a/b\') AS val2,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'//b\') AS val3,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/b\') AS val4,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b><b>eee</b></a>\', \'//b\') AS val5;\n\n+------+------+------+------+---------+\n| val1 | val2 | val3 | val4 | val5    |\n+------+------+------+------+---------+\n| ccc  | ddd  | ddd  |      | ddd eee |\n+------+------+------+------+---------+\n','http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (141,12,'OLD_PASSWORD','Syntax:\nOLD_PASSWORD(str)\n\nOLD_PASSWORD() was added when the implementation of PASSWORD() was\nchanged in MySQL 4.1 to improve security. OLD_PASSWORD() returns the\nvalue of the pre-4.1 implementation of PASSWORD() as a string, and is\nintended to permit you to reset passwords for any pre-4.1 clients that\nneed to connect to your version 5.5 MySQL server without locking them\nout. See http://dev.mysql.com/doc/refman/5.5/en/password-hashing.html.\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring.\n\n*Note*: Passwords that use the pre-4.1 hashing method are less secure\nthan passwords that use the native password hashing method and should\nbe avoided.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (142,38,'FORMAT','Syntax:\nFORMAT(X,D[,locale])\n\nFormats the number X to a format like \'#,###,###.##\', rounded to D\ndecimal places, and returns the result as a string. If D is 0, the\nresult has no decimal point or fractional part.\n\nThe optional third parameter enables a locale to be specified to be\nused for the result number\'s decimal point, thousands separator, and\ngrouping between separators. Permissible locale values are the same as\nthe legal values for the lc_time_names system variable (see\nhttp://dev.mysql.com/doc/refman/5.5/en/locale-support.html). If no\nlocale is specified, the default is \'en_US\'.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT FORMAT(12332.123456, 4);\n        -> \'12,332.1235\'\nmysql> SELECT FORMAT(12332.1,4);\n        -> \'12,332.1000\'\nmysql> SELECT FORMAT(12332.2,0);\n        -> \'12,332\'\nmysql> SELECT FORMAT(12332.2,2,\'de_DE\');\n        -> \'12.332,20\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (143,15,'||','Syntax:\nOR, ||\n\nLogical OR. When both operands are non-NULL, the result is 1 if any\noperand is nonzero, and 0 otherwise. With a NULL operand, the result is\n1 if the other operand is nonzero, and NULL otherwise. If both operands\nare NULL, the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT 1 || 1;\n        -> 1\nmysql> SELECT 1 || 0;\n        -> 1\nmysql> SELECT 0 || 0;\n        -> 0\nmysql> SELECT 0 || NULL;\n        -> NULL\nmysql> SELECT 1 || NULL;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (144,38,'BIT_LENGTH','Syntax:\nBIT_LENGTH(str)\n\nReturns the length of the string str in bits.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT BIT_LENGTH(\'text\');\n        -> 32\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (145,2,'EXTERIORRING','ExteriorRing(poly)\n\nReturns the exterior ring of the Polygon value poly as a LineString.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @poly =\n    -> \'Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))\';\nmysql> SELECT AsText(ExteriorRing(GeomFromText(@poly)));\n+-------------------------------------------+\n| AsText(ExteriorRing(GeomFromText(@poly))) |\n+-------------------------------------------+\n| LINESTRING(0 0,0 3,3 3,3 0,0 0)           |\n+-------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (146,33,'GEOMFROMWKB','GeomFromWKB(wkb[,srid]), GeometryFromWKB(wkb[,srid])\n\nConstructs a geometry value of any type using its WKB representation\nand SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (147,27,'SHOW SLAVE HOSTS','Syntax:\nSHOW SLAVE HOSTS\n\nDisplays a list of replication slaves currently registered with the\nmaster. (Before MySQL 5.5.3, only slaves started with the\n--report-host=host_name option are visible in this list.)\n\nThe list is displayed on any server (not just the master server). The\noutput looks like this:\n\nmysql> SHOW SLAVE HOSTS;\n+------------+-----------+------+-----------+\n| Server_id  | Host      | Port | Master_id |\n+------------+-----------+------+-----------+\n|  192168010 | iconnect2 | 3306 | 192168011 |\n| 1921680101 | athena    | 3306 | 192168011 |\n+------------+-----------+------+-----------+\n\no Server_id: The unique server ID of the slave server, as configured in\n  the server\'s option file, or on the command line with\n  --server-id=value.\n\no Host: The host name of the slave server, as configured in the\n  server\'s option file, or on the command line with\n  --report-host=host_name. Note that this can differ from the machine\n  name as configured in the operating system.\n\no Port: The port the slave server is listening on.\n\n  In MySQL 5.5.23 and later, a zero in this column means that the slave\n  port (--report-port) was not set. Prior to MySQL 5.5.23, 3306 was\n  used as the default in such cases (Bug #13333431).\n\no Master_id: The unique server ID of the master server that the slave\n  server is replicating from.\n\nSome MySQL versions report another variable, Rpl_recovery_rank. This\nvariable was never used, and was removed in MySQL 5.5.3. (Bug #13963)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-slave-hosts.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-slave-hosts.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (148,8,'START TRANSACTION','Syntax:\nSTART TRANSACTION [WITH CONSISTENT SNAPSHOT]\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that as\nsoon as you execute a statement that updates (modifies) a table, MySQL\nstores the update on disk to make it permanent. The change cannot be\nrolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nYou can also begin a transaction like this:\n\nSTART TRANSACTION WITH CONSISTENT SNAPSHOT;\n\nThe WITH CONSISTENT SNAPSHOT option starts a consistent read for\nstorage engines that are capable of it. This applies only to InnoDB.\nThe effect is the same as issuing a START TRANSACTION followed by a\nSELECT from any InnoDB table. See\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-consistent-read.html. The\nWITH CONSISTENT SNAPSHOT option does not change the current transaction\nisolation level, so it provides a consistent snapshot only if the\ncurrent isolation level is one that permits a consistent read. The only\nisolation level that permits a consistent read is REPEATABLE READ. For\nall other isolation levels, the WITH CONSISTENT SNAPSHOT clause is\nignored. As of MySQL 5.5.34, a warning is generated when the WITH\nCONSISTENT SNAPSHOT is ignored.\n\n*Important*: Many APIs used for writing MySQL client applications (such\nas JDBC) provide their own methods for starting transactions that can\n(and sometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttp://dev.mysql.com/doc/refman/5.5/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDBCLUSTER) are not made permanent immediately. You must use COMMIT to\nstore your changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax and\nis the recommended way to start an ad-hoc transaction.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*: Within all stored programs (stored procedures and functions,\ntriggers, and events), the parser treats BEGIN [WORK] as the beginning\nof a BEGIN ... END block. Begin a transaction in this context with\nSTART TRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The RELEASE clause causes the\nserver to disconnect the current client session after terminating the\ncurrent transaction. Including the NO keyword suppresses CHAIN or\nRELEASE completion, which can be useful if the completion_type system\nvariable is set to cause chaining or release completion by default.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/commit.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/commit.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (149,19,'BETWEEN AND','Syntax:\nexpr BETWEEN min AND max\n\nIf expr is greater than or equal to min and expr is less than or equal\nto max, BETWEEN returns 1, otherwise it returns 0. This is equivalent\nto the expression (min <= expr AND expr <= max) if all the arguments\nare of the same type. Otherwise type conversion takes place according\nto the rules described in\nhttp://dev.mysql.com/doc/refman/5.5/en/type-conversion.html, but\napplied to all the three arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 BETWEEN 1 AND 3, 2 BETWEEN 3 and 1;\n        -> 1, 0\nmysql> SELECT 1 BETWEEN 2 AND 3;\n        -> 0\nmysql> SELECT \'b\' BETWEEN \'a\' AND \'c\';\n        -> 1\nmysql> SELECT 2 BETWEEN 2 AND \'3\';\n        -> 1\nmysql> SELECT 2 BETWEEN 2 AND \'x-3\';\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (150,25,'MULTIPOLYGON','MultiPolygon(poly1,poly2,...)\n\nConstructs a MultiPolygon value from a set of Polygon or WKB Polygon\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (151,32,'TIME_FORMAT','Syntax:\nTIME_FORMAT(time,format)\n\nThis is used like the DATE_FORMAT() function, but the format string may\ncontain format specifiers only for hours, minutes, seconds, and\nmicroseconds. Other specifiers produce a NULL value or 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIME_FORMAT(\'100:00:00\', \'%H %k %h %I %l\');\n        -> \'100 100 04 04 4\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (152,38,'LEFT','Syntax:\nLEFT(str,len)\n\nReturns the leftmost len characters from the string str, or NULL if any\nargument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LEFT(\'foobarbar\', 5);\n        -> \'fooba\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (153,27,'FLUSH QUERY CACHE','You can defragment the query cache to better utilize its memory with\nthe FLUSH QUERY CACHE statement. The statement does not remove any\nqueries from the cache.\n\nThe RESET QUERY CACHE statement removes all query results from the\nquery cache. The FLUSH TABLES statement also does this.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/query-cache-status-and-maintenance.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/query-cache-status-and-maintenance.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (154,23,'SET DATA TYPE','SET(\'value1\',\'value2\',...) [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nA set. A string object that can have zero or more values, each of which\nmust be chosen from the list of values \'value1\', \'value2\', ... SET\nvalues are represented internally as integers.\n\nA SET column can have a maximum of 64 distinct members. A table can\nhave no more than 255 unique element list definitions among its ENUM\nand SET columns considered as a group. For more information on this\nlimit, see http://dev.mysql.com/doc/refman/5.5/en/limits-frm-file.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (155,4,'RAND','Syntax:\nRAND(), RAND(N)\n\nReturns a random floating-point value v in the range 0 <= v < 1.0. If a\nconstant integer argument N is specified, it is used as the seed value,\nwhich produces a repeatable sequence of column values. In the following\nexample, note that the sequences of values produced by RAND(3) is the\nsame both places where it occurs.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> CREATE TABLE t (i INT);\nQuery OK, 0 rows affected (0.42 sec)\n\nmysql> INSERT INTO t VALUES(1),(2),(3);\nQuery OK, 3 rows affected (0.00 sec)\nRecords: 3  Duplicates: 0  Warnings: 0\n\nmysql> SELECT i, RAND() FROM t;\n+------+------------------+\n| i    | RAND()           |\n+------+------------------+\n|    1 | 0.61914388706828 |\n|    2 | 0.93845168309142 |\n|    3 | 0.83482678498591 |\n+------+------------------+\n3 rows in set (0.00 sec)\n\nmysql> SELECT i, RAND(3) FROM t;\n+------+------------------+\n| i    | RAND(3)          |\n+------+------------------+\n|    1 | 0.90576975597606 |\n|    2 | 0.37307905813035 |\n|    3 | 0.14808605345719 |\n+------+------------------+\n3 rows in set (0.00 sec)\n\nmysql> SELECT i, RAND() FROM t;\n+------+------------------+\n| i    | RAND()           |\n+------+------------------+\n|    1 | 0.35877890638893 |\n|    2 | 0.28941420772058 |\n|    3 | 0.37073435016976 |\n+------+------------------+\n3 rows in set (0.00 sec)\n\nmysql> SELECT i, RAND(3) FROM t;\n+------+------------------+\n| i    | RAND(3)          |\n+------+------------------+\n|    1 | 0.90576975597606 |\n|    2 | 0.37307905813035 |\n|    3 | 0.14808605345719 |\n+------+------------------+\n3 rows in set (0.01 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (156,38,'RPAD','Syntax:\nRPAD(str,len,padstr)\n\nReturns the string str, right-padded with the string padstr to a length\nof len characters. If str is longer than len, the return value is\nshortened to len characters.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT RPAD(\'hi\',5,\'?\');\n        -> \'hi???\'\nmysql> SELECT RPAD(\'hi\',1,\'?\');\n        -> \'h\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (157,40,'CREATE DATABASE','Syntax:\nCREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n    [create_specification] ...\n\ncreate_specification:\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n\nCREATE DATABASE creates a database with the given name. To use this\nstatement, you need the CREATE privilege for the database. CREATE\nSCHEMA is a synonym for CREATE DATABASE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-database.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-database.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (158,23,'DEC','DEC[(M[,D])] [UNSIGNED] [ZEROFILL], NUMERIC[(M[,D])] [UNSIGNED]\n[ZEROFILL], FIXED[(M[,D])] [UNSIGNED] [ZEROFILL]\n\nThese types are synonyms for DECIMAL. The FIXED synonym is available\nfor compatibility with other database systems.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (159,16,'VAR_POP','Syntax:\nVAR_POP(expr)\n\nReturns the population standard variance of expr. It considers rows as\nthe whole population, not as a sample, so it has the number of rows as\nthe denominator. You can also use VARIANCE(), which is equivalent but\nis not standard SQL.\n\nVAR_POP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (160,38,'ELT','Syntax:\nELT(N,str1,str2,str3,...)\n\nELT() returns the Nth element of the list of strings: str1 if N = 1,\nstr2 if N = 2, and so on. Returns NULL if N is less than 1 or greater\nthan the number of arguments. ELT() is the complement of FIELD().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT ELT(1, \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> \'ej\'\nmysql> SELECT ELT(4, \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> \'foo\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (161,40,'ALTER VIEW','Syntax:\nALTER\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = { user | CURRENT_USER }]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThis statement changes the definition of a view, which must exist. The\nsyntax is similar to that for CREATE VIEW and the effect is the same as\nfor CREATE OR REPLACE VIEW. See [HELP CREATE VIEW]. This statement\nrequires the CREATE VIEW and DROP privileges for the view, and some\nprivilege for each column referred to in the SELECT statement. ALTER\nVIEW is permitted only to the definer or users with the SUPER\nprivilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-view.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (162,27,'SHOW DATABASES','Syntax:\nSHOW {DATABASES | SCHEMAS}\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW DATABASES lists the databases on the MySQL server host. SHOW\nSCHEMAS is a synonym for SHOW DATABASES. The LIKE clause, if present,\nindicates which database names to match. The WHERE clause can be given\nto select rows using more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nYou see only those databases for which you have some kind of privilege,\nunless you have the global SHOW DATABASES privilege. You can also get\nthis list using the mysqlshow command.\n\nIf the server was started with the --skip-show-database option, you\ncannot use this statement at all unless you have the SHOW DATABASES\nprivilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-databases.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-databases.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (163,20,'~','Syntax:\n~\n\nInvert all bits.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 5 & ~1;\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (164,23,'TEXT','TEXT[(M)] [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 65,535 (216 - 1) characters. The\neffective maximum length is less if the value contains multi-byte\ncharacters. Each TEXT value is stored using a 2-byte length prefix that\nindicates the number of bytes in the value.\n\nAn optional length M can be given for this type. If this is done, MySQL\ncreates the column as the smallest TEXT type large enough to hold\nvalues M characters long.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (165,38,'CONCAT_WS','Syntax:\nCONCAT_WS(separator,str1,str2,...)\n\nCONCAT_WS() stands for Concatenate With Separator and is a special form\nof CONCAT(). The first argument is the separator for the rest of the\narguments. The separator is added between the strings to be\nconcatenated. The separator can be a string, as can the rest of the\narguments. If the separator is NULL, the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT CONCAT_WS(\',\',\'First name\',\'Second name\',\'Last Name\');\n        -> \'First name,Second name,Last Name\'\nmysql> SELECT CONCAT_WS(\',\',\'First name\',NULL,\'Last Name\');\n        -> \'First name,Last Name\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (166,17,'ROW_COUNT','Syntax:\nROW_COUNT()\n\nBefore MySQL 5.5.5, ROW_COUNT() returns the number of rows changed,\ndeleted, or inserted by the last statement if it was an UPDATE, DELETE,\nor INSERT. For other statements, the value may not be meaningful.\n\nAs of MySQL 5.5.5, ROW_COUNT() returns a value as follows:\n\no DDL statements: 0. This applies to statements such as CREATE TABLE or\n  DROP TABLE.\n\no DML statements other than SELECT: The number of affected rows. This\n  applies to statements such as UPDATE, INSERT, or DELETE (as before),\n  but now also to statements such as ALTER TABLE and LOAD DATA INFILE.\n\no SELECT: -1 if the statement returns a result set, or the number of\n  rows "affected" if it does not. For example, for SELECT * FROM t1,\n  ROW_COUNT() returns -1. For SELECT * FROM t1 INTO OUTFILE\n  \'file_name\', ROW_COUNT() returns the number of rows written to the\n  file.\n\no SIGNAL statements: 0.\n\nFor UPDATE statements, the affected-rows value by default is the number\nof rows actually changed. If you specify the CLIENT_FOUND_ROWS flag to\nmysql_real_connect() when connecting to mysqld, the affected-rows value\nis the number of rows "found"; that is, matched by the WHERE clause.\n\nFor REPLACE statements, the affected-rows value is 2 if the new row\nreplaced an old row, because in this case, one row was inserted after\nthe duplicate was deleted.\n\nFor INSERT ... ON DUPLICATE KEY UPDATE statements, the affected-rows\nvalue per row is 1 if the row is inserted as a new row, 2 if an\nexisting row is updated, and 0 if an existing row is set to its current\nvalues. If you specify the CLIENT_FOUND_ROWS flag, the affected-rows\nvalue is 1 (not 0) if an existing row is set to its current values.\n\nThe ROW_COUNT() value is similar to the value from the\nmysql_affected_rows() C API function and the row count that the mysql\nclient displays following statement execution.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> INSERT INTO t VALUES(1),(2),(3);\nQuery OK, 3 rows affected (0.00 sec)\nRecords: 3  Duplicates: 0  Warnings: 0\n\nmysql> SELECT ROW_COUNT();\n+-------------+\n| ROW_COUNT() |\n+-------------+\n|           3 |\n+-------------+\n1 row in set (0.00 sec)\n\nmysql> DELETE FROM t WHERE i IN(1,2);\nQuery OK, 2 rows affected (0.00 sec)\n\nmysql> SELECT ROW_COUNT();\n+-------------+\n| ROW_COUNT() |\n+-------------+\n|           2 |\n+-------------+\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (167,4,'ASIN','Syntax:\nASIN(X)\n\nReturns the arc sine of X, that is, the value whose sine is X. Returns\nNULL if X is not in the range -1 to 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ASIN(0.2);\n        -> 0.20135792079033\nmysql> SELECT ASIN(\'foo\');\n\n+-------------+\n| ASIN(\'foo\') |\n+-------------+\n|           0 |\n+-------------+\n1 row in set, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+---------+------+-----------------------------------------+\n| Level   | Code | Message                                 |\n+---------+------+-----------------------------------------+\n| Warning | 1292 | Truncated incorrect DOUBLE value: \'foo\' |\n+---------+------+-----------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (168,4,'SIGN','Syntax:\nSIGN(X)\n\nReturns the sign of the argument as -1, 0, or 1, depending on whether X\nis negative, zero, or positive.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT SIGN(-32);\n        -> -1\nmysql> SELECT SIGN(0);\n        -> 0\nmysql> SELECT SIGN(234);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (169,32,'SEC_TO_TIME','Syntax:\nSEC_TO_TIME(seconds)\n\nReturns the seconds argument, converted to hours, minutes, and seconds,\nas a TIME value. The range of the result is constrained to that of the\nTIME data type. A warning occurs if the argument corresponds to a value\noutside that range.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT SEC_TO_TIME(2378);\n        -> \'00:39:38\'\nmysql> SELECT SEC_TO_TIME(2378) + 0;\n        -> 3938\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (170,23,'FLOAT','FLOAT[(M,D)] [UNSIGNED] [ZEROFILL]\n\nA small (single-precision) floating-point number. Permissible values\nare -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to\n3.402823466E+38. These are the theoretical limits, based on the IEEE\nstandard. The actual range might be slightly smaller depending on your\nhardware or operating system.\n\nM is the total number of digits and D is the number of digits following\nthe decimal point. If M and D are omitted, values are stored to the\nlimits permitted by the hardware. A single-precision floating-point\nnumber is accurate to approximately 7 decimal places.\n\nUNSIGNED, if specified, disallows negative values.\n\nUsing FLOAT might give you some unexpected problems because all\ncalculations in MySQL are done with double precision. See\nhttp://dev.mysql.com/doc/refman/5.5/en/no-matching-rows.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (171,38,'LOCATE','Syntax:\nLOCATE(substr,str), LOCATE(substr,str,pos)\n\nThe first syntax returns the position of the first occurrence of\nsubstring substr in string str. The second syntax returns the position\nof the first occurrence of substring substr in string str, starting at\nposition pos. Returns 0 if substr is not in str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LOCATE(\'bar\', \'foobarbar\');\n        -> 4\nmysql> SELECT LOCATE(\'xbar\', \'foobar\');\n        -> 0\nmysql> SELECT LOCATE(\'bar\', \'foobarbar\', 5);\n        -> 7\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (172,27,'SHOW EVENTS','Syntax:\nSHOW EVENTS [{FROM | IN} schema_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement displays information about Event Manager events. It\nrequires the EVENT privilege for the database from which the events are\nto be shown.\n\nIn its simplest form, SHOW EVENTS lists all of the events in the\ncurrent schema:\n\nmysql> SELECT CURRENT_USER(), SCHEMA();\n+----------------+----------+\n| CURRENT_USER() | SCHEMA() |\n+----------------+----------+\n| jon@ghidora    | myschema |\n+----------------+----------+\n1 row in set (0.00 sec)\n\nmysql> SHOW EVENTS\\G\n*************************** 1. row ***************************\n                  Db: myschema\n                Name: e_daily\n             Definer: jon@ghidora\n           Time zone: SYSTEM\n                Type: RECURRING\n          Execute at: NULL\n      Interval value: 10\n      Interval field: SECOND\n              Starts: 2006-02-09 10:41:23\n                Ends: NULL\n              Status: ENABLED\n          Originator: 0\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n\nTo see events for a specific schema, use the FROM clause. For example,\nto see events for the test schema, use the following statement:\n\nSHOW EVENTS FROM test;\n\nThe LIKE clause, if present, indicates which event names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-events.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-events.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (173,17,'CHARSET','Syntax:\nCHARSET(str)\n\nReturns the character set of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT CHARSET(\'abc\');\n        -> \'latin1\'\nmysql> SELECT CHARSET(CONVERT(\'abc\' USING utf8));\n        -> \'utf8\'\nmysql> SELECT CHARSET(USER());\n        -> \'utf8\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (174,32,'SUBDATE','Syntax:\nSUBDATE(date,INTERVAL expr unit), SUBDATE(expr,days)\n\nWhen invoked with the INTERVAL form of the second argument, SUBDATE()\nis a synonym for DATE_SUB(). For information on the INTERVAL unit\nargument, see the discussion for DATE_ADD().\n\nmysql> SELECT DATE_SUB(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2007-12-02\'\nmysql> SELECT SUBDATE(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2007-12-02\'\n\nThe second form enables the use of an integer value for days. In such\ncases, it is interpreted as the number of days to be subtracted from\nthe date or datetime expression expr.\n\nmysql> SELECT SUBDATE(\'2008-01-02 12:00:00\', 31);\n        -> \'2007-12-02 12:00:00\'\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (175,32,'DAYOFYEAR','Syntax:\nDAYOFYEAR(date)\n\nReturns the day of the year for date, in the range 1 to 366.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFYEAR(\'2007-02-03\');\n        -> 34\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (176,4,'%','Syntax:\nN % M, N MOD M\n\nModulo operation. Returns the remainder of N divided by M. For more\ninformation, see the description for the MOD() function in\nhttp://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (177,23,'LONGTEXT','LONGTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 4,294,967,295 or 4GB (232 - 1)\ncharacters. The effective maximum length is less if the value contains\nmulti-byte characters. The effective maximum length of LONGTEXT columns\nalso depends on the configured maximum packet size in the client/server\nprotocol and available memory. Each LONGTEXT value is stored using a\n4-byte length prefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (178,27,'KILL','Syntax:\nKILL [CONNECTION | QUERY] thread_id\n\nEach connection to mysqld runs in a separate thread. You can see which\nthreads are running with the SHOW PROCESSLIST statement and kill a\nthread with the KILL thread_id statement.\n\nKILL permits an optional CONNECTION or QUERY modifier:\n\no KILL CONNECTION is the same as KILL with no modifier: It terminates\n  the connection associated with the given thread_id.\n\no KILL QUERY terminates the statement that the connection is currently\n  executing, but leaves the connection itself intact.\n\nIf you have the PROCESS privilege, you can see all threads. If you have\nthe SUPER privilege, you can kill all threads and statements.\nOtherwise, you can see and kill only your own threads and statements.\n\nYou can also use the mysqladmin processlist and mysqladmin kill\ncommands to examine and kill threads.\n\n*Note*: You cannot use KILL with the Embedded MySQL Server library\nbecause the embedded server merely runs inside the threads of the host\napplication. It does not create any connection threads of its own.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/kill.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/kill.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (179,31,'DISJOINT','Disjoint(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 is spatially disjoint from (does\nnot intersect) g2.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (180,3,'ASTEXT','AsText(g), AsWKT(g)\n\nConverts a value in internal geometry format to its WKT representation\nand returns the string result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-to-convert-geometries-between-formats.html\n\n','mysql> SET @g = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(GeomFromText(@g));\n+--------------------------+\n| AsText(GeomFromText(@g)) |\n+--------------------------+\n| LINESTRING(1 1,2 2,3 3)  |\n+--------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/functions-to-convert-geometries-between-formats.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (181,38,'LPAD','Syntax:\nLPAD(str,len,padstr)\n\nReturns the string str, left-padded with the string padstr to a length\nof len characters. If str is longer than len, the return value is\nshortened to len characters.\n\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LPAD(\'hi\',4,\'??\');\n        -> \'??hi\'\nmysql> SELECT LPAD(\'hi\',1,\'??\');\n        -> \'h\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (182,24,'DECLARE CONDITION','Syntax:\nDECLARE condition_name CONDITION FOR condition_value\n\ncondition_value:\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n\nThe DECLARE ... CONDITION statement declares a named error condition,\nassociating a name with a condition that needs specific handling. The\nname can be referred to in a subsequent DECLARE ... HANDLER statement\n(see [HELP DECLARE HANDLER]).\n\nCondition declarations must appear before cursor or handler\ndeclarations.\n\nThe condition_value for DECLARE ... CONDITION can be a MySQL error code\n(a number) or an SQLSTATE value (a 5-character string literal). You\nshould not use MySQL error code 0 or SQLSTATE values that begin with\n\'00\', because those indicate success rather than an error condition.\nFor a list of MySQL error codes and SQLSTATE values, see\nhttp://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-condition.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/declare-condition.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (183,31,'OVERLAPS','Overlaps(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially overlaps g2. The term\nspatially overlaps is used if two geometries intersect and their\nintersection results in a geometry of the same dimension but not equal\nto either of the given geometries.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (184,8,'SET GLOBAL SQL_SLAVE_SKIP_COUNTER','Syntax:\nSET GLOBAL sql_slave_skip_counter = N\n\nThis statement skips the next N events from the master. This is useful\nfor recovering from replication stops caused by a statement.\n\nThis statement is valid only when the slave threads are not running.\nOtherwise, it produces an error.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-global-sql-slave-skip-counter.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-global-sql-slave-skip-counter.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (185,26,'NUMGEOMETRIES','NumGeometries(gc)\n\nReturns the number of geometries in the GeometryCollection value gc.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @gc = \'GeometryCollection(Point(1 1),LineString(2 2, 3 3))\';\nmysql> SELECT NumGeometries(GeomFromText(@gc));\n+----------------------------------+\n| NumGeometries(GeomFromText(@gc)) |\n+----------------------------------+\n|                                2 |\n+----------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (186,32,'MONTHNAME','Syntax:\nMONTHNAME(date)\n\nReturns the full name of the month for date. The language used for the\nname is controlled by the value of the lc_time_names system variable\n(http://dev.mysql.com/doc/refman/5.5/en/locale-support.html).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MONTHNAME(\'2008-02-03\');\n        -> \'February\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (187,8,'CHANGE MASTER TO','Syntax:\nCHANGE MASTER TO option [, option] ...\n\noption:\n    MASTER_BIND = \'interface_name\'\n  | MASTER_HOST = \'host_name\'\n  | MASTER_USER = \'user_name\'\n  | MASTER_PASSWORD = \'password\'\n  | MASTER_PORT = port_num\n  | MASTER_CONNECT_RETRY = interval\n  | MASTER_HEARTBEAT_PERIOD = interval\n  | MASTER_LOG_FILE = \'master_log_name\'\n  | MASTER_LOG_POS = master_log_pos\n  | RELAY_LOG_FILE = \'relay_log_name\'\n  | RELAY_LOG_POS = relay_log_pos\n  | MASTER_SSL = {0|1}\n  | MASTER_SSL_CA = \'ca_file_name\'\n  | MASTER_SSL_CAPATH = \'ca_directory_name\'\n  | MASTER_SSL_CERT = \'cert_file_name\'\n  | MASTER_SSL_KEY = \'key_file_name\'\n  | MASTER_SSL_CIPHER = \'cipher_list\'\n  | MASTER_SSL_VERIFY_SERVER_CERT = {0|1}\n  | IGNORE_SERVER_IDS = (server_id_list)\n\nserver_id_list:\n    [server_id [, server_id] ... ]\n\nCHANGE MASTER TO changes the parameters that the slave server uses for\nconnecting to the master server, for reading the master binary log, and\nreading the slave relay log. It also updates the contents of the\nmaster.info and relay-log.info files. To use CHANGE MASTER TO, the\nslave replication threads must be stopped (use STOP SLAVE if\nnecessary).\n\nOptions not specified retain their value, except as indicated in the\nfollowing discussion. Thus, in most cases, there is no need to specify\noptions that do not change. For example, if the password to connect to\nyour MySQL master has changed, you just need to issue these statements\nto tell the slave about the new password:\n\nSTOP SLAVE; -- if replication was running\nCHANGE MASTER TO MASTER_PASSWORD=\'new3cret\';\nSTART SLAVE; -- if you want to restart replication\n\nMASTER_HOST, MASTER_USER, MASTER_PASSWORD, and MASTER_PORT provide\ninformation to the slave about how to connect to its master:\n\no MASTER_HOST and MASTER_PORT are the host name (or IP address) of the\n  master host and its TCP/IP port.\n\n  *Note*: Replication cannot use Unix socket files. You must be able to\n  connect to the master MySQL server using TCP/IP.\n\n  If you specify the MASTER_HOST or MASTER_PORT option, the slave\n  assumes that the master server is different from before (even if the\n  option value is the same as its current value.) In this case, the old\n  values for the master binary log file name and position are\n  considered no longer applicable, so if you do not specify\n  MASTER_LOG_FILE and MASTER_LOG_POS in the statement,\n  MASTER_LOG_FILE=\'\' and MASTER_LOG_POS=4 are silently appended to it.\n\n  Setting MASTER_HOST=\'\' (that is, setting its value explicitly to an\n  empty string) is not the same as not setting MASTER_HOST at all.\n  Beginning with MySQL 5.5, trying to set MASTER_HOST to an empty\n  string fails with an error. Previously, setting MASTER_HOST to an\n  empty string caused START SLAVE subsequently to fail. (Bug #28796)\n\no MASTER_USER and MASTER_PASSWORD are the user name and password of the\n  account to use for connecting to the master.\n\n  In MySQL 5.5.20 and later, MASTER_USER cannot be made empty; setting\n  MASTER_USER = \'\' or leaving it unset when setting a value for for\n  MASTER_PASSWORD causes an error (Bug #13427949).\n\n  Currently, a password used for a replication slave account is\n  effectively limited to 32 characters in length; the password can be\n  longer, but any excess characters are truncated. This is not due to\n  any limit imposed by the MySQL Server generally, but rather is an\n  issue specific to MySQL Replication. (For more information, see Bug\n  #43439.)\n\n  The text of a running CHANGE MASTER TO statement, including values\n  for MASTER_USER and MASTER_PASSWORD, can be seen in the output of a\n  concurrent SHOW PROCESSLIST statement.\n\nThe MASTER_SSL_xxx options provide information about using SSL for the\nconnection. They correspond to the --ssl-xxx options described in\nhttp://dev.mysql.com/doc/refman/5.5/en/ssl-options.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/replication-solutions-ssl.html.\nThese options can be changed even on slaves that are compiled without\nSSL support. They are saved to the master.info file, but are ignored if\nthe slave does not have SSL support enabled.\n\nMASTER_CONNECT_RETRY specifies how many seconds to wait between connect\nretries. The default is 60. The number of reconnection attempts is\nlimited by the --master-retry-count server option; for more\ninformation, see\nhttp://dev.mysql.com/doc/refman/5.5/en/replication-options.html.\n\nThe MASTER_BIND option is available in MySQL Cluster NDB 7.2 and later,\nbut is not supported in mainline MySQL 5.5.\n\nMASTER_BIND is for use on replication slaves having multiple network\ninterfaces, and determines which of the slave\'s network interfaces is\nchosen for connecting to the master.\n\nMASTER_HEARTBEAT_PERIOD sets the interval in seconds between\nreplication heartbeats. Whenever the master\'s binary log is updated\nwith an event, the waiting period for the next heartbeat is reset.\ninterval is a decimal value having the range 0 to 4294967 seconds and a\nresolution in milliseconds; the smallest nonzero value is 0.001.\nHeartbeats are sent by the master only if there are no unsent events in\nthe binary log file for a period longer than interval.\n\nSetting interval to 0 disables heartbeats altogether. The default value\nfor interval is equal to the value of slave_net_timeout divided by 2.\n\nSetting @@global.slave_net_timeout to a value less than that of the\ncurrent heartbeat interval results in a warning being issued. The\neffect of issuing RESET SLAVE on the heartbeat interval is to reset it\nto the default value.\n\nMASTER_LOG_FILE and MASTER_LOG_POS are the coordinates at which the\nslave I/O thread should begin reading from the master the next time the\nthread starts. RELAY_LOG_FILE and RELAY_LOG_POS are the coordinates at\nwhich the slave SQL thread should begin reading from the relay log the\nnext time the thread starts. If you specify either of MASTER_LOG_FILE\nor MASTER_LOG_POS, you cannot specify RELAY_LOG_FILE or RELAY_LOG_POS.\nIf neither of MASTER_LOG_FILE or MASTER_LOG_POS is specified, the slave\nuses the last coordinates of the slave SQL thread before CHANGE MASTER\nTO was issued. This ensures that there is no discontinuity in\nreplication, even if the slave SQL thread was late compared to the\nslave I/O thread, when you merely want to change, say, the password to\nuse.\n\nCHANGE MASTER TO deletes all relay log files and starts a new one,\nunless you specify RELAY_LOG_FILE or RELAY_LOG_POS. In that case, relay\nlog files are kept; the relay_log_purge global variable is set silently\nto 0.\n\nPrior to MySQL 5.5, RELAY_LOG_FILE required an absolute path. In MySQL\n5.5, the path can be relative, in which case the path is assumed to be\nrelative to the slave\'s data directory. (Bug #12190)\n\nIGNORE_SERVER_IDS was added in MySQL 5.5. This option takes a\ncomma-separated list of 0 or more server IDs. Events originating from\nthe corresponding servers are ignored, with the exception of log\nrotation and deletion events, which are still recorded in the relay\nlog.\n\nIn circular replication, the originating server normally acts as the\nterminator of its own events, so that they are not applied more than\nonce. Thus, this option is useful in circular replication when one of\nthe servers in the circle is removed. Suppose that you have a circular\nreplication setup with 4 servers, having server IDs 1, 2, 3, and 4, and\nserver 3 fails. When bridging the gap by starting replication from\nserver 2 to server 4, you can include IGNORE_SERVER_IDS = (3) in the\nCHANGE MASTER TO statement that you issue on server 4 to tell it to use\nserver 2 as its master instead of server 3. Doing so causes it to\nignore and not to propagate any statements that originated with the\nserver that is no longer in use.\n\nIf a CHANGE MASTER TO statement is issued without any IGNORE_SERVER_IDS\noption, any existing list is preserved; RESET SLAVE also has no effect\non the server ID list. To clear the list of ignored servers, it is\nnecessary to use the option with an empty list:\n\nCHANGE MASTER TO IGNORE_SERVER_IDS = ();\n\nIf IGNORE_SERVER_IDS contains the server\'s own ID and the server was\nstarted with the --replicate-same-server-id option enabled, an error\nresults.\n\nAlso beginning with MySQL 5.5, the master.info file and the output of\nSHOW SLAVE STATUS are extended to provide the list of servers that are\ncurrently ignored. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/slave-logs-status.html, and\n[HELP SHOW SLAVE STATUS].\n\nBeginning with MySQL 5.5.5, invoking CHANGE MASTER TO causes the\nprevious values for MASTER_HOST, MASTER_PORT, MASTER_LOG_FILE, and\nMASTER_LOG_POS to be written to the error log, along with other\ninformation about the slave\'s state prior to execution.\n\nCHANGE MASTER TO is useful for setting up a slave when you have the\nsnapshot of the master and have recorded the master binary log\ncoordinates corresponding to the time of the snapshot. After loading\nthe snapshot into the slave to synchronize it to the slave, you can run\nCHANGE MASTER TO MASTER_LOG_FILE=\'log_name\', MASTER_LOG_POS=log_pos on\nthe slave to specify the coordinates at which the slave should begin\nreading the master binary log.\n\nThe following example changes the master server the slave uses and\nestablishes the master binary log coordinates from which the slave\nbegins reading. This is used when you want to set up the slave to\nreplicate the master:\n\nCHANGE MASTER TO\n  MASTER_HOST=\'master2.mycompany.com\',\n  MASTER_USER=\'replication\',\n  MASTER_PASSWORD=\'bigs3cret\',\n  MASTER_PORT=3306,\n  MASTER_LOG_FILE=\'master2-bin.001\',\n  MASTER_LOG_POS=4,\n  MASTER_CONNECT_RETRY=10;\n\nThe next example shows an operation that is less frequently employed.\nIt is used when the slave has relay log files that you want it to\nexecute again for some reason. To do this, the master need not be\nreachable. You need only use CHANGE MASTER TO and start the SQL thread\n(START SLAVE SQL_THREAD):\n\nCHANGE MASTER TO\n  RELAY_LOG_FILE=\'slave-relay-bin.006\',\n  RELAY_LOG_POS=4025;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/change-master-to.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/change-master-to.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (188,40,'DROP DATABASE','Syntax:\nDROP {DATABASE | SCHEMA} [IF EXISTS] db_name\n\nDROP DATABASE drops all tables in the database and deletes the\ndatabase. Be very careful with this statement! To use DROP DATABASE,\nyou need the DROP privilege on the database. DROP SCHEMA is a synonym\nfor DROP DATABASE.\n\n*Important*: When a database is dropped, user privileges on the\ndatabase are not automatically dropped. See [HELP GRANT].\n\nIF EXISTS is used to prevent an error from occurring if the database\ndoes not exist.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-database.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-database.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (189,6,'MBREQUAL','MBREqual(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangles of\nthe two geometries g1 and g2 are the same.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (190,32,'TIMESTAMP FUNCTION','Syntax:\nTIMESTAMP(expr), TIMESTAMP(expr1,expr2)\n\nWith a single argument, this function returns the date or datetime\nexpression expr as a datetime value. With two arguments, it adds the\ntime expression expr2 to the date or datetime expression expr1 and\nreturns the result as a datetime value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMESTAMP(\'2003-12-31\');\n        -> \'2003-12-31 00:00:00\'\nmysql> SELECT TIMESTAMP(\'2003-12-31 12:00:00\',\'12:00:00\');\n        -> \'2004-01-01 00:00:00\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (191,34,'PROCEDURE ANALYSE','Syntax:\nANALYSE([max_elements[,max_memory]])\n\nANALYSE() examines the result from a query and returns an analysis of\nthe results that suggests optimal data types for each column that may\nhelp reduce table sizes. To obtain this analysis, append PROCEDURE\nANALYSE to the end of a SELECT statement:\n\nSELECT ... FROM ... WHERE ... PROCEDURE ANALYSE([max_elements,[max_memory]])\n\nFor example:\n\nSELECT col1, col2 FROM table1 PROCEDURE ANALYSE(10, 2000);\n\nThe results show some statistics for the values returned by the query,\nand propose an optimal data type for the columns. This can be helpful\nfor checking your existing tables, or after importing new data. You may\nneed to try different settings for the arguments so that PROCEDURE\nANALYSE() does not suggest the ENUM data type when it is not\nappropriate.\n\nThe arguments are optional and are used as follows:\n\no max_elements (default 256) is the maximum number of distinct values\n  that ANALYSE() notices per column. This is used by ANALYSE() to check\n  whether the optimal data type should be of type ENUM; if there are\n  more than max_elements distinct values, then ENUM is not a suggested\n  type.\n\no max_memory (default 8192) is the maximum amount of memory that\n  ANALYSE() should allocate per column while trying to find all\n  distinct values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/procedure-analyse.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/procedure-analyse.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (192,9,'HELP_VERSION','This help information was generated from the MySQL 5.5 Reference Manual\non: 2013-11-04 (revision: 36597)\n\nThis information applies to MySQL 5.5 through 5.5.36.\n','','');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (193,38,'CHARACTER_LENGTH','Syntax:\nCHARACTER_LENGTH(str)\n\nCHARACTER_LENGTH() is a synonym for CHAR_LENGTH().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (194,27,'SHOW GRANTS','Syntax:\nSHOW GRANTS [FOR user]\n\nThis statement lists the GRANT statement or statements that must be\nissued to duplicate the privileges that are granted to a MySQL user\naccount. The account is named using the same format as for the GRANT\nstatement; for example, \'jeffrey\'@\'localhost\'. If you specify only the\nuser name part of the account name, a host name part of \'%\' is used.\nFor additional information about specifying account names, see [HELP\nGRANT].\n\nmysql> SHOW GRANTS FOR \'root\'@\'localhost\';\n+---------------------------------------------------------------------+\n| Grants for root@localhost                                           |\n+---------------------------------------------------------------------+\n| GRANT ALL PRIVILEGES ON *.* TO \'root\'@\'localhost\' WITH GRANT OPTION |\n+---------------------------------------------------------------------+\n\nTo list the privileges granted to the account that you are using to\nconnect to the server, you can use any of the following statements:\n\nSHOW GRANTS;\nSHOW GRANTS FOR CURRENT_USER;\nSHOW GRANTS FOR CURRENT_USER();\n\nIf SHOW GRANTS FOR CURRENT_USER (or any of the equivalent syntaxes) is\nused in DEFINER context, such as within a stored procedure that is\ndefined with SQL SECURITY DEFINER), the grants displayed are those of\nthe definer and not the invoker.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-grants.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-grants.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (195,27,'SHOW PRIVILEGES','Syntax:\nSHOW PRIVILEGES\n\nSHOW PRIVILEGES shows the list of system privileges that the MySQL\nserver supports. The exact list of privileges depends on the version of\nyour server.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-privileges.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-privileges.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (196,40,'CREATE TABLESPACE','Syntax:\nCREATE TABLESPACE tablespace_name\n    ADD DATAFILE \'file_name\'\n    USE LOGFILE GROUP logfile_group\n    [EXTENT_SIZE [=] extent_size]\n    [INITIAL_SIZE [=] initial_size]\n    [AUTOEXTEND_SIZE [=] autoextend_size]\n    [MAX_SIZE [=] max_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] comment_text]\n    ENGINE [=] engine_name\n\nThis statement is used to create a tablespace, which can contain one or\nmore data files, providing storage space for tables. One data file is\ncreated and added to the tablespace using this statement. Additional\ndata files may be added to the tablespace by using the ALTER TABLESPACE\nstatement (see [HELP ALTER TABLESPACE]). For rules covering the naming\nof tablespaces, see\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nA log file group of one or more UNDO log files must be assigned to the\ntablespace to be created with the USE LOGFILE GROUP clause.\nlogfile_group must be an existing log file group created with CREATE\nLOGFILE GROUP (see [HELP CREATE LOGFILE GROUP]). Multiple tablespaces\nmay use the same log file group for UNDO logging.\n\nThe EXTENT_SIZE sets the size, in bytes, of the extents used by any\nfiles belonging to the tablespace. The default value is 1M. The minimum\nsize is 32K, and theoretical maximum is 2G, although the practical\nmaximum size depends on a number of factors. In most cases, changing\nthe extent size does not have any measurable effect on performance, and\nthe default value is recommended for all but the most unusual\nsituations.\n\nAn extent is a unit of disk space allocation. One extent is filled with\nas much data as that extent can contain before another extent is used.\nIn theory, up to 65,535 (64K) extents may used per data file; however,\nthe recommended maximum is 32,768 (32K). The recommended maximum size\nfor a single data file is 32G---that is, 32K extents x 1 MB per extent.\nIn addition, once an extent is allocated to a given partition, it\ncannot be used to store data from a different partition; an extent\ncannot store data from more than one partition. This means, for example\nthat a tablespace having a single datafile whose INITIAL_SIZE is 256 MB\nand whose EXTENT_SIZE is 128M has just two extents, and so can be used\nto store data from at most two different disk data table partitions.\n\nYou can see how many extents remain free in a given data file by\nquerying the INFORMATION_SCHEMA.FILES table, and so derive an estimate\nfor how much space remains free in the file. For further discussion and\nexamples, see http://dev.mysql.com/doc/refman/5.5/en/files-table.html.\n\nThe INITIAL_SIZE parameter sets the data file\'s total size in bytes.\nOnce the file has been created, its size cannot be changed; however,\nyou can add more data files to the tablespace using ALTER TABLESPACE\n... ADD DATAFILE. See [HELP ALTER TABLESPACE].\n\nINITIAL_SIZE is optional; its default value is 128M.\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is 4G.\n(Bug #29186)\n\nWhen setting EXTENT_SIZE or INITIAL_SIZE (either or both), you may\noptionally follow the number with a one-letter abbreviation for an\norder of magnitude, similar to those used in my.cnf. Generally, this is\none of the letters M (for megabytes) or G (for gigabytes).\n\nINITIAL_SIZE, EXTENT_SIZE, and UNDO_BUFFER_SIZE are subject to rounding\nas follows:\n\no EXTENT_SIZE and UNDO_BUFFER_SIZE are each rounded up to the nearest\n  whole multiple of 32K.\n\no INITIAL_SIZE is rounded down to the nearest whole multiple of 32K.\n\n  For data files, INITIAL_SIZE is subject to further rounding; the\n  result just obtained is rounded up to the nearest whole multiple of\n  EXTENT_SIZE (after any rounding).\n\nThe rounding just described is done explicitly, and a warning is issued\nby the MySQL Server when any such rounding is performed. The rounded\nvalues are also used by the NDB kernel for calculating\nINFORMATION_SCHEMA.FILES column values and other purposes. However, to\navoid an unexpected result, we suggest that you always use whole\nmultiples of 32K in specifying these options.\n\nAUTOEXTEND_SIZE, MAX_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but\nignored, and so currently have no effect. These options are intended\nfor future expansion.\n\nThe ENGINE parameter determines the storage engine which uses this\ntablespace, with engine_name being the name of the storage engine.\nCurrently, engine_name must be one of the values NDB or NDBCLUSTER.\n\nWhen CREATE TABLESPACE is used with ENGINE = NDB, a tablespace and\nassociated data file are created on each Cluster data node. You can\nverify that the data files were created and obtain information about\nthem by querying the INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, FILE_NAME, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE TABLESPACE_NAME = \'newts\' AND FILE_TYPE = \'DATAFILE\';\n+--------------------+-------------+----------------+\n| LOGFILE_GROUP_NAME | FILE_NAME   | EXTRA          |\n+--------------------+-------------+----------------+\n| lg_3               | newdata.dat | CLUSTER_NODE=3 |\n| lg_3               | newdata.dat | CLUSTER_NODE=4 |\n+--------------------+-------------+----------------+\n2 rows in set (0.01 sec)\n\n(See http://dev.mysql.com/doc/refman/5.5/en/files-table.html.)\n\nCREATE TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-tablespace.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (197,38,'INSERT FUNCTION','Syntax:\nINSERT(str,pos,len,newstr)\n\nReturns the string str, with the substring beginning at position pos\nand len characters long replaced by the string newstr. Returns the\noriginal string if pos is not within the length of the string. Replaces\nthe rest of the string from position pos if len is not within the\nlength of the rest of the string. Returns NULL if any argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT INSERT(\'Quadratic\', 3, 4, \'What\');\n        -> \'QuWhattic\'\nmysql> SELECT INSERT(\'Quadratic\', -1, 4, \'What\');\n        -> \'Quadratic\'\nmysql> SELECT INSERT(\'Quadratic\', 3, 100, \'What\');\n        -> \'QuWhat\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (198,4,'CRC32','Syntax:\nCRC32(expr)\n\nComputes a cyclic redundancy check value and returns a 32-bit unsigned\nvalue. The result is NULL if the argument is NULL. The argument is\nexpected to be a string and (if possible) is treated as one if it is\nnot.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT CRC32(\'MySQL\');\n        -> 3259397556\nmysql> SELECT CRC32(\'mysql\');\n        -> 2501908538\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (199,15,'XOR','Syntax:\nXOR\n\nLogical XOR. Returns NULL if either operand is NULL. For non-NULL\noperands, evaluates to 1 if an odd number of operands is nonzero,\notherwise 0 is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT 1 XOR 1;\n        -> 0\nmysql> SELECT 1 XOR 0;\n        -> 1\nmysql> SELECT 1 XOR NULL;\n        -> NULL\nmysql> SELECT 1 XOR 1 XOR 1;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (200,13,'STARTPOINT','StartPoint(ls)\n\nReturns the Point that is the start point of the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(StartPoint(GeomFromText(@ls)));\n+---------------------------------------+\n| AsText(StartPoint(GeomFromText(@ls))) |\n+---------------------------------------+\n| POINT(1 1)                            |\n+---------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (201,10,'GRANT','Syntax:\nGRANT\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    TO user_specification [, user_specification] ...\n    [REQUIRE {NONE | ssl_option [[AND] ssl_option] ...}]\n    [WITH with_option ...]\n\nGRANT PROXY ON user_specification\n    TO user_specification [, user_specification] ...\n    [WITH GRANT OPTION]\n\nobject_type:\n    TABLE\n  | FUNCTION\n  | PROCEDURE\n\npriv_level:\n    *\n  | *.*\n  | db_name.*\n  | db_name.tbl_name\n  | tbl_name\n  | db_name.routine_name\n\nuser_specification:\n    user\n    [\n        IDENTIFIED BY [PASSWORD] \'password\'\n      | IDENTIFIED WITH auth_plugin [AS \'auth_string\']\n    ]\n\nssl_option:\n    SSL\n  | X509\n  | CIPHER \'cipher\'\n  | ISSUER \'issuer\'\n  | SUBJECT \'subject\'\n\nwith_option:\n    GRANT OPTION\n  | MAX_QUERIES_PER_HOUR count\n  | MAX_UPDATES_PER_HOUR count\n  | MAX_CONNECTIONS_PER_HOUR count\n  | MAX_USER_CONNECTIONS count\n\nThe GRANT statement grants privileges to MySQL user accounts. GRANT\nalso serves to specify other account characteristics such as use of\nsecure connections and limits on access to server resources. To use\nGRANT, you must have the GRANT OPTION privilege, and you must have the\nprivileges that you are granting.\n\nNormally, a database administrator first uses CREATE USER to create an\naccount, then GRANT to define its privileges and characteristics. For\nexample:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT SELECT ON db2.invoice TO \'jeffrey\'@\'localhost\';\nGRANT USAGE ON *.* TO \'jeffrey\'@\'localhost\' WITH MAX_QUERIES_PER_HOUR 90;\n\nHowever, if an account named in a GRANT statement does not already\nexist, GRANT may create it under the conditions described later in the\ndiscussion of the NO_AUTO_CREATE_USER SQL mode.\n\nThe REVOKE statement is related to GRANT and enables administrators to\nremove account privileges. See [HELP REVOKE].\n\nWhen successfully executed from the mysql program, GRANT responds with\nQuery OK, 0 rows affected. To determine what privileges result from the\noperation, use SHOW GRANTS. See [HELP SHOW GRANTS].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/grant.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/grant.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (202,24,'DECLARE VARIABLE','Syntax:\nDECLARE var_name [, var_name] ... type [DEFAULT value]\n\nThis statement declares local variables within stored programs. To\nprovide a default value for a variable, include a DEFAULT clause. The\nvalue can be specified as an expression; it need not be a constant. If\nthe DEFAULT clause is missing, the initial value is NULL.\n\nLocal variables are treated like stored routine parameters with respect\nto data type and overflow checking. See [HELP CREATE PROCEDURE].\n\nVariable declarations must appear before cursor or handler\ndeclarations.\n\nLocal variable names are not case sensitive. Permissible characters and\nquoting rules are the same as for other identifiers, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\nThe scope of a local variable is the BEGIN ... END block within which\nit is declared. The variable can be referred to in blocks nested within\nthe declaring block, except those blocks that declare a variable with\nthe same name.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-local-variable.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/declare-local-variable.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (203,3,'MPOLYFROMTEXT','MPolyFromText(wkt[,srid]), MultiPolygonFromText(wkt[,srid])\n\nConstructs a MULTIPOLYGON value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (204,6,'MBRINTERSECTS','MBRIntersects(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangles of\nthe two geometries g1 and g2 intersect.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (205,16,'BIT_OR','Syntax:\nBIT_OR(expr)\n\nReturns the bitwise OR of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (206,32,'YEARWEEK','Syntax:\nYEARWEEK(date), YEARWEEK(date,mode)\n\nReturns year and week for a date. The mode argument works exactly like\nthe mode argument to WEEK(). The year in the result may be different\nfrom the year in the date argument for the first and the last week of\nthe year.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT YEARWEEK(\'1987-01-01\');\n        -> 198653\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (207,19,'NOT BETWEEN','Syntax:\nexpr NOT BETWEEN min AND max\n\nThis is the same as NOT (expr BETWEEN min AND max).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (208,19,'IS NOT','Syntax:\nIS NOT boolean_value\n\nTests a value against a boolean value, where boolean_value can be TRUE,\nFALSE, or UNKNOWN.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NOT UNKNOWN, 0 IS NOT UNKNOWN, NULL IS NOT UNKNOWN;\n        -> 1, 1, 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (209,4,'LOG10','Syntax:\nLOG10(X)\n\nReturns the base-10 logarithm of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LOG10(2);\n        -> 0.30102999566398\nmysql> SELECT LOG10(100);\n        -> 2\nmysql> SELECT LOG10(-100);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (210,4,'SQRT','Syntax:\nSQRT(X)\n\nReturns the square root of a nonnegative number X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT SQRT(4);\n        -> 2\nmysql> SELECT SQRT(20);\n        -> 4.4721359549996\nmysql> SELECT SQRT(-16);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (211,23,'DECIMAL','DECIMAL[(M[,D])] [UNSIGNED] [ZEROFILL]\n\nA packed "exact" fixed-point number. M is the total number of digits\n(the precision) and D is the number of digits after the decimal point\n(the scale). The decimal point and (for negative numbers) the "-" sign\nare not counted in M. If D is 0, values have no decimal point or\nfractional part. The maximum number of digits (M) for DECIMAL is 65.\nThe maximum number of supported decimals (D) is 30. If D is omitted,\nthe default is 0. If M is omitted, the default is 10.\n\nUNSIGNED, if specified, disallows negative values.\n\nAll basic calculations (+, -, *, /) with DECIMAL columns are done with\na precision of 65 digits.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (212,40,'CREATE INDEX','Syntax:\nCREATE [ONLINE|OFFLINE] [UNIQUE|FULLTEXT|SPATIAL] INDEX index_name\n    [index_type]\n    ON tbl_name (index_col_name,...)\n    [index_option] ...\n\nindex_col_name:\n    col_name [(length)] [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option:\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n\nCREATE INDEX is mapped to an ALTER TABLE statement to create indexes.\nSee [HELP ALTER TABLE]. CREATE INDEX cannot be used to create a PRIMARY\nKEY; use ALTER TABLE instead. For more information about indexes, see\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-index.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (213,40,'CREATE FUNCTION','The CREATE FUNCTION statement is used to create stored functions and\nuser-defined functions (UDFs):\n\no For information about creating stored functions, see [HELP CREATE\n  PROCEDURE].\n\no For information about creating user-defined functions, see [HELP\n  CREATE FUNCTION UDF].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-function.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (214,40,'ALTER DATABASE','Syntax:\nALTER {DATABASE | SCHEMA} [db_name]\n    alter_specification ...\nALTER {DATABASE | SCHEMA} db_name\n    UPGRADE DATA DIRECTORY NAME\n\nalter_specification:\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n\nALTER DATABASE enables you to change the overall characteristics of a\ndatabase. These characteristics are stored in the db.opt file in the\ndatabase directory. To use ALTER DATABASE, you need the ALTER privilege\non the database. ALTER SCHEMA is a synonym for ALTER DATABASE.\n\nThe database name can be omitted from the first syntax, in which case\nthe statement applies to the default database.\n\nNational Language Characteristics\n\nThe CHARACTER SET clause changes the default database character set.\nThe COLLATE clause changes the default database collation.\nhttp://dev.mysql.com/doc/refman/5.5/en/charset.html, discusses\ncharacter set and collation names.\n\nYou can see what character sets and collations are available using,\nrespectively, the SHOW CHARACTER SET and SHOW COLLATION statements. See\n[HELP SHOW CHARACTER SET], and [HELP SHOW COLLATION], for more\ninformation.\n\nIf you change the default character set or collation for a database,\nstored routines that use the database defaults must be dropped and\nrecreated so that they use the new defaults. (In a stored routine,\nvariables with character data types use the database defaults if the\ncharacter set or collation are not specified explicitly. See [HELP\nCREATE PROCEDURE].)\n\nUpgrading from Versions Older than MySQL 5.1\n\nThe syntax that includes the UPGRADE DATA DIRECTORY NAME clause updates\nthe name of the directory associated with the database to use the\nencoding implemented in MySQL 5.1 for mapping database names to\ndatabase directory names (see\nhttp://dev.mysql.com/doc/refman/5.5/en/identifier-mapping.html). This\nclause is for use under these conditions:\n\no It is intended when upgrading MySQL to 5.1 or later from older\n  versions.\n\no It is intended to update a database directory name to the current\n  encoding format if the name contains special characters that need\n  encoding.\n\no The statement is used by mysqlcheck (as invoked by mysql_upgrade).\n\nFor example, if a database in MySQL 5.0 has the name a-b-c, the name\ncontains instances of the - (dash) character. In MySQL 5.0, the\ndatabase directory is also named a-b-c, which is not necessarily safe\nfor all file systems. In MySQL 5.1 and later, the same database name is\nencoded as a@002db@002dc to produce a file system-neutral directory\nname.\n\nWhen a MySQL installation is upgraded to MySQL 5.1 or later from an\nolder version,the server displays a name such as a-b-c (which is in the\nold format) as #mysql50#a-b-c, and you must refer to the name using the\n#mysql50# prefix. Use UPGRADE DATA DIRECTORY NAME in this case to\nexplicitly tell the server to re-encode the database directory name to\nthe current encoding format:\n\nALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME;\n\nAfter executing this statement, you can refer to the database as a-b-c\nwithout the special #mysql50# prefix.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-database.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-database.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (215,26,'GEOMETRYN','GeometryN(gc,N)\n\nReturns the N-th geometry in the GeometryCollection value gc.\nGeometries are numbered beginning with 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @gc = \'GeometryCollection(Point(1 1),LineString(2 2, 3 3))\';\nmysql> SELECT AsText(GeometryN(GeomFromText(@gc),1));\n+----------------------------------------+\n| AsText(GeometryN(GeomFromText(@gc),1)) |\n+----------------------------------------+\n| POINT(1 1)                             |\n+----------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (216,20,'<<','Syntax:\n<<\n\nShifts a longlong (BIGINT) number to the left.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 1 << 2;\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (217,27,'SHOW TABLE STATUS','Syntax:\nSHOW TABLE STATUS [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLE STATUS works likes SHOW TABLES, but provides a lot of\ninformation about each non-TEMPORARY table. You can also get this list\nusing the mysqlshow --status db_name command. The LIKE clause, if\npresent, indicates which table names to match. The WHERE clause can be\ngiven to select rows using more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (218,12,'MD5','Syntax:\nMD5(str)\n\nCalculates an MD5 128-bit checksum for the string. The value is\nreturned as a string of 32 hex digits, or NULL if the argument was\nNULL. The return value can, for example, be used as a hash key. See the\nnotes at the beginning of this section about storing hash values\nefficiently.\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring; see the notes at the beginning of this section about using the\nvalue as a nonbinary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT MD5(\'testing\');\n        -> \'ae2b1fca515949e5d54fb22b8ed95575\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (219,19,'<','Syntax:\n<\n\nLess than:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 < 2;\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (220,32,'UNIX_TIMESTAMP','Syntax:\nUNIX_TIMESTAMP(), UNIX_TIMESTAMP(date)\n\nIf called with no argument, returns a Unix timestamp (seconds since\n\'1970-01-01 00:00:00\' UTC) as an unsigned integer. If UNIX_TIMESTAMP()\nis called with a date argument, it returns the value of the argument as\nseconds since \'1970-01-01 00:00:00\' UTC. date may be a DATE string, a\nDATETIME string, a TIMESTAMP, or a number in the format YYMMDD or\nYYYYMMDD. The server interprets date as a value in the current time\nzone and converts it to an internal value in UTC. Clients can set their\ntime zone as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UNIX_TIMESTAMP();\n        -> 1196440210\nmysql> SELECT UNIX_TIMESTAMP(\'2007-11-30 10:30:19\');\n        -> 1196440219\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (221,32,'DAYOFMONTH','Syntax:\nDAYOFMONTH(date)\n\nReturns the day of the month for date, in the range 1 to 31, or 0 for\ndates such as \'0000-00-00\' or \'2008-00-00\' that have a zero day part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFMONTH(\'2007-02-03\');\n        -> 3\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (222,38,'ASCII','Syntax:\nASCII(str)\n\nReturns the numeric value of the leftmost character of the string str.\nReturns 0 if str is the empty string. Returns NULL if str is NULL.\nASCII() works for 8-bit characters.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT ASCII(\'2\');\n        -> 50\nmysql> SELECT ASCII(2);\n        -> 50\nmysql> SELECT ASCII(\'dx\');\n        -> 100\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (223,4,'DIV','Syntax:\nDIV\n\nInteger division. Similar to FLOOR(), but is safe with BIGINT values.\n\nAs of MySQL 5.5.3, if either operand has a noninteger type, the\noperands are converted to DECIMAL and divided using DECIMAL arithmetic\nbefore converting the result to BIGINT. If the result exceeds BIGINT\nrange, an error occurs. Before MySQL 5.5.3, incorrect results may occur\nfor noninteger operands that exceed BIGINT range.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 5 DIV 2;\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (224,10,'RENAME USER','Syntax:\nRENAME USER old_user TO new_user\n    [, old_user TO new_user] ...\n\nThe RENAME USER statement renames existing MySQL accounts. To use it,\nyou must have the global CREATE USER privilege or the UPDATE privilege\nfor the mysql database. An error occurs if any old account does not\nexist or any new account exists. Each account name uses the format\ndescribed in http://dev.mysql.com/doc/refman/5.5/en/account-names.html.\nFor example:\n\nRENAME USER \'jeffrey\'@\'localhost\' TO \'jeff\'@\'127.0.0.1\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nRENAME USER causes the privileges held by the old user to be those held\nby the new user. However, RENAME USER does not automatically drop or\ninvalidate databases or objects within them that the old user created.\nThis includes stored programs or views for which the DEFINER attribute\nnames the old user. Attempts to access such objects may produce an\nerror if they execute in definer security context. (For information\nabout security context, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-security.html.)\n\nThe privilege changes take effect as indicated in\nhttp://dev.mysql.com/doc/refman/5.5/en/privilege-changes.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/rename-user.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/rename-user.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (225,27,'SHOW SLAVE STATUS','Syntax:\nSHOW SLAVE STATUS\n\nThis statement provides status information on essential parameters of\nthe slave threads. It requires either the SUPER or REPLICATION CLIENT\nprivilege.\n\nIf you issue this statement using the mysql client, you can use a \\G\nstatement terminator rather than a semicolon to obtain a more readable\nvertical layout:\n\nmysql> SHOW SLAVE STATUS\\G\n*************************** 1. row ***************************\n               Slave_IO_State: Waiting for master to send event\n                  Master_Host: localhost\n                  Master_User: root\n                  Master_Port: 3306\n                Connect_Retry: 3\n              Master_Log_File: gbichot-bin.005\n          Read_Master_Log_Pos: 79\n               Relay_Log_File: gbichot-relay-bin.005\n                Relay_Log_Pos: 548\n        Relay_Master_Log_File: gbichot-bin.005\n             Slave_IO_Running: Yes\n            Slave_SQL_Running: Yes\n              Replicate_Do_DB:\n          Replicate_Ignore_DB:\n           Replicate_Do_Table:\n       Replicate_Ignore_Table:\n      Replicate_Wild_Do_Table:\n  Replicate_Wild_Ignore_Table:\n                   Last_Errno: 0\n                   Last_Error:\n                 Skip_Counter: 0\n          Exec_Master_Log_Pos: 79\n              Relay_Log_Space: 552\n              Until_Condition: None\n               Until_Log_File:\n                Until_Log_Pos: 0\n           Master_SSL_Allowed: No\n           Master_SSL_CA_File:\n           Master_SSL_CA_Path:\n              Master_SSL_Cert:\n            Master_SSL_Cipher:\n               Master_SSL_Key:\n        Seconds_Behind_Master: 8\nMaster_SSL_Verify_Server_Cert: No\n                Last_IO_Errno: 0\n                Last_IO_Error:\n               Last_SQL_Errno: 0\n               Last_SQL_Error:\n  Replicate_Ignore_Server_Ids: 0\n             Master_Server_Id: 1\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-slave-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-slave-status.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (226,35,'GEOMETRY','MySQL provides a standard way of creating spatial columns for geometry\ntypes, for example, with CREATE TABLE or ALTER TABLE. Currently,\nspatial columns are supported for MyISAM, InnoDB, NDB, and ARCHIVE\ntables. See also the annotations about spatial indexes under [HELP\nSPATIAL].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-columns.html\n\n','CREATE TABLE geom (g GEOMETRY);\n','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-columns.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (227,13,'NUMPOINTS','NumPoints(ls)\n\nReturns the number of Point objects in the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT NumPoints(GeomFromText(@ls));\n+------------------------------+\n| NumPoints(GeomFromText(@ls)) |\n+------------------------------+\n|                            3 |\n+------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (228,40,'ALTER LOGFILE GROUP','Syntax:\nALTER LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n    ENGINE [=] engine_name\n\nThis statement adds an UNDO file named \'file_name\' to an existing log\nfile group logfile_group. An ALTER LOGFILE GROUP statement has one and\nonly one ADD UNDOFILE clause. No DROP UNDOFILE clause is currently\nsupported.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and an undo log file with the same name, or an undo\nlog file and a data file with the same name.\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size\nin bytes; if not specified, the initial size default to 128M (128\nmegabytes). You may optionally follow size with a one-letter\nabbreviation for an order of magnitude, similar to those used in\nmy.cnf. Generally, this is one of the letters M (for megabytes) or G\n(for gigabytes).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is 4G.\n(Bug #29186)\n\nThe minimum permitted value for INITIAL_SIZE is 1M. (Bug #29574)\n\n*Note*: WAIT is parsed but otherwise ignored. This keyword currently\nhas no effect, and is intended for future expansion.\n\nThe ENGINE parameter (required) determines the storage engine which is\nused by this log file group, with engine_name being the name of the\nstorage engine. Currently, the only accepted values for engine_name are\n"NDBCLUSTER" and "NDB". The two values are equivalent.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-logfile-group.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (229,20,'&','Syntax:\n&\n\nBitwise AND:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 29 & 15;\n        -> 13\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (230,32,'LOCALTIMESTAMP','Syntax:\nLOCALTIMESTAMP, LOCALTIMESTAMP()\n\nLOCALTIMESTAMP and LOCALTIMESTAMP() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (231,15,'ASSIGN-EQUAL','Syntax:\n=\n\nThis operator is used to perform value assignments in two cases,\ndescribed in the next two paragraphs.\n\nWithin a SET statement, = is treated as an assignment operator that\ncauses the user variable on the left hand side of the operator to take\non the value to its right. (In other words, when used in a SET\nstatement, = is treated identically to :=.) The value on the right hand\nside may be a literal value, another variable storing a value, or any\nlegal expression that yields a scalar value, including the result of a\nquery (provided that this value is a scalar value). You can perform\nmultiple assignments in the same SET statement.\n\nIn the SET clause of an UPDATE statement, = also acts as an assignment\noperator; in this case, however, it causes the column named on the left\nhand side of the operator to assume the value given to the right,\nprovided any WHERE conditions that are part of the UPDATE are met. You\ncan make multiple assignments in the same SET clause of an UPDATE\nstatement.\n\nIn any other context, = is treated as a comparison operator.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n        -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n        -> 1, 1\nmysql> SELECT @var1, @var2;\n        -> 1, 1\n','http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (232,38,'CONVERT','Syntax:\nCONVERT(expr,type), CONVERT(expr USING transcoding_name)\n\nThe CONVERT() and CAST() functions take an expression of any type and\nproduce a result value of a specified type.\n\nThe type for the result can be one of the following values:\n\no BINARY[(N)]\n\no CHAR[(N)]\n\no DATE\n\no DATETIME\n\no DECIMAL[(M[,D])]\n\no SIGNED [INTEGER]\n\no TIME\n\no UNSIGNED [INTEGER]\n\nBINARY produces a string with the BINARY data type. See\nhttp://dev.mysql.com/doc/refman/5.5/en/binary-varbinary.html for a\ndescription of how this affects comparisons. If the optional length N\nis given, BINARY(N) causes the cast to use no more than N bytes of the\nargument. Values shorter than N bytes are padded with 0x00 bytes to a\nlength of N.\n\nCHAR(N) causes the cast to use no more than N characters of the\nargument.\n\nCAST() and CONVERT(... USING ...) are standard SQL syntax. The\nnon-USING form of CONVERT() is ODBC syntax.\n\nCONVERT() with USING is used to convert data between different\ncharacter sets. In MySQL, transcoding names are the same as the\ncorresponding character set names. For example, this statement converts\nthe string \'abc\' in the default character set to the corresponding\nstring in the utf8 character set:\n\nSELECT CONVERT(\'abc\' USING utf8);\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html\n\n','SELECT enum_col FROM tbl_name ORDER BY CAST(enum_col AS CHAR);\n','http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (233,40,'DROP LOGFILE GROUP','Syntax:\nDROP LOGFILE GROUP logfile_group\n    ENGINE [=] engine_name\n\nThis statement drops the log file group named logfile_group. The log\nfile group must already exist or an error results. (For information on\ncreating log file groups, see [HELP CREATE LOGFILE GROUP].)\n\n*Important*: Before dropping a log file group, you must drop all\ntablespaces that use that log file group for UNDO logging.\n\nThe required ENGINE clause provides the name of the storage engine used\nby the log file group to be dropped. Currently, the only permitted\nvalues for engine_name are NDB and NDBCLUSTER.\n\nDROP LOGFILE GROUP is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-logfile-group.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (234,32,'ADDDATE','Syntax:\nADDDATE(date,INTERVAL expr unit), ADDDATE(expr,days)\n\nWhen invoked with the INTERVAL form of the second argument, ADDDATE()\nis a synonym for DATE_ADD(). The related function SUBDATE() is a\nsynonym for DATE_SUB(). For information on the INTERVAL unit argument,\nsee the discussion for DATE_ADD().\n\nmysql> SELECT DATE_ADD(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2008-02-02\'\nmysql> SELECT ADDDATE(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2008-02-02\'\n\nWhen invoked with the days form of the second argument, MySQL treats it\nas an integer number of days to be added to expr.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT ADDDATE(\'2008-01-02\', 31);\n        -> \'2008-02-02\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (235,24,'REPEAT LOOP','Syntax:\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\nThe statement list within a REPEAT statement is repeated until the\nsearch_condition expression is true. Thus, a REPEAT always enters the\nloop at least once. statement_list consists of one or more statements,\neach terminated by a semicolon (;) statement delimiter.\n\nA REPEAT statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/repeat.html\n\n','mysql> delimiter //\n\nmysql> CREATE PROCEDURE dorepeat(p1 INT)\n    -> BEGIN\n    ->   SET @x = 0;\n    ->   REPEAT\n    ->     SET @x = @x + 1;\n    ->   UNTIL @x > p1 END REPEAT;\n    -> END\n    -> //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL dorepeat(1000)//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n+------+\n| @x   |\n+------+\n| 1001 |\n+------+\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/repeat.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (236,40,'ALTER FUNCTION','Syntax:\nALTER FUNCTION func_name [characteristic ...]\n\ncharacteristic:\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n\nThis statement can be used to change the characteristics of a stored\nfunction. More than one change may be specified in an ALTER FUNCTION\nstatement. However, you cannot change the parameters or body of a\nstored function using this statement; to make such changes, you must\ndrop and re-create the function using DROP FUNCTION and CREATE\nFUNCTION.\n\nYou must have the ALTER ROUTINE privilege for the function. (That\nprivilege is granted automatically to the function creator.) If binary\nlogging is enabled, the ALTER FUNCTION statement might also require the\nSUPER privilege, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-logging.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-function.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (237,23,'SMALLINT','SMALLINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA small integer. The signed range is -32768 to 32767. The unsigned\nrange is 0 to 65535.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (238,23,'DOUBLE PRECISION','DOUBLE PRECISION[(M,D)] [UNSIGNED] [ZEROFILL], REAL[(M,D)] [UNSIGNED]\n[ZEROFILL]\n\nThese types are synonyms for DOUBLE. Exception: If the REAL_AS_FLOAT\nSQL mode is enabled, REAL is a synonym for FLOAT rather than DOUBLE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (239,38,'ORD','Syntax:\nORD(str)\n\nIf the leftmost character of the string str is a multi-byte character,\nreturns the code for that character, calculated from the numeric values\nof its constituent bytes using this formula:\n\n  (1st byte code)\n+ (2nd byte code * 256)\n+ (3rd byte code * 2562) ...\n\nIf the leftmost character is not a multi-byte character, ORD() returns\nthe same value as the ASCII() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT ORD(\'2\');\n        -> 50\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (240,8,'DEALLOCATE PREPARE','Syntax:\n{DEALLOCATE | DROP} PREPARE stmt_name\n\nTo deallocate a prepared statement produced with PREPARE, use a\nDEALLOCATE PREPARE statement that refers to the prepared statement\nname. Attempting to execute a prepared statement after deallocating it\nresults in an error.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/deallocate-prepare.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/deallocate-prepare.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (241,37,'ENVELOPE','Envelope(g)\n\nReturns the Minimum Bounding Rectangle (MBR) for the geometry value g.\nThe result is returned as a Polygon value.\n\nThe polygon is defined by the corner points of the bounding box:\n\nPOLYGON((MINX MINY, MAXX MINY, MAXX MAXY, MINX MAXY, MINX MINY))\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SELECT AsText(Envelope(GeomFromText(\'LineString(1 1,2 2)\')));\n+-------------------------------------------------------+\n| AsText(Envelope(GeomFromText(\'LineString(1 1,2 2)\'))) |\n+-------------------------------------------------------+\n| POLYGON((1 1,2 1,2 2,1 2,1 1))                        |\n+-------------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (242,14,'IS_FREE_LOCK','Syntax:\nIS_FREE_LOCK(str)\n\nChecks whether the lock named str is free to use (that is, not locked).\nReturns 1 if the lock is free (no one is using the lock), 0 if the lock\nis in use, and NULL if an error occurs (such as an incorrect argument).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (243,31,'TOUCHES','Touches(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially touches g2. Two\ngeometries spatially touch if the interiors of the geometries do not\nintersect, but the boundary of one of the geometries intersects either\nthe boundary or the interior of the other.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (244,14,'INET_ATON','Syntax:\nINET_ATON(expr)\n\nGiven the dotted-quad representation of an IPv4 network address as a\nstring, returns an integer that represents the numeric value of the\naddress in network byte order (big endian). INET_ATON() returns NULL if\nit does not understand its argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT INET_ATON(\'10.0.5.9\');\n        -> 167773449\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (245,12,'UNCOMPRESS','Syntax:\nUNCOMPRESS(string_to_uncompress)\n\nUncompresses a string compressed by the COMPRESS() function. If the\nargument is not a compressed value, the result is NULL. This function\nrequires MySQL to have been compiled with a compression library such as\nzlib. Otherwise, the return value is always NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT UNCOMPRESS(COMPRESS(\'any string\'));\n        -> \'any string\'\nmysql> SELECT UNCOMPRESS(\'any string\');\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (246,23,'AUTO_INCREMENT','The AUTO_INCREMENT attribute can be used to generate a unique identity\nfor new rows:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/example-auto-increment.html\n\n','CREATE TABLE animals (\n     id MEDIUMINT NOT NULL AUTO_INCREMENT,\n     name CHAR(30) NOT NULL,\n     PRIMARY KEY (id)\n);\n\nINSERT INTO animals (name) VALUES\n    (\'dog\'),(\'cat\'),(\'penguin\'),\n    (\'lax\'),(\'whale\'),(\'ostrich\');\n\nSELECT * FROM animals;\n','http://dev.mysql.com/doc/refman/5.5/en/example-auto-increment.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (247,37,'ISSIMPLE','IsSimple(g)\n\nIn MySQL 5.5, this function is a placeholder that always returns 0.\n\nThe description of each instantiable geometric class given earlier in\nthe chapter includes the specific conditions that cause an instance of\nthat class to be classified as not simple. (See [HELP Geometry\nhierarchy].)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (248,4,'- BINARY','Syntax:\n-\n\nSubtraction:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3-5;\n        -> -2\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (249,3,'GEOMCOLLFROMTEXT','GeomCollFromText(wkt[,srid]), GeometryCollectionFromText(wkt[,srid])\n\nConstructs a GEOMETRYCOLLECTION value using its WKT representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (250,3,'WKT DEFINITION','The Well-Known Text (WKT) representation of Geometry is designed to\nexchange geometry data in ASCII form. For a Backus-Naur grammar that\nspecifies the formal production rules for writing WKT values, see the\nOpenGIS specification document referenced in\nhttp://dev.mysql.com/doc/refman/5.5/en/spatial-extensions.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-format.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-format.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (251,32,'CURRENT_TIME','Syntax:\nCURRENT_TIME, CURRENT_TIME()\n\nCURRENT_TIME and CURRENT_TIME() are synonyms for CURTIME().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (252,10,'REVOKE','Syntax:\nREVOKE\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    FROM user [, user] ...\n\nREVOKE ALL PRIVILEGES, GRANT OPTION\n    FROM user [, user] ...\n\nREVOKE PROXY ON user\n    FROM user [, user] ...\n\nThe REVOKE statement enables system administrators to revoke privileges\nfrom MySQL accounts. Each account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nREVOKE INSERT ON *.* FROM \'jeffrey\'@\'localhost\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nFor details on the levels at which privileges exist, the permissible\npriv_type and priv_level values, and the syntax for specifying users\nand passwords, see [HELP GRANT]\n\nTo use the first REVOKE syntax, you must have the GRANT OPTION\nprivilege, and you must have the privileges that you are revoking.\n\nTo revoke all privileges, use the second syntax, which drops all\nglobal, database, table, column, and routine privileges for the named\nuser or users:\n\nREVOKE ALL PRIVILEGES, GRANT OPTION FROM user [, user] ...\n\nTo use this REVOKE syntax, you must have the global CREATE USER\nprivilege or the UPDATE privilege for the mysql database.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/revoke.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/revoke.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (253,17,'LAST_INSERT_ID','Syntax:\nLAST_INSERT_ID(), LAST_INSERT_ID(expr)\n\nWith no argument, LAST_INSERT_ID() returns a 64-bit value representing\nthe first automatically generated value successfully inserted for an\nAUTO_INCREMENT column as a result of the most recently executed INSERT\nstatement. The value has a type of BIGINT UNSIGNED as of MySQL 5.5.29,\nBIGINT (signed) before that. The value of LAST_INSERT_ID() remains\nunchanged if no rows are successfully inserted.\n\nWith an argument, LAST_INSERT_ID() returns an unsigned integer as of\nMySQL 5.5.29, a signed integer before that.\n\nFor example, after inserting a row that generates an AUTO_INCREMENT\nvalue, you can get the value like this:\n\nmysql> SELECT LAST_INSERT_ID();\n        -> 195\n\nThe currently executing statement does not affect the value of\nLAST_INSERT_ID(). Suppose that you generate an AUTO_INCREMENT value\nwith one statement, and then refer to LAST_INSERT_ID() in a\nmultiple-row INSERT statement that inserts rows into a table with its\nown AUTO_INCREMENT column. The value of LAST_INSERT_ID() will remain\nstable in the second statement; its value for the second and later rows\nis not affected by the earlier row insertions. (However, if you mix\nreferences to LAST_INSERT_ID() and LAST_INSERT_ID(expr), the effect is\nundefined.)\n\nIf the previous statement returned an error, the value of\nLAST_INSERT_ID() is undefined. For transactional tables, if the\nstatement is rolled back due to an error, the value of LAST_INSERT_ID()\nis left undefined. For manual ROLLBACK, the value of LAST_INSERT_ID()\nis not restored to that before the transaction; it remains as it was at\nthe point of the ROLLBACK.\n\nPrior to MySQL 5.5.35, this function was not replicated correctly if\nreplication filtering rules were in use. (Bug #17234370, Bug #69861)\n\nWithin the body of a stored routine (procedure or function) or a\ntrigger, the value of LAST_INSERT_ID() changes the same way as for\nstatements executed outside the body of these kinds of objects. The\neffect of a stored routine or trigger upon the value of\nLAST_INSERT_ID() that is seen by following statements depends on the\nkind of routine:\n\no If a stored procedure executes statements that change the value of\n  LAST_INSERT_ID(), the changed value is seen by statements that follow\n  the procedure call.\n\no For stored functions and triggers that change the value, the value is\n  restored when the function or trigger ends, so following statements\n  will not see a changed value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (254,32,'LAST_DAY','Syntax:\nLAST_DAY(date)\n\nTakes a date or datetime value and returns the corresponding value for\nthe last day of the month. Returns NULL if the argument is invalid.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT LAST_DAY(\'2003-02-05\');\n        -> \'2003-02-28\'\nmysql> SELECT LAST_DAY(\'2004-02-05\');\n        -> \'2004-02-29\'\nmysql> SELECT LAST_DAY(\'2004-01-01 01:01:01\');\n        -> \'2004-01-31\'\nmysql> SELECT LAST_DAY(\'2003-03-32\');\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (255,23,'MEDIUMINT','MEDIUMINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA medium-sized integer. The signed range is -8388608 to 8388607. The\nunsigned range is 0 to 16777215.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (256,4,'FLOOR','Syntax:\nFLOOR(X)\n\nReturns the largest integer value not greater than X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT FLOOR(1.23);\n        -> 1\nmysql> SELECT FLOOR(-1.23);\n        -> -2\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (257,38,'RTRIM','Syntax:\nRTRIM(str)\n\nReturns the string str with trailing space characters removed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT RTRIM(\'barbar   \');\n        -> \'barbar\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (258,29,'EXPLAIN','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type] SELECT select_options\n\nexplain_type: {EXTENDED | PARTITIONS}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query). The\nfollowing discussion uses the DESCRIBE and EXPLAIN keywords in\naccordance with those uses, but the MySQL parser treats them as\ncompletely synonymous.\n\nObtaining Table Structure Information\n\nDESCRIBE provides information about the columns in a table:\n\nmysql> DESCRIBE City;\n+------------+----------+------+-----+---------+----------------+\n| Field      | Type     | Null | Key | Default | Extra          |\n+------------+----------+------+-----+---------+----------------+\n| Id         | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name       | char(35) | NO   |     |         |                |\n| Country    | char(3)  | NO   | UNI |         |                |\n| District   | char(20) | YES  | MUL |         |                |\n| Population | int(11)  | NO   |     | 0       |                |\n+------------+----------+------+-----+---------+----------------+\n\nDESCRIBE is a shortcut for SHOW COLUMNS. These statements also display\ninformation for views. The description for SHOW COLUMNS provides more\ninformation about the output columns. See [HELP SHOW COLUMNS].\n\nBy default, DESCRIBE displays information about all columns in the\ntable. col_name, if given, is the name of a column in the table. In\nthis case, the statement displays information only for the named\ncolumn. wild, if given, is a pattern string. It can contain the SQL "%"\nand "_" wildcard characters. In this case, the statement displays\noutput only for the columns with names matching the string. There is no\nneed to enclose the string within quotation marks unless it contains\nspaces or other special characters.\n\nThe DESCRIBE statement is provided for compatibility with Oracle.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nObtaining Execution Plan Information\n\nThe EXPLAIN statement provides information about how MySQL executes\nstatements:\n\no When you precede a SELECT statement with the keyword EXPLAIN, MySQL\n  displays information from the optimizer about the statement execution\n  plan. That is, MySQL explains how it would process the statement,\n  including information about how tables are joined and in which order.\n  For information about using EXPLAIN to obtain execution plan\n  information, see\n  http://dev.mysql.com/doc/refman/5.5/en/explain-output.html.\n\no EXPLAIN EXTENDED can be used to obtain additional execution plan\n  information. See\n  http://dev.mysql.com/doc/refman/5.5/en/explain-extended.html.\n\no EXPLAIN PARTITIONS is useful for examining queries involving\n  partitioned tables. See\n  http://dev.mysql.com/doc/refman/5.5/en/partitioning-info.html.\n\nWith the help of EXPLAIN, you can see where you should add indexes to\ntables so that the statement executes faster by using indexes to find\nrows. You can also use EXPLAIN to check whether the optimizer joins the\ntables in an optimal order. To give a hint to the optimizer to use a\njoin order corresponding to the order in which the tables are named in\na SELECT statement, begin the statement with SELECT STRAIGHT_JOIN\nrather than just SELECT. (See\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.)\n\nIf you have a problem with indexes not being used when you believe that\nthey should be, run ANALYZE TABLE to update table statistics, such as\ncardinality of keys, that can affect the choices the optimizer makes.\nSee [HELP ANALYZE TABLE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/explain.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/explain.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (259,4,'DEGREES','Syntax:\nDEGREES(X)\n\nReturns the argument X, converted from radians to degrees.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT DEGREES(PI());\n        -> 180\nmysql> SELECT DEGREES(PI() / 2);\n        -> 90\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (260,23,'VARCHAR','[NATIONAL] VARCHAR(M) [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nA variable-length string. M represents the maximum column length in\ncharacters. The range of M is 0 to 65,535. The effective maximum length\nof a VARCHAR is subject to the maximum row size (65,535 bytes, which is\nshared among all columns) and the character set used. For example, utf8\ncharacters can require up to three bytes per character, so a VARCHAR\ncolumn that uses the utf8 character set can be declared to be a maximum\nof 21,844 characters. See\nhttp://dev.mysql.com/doc/refman/5.5/en/column-count-limit.html.\n\nMySQL stores VARCHAR values as a 1-byte or 2-byte length prefix plus\ndata. The length prefix indicates the number of bytes in the value. A\nVARCHAR column uses one length byte if values require no more than 255\nbytes, two length bytes if values may require more than 255 bytes.\n\n*Note*: MySQL 5.5 follows the standard SQL specification, and does not\nremove trailing spaces from VARCHAR values.\n\nVARCHAR is shorthand for CHARACTER VARYING. NATIONAL VARCHAR is the\nstandard SQL way to define that a VARCHAR column should use some\npredefined character set. MySQL 4.1 and up uses utf8 as this predefined\ncharacter set.\nhttp://dev.mysql.com/doc/refman/5.5/en/charset-national.html. NVARCHAR\nis shorthand for NATIONAL VARCHAR.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (261,38,'UNHEX','Syntax:\n\nUNHEX(str)\n\nFor a string argument str, UNHEX(str) performs the inverse operation of\nHEX(str). That is, it interprets each pair of characters in the\nargument as a hexadecimal number and converts it to the character\nrepresented by the number. The return value is a binary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT UNHEX(\'4D7953514C\');\n        -> \'MySQL\'\nmysql> SELECT 0x4D7953514C;\n        -> \'MySQL\'\nmysql> SELECT UNHEX(HEX(\'string\'));\n        -> \'string\'\nmysql> SELECT HEX(UNHEX(\'1267\'));\n        -> \'1267\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (262,4,'- UNARY','Syntax:\n-\n\nUnary minus. This operator changes the sign of the operand.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT - 2;\n        -> -2\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (263,16,'STD','Syntax:\nSTD(expr)\n\nReturns the population standard deviation of expr. This is an extension\nto standard SQL. The standard SQL function STDDEV_POP() can be used\ninstead.\n\nThis function returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (264,4,'COS','Syntax:\nCOS(X)\n\nReturns the cosine of X, where X is given in radians.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT COS(PI());\n        -> -1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (265,32,'DATE FUNCTION','Syntax:\nDATE(expr)\n\nExtracts the date part of the date or datetime expression expr.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATE(\'2003-12-31 01:02:03\');\n        -> \'2003-12-31\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (266,40,'DROP TRIGGER','Syntax:\nDROP TRIGGER [IF EXISTS] [schema_name.]trigger_name\n\nThis statement drops a trigger. The schema (database) name is optional.\nIf the schema is omitted, the trigger is dropped from the default\nschema. DROP TRIGGER requires the TRIGGER privilege for the table\nassociated with the trigger.\n\nUse IF EXISTS to prevent an error from occurring for a trigger that\ndoes not exist. A NOTE is generated for a nonexistent trigger when\nusing IF EXISTS. See [HELP SHOW WARNINGS].\n\nTriggers for a table are also dropped if you drop the table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-trigger.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (267,8,'RESET MASTER','Syntax:\nRESET MASTER\n\nDeletes all binary log files listed in the index file, resets the\nbinary log index file to be empty, and creates a new binary log file.\nThis statement is intended to be used only when the master is started\nfor the first time.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/reset-master.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/reset-master.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (268,4,'TAN','Syntax:\nTAN(X)\n\nReturns the tangent of X, where X is given in radians.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT TAN(PI());\n        -> -1.2246063538224e-16\nmysql> SELECT TAN(PI()+1);\n        -> 1.5574077246549\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (269,4,'PI','Syntax:\nPI()\n\nReturns the value of π (pi). The default number of decimal places\ndisplayed is seven, but MySQL uses the full double-precision value\ninternally.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT PI();\n        -> 3.141593\nmysql> SELECT PI()+0.000000000000000000;\n        -> 3.141592653589793116\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (270,32,'WEEKOFYEAR','Syntax:\nWEEKOFYEAR(date)\n\nReturns the calendar week of the date as a number in the range from 1\nto 53. WEEKOFYEAR() is a compatibility function that is equivalent to\nWEEK(date,3).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT WEEKOFYEAR(\'2008-02-20\');\n        -> 8\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (271,4,'/','Syntax:\n/\n\nDivision:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3/5;\n        -> 0.60\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (272,8,'PURGE BINARY LOGS','Syntax:\nPURGE { BINARY | MASTER } LOGS\n    { TO \'log_name\' | BEFORE datetime_expr }\n\nThe binary log is a set of files that contain information about data\nmodifications made by the MySQL server. The log consists of a set of\nbinary log files, plus an index file (see\nhttp://dev.mysql.com/doc/refman/5.5/en/binary-log.html).\n\nThe PURGE BINARY LOGS statement deletes all the binary log files listed\nin the log index file prior to the specified log file name or date.\nBINARY and MASTER are synonyms. Deleted log files also are removed from\nthe list recorded in the index file, so that the given log file becomes\nthe first in the list.\n\nThis statement has no effect if the server was not started with the\n--log-bin option to enable binary logging.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/purge-binary-logs.html\n\n','PURGE BINARY LOGS TO \'mysql-bin.010\';\nPURGE BINARY LOGS BEFORE \'2008-04-02 22:46:26\';\n','http://dev.mysql.com/doc/refman/5.5/en/purge-binary-logs.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (273,16,'STDDEV_SAMP','Syntax:\nSTDDEV_SAMP(expr)\n\nReturns the sample standard deviation of expr (the square root of\nVAR_SAMP().\n\nSTDDEV_SAMP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (274,17,'SCHEMA','Syntax:\nSCHEMA()\n\nThis function is a synonym for DATABASE().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (275,33,'MLINEFROMWKB','MLineFromWKB(wkb[,srid]), MultiLineStringFromWKB(wkb[,srid])\n\nConstructs a MULTILINESTRING value using its WKB representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (276,4,'LOG2','Syntax:\nLOG2(X)\n\nReturns the base-2 logarithm of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LOG2(65536);\n        -> 16\nmysql> SELECT LOG2(-100);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (277,32,'SUBTIME','Syntax:\nSUBTIME(expr1,expr2)\n\nSUBTIME() returns expr1 - expr2 expressed as a value in the same format\nas expr1. expr1 is a time or datetime expression, and expr2 is a time\nexpression.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT SUBTIME(\'2007-12-31 23:59:59.999999\',\'1 1:1:1.000002\');\n        -> \'2007-12-30 22:58:58.999997\'\nmysql> SELECT SUBTIME(\'01:00:00.999999\', \'02:00:00.999998\');\n        -> \'-00:59:59.999999\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (278,12,'UNCOMPRESSED_LENGTH','Syntax:\nUNCOMPRESSED_LENGTH(compressed_string)\n\nReturns the length that the compressed string had before being\ncompressed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT UNCOMPRESSED_LENGTH(COMPRESS(REPEAT(\'a\',30)));\n        -> 30\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (279,40,'DROP TABLE','Syntax:\nDROP [TEMPORARY] TABLE [IF EXISTS]\n    tbl_name [, tbl_name] ...\n    [RESTRICT | CASCADE]\n\nDROP TABLE removes one or more tables. You must have the DROP privilege\nfor each table. All table data and the table definition are removed, so\nbe careful with this statement! If any of the tables named in the\nargument list do not exist, MySQL returns an error indicating by name\nwhich nonexisting tables it was unable to drop, but it also drops all\nof the tables in the list that do exist.\n\n*Important*: When a table is dropped, user privileges on the table are\nnot automatically dropped. See [HELP GRANT].\n\nNote that for a partitioned table, DROP TABLE permanently removes the\ntable definition, all of its partitions, and all of the data which was\nstored in those partitions. It also removes the partitioning definition\n(.par) file associated with the dropped table.\n\nUse IF EXISTS to prevent an error from occurring for tables that do not\nexist. A NOTE is generated for each nonexistent table when using IF\nEXISTS. See [HELP SHOW WARNINGS].\n\nRESTRICT and CASCADE are permitted to make porting easier. In MySQL\n5.5, they do nothing.\n\n*Note*: DROP TABLE automatically commits the current active\ntransaction, unless you use the TEMPORARY keyword.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (280,4,'POW','Syntax:\nPOW(X,Y)\n\nReturns the value of X raised to the power of Y.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT POW(2,2);\n        -> 4\nmysql> SELECT POW(2,-2);\n        -> 0.25\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (281,27,'SHOW CREATE TABLE','Syntax:\nSHOW CREATE TABLE tbl_name\n\nShows the CREATE TABLE statement that creates the named table. To use\nthis statement, you must have some privilege for the table. This\nstatement also works with views.\nSHOW CREATE TABLE quotes table and column names according to the value\nof the sql_quote_show_create option. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-table.html\n\n','mysql> SHOW CREATE TABLE t\\G\n*************************** 1. row ***************************\n       Table: t\nCreate Table: CREATE TABLE t (\n  id INT(11) default NULL auto_increment,\n  s char(60) default NULL,\n  PRIMARY KEY (id)\n) ENGINE=MyISAM\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (282,28,'DUAL','You are permitted to specify DUAL as a dummy table name in situations\nwhere no tables are referenced:\n\nmysql> SELECT 1 + 1 FROM DUAL;\n        -> 2\n\nDUAL is purely for the convenience of people who require that all\nSELECT statements should have FROM and possibly other clauses. MySQL\nmay ignore the clauses. MySQL does not require FROM DUAL if no tables\nare referenced.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/select.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/select.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (283,38,'INSTR','Syntax:\nINSTR(str,substr)\n\nReturns the position of the first occurrence of substring substr in\nstring str. This is the same as the two-argument form of LOCATE(),\nexcept that the order of the arguments is reversed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT INSTR(\'foobarbar\', \'bar\');\n        -> 4\nmysql> SELECT INSTR(\'xbar\', \'foobar\');\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (284,32,'NOW','Syntax:\nNOW()\n\nReturns the current date and time as a value in \'YYYY-MM-DD HH:MM:SS\'\nor YYYYMMDDHHMMSS.uuuuuu format, depending on whether the function is\nused in a string or numeric context. The value is expressed in the\ncurrent time zone.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT NOW();\n        -> \'2007-12-15 23:50:26\'\nmysql> SELECT NOW() + 0;\n        -> 20071215235026.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (285,27,'SHOW ENGINES','Syntax:\nSHOW [STORAGE] ENGINES\n\nSHOW ENGINES displays status information about the server\'s storage\nengines. This is particularly useful for checking whether a storage\nengine is supported, or to see what the default engine is.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-engines.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-engines.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (286,19,'>=','Syntax:\n>=\n\nGreater than or equal:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 >= 2;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (287,4,'EXP','Syntax:\nEXP(X)\n\nReturns the value of e (the base of natural logarithms) raised to the\npower of X. The inverse of this function is LOG() (using a single\nargument only) or LN().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT EXP(2);\n        -> 7.3890560989307\nmysql> SELECT EXP(-2);\n        -> 0.13533528323661\nmysql> SELECT EXP(0);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (288,23,'LONGBLOB','LONGBLOB\n\nA BLOB column with a maximum length of 4,294,967,295 or 4GB (232 - 1)\nbytes. The effective maximum length of LONGBLOB columns depends on the\nconfigured maximum packet size in the client/server protocol and\navailable memory. Each LONGBLOB value is stored using a 4-byte length\nprefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (289,13,'POINTN','PointN(ls,N)\n\nReturns the N-th Point in the Linestring value ls. Points are numbered\nbeginning with 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(PointN(GeomFromText(@ls),2));\n+-------------------------------------+\n| AsText(PointN(GeomFromText(@ls),2)) |\n+-------------------------------------+\n| POINT(2 2)                          |\n+-------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (290,23,'YEAR DATA TYPE','YEAR[(2|4)]\n\nA year in two-digit or four-digit format. The default is four-digit\nformat. YEAR(2) or YEAR(4) differ in display format, but have the same\nrange of values. In four-digit format, values display as 1901 to 2155,\nand 0000. In two-digit format, values display as 70 to 69, representing\nyears from 1970 to 2069. MySQL displays YEAR values in YYYY or\nYYformat, but permits assignment of values to YEAR columns using either\nstrings or numbers.\n\n*Note*: The YEAR(2) data type has certain issues that you should\nconsider before choosing to use it. As of MySQL 5.5.27, YEAR(2) is\ndeprecated. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/migrating-to-year4.html.\n\nFor additional information about YEAR display format and interpretation\nof input values, see http://dev.mysql.com/doc/refman/5.5/en/year.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (291,16,'SUM','Syntax:\nSUM([DISTINCT] expr)\n\nReturns the sum of expr. If the return set has no rows, SUM() returns\nNULL. The DISTINCT keyword can be used to sum only the distinct values\nof expr.\n\nSUM() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (292,38,'OCT','Syntax:\nOCT(N)\n\nReturns a string representation of the octal value of N, where N is a\nlonglong (BIGINT) number. This is equivalent to CONV(N,10,8). Returns\nNULL if N is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT OCT(12);\n        -> \'14\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (293,32,'SYSDATE','Syntax:\nSYSDATE()\n\nReturns the current date and time as a value in \'YYYY-MM-DD HH:MM:SS\'\nor YYYYMMDDHHMMSS.uuuuuu format, depending on whether the function is\nused in a string or numeric context.\n\nSYSDATE() returns the time at which it executes. This differs from the\nbehavior for NOW(), which returns a constant time that indicates the\ntime at which the statement began to execute. (Within a stored function\nor trigger, NOW() returns the time at which the function or triggering\nstatement began to execute.)\n\nmysql> SELECT NOW(), SLEEP(2), NOW();\n+---------------------+----------+---------------------+\n| NOW()               | SLEEP(2) | NOW()               |\n+---------------------+----------+---------------------+\n| 2006-04-12 13:47:36 |        0 | 2006-04-12 13:47:36 |\n+---------------------+----------+---------------------+\n\nmysql> SELECT SYSDATE(), SLEEP(2), SYSDATE();\n+---------------------+----------+---------------------+\n| SYSDATE()           | SLEEP(2) | SYSDATE()           |\n+---------------------+----------+---------------------+\n| 2006-04-12 13:47:44 |        0 | 2006-04-12 13:47:46 |\n+---------------------+----------+---------------------+\n\nIn addition, the SET TIMESTAMP statement affects the value returned by\nNOW() but not by SYSDATE(). This means that timestamp settings in the\nbinary log have no effect on invocations of SYSDATE().\n\nBecause SYSDATE() can return different values even within the same\nstatement, and is not affected by SET TIMESTAMP, it is nondeterministic\nand therefore unsafe for replication if statement-based binary logging\nis used. If that is a problem, you can use row-based logging.\n\nAlternatively, you can use the --sysdate-is-now option to cause\nSYSDATE() to be an alias for NOW(). This works if the option is used on\nboth the master and the slave.\n\nThe nondeterministic nature of SYSDATE() also means that indexes cannot\nbe used for evaluating expressions that refer to it.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (294,5,'UNINSTALL PLUGIN','Syntax:\nUNINSTALL PLUGIN plugin_name\n\nThis statement removes an installed server plugin. It requires the\nDELETE privilege for the mysql.plugin table.\n\nplugin_name must be the name of some plugin that is listed in the\nmysql.plugin table. The server executes the plugin\'s deinitialization\nfunction and removes the row for the plugin from the mysql.plugin\ntable, so that subsequent server restarts will not load and initialize\nthe plugin. UNINSTALL PLUGIN does not remove the plugin\'s shared\nlibrary file.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/uninstall-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/uninstall-plugin.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (295,33,'ASBINARY','AsBinary(g), AsWKB(g)\n\nConverts a value in internal geometry format to its WKB representation\nand returns the binary result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-to-convert-geometries-between-formats.html\n\n','SELECT AsBinary(g) FROM geom;\n','http://dev.mysql.com/doc/refman/5.5/en/functions-to-convert-geometries-between-formats.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (296,38,'REPEAT FUNCTION','Syntax:\nREPEAT(str,count)\n\nReturns a string consisting of the string str repeated count times. If\ncount is less than 1, returns an empty string. Returns NULL if str or\ncount are NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT REPEAT(\'MySQL\', 3);\n        -> \'MySQLMySQLMySQL\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (297,27,'SHOW TABLES','Syntax:\nSHOW [FULL] TABLES [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLES lists the non-TEMPORARY tables in a given database. You can\nalso get this list using the mysqlshow db_name command. The LIKE\nclause, if present, indicates which table names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in http://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nMatching performed by the LIKE clause is dependent on the setting of\nthe lower_case_table_names system variable.\n\nThis statement also lists any views in the database. The FULL modifier\nis supported such that SHOW FULL TABLES displays a second output\ncolumn. Values for the second column are BASE TABLE for a table and\nVIEW for a view.\n\nIf you have no privileges for a base table or view, it does not show up\nin the output from SHOW TABLES or mysqlshow db_name.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-tables.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (298,32,'MAKEDATE','Syntax:\nMAKEDATE(year,dayofyear)\n\nReturns a date, given year and day-of-year values. dayofyear must be\ngreater than 0 or the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MAKEDATE(2011,31), MAKEDATE(2011,32);\n        -> \'2011-01-31\', \'2011-02-01\'\nmysql> SELECT MAKEDATE(2011,365), MAKEDATE(2014,365);\n        -> \'2011-12-31\', \'2014-12-31\'\nmysql> SELECT MAKEDATE(2011,0);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (299,38,'BINARY OPERATOR','Syntax:\nBINARY\n\nThe BINARY operator casts the string following it to a binary string.\nThis is an easy way to force a column comparison to be done byte by\nbyte rather than character by character. This causes the comparison to\nbe case sensitive even if the column is not defined as BINARY or BLOB.\nBINARY also causes trailing spaces to be significant.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html\n\n','mysql> SELECT \'a\' = \'A\';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'A\';\n        -> 0\nmysql> SELECT \'a\' = \'a \';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'a \';\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (300,6,'MBROVERLAPS','MBROverlaps(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangles of\nthe two geometries g1 and g2 overlap. The term spatially overlaps is\nused if two geometries intersect and their intersection results in a\ngeometry of the same dimension but not equal to either of the given\ngeometries.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (301,38,'SOUNDEX','Syntax:\nSOUNDEX(str)\n\nReturns a soundex string from str. Two strings that sound almost the\nsame should have identical soundex strings. A standard soundex string\nis four characters long, but the SOUNDEX() function returns an\narbitrarily long string. You can use SUBSTRING() on the result to get a\nstandard soundex string. All nonalphabetic characters in str are\nignored. All international alphabetic characters outside the A-Z range\nare treated as vowels.\n\n*Important*: When using SOUNDEX(), you should be aware of the following\nlimitations:\n\no This function, as currently implemented, is intended to work well\n  with strings that are in the English language only. Strings in other\n  languages may not produce reliable results.\n\no This function is not guaranteed to provide consistent results with\n  strings that use multi-byte character sets, including utf-8.\n\n  We hope to remove these limitations in a future release. See Bug\n  #22638 for more information.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SOUNDEX(\'Hello\');\n        -> \'H400\'\nmysql> SELECT SOUNDEX(\'Quadratically\');\n        -> \'Q36324\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (302,6,'MBRTOUCHES','MBRTouches(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangles of\nthe two geometries g1 and g2 touch. Two geometries spatially touch if\nthe interiors of the geometries do not intersect, but the boundary of\none of the geometries intersects either the boundary or the interior of\nthe other.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (303,40,'DROP EVENT','Syntax:\nDROP EVENT [IF EXISTS] event_name\n\nThis statement drops the event named event_name. The event immediately\nceases being active, and is deleted completely from the server.\n\nIf the event does not exist, the error ERROR 1517 (HY000): Unknown\nevent \'event_name\' results. You can override this and cause the\nstatement to generate a warning for nonexistent events instead using IF\nEXISTS.\n\nThis statement requires the EVENT privilege for the schema to which the\nevent to be dropped belongs.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-event.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-event.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (304,28,'INSERT SELECT','Syntax:\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name [(col_name,...)]\n    SELECT ...\n    [ ON DUPLICATE KEY UPDATE col_name=expr, ... ]\n\nWith INSERT ... SELECT, you can quickly insert many rows into a table\nfrom one or many tables. For example:\n\nINSERT INTO tbl_temp2 (fld_id)\n  SELECT tbl_temp1.fld_order_id\n  FROM tbl_temp1 WHERE tbl_temp1.fld_order_id > 100;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/insert-select.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/insert-select.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (305,40,'CREATE PROCEDURE','Syntax:\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    PROCEDURE sp_name ([proc_parameter[,...]])\n    [characteristic ...] routine_body\n\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    FUNCTION sp_name ([func_parameter[,...]])\n    RETURNS type\n    [characteristic ...] routine_body\n\nproc_parameter:\n    [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n    param_name type\n\ntype:\n    Any valid MySQL data type\n\ncharacteristic:\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | [NOT] DETERMINISTIC\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n\nroutine_body:\n    Valid SQL routine statement\n\nThese statements create stored routines. By default, a routine is\nassociated with the default database. To associate the routine\nexplicitly with a given database, specify the name as db_name.sp_name\nwhen you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support UDFs\n(user-defined functions). See\nhttp://dev.mysql.com/doc/refman/5.5/en/adding-functions.html. A UDF can\nbe regarded as an external stored function. Stored functions share\ntheir namespace with UDFs. See\nhttp://dev.mysql.com/doc/refman/5.5/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. They might also require the SUPER privilege, depending on\nthe DEFINER value, as described later in this section. If binary\nlogging is enabled, CREATE FUNCTION might require the SUPER privilege,\nas described in\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-routines-privileges.html.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*: Specifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an IN or INOUT\nparameter.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-program-restrictions.html\n.\n\nThe following example shows a simple stored procedure that uses an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE simpleproc (OUT param1 INT)\n    -> BEGIN\n    ->   SELECT COUNT(*) INTO param1 FROM t;\n    -> END//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter ;\n\nmysql> CALL simpleproc(@a);\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @a;\n+------+\n| @a   |\n+------+\n| 3    |\n+------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n    -> RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world!  |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type, except that the COLLATE attribute cannot be used prior\nto MySQL 5.5.3. As of 5.5.3, COLLATE can be used if preceded by the\nCHARACTER SET attribute.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttp://dev.mysql.com/doc/refman/5.5/en/sql-syntax-compound-statements.h\ntml.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET). For statements that can be determined only at\nruntime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-program-restrictions.html\n.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-procedure.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (306,23,'VARBINARY','VARBINARY(M)\n\nThe VARBINARY type is similar to the VARCHAR type, but stores binary\nbyte strings rather than nonbinary character strings. M represents the\nmaximum column length in bytes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (307,27,'LOAD INDEX','Syntax:\nLOAD INDEX INTO CACHE\n  tbl_index_list [, tbl_index_list] ...\n\ntbl_index_list:\n  tbl_name\n    [PARTITION (partition_list | ALL)]\n    [[INDEX|KEY] (index_name[, index_name] ...)]\n    [IGNORE LEAVES]\n\npartition_list:\n    partition_name[, partition_name][, ...]\n\nThe LOAD INDEX INTO CACHE statement preloads a table index into the key\ncache to which it has been assigned by an explicit CACHE INDEX\nstatement, or into the default key cache otherwise.\n\nLOAD INDEX INTO CACHE is used only for MyISAM tables. In MySQL 5.5, it\nis also supported for partitioned MyISAM tables; in addition, indexes\non partitioned tables can be preloaded for one, several, or all\npartitions.\n\nThe IGNORE LEAVES modifier causes only blocks for the nonleaf nodes of\nthe index to be preloaded.\n\nIGNORE LEAVES is also supported for partitioned MyISAM tables.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/load-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/load-index.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (308,28,'UNION','Syntax:\nSELECT ...\nUNION [ALL | DISTINCT] SELECT ...\n[UNION [ALL | DISTINCT] SELECT ...]\n\nUNION is used to combine the result from multiple SELECT statements\ninto a single result set.\n\nThe column names from the first SELECT statement are used as the column\nnames for the results returned. Selected columns listed in\ncorresponding positions of each SELECT statement should have the same\ndata type. (For example, the first column selected by the first\nstatement should have the same type as the first column selected by the\nother statements.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/union.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/union.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (309,32,'TO_DAYS','Syntax:\nTO_DAYS(date)\n\nGiven a date date, returns a day number (the number of days since year\n0).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TO_DAYS(950501);\n        -> 728779\nmysql> SELECT TO_DAYS(\'2007-10-07\');\n        -> 733321\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (310,38,'NOT REGEXP','Syntax:\nexpr NOT REGEXP pat, expr NOT RLIKE pat\n\nThis is the same as NOT (expr REGEXP pat).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/regexp.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/regexp.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (311,27,'SHOW INDEX','Syntax:\nSHOW {INDEX | INDEXES | KEYS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [WHERE expr]\n\nSHOW INDEX returns table index information. The format resembles that\nof the SQLStatistics call in ODBC. This statement requires some\nprivilege for any column in the table.\nYou can use db_name.tbl_name as an alternative to the tbl_name FROM\ndb_name syntax. These two statements are equivalent:\n\nSHOW INDEX FROM mytable FROM mydb;\nSHOW INDEX FROM mydb.mytable;\n\nThe WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nYou can also list a table\'s indexes with the mysqlshow -k db_name\ntbl_name command.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-index.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (312,27,'SHOW CREATE DATABASE','Syntax:\nSHOW CREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n\nShows the CREATE DATABASE statement that creates the named database. If\nthe SHOW statement includes an IF NOT EXISTS clause, the output too\nincludes such a clause. SHOW CREATE SCHEMA is a synonym for SHOW CREATE\nDATABASE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-database.html\n\n','mysql> SHOW CREATE DATABASE test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test`\n                 /*!40100 DEFAULT CHARACTER SET latin1 */\n\nmysql> SHOW CREATE SCHEMA test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test`\n                 /*!40100 DEFAULT CHARACTER SET latin1 */\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-database.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (313,24,'LEAVE','Syntax:\nLEAVE label\n\nThis statement is used to exit the flow control construct that has the\ngiven label. If the label is for the outermost stored program block,\nLEAVE exits the program.\n\nLEAVE can be used within BEGIN ... END or loop constructs (LOOP,\nREPEAT, WHILE).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/leave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/leave.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (314,19,'NOT IN','Syntax:\nexpr NOT IN (value,...)\n\nThis is the same as NOT (expr IN (value,...)).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (315,15,'!','Syntax:\nNOT, !\n\nLogical NOT. Evaluates to 1 if the operand is 0, to 0 if the operand is\nnonzero, and NOT NULL returns NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT NOT 10;\n        -> 0\nmysql> SELECT NOT 0;\n        -> 1\nmysql> SELECT NOT NULL;\n        -> NULL\nmysql> SELECT ! (1+1);\n        -> 0\nmysql> SELECT ! 1+1;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (316,24,'DECLARE HANDLER','Syntax:\nDECLARE handler_action HANDLER\n    FOR condition_value [, condition_value] ...\n    statement\n\nhandler_action:\n    CONTINUE\n  | EXIT\n  | UNDO\n\ncondition_value:\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n  | SQLWARNING\n  | NOT FOUND\n  | SQLEXCEPTION\n\nThe DECLARE ... HANDLER statement specifies a handler that deals with\none or more conditions. If one of these conditions occurs, the\nspecified statement executes. statement can be a simple statement such\nas SET var_name = value, or a compound statement written using BEGIN\nand END (see [HELP BEGIN END]).\n\nHandler declarations must appear after variable or condition\ndeclarations.\n\nThe handler_action value indicates what action the handler takes after\nexecution of the handler statement:\n\no CONTINUE: Execution of the current program continues.\n\no EXIT: Execution terminates for the BEGIN ... END compound statement\n  in which the handler is declared. This is true even if the condition\n  occurs in an inner block.\n\no UNDO: Not supported.\n\nThe condition_value for DECLARE ... HANDLER indicates the specific\ncondition or class of conditions that activates the handler:\n\no A MySQL error code (a number) or an SQLSTATE value (a 5-character\n  string literal). You should not use MySQL error code 0 or SQLSTATE\n  values that begin with \'00\', because those indicate success rather\n  than an error condition. For a list of MySQL error codes and SQLSTATE\n  values, see\n  http://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html.\n\no A condition name previously specified with DECLARE ... CONDITION. A\n  condition name can be associated with a MySQL error code or SQLSTATE\n  value. See [HELP DECLARE CONDITION].\n\no SQLWARNING is shorthand for the class of SQLSTATE values that begin\n  with \'01\'.\n\no NOT FOUND is shorthand for the class of SQLSTATE values that begin\n  with \'02\'. This is relevant within the context of cursors and is used\n  to control what happens when a cursor reaches the end of a data set.\n  If no more rows are available, a No Data condition occurs with\n  SQLSTATE value \'02000\'. To detect this condition, you can set up a\n  handler for it (or for a NOT FOUND condition). For an example, see\n  http://dev.mysql.com/doc/refman/5.5/en/cursors.html. This condition\n  also occurs for SELECT ... INTO var_list statements that retrieve no\n  rows.\n\no SQLEXCEPTION is shorthand for the class of SQLSTATE values that do\n  not begin with \'00\', \'01\', or \'02\'.\n\nIf a condition occurs for which no handler has been declared, the\naction taken depends on the condition class:\n\no For SQLEXCEPTION conditions, the stored program terminates at the\n  statement that raised the condition, as if there were an EXIT\n  handler. If the program was called by another stored program, the\n  calling program handles the condition using the handler selection\n  rules applied to its own handlers.\n\no For SQLWARNING conditions, the program continues executing, as if\n  there were a CONTINUE handler.\n\no For NOT FOUND conditions, if the condition was raised normally, the\n  action is CONTINUE. If it was raised by SIGNAL or RESIGNAL, the\n  action is EXIT.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-handler.html\n\n','mysql> CREATE TABLE test.t (s1 INT, PRIMARY KEY (s1));\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE handlerdemo ()\n    -> BEGIN\n    ->   DECLARE CONTINUE HANDLER FOR SQLSTATE \'23000\' SET @x2 = 1;\n    ->   SET @x = 1;\n    ->   INSERT INTO test.t VALUES (1);\n    ->   SET @x = 2;\n    ->   INSERT INTO test.t VALUES (1);\n    ->   SET @x = 3;\n    -> END;\n    -> //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL handlerdemo()//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n    +------+\n    | @x   |\n    +------+\n    | 3    |\n    +------+\n    1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/declare-handler.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (317,23,'DOUBLE','DOUBLE[(M,D)] [UNSIGNED] [ZEROFILL]\n\nA normal-size (double-precision) floating-point number. Permissible\nvalues are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and\n2.2250738585072014E-308 to 1.7976931348623157E+308. These are the\ntheoretical limits, based on the IEEE standard. The actual range might\nbe slightly smaller depending on your hardware or operating system.\n\nM is the total number of digits and D is the number of digits following\nthe decimal point. If M and D are omitted, values are stored to the\nlimits permitted by the hardware. A double-precision floating-point\nnumber is accurate to approximately 15 decimal places.\n\nUNSIGNED, if specified, disallows negative values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (318,23,'TIME','TIME\n\nA time. The range is \'-838:59:59\' to \'838:59:59\'. MySQL displays TIME\nvalues in \'HH:MM:SS\' format, but permits assignment of values to TIME\ncolumns using either strings or numbers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (319,15,'&&','Syntax:\nAND, &&\n\nLogical AND. Evaluates to 1 if all operands are nonzero and not NULL,\nto 0 if one or more operands are 0, otherwise NULL is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT 1 && 1;\n        -> 1\nmysql> SELECT 1 && 0;\n        -> 0\nmysql> SELECT 1 && NULL;\n        -> NULL\nmysql> SELECT 0 && NULL;\n        -> 0\nmysql> SELECT NULL && 0;\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (320,11,'X','X(p)\n\nReturns the X-coordinate value for the Point object p as a\ndouble-precision number.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SELECT X(POINT(56.7, 53.34));\n+-----------------------+\n| X(POINT(56.7, 53.34)) |\n+-----------------------+\n|                  56.7 |\n+-----------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (321,17,'SYSTEM_USER','Syntax:\nSYSTEM_USER()\n\nSYSTEM_USER() is a synonym for USER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (322,17,'FOUND_ROWS','Syntax:\nFOUND_ROWS()\n\nA SELECT statement may include a LIMIT clause to restrict the number of\nrows the server returns to the client. In some cases, it is desirable\nto know how many rows the statement would have returned without the\nLIMIT, but without running the statement again. To obtain this row\ncount, include a SQL_CALC_FOUND_ROWS option in the SELECT statement,\nand then invoke FOUND_ROWS() afterward:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT SQL_CALC_FOUND_ROWS * FROM tbl_name\n    -> WHERE id > 100 LIMIT 10;\nmysql> SELECT FOUND_ROWS();\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (323,31,'CROSSES','Crosses(g1,g2)\n\nReturns 1 if g1 spatially crosses g2. Returns NULL if g1 is a Polygon\nor a MultiPolygon, or if g2 is a Point or a MultiPoint. Otherwise,\nreturns 0.\n\nThe term spatially crosses denotes a spatial relation between two given\ngeometries that has the following properties:\n\no The two geometries intersect\n\no Their intersection results in a geometry that has a dimension that is\n  one less than the maximum dimension of the two given geometries\n\no Their intersection is not equal to either of the two given geometries\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (324,40,'TRUNCATE TABLE','Syntax:\nTRUNCATE [TABLE] tbl_name\n\nTRUNCATE TABLE empties a table completely. It requires the DROP\nprivilege.\n\nLogically, TRUNCATE TABLE is similar to a DELETE statement that deletes\nall rows, or a sequence of DROP TABLE and CREATE TABLE statements. To\nachieve high performance, it bypasses the DML method of deleting data.\nThus, it cannot be rolled back, it does not cause ON DELETE triggers to\nfire, and it cannot be performed for InnoDB tables with parent-child\nforeign key relationships.\n\nAlthough TRUNCATE TABLE is similar to DELETE, it is classified as a DDL\nstatement rather than a DML statement. It differs from DELETE in the\nfollowing ways in MySQL 5.5:\n\no Truncate operations drop and re-create the table, which is much\n  faster than deleting rows one by one, particularly for large tables.\n\no Truncate operations cause an implicit commit, and so cannot be rolled\n  back.\n\no Truncation operations cannot be performed if the session holds an\n  active table lock.\n\no TRUNCATE TABLE fails for an InnoDB table if there are any FOREIGN KEY\n  constraints from other tables that reference the table. Foreign key\n  constraints between columns of the same table are permitted.\n\no Truncation operations do not return a meaningful value for the number\n  of deleted rows. The usual result is "0 rows affected," which should\n  be interpreted as "no information."\n\no As long as the table format file tbl_name.frm is valid, the table can\n  be re-created as an empty table with TRUNCATE TABLE, even if the data\n  or index files have become corrupted.\n\no Any AUTO_INCREMENT value is reset to its start value. This is true\n  even for MyISAM and InnoDB, which normally do not reuse sequence\n  values.\n\no When used with partitioned tables, TRUNCATE TABLE preserves the\n  partitioning; that is, the data and index files are dropped and\n  re-created, while the partition definitions (.par) file is\n  unaffected.\n\no The TRUNCATE TABLE statement does not invoke ON DELETE triggers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/truncate-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/truncate-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (325,16,'BIT_XOR','Syntax:\nBIT_XOR(expr)\n\nReturns the bitwise XOR of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (326,32,'CURRENT_DATE','Syntax:\nCURRENT_DATE, CURRENT_DATE()\n\nCURRENT_DATE and CURRENT_DATE() are synonyms for CURDATE().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (327,8,'START SLAVE','Syntax:\nSTART SLAVE [thread_types]\n\nSTART SLAVE [SQL_THREAD] UNTIL\n    MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n\nSTART SLAVE [SQL_THREAD] UNTIL\n    RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nSTART SLAVE with no thread_type options starts both of the slave\nthreads. The I/O thread reads events from the master server and stores\nthem in the relay log. The SQL thread reads events from the relay log\nand executes them. START SLAVE requires the SUPER privilege.\n\nIf START SLAVE succeeds in starting the slave threads, it returns\nwithout any error. However, even in that case, it might be that the\nslave threads start and then later stop (for example, because they do\nnot manage to connect to the master or read its binary log, or some\nother problem). START SLAVE does not warn you about this. You must\ncheck the slave\'s error log for error messages generated by the slave\nthreads, or check that they are running satisfactorily with SHOW SLAVE\nSTATUS.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/start-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/start-slave.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (328,2,'AREA','Area(poly)\n\nReturns as a double-precision number the area of the Polygon value\npoly, as measured in its spatial reference system.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @poly = \'Polygon((0 0,0 3,3 0,0 0),(1 1,1 2,2 1,1 1))\';\nmysql> SELECT Area(GeomFromText(@poly));\n+---------------------------+\n| Area(GeomFromText(@poly)) |\n+---------------------------+\n|                         4 |\n+---------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (329,27,'FLUSH','Syntax:\nFLUSH [NO_WRITE_TO_BINLOG | LOCAL]\n    flush_option [, flush_option] ...\n\nThe FLUSH statement has several variant forms that clear or reload\nvarious internal caches, flush tables, or acquire locks. To execute\nFLUSH, you must have the RELOAD privilege. Specific flush options might\nrequire additional privileges, as described later.\n\nBy default, the server writes FLUSH statements to the binary log so\nthat they replicate to replication slaves. To suppress logging, specify\nthe optional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\n*Note*: FLUSH LOGS, FLUSH MASTER, FLUSH SLAVE, and FLUSH TABLES WITH\nREAD LOCK (with or without a table list) are not written to the binary\nlog in any case because they would cause problems if replicated to a\nslave.\n\nSending a SIGHUP signal to the server causes several flush operations\nto occur that are similar to various forms of the FLUSH statement. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-signal-response.html.\n\nThe FLUSH statement causes an implicit commit. See\nhttp://dev.mysql.com/doc/refman/5.5/en/implicit-commit.html.\n\nThe RESET statement is similar to FLUSH. See [HELP RESET], for\ninformation about using the RESET statement with replication.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/flush.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/flush.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (330,24,'BEGIN END','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\nBEGIN ... END syntax is used for writing compound statements, which can\nappear within stored programs (stored procedures and functions,\ntriggers, and events). A compound statement can contain multiple\nstatements, enclosed by the BEGIN and END keywords. statement_list\nrepresents a list of one or more statements, each terminated by a\nsemicolon (;) statement delimiter. The statement_list itself is\noptional, so the empty compound statement (BEGIN END) is legal.\n\nBEGIN ... END blocks can be nested.\n\nUse of multiple statements requires that a client is able to send\nstatement strings containing the ; statement delimiter. In the mysql\ncommand-line client, this is handled with the delimiter command.\nChanging the ; end-of-statement delimiter (for example, to //) permit ;\nto be used in a program body. For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-defining.html.\n\nA BEGIN ... END block can be labeled. See [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/begin-end.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/begin-end.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (331,27,'SHOW PROCEDURE STATUS','Syntax:\nSHOW PROCEDURE STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is a MySQL extension. It returns characteristics of a\nstored procedure, such as the database, name, type, creator, creation\nand modification dates, and character set information. A similar\nstatement, SHOW FUNCTION STATUS, displays information about stored\nfunctions (see [HELP SHOW FUNCTION STATUS]).\n\nThe LIKE clause, if present, indicates which procedure or function\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-procedure-status.html\n\n','mysql> SHOW PROCEDURE STATUS LIKE \'sp1\'\\G\n*************************** 1. row ***************************\n                  Db: test\n                Name: sp1\n                Type: PROCEDURE\n             Definer: testuser@localhost\n            Modified: 2004-08-03 15:29:37\n             Created: 2004-08-03 15:29:37\n       Security_type: DEFINER\n             Comment:\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.5/en/show-procedure-status.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (332,27,'SHOW WARNINGS','Syntax:\nSHOW WARNINGS [LIMIT [offset,] row_count]\nSHOW COUNT(*) WARNINGS\n\nSHOW WARNINGS is a diagnostic statement that displays information about\nthe conditions (errors, warnings, and notes) resulting from executing a\nstatement in the current session. Warnings are generated for DML\nstatements such as INSERT, UPDATE, and LOAD DATA INFILE as well as DDL\nstatements such as CREATE TABLE and ALTER TABLE.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nSHOW WARNINGS is also used following EXPLAIN EXTENDED, to display the\nextra information generated by EXPLAIN when the EXTENDED keyword is\nused. See http://dev.mysql.com/doc/refman/5.5/en/explain-extended.html.\n\nSHOW WARNINGS displays information about the conditions resulting from\nthe most recent statement in the current session that generated\nmessages. It shows nothing if the most recent statement used a table\nand generated no messages. (That is, statements that use a table but\ngenerate no messages clear the message list.) Statements that do not\nuse tables and do not generate messages have no effect on the message\nlist.\n\nThe SHOW COUNT(*) WARNINGS diagnostic statement displays the total\nnumber of errors, warnings, and notes. You can also retrieve this\nnumber from the warning_count system variable:\n\nSHOW COUNT(*) WARNINGS;\nSELECT @@warning_count;\n\nA related diagnostic statement, SHOW ERRORS, shows only error\nconditions (it excludes warnings and notes), and SHOW COUNT(*) ERRORS\nstatement displays the total number of errors. See [HELP SHOW ERRORS].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-warnings.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-warnings.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (333,10,'DROP USER','Syntax:\nDROP USER user [, user] ...\n\nThe DROP USER statement removes one or more MySQL accounts and their\nprivileges. It removes privilege rows for the account from all grant\ntables. To use this statement, you must have the global CREATE USER\nprivilege or the DELETE privilege for the mysql database. Each account\nname uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nDROP USER \'jeffrey\'@\'localhost\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-user.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-user.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (334,16,'STDDEV_POP','Syntax:\nSTDDEV_POP(expr)\n\nReturns the population standard deviation of expr (the square root of\nVAR_POP()). You can also use STD() or STDDEV(), which are equivalent\nbut not standard SQL.\n\nSTDDEV_POP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (335,27,'SHOW CHARACTER SET','Syntax:\nSHOW CHARACTER SET\n    [LIKE \'pattern\' | WHERE expr]\n\nThe SHOW CHARACTER SET statement shows all available character sets.\nThe LIKE clause, if present, indicates which character set names to\nmatch. The WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html. For example:\n\nmysql> SHOW CHARACTER SET LIKE \'latin%\';\n+---------+-----------------------------+-------------------+--------+\n| Charset | Description                 | Default collation | Maxlen |\n+---------+-----------------------------+-------------------+--------+\n| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |\n| latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |\n| latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |\n| latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |\n+---------+-----------------------------+-------------------+--------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-character-set.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-character-set.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (336,38,'SUBSTRING','Syntax:\nSUBSTRING(str,pos), SUBSTRING(str FROM pos), SUBSTRING(str,pos,len),\nSUBSTRING(str FROM pos FOR len)\n\nThe forms without a len argument return a substring from string str\nstarting at position pos. The forms with a len argument return a\nsubstring len characters long from string str, starting at position\npos. The forms that use FROM are standard SQL syntax. It is also\npossible to use a negative value for pos. In this case, the beginning\nof the substring is pos characters from the end of the string, rather\nthan the beginning. A negative value may be used for pos in any of the\nforms of this function.\n\nFor all forms of SUBSTRING(), the position of the first character in\nthe string from which the substring is to be extracted is reckoned as\n1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SUBSTRING(\'Quadratically\',5);\n        -> \'ratically\'\nmysql> SELECT SUBSTRING(\'foobarbar\' FROM 4);\n        -> \'barbar\'\nmysql> SELECT SUBSTRING(\'Quadratically\',5,6);\n        -> \'ratica\'\nmysql> SELECT SUBSTRING(\'Sakila\', -3);\n        -> \'ila\'\nmysql> SELECT SUBSTRING(\'Sakila\', -5, 3);\n        -> \'aki\'\nmysql> SELECT SUBSTRING(\'Sakila\' FROM -4 FOR 2);\n        -> \'ki\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (337,37,'ISEMPTY','IsEmpty(g)\n\nThis function is a placeholder that returns 0 for any valid geometry\nvalue, 1 for any invalid geometry value or NULL.\n\nMySQL does not support GIS EMPTY values such as POINT EMPTY.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (338,27,'SHOW FUNCTION STATUS','Syntax:\nSHOW FUNCTION STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is similar to SHOW PROCEDURE STATUS but for stored\nfunctions. See [HELP SHOW PROCEDURE STATUS].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-function-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-function-status.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (339,38,'LTRIM','Syntax:\nLTRIM(str)\n\nReturns the string str with leading space characters removed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LTRIM(\'  barbar\');\n        -> \'barbar\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (340,31,'INTERSECTS','Intersects(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially intersects g2.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (341,28,'CALL','Syntax:\nCALL sp_name([parameter[,...]])\nCALL sp_name[()]\n\nThe CALL statement invokes a stored procedure that was defined\npreviously with CREATE PROCEDURE.\n\nStored procedures that take no arguments can be invoked without\nparentheses. That is, CALL p() and CALL p are equivalent.\n\nCALL can pass back values to its caller using parameters that are\ndeclared as OUT or INOUT parameters. When the procedure returns, a\nclient program can also obtain the number of rows affected for the\nfinal statement executed within the routine: At the SQL level, call the\nROW_COUNT() function; from the C API, call the mysql_affected_rows()\nfunction.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/call.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/call.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (342,6,'MBRDISJOINT','MBRDisjoint(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangles of\nthe two geometries g1 and g2 are disjoint (do not intersect).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (343,14,'VALUES','Syntax:\nVALUES(col_name)\n\nIn an INSERT ... ON DUPLICATE KEY UPDATE statement, you can use the\nVALUES(col_name) function in the UPDATE clause to refer to column\nvalues from the INSERT portion of the statement. In other words,\nVALUES(col_name) in the UPDATE clause refers to the value of col_name\nthat would be inserted, had no duplicate-key conflict occurred. This\nfunction is especially useful in multiple-row inserts. The VALUES()\nfunction is meaningful only in the ON DUPLICATE KEY UPDATE clause of\nINSERT statements and returns NULL otherwise. See\nhttp://dev.mysql.com/doc/refman/5.5/en/insert-on-duplicate.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> INSERT INTO table (a,b,c) VALUES (1,2,3),(4,5,6)\n    -> ON DUPLICATE KEY UPDATE c=VALUES(a)+VALUES(b);\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (344,38,'SUBSTRING_INDEX','Syntax:\nSUBSTRING_INDEX(str,delim,count)\n\nReturns the substring from string str before count occurrences of the\ndelimiter delim. If count is positive, everything to the left of the\nfinal delimiter (counting from the left) is returned. If count is\nnegative, everything to the right of the final delimiter (counting from\nthe right) is returned. SUBSTRING_INDEX() performs a case-sensitive\nmatch when searching for delim.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SUBSTRING_INDEX(\'www.mysql.com\', \'.\', 2);\n        -> \'www.mysql\'\nmysql> SELECT SUBSTRING_INDEX(\'www.mysql.com\', \'.\', -2);\n        -> \'mysql.com\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (345,12,'ENCODE','Syntax:\nENCODE(str,pass_str)\n\nEncrypt str using pass_str as the password. The result is a binary\nstring of the same length as str. To decrypt the result, use DECODE().\n\nThe ENCODE() function should no longer be used. If you still need to\nuse ENCODE(), a salt value must be used with it to reduce risk. For\nexample:\n\nENCODE(\'plaintext\', CONCAT(\'my_random_salt\',\'my_secret_password\'))\n\nA new random salt value must be used whenever a password is updated.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (346,24,'LOOP','Syntax:\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\nLOOP implements a simple loop construct, enabling repeated execution of\nthe statement list, which consists of one or more statements, each\nterminated by a semicolon (;) statement delimiter. The statements\nwithin the loop are repeated until the loop is terminated. Usually,\nthis is accomplished with a LEAVE statement. Within a stored function,\nRETURN can also be used, which exits the function entirely.\n\nNeglecting to include a loop-termination statement results in an\ninfinite loop.\n\nA LOOP statement can be labeled. For the rules regarding label use, see\n[HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/loop.html\n\n','CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN\n      ITERATE label1;\n    END IF;\n    LEAVE label1;\n  END LOOP label1;\n  SET @x = p1;\nEND;\n','http://dev.mysql.com/doc/refman/5.5/en/loop.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (347,4,'TRUNCATE','Syntax:\nTRUNCATE(X,D)\n\nReturns the number X, truncated to D decimal places. If D is 0, the\nresult has no decimal point or fractional part. D can be negative to\ncause D digits left of the decimal point of the value X to become zero.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT TRUNCATE(1.223,1);\n        -> 1.2\nmysql> SELECT TRUNCATE(1.999,1);\n        -> 1.9\nmysql> SELECT TRUNCATE(1.999,0);\n        -> 1\nmysql> SELECT TRUNCATE(-1.999,1);\n        -> -1.9\nmysql> SELECT TRUNCATE(122,-2);\n       -> 100\nmysql> SELECT TRUNCATE(10.28*100,0);\n       -> 1028\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (348,32,'TIMESTAMPADD','Syntax:\nTIMESTAMPADD(unit,interval,datetime_expr)\n\nAdds the integer expression interval to the date or datetime expression\ndatetime_expr. The unit for interval is given by the unit argument,\nwhich should be one of the following values: MICROSECOND\n(microseconds), SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, or\nYEAR.\n\nIt is possible to use FRAC_SECOND in place of MICROSECOND, but\nFRAC_SECOND is deprecated. FRAC_SECOND was removed in MySQL 5.5.3.\n\nThe unit value may be specified using one of keywords as shown, or with\na prefix of SQL_TSI_. For example, DAY and SQL_TSI_DAY both are legal.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMESTAMPADD(MINUTE,1,\'2003-01-02\');\n        -> \'2003-01-02 00:01:00\'\nmysql> SELECT TIMESTAMPADD(WEEK,1,\'2003-01-02\');\n        -> \'2003-01-09\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (349,27,'SHOW','SHOW has many forms that provide information about databases, tables,\ncolumns, or status information about the server. This section describes\nthose following:\n\nSHOW AUTHORS\nSHOW {BINARY | MASTER} LOGS\nSHOW BINLOG EVENTS [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\nSHOW CHARACTER SET [like_or_where]\nSHOW COLLATION [like_or_where]\nSHOW [FULL] COLUMNS FROM tbl_name [FROM db_name] [like_or_where]\nSHOW CONTRIBUTORS\nSHOW CREATE DATABASE db_name\nSHOW CREATE EVENT event_name\nSHOW CREATE FUNCTION func_name\nSHOW CREATE PROCEDURE proc_name\nSHOW CREATE TABLE tbl_name\nSHOW CREATE TRIGGER trigger_name\nSHOW CREATE VIEW view_name\nSHOW DATABASES [like_or_where]\nSHOW ENGINE engine_name {STATUS | MUTEX}\nSHOW [STORAGE] ENGINES\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW EVENTS\nSHOW FUNCTION CODE func_name\nSHOW FUNCTION STATUS [like_or_where]\nSHOW GRANTS FOR user\nSHOW INDEX FROM tbl_name [FROM db_name]\nSHOW MASTER STATUS\nSHOW OPEN TABLES [FROM db_name] [like_or_where]\nSHOW PLUGINS\nSHOW PROCEDURE CODE proc_name\nSHOW PROCEDURE STATUS [like_or_where]\nSHOW PRIVILEGES\nSHOW [FULL] PROCESSLIST\nSHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]\nSHOW PROFILES\nSHOW SLAVE HOSTS\nSHOW SLAVE STATUS\nSHOW [GLOBAL | SESSION] STATUS [like_or_where]\nSHOW TABLE STATUS [FROM db_name] [like_or_where]\nSHOW [FULL] TABLES [FROM db_name] [like_or_where]\nSHOW TRIGGERS [FROM db_name] [like_or_where]\nSHOW [GLOBAL | SESSION] VARIABLES [like_or_where]\nSHOW WARNINGS [LIMIT [offset,] row_count]\n\nlike_or_where:\n    LIKE \'pattern\'\n  | WHERE expr\n\nIf the syntax for a given SHOW statement includes a LIKE \'pattern\'\npart, \'pattern\' is a string that can contain the SQL "%" and "_"\nwildcard characters. The pattern is useful for restricting statement\noutput to matching values.\n\nSeveral SHOW statements also accept a WHERE clause that provides more\nflexibility in specifying which rows to display. See\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (350,19,'GREATEST','Syntax:\nGREATEST(value1,value2,...)\n\nWith two or more arguments, returns the largest (maximum-valued)\nargument. The arguments are compared using the same rules as for\nLEAST().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT GREATEST(2,0);\n        -> 2\nmysql> SELECT GREATEST(34.0,3.0,5.0,767.0);\n        -> 767.0\nmysql> SELECT GREATEST(\'B\',\'A\',\'C\');\n        -> \'C\'\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (351,27,'SHOW VARIABLES','Syntax:\nSHOW [GLOBAL | SESSION] VARIABLES\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW VARIABLES shows the values of MySQL system variables. This\ninformation also can be obtained using the mysqladmin variables\ncommand. The LIKE clause, if present, indicates which variable names to\nmatch. The WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html. This\nstatement does not require any privilege. It requires only the ability\nto connect to the server.\n\nWith the GLOBAL modifier, SHOW VARIABLES displays the values that are\nused for new connections to MySQL. As of MySQL 5.5.3, if a variable has\nno global value, no value is displayed. Before 5.5.3, the session value\nis displayed. With SESSION, SHOW VARIABLES displays the values that are\nin effect for the current connection. If no modifier is present, the\ndefault is SESSION. LOCAL is a synonym for SESSION.\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern. To obtain the row for a\nspecific variable, use a LIKE clause as shown:\n\nSHOW VARIABLES LIKE \'max_join_size\';\nSHOW SESSION VARIABLES LIKE \'max_join_size\';\n\nTo get a list of variables whose name match a pattern, use the "%"\nwildcard character in a LIKE clause:\n\nSHOW VARIABLES LIKE \'%size%\';\nSHOW GLOBAL VARIABLES LIKE \'%size%\';\n\nWildcard characters can be used in any position within the pattern to\nbe matched. Strictly speaking, because "_" is a wildcard that matches\nany single character, you should escape it as "\\_" to match it\nliterally. In practice, this is rarely necessary.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-variables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-variables.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (352,27,'BINLOG','Syntax:\nBINLOG \'str\'\n\nBINLOG is an internal-use statement. It is generated by the mysqlbinlog\nprogram as the printable representation of certain events in binary log\nfiles. (See http://dev.mysql.com/doc/refman/5.5/en/mysqlbinlog.html.)\nThe \'str\' value is a base 64-encoded string the that server decodes to\ndetermine the data change indicated by the corresponding event. This\nstatement requires the SUPER privilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/binlog.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/binlog.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (353,16,'BIT_AND','Syntax:\nBIT_AND(expr)\n\nReturns the bitwise AND of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (354,32,'SECOND','Syntax:\nSECOND(time)\n\nReturns the second for time, in the range 0 to 59.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT SECOND(\'10:05:03\');\n        -> 3\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (355,4,'ATAN2','Syntax:\nATAN(Y,X), ATAN2(Y,X)\n\nReturns the arc tangent of the two variables X and Y. It is similar to\ncalculating the arc tangent of Y / X, except that the signs of both\narguments are used to determine the quadrant of the result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ATAN(-2,2);\n        -> -0.78539816339745\nmysql> SELECT ATAN2(PI(),0);\n        -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (356,6,'MBRCONTAINS','MBRContains(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangle of g1\ncontains the Minimum Bounding Rectangle of g2. This tests the opposite\nrelationship as MBRWithin().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','mysql> SET @g1 = GeomFromText(\'Polygon((0 0,0 3,3 3,3 0,0 0))\');\nmysql> SET @g2 = GeomFromText(\'Point(1 1)\');\nmysql> SELECT MBRContains(@g1,@g2), MBRContains(@g2,@g1);\n----------------------+----------------------+\n| MBRContains(@g1,@g2) | MBRContains(@g2,@g1) |\n+----------------------+----------------------+\n|                    1 |                    0 |\n+----------------------+----------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (357,32,'HOUR','Syntax:\nHOUR(time)\n\nReturns the hour for time. The range of the return value is 0 to 23 for\ntime-of-day values. However, the range of TIME values actually is much\nlarger, so HOUR can return values greater than 23.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT HOUR(\'10:05:03\');\n        -> 10\nmysql> SELECT HOUR(\'272:59:59\');\n        -> 272\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (358,28,'SELECT','Syntax:\nSELECT\n    [ALL | DISTINCT | DISTINCTROW ]\n      [HIGH_PRIORITY]\n      [STRAIGHT_JOIN]\n      [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]\n      [SQL_CACHE | SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]\n    select_expr [, select_expr ...]\n    [FROM table_references\n    [WHERE where_condition]\n    [GROUP BY {col_name | expr | position}\n      [ASC | DESC], ... [WITH ROLLUP]]\n    [HAVING where_condition]\n    [ORDER BY {col_name | expr | position}\n      [ASC | DESC], ...]\n    [LIMIT {[offset,] row_count | row_count OFFSET offset}]\n    [PROCEDURE procedure_name(argument_list)]\n    [INTO OUTFILE \'file_name\'\n        [CHARACTER SET charset_name]\n        export_options\n      | INTO DUMPFILE \'file_name\'\n      | INTO var_name [, var_name]]\n    [FOR UPDATE | LOCK IN SHARE MODE]]\n\nSELECT is used to retrieve rows selected from one or more tables, and\ncan include UNION statements and subqueries. See [HELP UNION], and\nhttp://dev.mysql.com/doc/refman/5.5/en/subqueries.html.\n\nThe most commonly used clauses of SELECT statements are these:\n\no Each select_expr indicates a column that you want to retrieve. There\n  must be at least one select_expr.\n\no table_references indicates the table or tables from which to retrieve\n  rows. Its syntax is described in [HELP JOIN].\n\no The WHERE clause, if given, indicates the condition or conditions\n  that rows must satisfy to be selected. where_condition is an\n  expression that evaluates to true for each row to be selected. The\n  statement selects all rows if there is no WHERE clause.\n\n  In the WHERE expression, you can use any of the functions and\n  operators that MySQL supports, except for aggregate (summary)\n  functions. See\n  http://dev.mysql.com/doc/refman/5.5/en/expressions.html, and\n  http://dev.mysql.com/doc/refman/5.5/en/functions.html.\n\nSELECT can also be used to retrieve rows computed without reference to\nany table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/select.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/select.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (359,4,'COT','Syntax:\nCOT(X)\n\nReturns the cotangent of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT COT(12);\n        -> -1.5726734063977\nmysql> SELECT COT(0);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (360,27,'SHOW CREATE EVENT','Syntax:\nSHOW CREATE EVENT event_name\n\nThis statement displays the CREATE EVENT statement needed to re-create\na given event. It requires the EVENT privilege for the database from\nwhich the event is to be shown. For example (using the same event\ne_daily defined and then altered in [HELP SHOW EVENTS]):\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-event.html\n\n','mysql> SHOW CREATE EVENT test.e_daily\\G\n*************************** 1. row ***************************\n               Event: e_daily\n            sql_mode:\n           time_zone: SYSTEM\n        Create Event: CREATE EVENT `e_daily`\n                        ON SCHEDULE EVERY 1 DAY\n                        STARTS CURRENT_TIMESTAMP + INTERVAL 6 HOUR\n                        ON COMPLETION NOT PRESERVE\n                        ENABLE\n                        COMMENT \'Saves total number of sessions then\n                                clears the table each day\'\n                        DO BEGIN\n                          INSERT INTO site_activity.totals (time, total)\n                            SELECT CURRENT_TIMESTAMP, COUNT(*)\n                            FROM site_activity.sessions;\n                          DELETE FROM site_activity.sessions;\n                        END\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-event.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (361,38,'LOAD_FILE','Syntax:\nLOAD_FILE(file_name)\n\nReads the file and returns the file contents as a string. To use this\nfunction, the file must be located on the server host, you must specify\nthe full path name to the file, and you must have the FILE privilege.\nThe file must be readable by all and its size less than\nmax_allowed_packet bytes. If the secure_file_priv system variable is\nset to a nonempty directory name, the file to be loaded must be located\nin that directory.\n\nIf the file does not exist or cannot be read because one of the\npreceding conditions is not satisfied, the function returns NULL.\n\nThe character_set_filesystem system variable controls interpretation of\nfile names that are given as literal strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> UPDATE t\n            SET blob_col=LOAD_FILE(\'/tmp/picture\')\n            WHERE id=1;\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (362,3,'POINTFROMTEXT','PointFromText(wkt[,srid])\n\nConstructs a POINT value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (363,16,'GROUP_CONCAT','Syntax:\nGROUP_CONCAT(expr)\n\nThis function returns a string result with the concatenated non-NULL\nvalues from a group. It returns NULL if there are no non-NULL values.\nThe full syntax is as follows:\n\nGROUP_CONCAT([DISTINCT] expr [,expr ...]\n             [ORDER BY {unsigned_integer | col_name | expr}\n                 [ASC | DESC] [,col_name ...]]\n             [SEPARATOR str_val])\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name,\n    ->     GROUP_CONCAT(test_score)\n    ->     FROM student\n    ->     GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (364,32,'DATE_FORMAT','Syntax:\nDATE_FORMAT(date,format)\n\nFormats the date value according to the format string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATE_FORMAT(\'2009-10-04 22:23:00\', \'%W %M %Y\');\n        -> \'Sunday October 2009\'\nmysql> SELECT DATE_FORMAT(\'2007-10-04 22:23:00\', \'%H:%i:%s\');\n        -> \'22:23:00\'\nmysql> SELECT DATE_FORMAT(\'1900-10-04 22:23:00\',\n    ->                 \'%D %y %a %d %m %b %j\');\n        -> \'4th 00 Thu 04 10 Oct 277\'\nmysql> SELECT DATE_FORMAT(\'1997-10-04 22:23:00\',\n    ->                 \'%H %k %I %r %T %S %w\');\n        -> \'22 22 10 10:23:00 PM 22:23:00 00 6\'\nmysql> SELECT DATE_FORMAT(\'1999-01-01\', \'%X %V\');\n        -> \'1998 52\'\nmysql> SELECT DATE_FORMAT(\'2006-06-00\', \'%d\');\n        -> \'00\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (365,17,'BENCHMARK','Syntax:\nBENCHMARK(count,expr)\n\nThe BENCHMARK() function executes the expression expr repeatedly count\ntimes. It may be used to time how quickly MySQL processes the\nexpression. The result value is always 0. The intended use is from\nwithin the mysql client, which reports query execution times:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT BENCHMARK(1000000,ENCODE(\'hello\',\'goodbye\'));\n+----------------------------------------------+\n| BENCHMARK(1000000,ENCODE(\'hello\',\'goodbye\')) |\n+----------------------------------------------+\n|                                            0 |\n+----------------------------------------------+\n1 row in set (4.74 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (366,32,'YEAR','Syntax:\nYEAR(date)\n\nReturns the year for date, in the range 1000 to 9999, or 0 for the\n"zero" date.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT YEAR(\'1987-01-01\');\n        -> 1987\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (367,27,'SHOW ENGINE','Syntax:\nSHOW ENGINE engine_name {STATUS | MUTEX}\n\nSHOW ENGINE displays operational information about a storage engine. It\nrequires the PROCESS privilege. The following statements currently are\nsupported:\n\nSHOW ENGINE INNODB STATUS\nSHOW ENGINE INNODB MUTEX\nSHOW ENGINE {NDB | NDBCLUSTER} STATUS\nSHOW ENGINE PERFORMANCE_SCHEMA STATUS\n\nSHOW ENGINE INNODB STATUS displays extensive information from the\nstandard InnoDB Monitor about the state of the InnoDB storage engine.\nFor information about the standard monitor and other InnoDB Monitors\nthat provide information about InnoDB processing, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-monitors.html.\n\nSHOW ENGINE INNODB MUTEX displays InnoDB mutex statistics. Statement\noutput has the following columns:\n\no Type\n\n  Always InnoDB.\n\no Name\n\n  The source file where the mutex is implemented, and the line number\n  in the file where the mutex is created. The line number may change\n  depending on your version of MySQL.\n\no Status\n\n  The mutex status. This field displays several values if UNIV_DEBUG\n  was defined at MySQL compilation time (for example, in include/univ.i\n  in the InnoDB part of the MySQL source tree). If UNIV_DEBUG was not\n  defined, the statement displays only the os_waits value. In the\n  latter case (without UNIV_DEBUG), the information on which the output\n  is based is insufficient to distinguish regular mutexes and mutexes\n  that protect rw-locks (which permit multiple readers or a single\n  writer). Consequently, the output may appear to contain multiple rows\n  for the same mutex.\n\n  o count indicates how many times the mutex was requested.\n\n  o spin_waits indicates how many times the spinlock had to run.\n\n  o spin_rounds indicates the number of spinlock rounds. (spin_rounds\n    divided by spin_waits provides the average round count.)\n\n  o os_waits indicates the number of operating system waits. This\n    occurs when the spinlock did not work (the mutex was not locked\n    during the spinlock and it was necessary to yield to the operating\n    system and wait).\n\n  o os_yields indicates the number of times a the thread trying to lock\n    a mutex gave up its timeslice and yielded to the operating system\n    (on the presumption that permitting other threads to run will free\n    the mutex so that it can be locked).\n\n  o os_wait_times indicates the amount of time (in ms) spent in\n    operating system waits, if the timed_mutexes system variable is 1\n    (ON). If timed_mutexes is 0 (OFF), timing is disabled, so\n    os_wait_times is 0. timed_mutexes is off by default.\n\nInformation from this statement can be used to diagnose system\nproblems. For example, large values of spin_waits and spin_rounds may\nindicate scalability problems.\n\nUse SHOW ENGINE PERFORMANCE_SCHEMA STATUS to inspect the internal\noperation of the Performance Schema code:\n\nmysql> SHOW ENGINE PERFORMANCE_SCHEMA STATUS\\G\n...\n*************************** 3. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.row_size\nStatus: 76\n*************************** 4. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.row_count\nStatus: 10000\n*************************** 5. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.memory\nStatus: 760000\n...\n*************************** 57. row ***************************\n  Type: performance_schema\n  Name: performance_schema.memory\nStatus: 26459600\n...\n\nThis statement is intended to help the DBA understand the effects that\ndifferent Performance Schema options have on memory requirements.\n\nName values consist of two parts, which name an internal buffer and a\nbuffer attribute, respectively. Interpret buffer names as follows:\n\no An internal buffer that is not exposed as a table is named within\n  parentheses. Examples: (pfs_cond_class).row_size,\n  (pfs_mutex_class).memory.\n\no An internal buffer that is exposed as a table in the\n  performance_schema database is named after the table, without\n  parentheses. Examples: events_waits_history.row_size,\n  mutex_instances.row_count.\n\no A value that applies to the Performance Schema as a whole begins with\n  performance_schema. Example: performance_schema.memory.\n\nBuffer attributes have these meanings:\n\no row_size is the size of the internal record used by the\n  implementation, such as the size of a row in a table. row_size values\n  cannot be changed.\n\no row_count is the number of internal records, such as the number of\n  rows in a table. row_count values can be changed using Performance\n  Schema configuration options.\n\no For a table, tbl_name.memory is the product of row_size and\n  row_count. For the Performance Schema as a whole,\n  performance_schema.memory is the sum of all the memory used (the sum\n  of all other memory values).\n\nIn some cases, there is a direct relationship between a Performance\nSchema configuration parameter and a SHOW ENGINE value. For example,\nevents_waits_history_long.row_count corresponds to\nperformance_schema_events_waits_history_long_size. In other cases, the\nrelationship is more complex. For example,\nevents_waits_history.row_count corresponds to\nperformance_schema_events_waits_history_size (the number of rows per\nthread) multiplied by performance_schema_max_thread_instances ( the\nnumber of threads).\n\nIf the server has the NDBCLUSTER storage engine enabled, SHOW ENGINE\nNDB STATUS displays cluster status information such as the number of\nconnected data nodes, the cluster connectstring, and cluster binlog\nepochs, as well as counts of various Cluster API objects created by the\nMySQL Server when connected to the cluster. Sample output from this\nstatement is shown here:\n\nmysql> SHOW ENGINE NDB STATUS;\n+------------+-----------------------+--------------------------------------------------+\n| Type       | Name                  | Status                                           |\n+------------+-----------------------+--------------------------------------------------+\n| ndbcluster | connection            | cluster_node_id=7,\n  connected_host=192.168.0.103, connected_port=1186, number_of_data_nodes=4,\n  number_of_ready_data_nodes=3, connect_count=0                                         |\n| ndbcluster | NdbTransaction        | created=6, free=0, sizeof=212                    |\n| ndbcluster | NdbOperation          | created=8, free=8, sizeof=660                    |\n| ndbcluster | NdbIndexScanOperation | created=1, free=1, sizeof=744                    |\n| ndbcluster | NdbIndexOperation     | created=0, free=0, sizeof=664                    |\n| ndbcluster | NdbRecAttr            | created=1285, free=1285, sizeof=60               |\n| ndbcluster | NdbApiSignal          | created=16, free=16, sizeof=136                  |\n| ndbcluster | NdbLabel              | created=0, free=0, sizeof=196                    |\n| ndbcluster | NdbBranch             | created=0, free=0, sizeof=24                     |\n| ndbcluster | NdbSubroutine         | created=0, free=0, sizeof=68                     |\n| ndbcluster | NdbCall               | created=0, free=0, sizeof=16                     |\n| ndbcluster | NdbBlob               | created=1, free=1, sizeof=264                    |\n| ndbcluster | NdbReceiver           | created=4, free=0, sizeof=68                     |\n| ndbcluster | binlog                | latest_epoch=155467, latest_trans_epoch=148126,\n  latest_received_binlog_epoch=0, latest_handled_binlog_epoch=0,\n  latest_applied_binlog_epoch=0                                                         |\n+------------+-----------------------+--------------------------------------------------+\n\nThe rows with connection and binlog in the Name column were added to\nthe output of this statement in MySQL 5.1. The Status column in each of\nthese rows provides information about the MySQL server\'s connection to\nthe cluster and about the cluster binary log\'s status, respectively.\nThe Status information is in the form of comma-delimited set of\nname/value pairs.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-engine.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-engine.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (368,14,'NAME_CONST','Syntax:\nNAME_CONST(name,value)\n\nReturns the given value. When used to produce a result set column,\nNAME_CONST() causes the column to have the given name. The arguments\nshould be constants.\n\nmysql> SELECT NAME_CONST(\'myname\', 14);\n+--------+\n| myname |\n+--------+\n|     14 |\n+--------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (369,14,'RELEASE_LOCK','Syntax:\nRELEASE_LOCK(str)\n\nReleases the lock named by the string str that was obtained with\nGET_LOCK(). Returns 1 if the lock was released, 0 if the lock was not\nestablished by this thread (in which case the lock is not released),\nand NULL if the named lock did not exist. The lock does not exist if it\nwas never obtained by a call to GET_LOCK() or if it has previously been\nreleased.\n\nThe DO statement is convenient to use with RELEASE_LOCK(). See [HELP\nDO].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (370,19,'IS NULL','Syntax:\nIS NULL\n\nTests whether a value is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NULL, 0 IS NULL, NULL IS NULL;\n        -> 0, 0, 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (371,32,'CONVERT_TZ','Syntax:\nCONVERT_TZ(dt,from_tz,to_tz)\n\nCONVERT_TZ() converts a datetime value dt from the time zone given by\nfrom_tz to the time zone given by to_tz and returns the resulting\nvalue. Time zones are specified as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html. This\nfunction returns NULL if the arguments are invalid.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT CONVERT_TZ(\'2004-01-01 12:00:00\',\'GMT\',\'MET\');\n        -> \'2004-01-01 13:00:00\'\nmysql> SELECT CONVERT_TZ(\'2004-01-01 12:00:00\',\'+00:00\',\'+10:00\');\n        -> \'2004-01-01 22:00:00\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (372,32,'TIME_TO_SEC','Syntax:\nTIME_TO_SEC(time)\n\nReturns the time argument, converted to seconds.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIME_TO_SEC(\'22:23:00\');\n        -> 80580\nmysql> SELECT TIME_TO_SEC(\'00:39:38\');\n        -> 2378\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (373,32,'WEEKDAY','Syntax:\nWEEKDAY(date)\n\nReturns the weekday index for date (0 = Monday, 1 = Tuesday, ... 6 =\nSunday).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT WEEKDAY(\'2008-02-03 22:23:00\');\n        -> 6\nmysql> SELECT WEEKDAY(\'2007-11-06\');\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (374,38,'EXPORT_SET','Syntax:\nEXPORT_SET(bits,on,off[,separator[,number_of_bits]])\n\nReturns a string such that for every bit set in the value bits, you get\nan on string and for every bit not set in the value, you get an off\nstring. Bits in bits are examined from right to left (from low-order to\nhigh-order bits). Strings are added to the result from left to right,\nseparated by the separator string (the default being the comma\ncharacter ","). The number of bits examined is given by number_of_bits,\nwhich has a default of 64 if not specified. number_of_bits is silently\nclipped to 64 if larger than 64. It is treated as an unsigned integer,\nso a value of -1 is effectively the same as 64.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT EXPORT_SET(5,\'Y\',\'N\',\',\',4);\n        -> \'Y,N,Y,N\'\nmysql> SELECT EXPORT_SET(6,\'1\',\'0\',\',\',10);\n        -> \'0,1,1,0,0,0,0,0,0,0\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (375,40,'ALTER SERVER','Syntax:\nALTER SERVER  server_name\n    OPTIONS (option [, option] ...)\n\nAlters the server information for server_name, adjusting any of the\noptions permitted in the CREATE SERVER statement. The corresponding\nfields in the mysql.servers table are updated accordingly. This\nstatement requires the SUPER privilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-server.html\n\n','ALTER SERVER s OPTIONS (USER \'sally\');\n','http://dev.mysql.com/doc/refman/5.5/en/alter-server.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (376,24,'RESIGNAL','Syntax:\nRESIGNAL [condition_value]\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value:\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name:\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nRESIGNAL passes on the error condition information that is available\nduring execution of a condition handler within a compound statement\ninside a stored procedure or function, trigger, or event. RESIGNAL may\nchange some or all information before passing it on. RESIGNAL is\nrelated to SIGNAL, but instead of originating a condition as SIGNAL\ndoes, RESIGNAL relays existing condition information, possibly after\nmodifying it.\n\nRESIGNAL makes it possible to both handle an error and return the error\ninformation. Otherwise, by executing an SQL statement within the\nhandler, information that caused the handler\'s activation is destroyed.\nRESIGNAL also can make some procedures shorter if a given handler can\nhandle part of a situation, then pass the condition "up the line" to\nanother handler.\n\nNo special privileges are required to execute the RESIGNAL statement.\n\nAll forms of RESIGNAL require that the current context be a condition\nhandler. Otherwise, RESIGNAL is illegal and a RESIGNAL when handler not\nactive error occurs.\n\nFor condition_value and signal_information_item, the definitions and\nrules are the same for RESIGNAL as for SIGNAL. For example, the\ncondition_value can be an SQLSTATE value, and the value can indicate\nerrors, warnings, or "not found." For additional information, see [HELP\nSIGNAL].\n\nThe RESIGNAL statement takes condition_value and SET clauses, both of\nwhich are optional. This leads to several possible uses:\n\no RESIGNAL alone:\n\nRESIGNAL;\n\no RESIGNAL with new signal information:\n\nRESIGNAL SET signal_information_item [, signal_information_item] ...;\n\no RESIGNAL with a condition value and possibly new signal information:\n\nRESIGNAL condition_value\n    [SET signal_information_item [, signal_information_item] ...];\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/resignal.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/resignal.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (377,32,'TIME FUNCTION','Syntax:\nTIME(expr)\n\nExtracts the time part of the time or datetime expression expr and\nreturns it as a string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIME(\'2003-12-31 01:02:03\');\n        -> \'01:02:03\'\nmysql> SELECT TIME(\'2003-12-31 01:02:03.000123\');\n        -> \'01:02:03.000123\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (378,32,'DATE_ADD','Syntax:\nDATE_ADD(date,INTERVAL expr unit), DATE_SUB(date,INTERVAL expr unit)\n\nThese functions perform date arithmetic. The date argument specifies\nthe starting date or datetime value. expr is an expression specifying\nthe interval value to be added or subtracted from the starting date.\nexpr is a string; it may start with a "-" for negative intervals. unit\nis a keyword indicating the units in which the expression should be\ninterpreted.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT \'2008-12-31 23:59:59\' + INTERVAL 1 SECOND;\n        -> \'2009-01-01 00:00:00\'\nmysql> SELECT INTERVAL 1 DAY + \'2008-12-31\';\n        -> \'2009-01-01\'\nmysql> SELECT \'2005-01-01\' - INTERVAL 1 SECOND;\n        -> \'2004-12-31 23:59:59\'\nmysql> SELECT DATE_ADD(\'2000-12-31 23:59:59\',\n    ->                 INTERVAL 1 SECOND);\n        -> \'2001-01-01 00:00:00\'\nmysql> SELECT DATE_ADD(\'2010-12-31 23:59:59\',\n    ->                 INTERVAL 1 DAY);\n        -> \'2011-01-01 23:59:59\'\nmysql> SELECT DATE_ADD(\'2100-12-31 23:59:59\',\n    ->                 INTERVAL \'1:1\' MINUTE_SECOND);\n        -> \'2101-01-01 00:01:00\'\nmysql> SELECT DATE_SUB(\'2005-01-01 00:00:00\',\n    ->                 INTERVAL \'1 1:1:1\' DAY_SECOND);\n        -> \'2004-12-30 22:58:59\'\nmysql> SELECT DATE_ADD(\'1900-01-01 00:00:00\',\n    ->                 INTERVAL \'-1 10\' DAY_HOUR);\n        -> \'1899-12-30 14:00:00\'\nmysql> SELECT DATE_SUB(\'1998-01-02\', INTERVAL 31 DAY);\n        -> \'1997-12-02\'\nmysql> SELECT DATE_ADD(\'1992-12-31 23:59:59.000002\',\n    ->            INTERVAL \'1.999999\' SECOND_MICROSECOND);\n        -> \'1993-01-01 00:00:01.000001\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (379,38,'CAST','Syntax:\nCAST(expr AS type)\n\nThe CAST() function takes an expression of any type and produces a\nresult value of a specified type, similar to CONVERT(). See the\ndescription of CONVERT() for more information.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (380,38,'SOUNDS LIKE','Syntax:\nexpr1 SOUNDS LIKE expr2\n\nThis is the same as SOUNDEX(expr1) = SOUNDEX(expr2).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (381,32,'PERIOD_DIFF','Syntax:\nPERIOD_DIFF(P1,P2)\n\nReturns the number of months between periods P1 and P2. P1 and P2\nshould be in the format YYMM or YYYYMM. Note that the period arguments\nP1 and P2 are not date values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT PERIOD_DIFF(200802,200703);\n        -> 11\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (382,38,'LIKE','Syntax:\nexpr LIKE pat [ESCAPE \'escape_char\']\n\nPattern matching using SQL simple regular expression comparison.\nReturns 1 (TRUE) or 0 (FALSE). If either expr or pat is NULL, the\nresult is NULL.\n\nThe pattern need not be a literal string. For example, it can be\nspecified as a string expression or table column.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html\n\n','mysql> SELECT \'David!\' LIKE \'David_\';\n        -> 1\nmysql> SELECT \'David!\' LIKE \'%D%v%\';\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (383,25,'MULTIPOINT','MultiPoint(pt1,pt2,...)\n\nConstructs a MultiPoint value using Point or WKB Point arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (384,20,'>>','Syntax:\n>>\n\nShifts a longlong (BIGINT) number to the right.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 4 >> 2;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (385,24,'FETCH','Syntax:\nFETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...\n\nThis statement fetches the next row for the SELECT statement associated\nwith the specified cursor (which must be open), and advances the cursor\npointer. If a row exists, the fetched columns are stored in the named\nvariables. The number of columns retrieved by the SELECT statement must\nmatch the number of output variables specified in the FETCH statement.\n\nIf no more rows are available, a No Data condition occurs with SQLSTATE\nvalue \'02000\'. To detect this condition, you can set up a handler for\nit (or for a NOT FOUND condition). For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/fetch.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/fetch.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (386,16,'AVG','Syntax:\nAVG([DISTINCT] expr)\n\nReturns the average value of expr. The DISTINCT option can be used to\nreturn the average of the distinct values of expr.\n\nAVG() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name, AVG(test_score)\n    ->        FROM student\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (387,30,'TRUE FALSE','The constants TRUE and FALSE evaluate to 1 and 0, respectively. The\nconstant names can be written in any lettercase.\n\nmysql> SELECT TRUE, true, FALSE, false;\n        -> 1, 1, 0, 0\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/boolean-literals.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/boolean-literals.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (388,6,'MBRWITHIN','MBRWithin(g1,g2)\n\nReturns 1 or 0 to indicate whether the Minimum Bounding Rectangle of g1\nis within the Minimum Bounding Rectangle of g2. This tests the opposite\nrelationship as MBRContains().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','mysql> SET @g1 = GeomFromText(\'Polygon((0 0,0 3,3 3,3 0,0 0))\');\nmysql> SET @g2 = GeomFromText(\'Polygon((0 0,0 5,5 5,5 0,0 0))\');\nmysql> SELECT MBRWithin(@g1,@g2), MBRWithin(@g2,@g1);\n+--------------------+--------------------+\n| MBRWithin(@g1,@g2) | MBRWithin(@g2,@g1) |\n+--------------------+--------------------+\n|                  1 |                  0 |\n+--------------------+--------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (389,17,'SESSION_USER','Syntax:\nSESSION_USER()\n\nSESSION_USER() is a synonym for USER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (390,19,'IN','Syntax:\nexpr IN (value,...)\n\nReturns 1 if expr is equal to any of the values in the IN list, else\nreturns 0. If all values are constants, they are evaluated according to\nthe type of expr and sorted. The search for the item then is done using\na binary search. This means IN is very quick if the IN value list\nconsists entirely of constants. Otherwise, type conversion takes place\naccording to the rules described in\nhttp://dev.mysql.com/doc/refman/5.5/en/type-conversion.html, but\napplied to all the arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 IN (0,3,5,7);\n        -> 0\nmysql> SELECT \'wefwf\' IN (\'wee\',\'wefwf\',\'weg\');\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (391,38,'QUOTE','Syntax:\nQUOTE(str)\n\nQuotes a string to produce a result that can be used as a properly\nescaped data value in an SQL statement. The string is returned enclosed\nby single quotation marks and with each instance of backslash ("\\"),\nsingle quote ("\'"), ASCII NUL, and Control+Z preceded by a backslash.\nIf the argument is NULL, the return value is the word "NULL" without\nenclosing single quotation marks.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT QUOTE(\'Don\\\'t!\');\n        -> \'Don\\\'t!\'\nmysql> SELECT QUOTE(NULL);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (392,27,'HELP COMMAND','Syntax:\nmysql> help search_string\n\nIf you provide an argument to the help command, mysql uses it as a\nsearch string to access server-side help from the contents of the MySQL\nReference Manual. The proper operation of this command requires that\nthe help tables in the mysql database be initialized with help topic\ninformation (see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-side-help-support.html).\n\nIf there is no match for the search string, the search fails:\n\nmysql> help me\n\nNothing found\nPlease try to run \'help contents\' for a list of all accessible topics\n\nUse help contents to see a list of the help categories:\n\nmysql> help contents\nYou asked for help about help category: "Contents"\nFor more information, type \'help <item>\', where <item> is one of the\nfollowing categories:\n   Account Management\n   Administration\n   Data Definition\n   Data Manipulation\n   Data Types\n   Functions\n   Functions and Modifiers for Use with GROUP BY\n   Geographic Features\n   Language Structure\n   Plugins\n   Storage Engines\n   Stored Routines\n   Table Maintenance\n   Transactions\n   Triggers\n\nIf the search string matches multiple items, mysql shows a list of\nmatching topics:\n\nmysql> help logs\nMany help items for your request exist.\nTo make a more specific request, please type \'help <item>\',\nwhere <item> is one of the following topics:\n   SHOW\n   SHOW BINARY LOGS\n   SHOW ENGINE\n   SHOW LOGS\n\nUse a topic as the search string to see the help entry for that topic:\n\nmysql> help show binary logs\nName: \'SHOW BINARY LOGS\'\nDescription:\nSyntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [purge-binary-logs], that shows how\nto determine which logs can be purged.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+\n| Log_name      | File_size |\n+---------------+-----------+\n| binlog.000015 |    724935 |\n| binlog.000016 |    733481 |\n+---------------+-----------+\n\nThe search string can contain the the wildcard characters "%" and "_".\nThese have the same meaning as for pattern-matching operations\nperformed with the LIKE operator. For example, HELP rep% returns a list\nof topics that begin with rep:\n\nmysql> HELP rep%\nMany help items for your request exist.\nTo make a more specific request, please type \'help <item>\',\nwhere <item> is one of the following\ntopics:\n   REPAIR TABLE\n   REPEAT FUNCTION\n   REPEAT LOOP\n   REPLACE\n   REPLACE FUNCTION\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mysql-server-side-help.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/mysql-server-side-help.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (393,32,'QUARTER','Syntax:\nQUARTER(date)\n\nReturns the quarter of the year for date, in the range 1 to 4.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT QUARTER(\'2008-04-01\');\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (394,38,'POSITION','Syntax:\nPOSITION(substr IN str)\n\nPOSITION(substr IN str) is a synonym for LOCATE(substr,str).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (395,27,'SHOW CREATE FUNCTION','Syntax:\nSHOW CREATE FUNCTION func_name\n\nThis statement is similar to SHOW CREATE PROCEDURE but for stored\nfunctions. See [HELP SHOW CREATE PROCEDURE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-create-function.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (396,14,'IS_USED_LOCK','Syntax:\nIS_USED_LOCK(str)\n\nChecks whether the lock named str is in use (that is, locked). If so,\nit returns the connection identifier of the client that holds the lock.\nOtherwise, it returns NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (397,3,'POLYFROMTEXT','PolyFromText(wkt[,srid]), PolygonFromText(wkt[,srid])\n\nConstructs a POLYGON value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (398,12,'DES_ENCRYPT','Syntax:\nDES_ENCRYPT(str[,{key_num|key_str}])\n\nEncrypts the string with the given key using the Triple-DES algorithm.\n\nThis function works only if MySQL has been configured with SSL support.\nSee http://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html.\n\nThe encryption key to use is chosen based on the second argument to\nDES_ENCRYPT(), if one was given. With no argument, the first key from\nthe DES key file is used. With a key_num argument, the given key number\n(0 to 9) from the DES key file is used. With a key_str argument, the\ngiven key string is used to encrypt str.\n\nThe key file can be specified with the --des-key-file server option.\n\nThe return string is a binary string where the first character is\nCHAR(128 | key_num). If an error occurs, DES_ENCRYPT() returns NULL.\n\nThe 128 is added to make it easier to recognize an encrypted key. If\nyou use a string key, key_num is 127.\n\nThe string length for the result is given by this formula:\n\nnew_len = orig_len + (8 - (orig_len % 8)) + 1\n\nEach line in the DES key file has the following format:\n\nkey_num des_key_str\n\nEach key_num value must be a number in the range from 0 to 9. Lines in\nthe file may be in any order. des_key_str is the string that is used to\nencrypt the message. There should be at least one space between the\nnumber and the key. The first key is the default key that is used if\nyou do not specify any key argument to DES_ENCRYPT().\n\nYou can tell MySQL to read new key values from the key file with the\nFLUSH DES_KEY_FILE statement. This requires the RELOAD privilege.\n\nOne benefit of having a set of default keys is that it gives\napplications a way to check for the existence of encrypted column\nvalues, without giving the end user the right to decrypt those values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT customer_address FROM customer_table \n     > WHERE crypted_credit_card = DES_ENCRYPT(\'credit_card_number\');\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (399,4,'CEIL','Syntax:\nCEIL(X)\n\nCEIL() is a synonym for CEILING().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (400,38,'LENGTH','Syntax:\nLENGTH(str)\n\nReturns the length of the string str, measured in bytes. A multi-byte\ncharacter counts as multiple bytes. This means that for a string\ncontaining five 2-byte characters, LENGTH() returns 10, whereas\nCHAR_LENGTH() returns 5.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LENGTH(\'text\');\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (401,32,'STR_TO_DATE','Syntax:\nSTR_TO_DATE(str,format)\n\nThis is the inverse of the DATE_FORMAT() function. It takes a string\nstr and a format string format. STR_TO_DATE() returns a DATETIME value\nif the format string contains both date and time parts, or a DATE or\nTIME value if the string contains only date or time parts. If the date,\ntime, or datetime value extracted from str is illegal, STR_TO_DATE()\nreturns NULL and produces a warning.\n\nThe server scans str attempting to match format to it. The format\nstring can contain literal characters and format specifiers beginning\nwith %. Literal characters in format must match literally in str.\nFormat specifiers in format must match a date or time part in str. For\nthe specifiers that can be used in format, see the DATE_FORMAT()\nfunction description.\n\nmysql> SELECT STR_TO_DATE(\'01,5,2013\',\'%d,%m,%Y\');\n        -> \'2013-05-01\'\nmysql> SELECT STR_TO_DATE(\'May 1, 2013\',\'%M %d,%Y\');\n        -> \'2013-05-01\'\n\nScanning starts at the beginning of str and fails if format is found\nnot to match. Extra characters at the end of str are ignored.\n\nmysql> SELECT STR_TO_DATE(\'a09:30:17\',\'a%h:%i:%s\');\n        -> \'09:30:17\'\nmysql> SELECT STR_TO_DATE(\'a09:30:17\',\'%h:%i:%s\');\n        -> NULL\nmysql> SELECT STR_TO_DATE(\'09:30:17a\',\'%h:%i:%s\');\n        -> \'09:30:17\'\n\nUnspecified date or time parts have a value of 0, so incompletely\nspecified values in str produce a result with some or all parts set to\n0:\n\nmysql> SELECT STR_TO_DATE(\'abc\',\'abc\');\n        -> \'0000-00-00\'\nmysql> SELECT STR_TO_DATE(\'9\',\'%m\');\n        -> \'0000-09-00\'\nmysql> SELECT STR_TO_DATE(\'9\',\'%s\');\n        -> \'00:00:09\'\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (402,11,'Y','Y(p)\n\nReturns the Y-coordinate value for the Point object p as a\ndouble-precision number.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SELECT Y(POINT(56.7, 53.34));\n+-----------------------+\n| Y(POINT(56.7, 53.34)) |\n+-----------------------+\n|                 53.34 |\n+-----------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (403,21,'CHECKSUM TABLE','Syntax:\nCHECKSUM TABLE tbl_name [, tbl_name] ... [ QUICK | EXTENDED ]\n\nCHECKSUM TABLE reports a table checksum. This statement requires the\nSELECT privilege for the table.\n\nWith QUICK, the live table checksum is reported if it is available, or\nNULL otherwise. This is very fast. A live checksum is enabled by\nspecifying the CHECKSUM=1 table option when you create the table;\ncurrently, this is supported only for MyISAM tables. See [HELP CREATE\nTABLE].\n\nWith EXTENDED, the entire table is read row by row and the checksum is\ncalculated. This can be very slow for large tables.\n\nIf neither QUICK nor EXTENDED is specified, MySQL returns a live\nchecksum if the table storage engine supports it and scans the table\notherwise.\n\nFor a nonexistent table, CHECKSUM TABLE returns NULL and generates a\nwarning.\n\nIn MySQL 5.5, CHECKSUM TABLE returns 0 for partitioned tables unless\nyou include the EXTENDED option. This issue is resolved in MySQL 5.6.\n(Bug #11933226, Bug #60681)\n\nThe checksum value depends on the table row format. If the row format\nchanges, the checksum also changes. For example, the storage format for\nVARCHAR changed between MySQL 4.1 and 5.0, so if a 4.1 table is\nupgraded to MySQL 5.0, the checksum value may change.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/checksum-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/checksum-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (404,2,'NUMINTERIORRINGS','NumInteriorRings(poly)\n\nReturns the number of interior rings in the Polygon value poly.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @poly =\n    -> \'Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))\';\nmysql> SELECT NumInteriorRings(GeomFromText(@poly));\n+---------------------------------------+\n| NumInteriorRings(GeomFromText(@poly)) |\n+---------------------------------------+\n|                                     1 |\n+---------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (405,2,'INTERIORRINGN','InteriorRingN(poly,N)\n\nReturns the N-th interior ring for the Polygon value poly as a\nLineString. Rings are numbered beginning with 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @poly =\n    -> \'Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))\';\nmysql> SELECT AsText(InteriorRingN(GeomFromText(@poly),1));\n+----------------------------------------------+\n| AsText(InteriorRingN(GeomFromText(@poly),1)) |\n+----------------------------------------------+\n| LINESTRING(1 1,1 2,2 2,2 1,1 1)              |\n+----------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (406,32,'UTC_TIME','Syntax:\nUTC_TIME, UTC_TIME()\n\nReturns the current UTC time as a value in \'HH:MM:SS\' or HHMMSS.uuuuuu\nformat, depending on whether the function is used in a string or\nnumeric context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_TIME(), UTC_TIME() + 0;\n        -> \'18:07:53\', 180753.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (407,40,'DROP FUNCTION','The DROP FUNCTION statement is used to drop stored functions and\nuser-defined functions (UDFs):\n\no For information about dropping stored functions, see [HELP DROP\n  PROCEDURE].\n\no For information about dropping user-defined functions, see [HELP DROP\n  FUNCTION UDF].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-function.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (408,40,'ALTER EVENT','Syntax:\nALTER\n    [DEFINER = { user | CURRENT_USER }]\n    EVENT event_name\n    [ON SCHEDULE schedule]\n    [ON COMPLETION [NOT] PRESERVE]\n    [RENAME TO new_event_name]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'comment\']\n    [DO event_body]\n\nThe ALTER EVENT statement changes one or more of the characteristics of\nan existing event without the need to drop and recreate it. The syntax\nfor each of the DEFINER, ON SCHEDULE, ON COMPLETION, COMMENT, ENABLE /\nDISABLE, and DO clauses is exactly the same as when used with CREATE\nEVENT. (See [HELP CREATE EVENT].)\n\nAny user can alter an event defined on a database for which that user\nhas the EVENT privilege. When a user executes a successful ALTER EVENT\nstatement, that user becomes the definer for the affected event.\n\nALTER EVENT works only with an existing event:\n\nmysql> ALTER EVENT no_such_event \n     >     ON SCHEDULE \n     >       EVERY \'2:3\' DAY_HOUR;\nERROR 1517 (HY000): Unknown event \'no_such_event\'\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-event.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-event.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (409,16,'STDDEV','Syntax:\nSTDDEV(expr)\n\nReturns the population standard deviation of expr. This function is\nprovided for compatibility with Oracle. The standard SQL function\nSTDDEV_POP() can be used instead.\n\nThis function returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (410,32,'DATE_SUB','Syntax:\nDATE_SUB(date,INTERVAL expr unit)\n\nSee the description for DATE_ADD().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (411,32,'PERIOD_ADD','Syntax:\nPERIOD_ADD(P,N)\n\nAdds N months to period P (in the format YYMM or YYYYMM). Returns a\nvalue in the format YYYYMM. Note that the period argument P is not a\ndate value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT PERIOD_ADD(200801,2);\n        -> 200803\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (412,20,'|','Syntax:\n|\n\nBitwise OR:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 29 | 15;\n        -> 31\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (413,3,'GEOMFROMTEXT','GeomFromText(wkt[,srid]), GeometryFromText(wkt[,srid])\n\nConstructs a geometry value of any type using its WKT representation\nand SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (414,14,'UUID_SHORT','Syntax:\nUUID_SHORT()\n\nReturns a "short" universal identifier as a 64-bit unsigned integer\n(rather than a string-form 128-bit identifier as returned by the UUID()\nfunction).\n\nThe value of UUID_SHORT() is guaranteed to be unique if the following\nconditions hold:\n\no The server_id of the current host is unique among your set of master\n  and slave servers\n\no server_id is between 0 and 255\n\no You do not set back your system time for your server between mysqld\n  restarts\n\no You do not invoke UUID_SHORT() on average more than 16 million times\n  per second between mysqld restarts\n\nThe UUID_SHORT() return value is constructed this way:\n\n  (server_id & 255) << 56\n+ (server_startup_time_in_seconds << 24)\n+ incremented_variable++;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID_SHORT();\n        -> 92395783831158784\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (415,38,'RIGHT','Syntax:\nRIGHT(str,len)\n\nReturns the rightmost len characters from the string str, or NULL if\nany argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT RIGHT(\'foobarbar\', 4);\n        -> \'rbar\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (416,32,'DATEDIFF','Syntax:\nDATEDIFF(expr1,expr2)\n\nDATEDIFF() returns expr1 - expr2 expressed as a value in days from one\ndate to the other. expr1 and expr2 are date or date-and-time\nexpressions. Only the date parts of the values are used in the\ncalculation.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATEDIFF(\'2007-12-31 23:59:59\',\'2007-12-30\');\n        -> 1\nmysql> SELECT DATEDIFF(\'2010-11-30 23:59:59\',\'2010-12-31\');\n        -> -31\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (417,40,'DROP TABLESPACE','Syntax:\nDROP TABLESPACE tablespace_name\n    ENGINE [=] engine_name\n\nThis statement drops a tablespace that was previously created using\nCREATE TABLESPACE (see [HELP CREATE TABLESPACE]).\n\n*Important*: The tablespace to be dropped must not contain any data\nfiles; in other words, before you can drop a tablespace, you must first\ndrop each of its data files using ALTER TABLESPACE ... DROP DATAFILE\n(see [HELP ALTER TABLESPACE]).\n\nThe ENGINE clause (required) specifies the storage engine used by the\ntablespace. Currently, the only accepted values for engine_name are NDB\nand NDBCLUSTER.\n\nDROP TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-tablespace.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (418,40,'DROP PROCEDURE','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThis statement is used to drop a stored procedure or function. That is,\nthe specified routine is removed from the server. You must have the\nALTER ROUTINE privilege for the routine. (If the\nautomatic_sp_privileges system variable is enabled, that privilege and\nEXECUTE are granted automatically to the routine creator when the\nroutine is created and dropped from the creator when the routine is\ndropped. See\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-routines-privileges.html.\n)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-procedure.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (419,21,'CHECK TABLE','Syntax:\nCHECK TABLE tbl_name [, tbl_name] ... [option] ...\n\noption = {FOR UPGRADE | QUICK | FAST | MEDIUM | EXTENDED | CHANGED}\n\nCHECK TABLE checks a table or tables for errors. CHECK TABLE works for\nInnoDB, MyISAM, ARCHIVE, and CSV tables. For MyISAM tables, the key\nstatistics are updated as well.\n\nTo check a table, you must have some privilege for it.\n\nCHECK TABLE can also check views for problems, such as tables that are\nreferenced in the view definition that no longer exist.\n\nCHECK TABLE is supported for partitioned tables, and you can use ALTER\nTABLE ... CHECK PARTITION to check one or more partitions; for more\ninformation, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/check-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/check-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (420,38,'BIN','Syntax:\nBIN(N)\n\nReturns a string representation of the binary value of N, where N is a\nlonglong (BIGINT) number. This is equivalent to CONV(N,10,2). Returns\nNULL if N is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT BIN(12);\n        -> \'1100\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (421,5,'INSTALL PLUGIN','Syntax:\nINSTALL PLUGIN plugin_name SONAME \'shared_library_name\'\n\nThis statement installs a server plugin. It requires the INSERT\nprivilege for the mysql.plugin table.\n\nplugin_name is the name of the plugin as defined in the plugin\ndescriptor structure contained in the library file (see\nhttp://dev.mysql.com/doc/refman/5.5/en/plugin-data-structures.html).\nPlugin names are not case sensitive. For maximal compatibility, plugin\nnames should be limited to ASCII letters, digits, and underscore\nbecause they are used in C source files, shell command lines, M4 and\nBourne shell scripts, and SQL environments.\n\nshared_library_name is the name of the shared library that contains the\nplugin code. The name includes the file name extension (for example,\nlibmyplugin.so, libmyplugin.dll, or libmyplugin.dylib).\n\nThe shared library must be located in the plugin directory (the\ndirectory named by the plugin_dir system variable). The library must be\nin the plugin directory itself, not in a subdirectory. By default,\nplugin_dir is the plugin directory under the directory named by the\npkglibdir configuration variable, but it can be changed by setting the\nvalue of plugin_dir at server startup. For example, set its value in a\nmy.cnf file:\n\n[mysqld]\nplugin_dir=/path/to/plugin/directory\n\nIf the value of plugin_dir is a relative path name, it is taken to be\nrelative to the MySQL base directory (the value of the basedir system\nvariable).\n\nINSTALL PLUGIN loads and initializes the plugin code to make the plugin\navailable for use. A plugin is initialized by executing its\ninitialization function, which handles any setup that the plugin must\nperform before it can be used. When the server shuts down, it executes\nthe deinitialization function for each plugin that is loaded so that\nthe plugin has a change to perform any final cleanup.\n\nINSTALL PLUGIN also registers the plugin by adding a line that\nindicates the plugin name and library file name to the mysql.plugin\ntable. At server startup, the server loads and initializes any plugin\nthat is listed in the mysql.plugin table. This means that a plugin is\ninstalled with INSTALL PLUGIN only once, not every time the server\nstarts. Plugin loading at startup does not occur if the server is\nstarted with the --skip-grant-tables option.\n\nA plugin library can contain multiple plugins. For each of them to be\ninstalled, use a separate INSTALL PLUGIN statement. Each statement\nnames a different plugin, but all of them specify the same library\nname.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/install-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/install-plugin.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (422,24,'DECLARE CURSOR','Syntax:\nDECLARE cursor_name CURSOR FOR select_statement\n\nThis statement declares a cursor and associates it with a SELECT\nstatement that retrieves the rows to be traversed by the cursor. To\nfetch the rows later, use a FETCH statement. The number of columns\nretrieved by the SELECT statement must match the number of output\nvariables specified in the FETCH statement.\n\nThe SELECT statement cannot have an INTO clause.\n\nCursor declarations must appear before handler declarations and after\nvariable and condition declarations.\n\nA stored program may contain multiple cursor declarations, but each\ncursor declared in a given block must have a unique name. For an\nexample, see http://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nFor information available through SHOW statements, it is possible in\nmany cases to obtain equivalent information by using a cursor with an\nINFORMATION_SCHEMA table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-cursor.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/declare-cursor.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (423,28,'LOAD DATA','Syntax:\nLOAD DATA [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE tbl_name\n    [CHARACTER SET charset_name]\n    [{FIELDS | COLUMNS}\n        [TERMINATED BY \'string\']\n        [[OPTIONALLY] ENCLOSED BY \'char\']\n        [ESCAPED BY \'char\']\n    ]\n    [LINES\n        [STARTING BY \'string\']\n        [TERMINATED BY \'string\']\n    ]\n    [IGNORE number {LINES | ROWS}]\n    [(col_name_or_user_var,...)]\n    [SET col_name = expr,...]\n\nThe LOAD DATA INFILE statement reads rows from a text file into a table\nat a very high speed. LOAD DATA INFILE is the complement of SELECT ...\nINTO OUTFILE. (See\nhttp://dev.mysql.com/doc/refman/5.5/en/select-into.html.) To write data\nfrom a table to a file, use SELECT ... INTO OUTFILE. To read the file\nback into a table, use LOAD DATA INFILE. The syntax of the FIELDS and\nLINES clauses is the same for both statements. Both clauses are\noptional, but FIELDS must precede LINES if both are specified.\n\nYou can also load data files by using the mysqlimport utility; it\noperates by sending a LOAD DATA INFILE statement to the server. The\n--local option causes mysqlimport to read data files from the client\nhost. You can specify the --compress option to get better performance\nover slow networks if the client and server support the compressed\nprotocol. See http://dev.mysql.com/doc/refman/5.5/en/mysqlimport.html.\n\nFor more information about the efficiency of INSERT versus LOAD DATA\nINFILE and speeding up LOAD DATA INFILE, see\nhttp://dev.mysql.com/doc/refman/5.5/en/insert-speed.html.\n\nThe file name must be given as a literal string. On Windows, specify\nbackslashes in path names as forward slashes or doubled backslashes.\nThe character_set_filesystem system variable controls the\ninterpretation of the file name.\n\nThe character set indicated by the character_set_database system\nvariable is used to interpret the information in the file. SET NAMES\nand the setting of character_set_client do not affect interpretation of\ninput. If the contents of the input file use a character set that\ndiffers from the default, it is usually preferable to specify the\ncharacter set of the file by using the CHARACTER SET clause. A\ncharacter set of binary specifies "no conversion."\n\nLOAD DATA INFILE interprets all fields in the file as having the same\ncharacter set, regardless of the data types of the columns into which\nfield values are loaded. For proper interpretation of file contents,\nyou must ensure that it was written with the correct character set. For\nexample, if you write a data file with mysqldump -T or by issuing a\nSELECT ... INTO OUTFILE statement in mysql, be sure to use a\n--default-character-set option so that output is written in the\ncharacter set to be used when the file is loaded with LOAD DATA INFILE.\n\n*Note*: It is not possible to load data files that use the ucs2, utf16,\nor utf32 character set.\n\nIf you use LOW_PRIORITY, execution of the LOAD DATA statement is\ndelayed until no other clients are reading from the table. This affects\nonly storage engines that use only table-level locking (such as MyISAM,\nMEMORY, and MERGE).\n\nIf you specify CONCURRENT with a MyISAM table that satisfies the\ncondition for concurrent inserts (that is, it contains no free blocks\nin the middle), other threads can retrieve data from the table while\nLOAD DATA is executing. This option affects the performance of LOAD\nDATA a bit, even if no other thread is using the table at the same\ntime.\n\nWith row-based replication, CONCURRENT is replicated regardless of\nMySQL version. With statement-based replication CONCURRENT is not\nreplicated prior to MySQL 5.5.1 (see Bug #34628). For more information,\nsee\nhttp://dev.mysql.com/doc/refman/5.5/en/replication-features-load-data.h\ntml.\n\nThe LOCAL keyword affects expected location of the file and error\nhandling, as described later. LOCAL works only if your server and your\nclient both have been configured to permit it. For example, if mysqld\nwas started with --local-infile=0, LOCAL does not work. See\nhttp://dev.mysql.com/doc/refman/5.5/en/load-data-local.html.\n\nThe LOCAL keyword affects where the file is expected to be found:\n\no If LOCAL is specified, the file is read by the client program on the\n  client host and sent to the server. The file can be given as a full\n  path name to specify its exact location. If given as a relative path\n  name, the name is interpreted relative to the directory in which the\n  client program was started.\n\n  When using LOCAL with LOAD DATA, a copy of the file is created in the\n  server\'s temporary directory. This is not the directory determined by\n  the value of tmpdir or slave_load_tmpdir, but rather the operating\n  system\'s temporary directory, and is not configurable in the MySQL\n  Server. (Typically the system temporary directory is /tmp on Linux\n  systems and C:\\WINDOWS\\TEMP on Windows.) Lack of sufficient space for\n  the copy in this directory can cause the LOAD DATA LOCAL statement to\n  fail.\n\no If LOCAL is not specified, the file must be located on the server\n  host and is read directly by the server. The server uses the\n  following rules to locate the file:\n\n  o If the file name is an absolute path name, the server uses it as\n    given.\n\n  o If the file name is a relative path name with one or more leading\n    components, the server searches for the file relative to the\n    server\'s data directory.\n\n  o If a file name with no leading components is given, the server\n    looks for the file in the database directory of the default\n    database.\n\nIn the non-LOCAL case, these rules mean that a file named as\n./myfile.txt is read from the server\'s data directory, whereas the file\nnamed as myfile.txt is read from the database directory of the default\ndatabase. For example, if db1 is the default database, the following\nLOAD DATA statement reads the file data.txt from the database directory\nfor db1, even though the statement explicitly loads the file into a\ntable in the db2 database:\n\nLOAD DATA INFILE \'data.txt\' INTO TABLE db2.my_table;\n\nFor security reasons, when reading text files located on the server,\nthe files must either reside in the database directory or be readable\nby all. Also, to use LOAD DATA INFILE on server files, you must have\nthe FILE privilege. See\nhttp://dev.mysql.com/doc/refman/5.5/en/privileges-provided.html. For\nnon-LOCAL load operations, if the secure_file_priv system variable is\nset to a nonempty directory name, the file to be loaded must be located\nin that directory.\n\nUsing LOCAL is a bit slower than letting the server access the files\ndirectly, because the contents of the file must be sent over the\nconnection by the client to the server. On the other hand, you do not\nneed the FILE privilege to load local files.\n\nLOCAL also affects error handling:\n\no With LOAD DATA INFILE, data-interpretation and duplicate-key errors\n  terminate the operation.\n\no With LOAD DATA LOCAL INFILE, data-interpretation and duplicate-key\n  errors become warnings and the operation continues because the server\n  has no way to stop transmission of the file in the middle of the\n  operation. For duplicate-key errors, this is the same as if IGNORE is\n  specified. IGNORE is explained further later in this section.\n\nThe REPLACE and IGNORE keywords control handling of input rows that\nduplicate existing rows on unique key values:\n\no If you specify REPLACE, input rows replace existing rows. In other\n  words, rows that have the same value for a primary key or unique\n  index as an existing row. See [HELP REPLACE].\n\no If you specify IGNORE, input rows that duplicate an existing row on a\n  unique key value are skipped.\n\no If you do not specify either option, the behavior depends on whether\n  the LOCAL keyword is specified. Without LOCAL, an error occurs when a\n  duplicate key value is found, and the rest of the text file is\n  ignored. With LOCAL, the default behavior is the same as if IGNORE is\n  specified; this is because the server has no way to stop transmission\n  of the file in the middle of the operation.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/load-data.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/load-data.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (424,25,'MULTILINESTRING','MultiLineString(ls1,ls2,...)\n\nConstructs a MultiLineString value using LineString or WKB LineString\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (425,32,'LOCALTIME','Syntax:\nLOCALTIME, LOCALTIME()\n\nLOCALTIME and LOCALTIME() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (426,27,'SHOW RELAYLOG EVENTS','Syntax:\nSHOW RELAYLOG EVENTS\n   [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nShows the events in the relay log of a replication slave. If you do not\nspecify \'log_name\', the first relay log is displayed. This statement\nhas no effect on the master.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-relaylog-events.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-relaylog-events.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (427,3,'MPOINTFROMTEXT','MPointFromText(wkt[,srid]), MultiPointFromText(wkt[,srid])\n\nConstructs a MULTIPOINT value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (428,23,'BLOB','BLOB[(M)]\n\nA BLOB column with a maximum length of 65,535 (216 - 1) bytes. Each\nBLOB value is stored using a 2-byte length prefix that indicates the\nnumber of bytes in the value.\n\nAn optional length M can be given for this type. If this is done, MySQL\ncreates the column as the smallest BLOB type large enough to hold\nvalues M bytes long.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (429,12,'SHA1','Syntax:\nSHA1(str), SHA(str)\n\nCalculates an SHA-1 160-bit checksum for the string, as described in\nRFC 3174 (Secure Hash Algorithm). The value is returned as a string of\n40 hex digits, or NULL if the argument was NULL. One of the possible\nuses for this function is as a hash key. See the notes at the beginning\nof this section about storing hash values efficiently. You can also use\nSHA1() as a cryptographic function for storing passwords. SHA() is\nsynonymous with SHA1().\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring; see the notes at the beginning of this section about using the\nvalue as a nonbinary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT SHA1(\'abc\');\n        -> \'a9993e364706816aba3e25717850c26c9cd0d89d\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (430,38,'SUBSTR','Syntax:\nSUBSTR(str,pos), SUBSTR(str FROM pos), SUBSTR(str,pos,len), SUBSTR(str\nFROM pos FOR len)\n\nSUBSTR() is a synonym for SUBSTRING().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (431,12,'PASSWORD','Syntax:\nPASSWORD(str)\n\nCalculates and returns a hashed password string from the plaintext\npassword str and returns a nonbinary string in the connection character\nset (a binary string before MySQL 5.5.3), or NULL if the argument is\nNULL. This function is the SQL interface to the algorithm used by the\nserver to encrypt MySQL passwords for storage in the mysql.user grant\ntable.\n\nThe old_passwords system variable controls the password hashing method\nused by PASSWORD() (as well as for the IDENTIFIED BY clause of the\nCREATE USER and GRANT statements).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SET old_passwords = 0;\nmysql> SELECT PASSWORD(\'mypass\');\n+-------------------------------------------+\n| PASSWORD(\'mypass\')                        |\n+-------------------------------------------+\n| *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4 |\n+-------------------------------------------+\n\nmysql> SET old_passwords = 1;\nmysql> SELECT PASSWORD(\'mypass\');\n+--------------------+\n| PASSWORD(\'mypass\') |\n+--------------------+\n| 6f8c114b58f2ce9e   |\n+--------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (432,23,'CHAR','[NATIONAL] CHAR[(M)] [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nA fixed-length string that is always right-padded with spaces to the\nspecified length when stored. M represents the column length in\ncharacters. The range of M is 0 to 255. If M is omitted, the length is\n1.\n\n*Note*: Trailing spaces are removed when CHAR values are retrieved\nunless the PAD_CHAR_TO_FULL_LENGTH SQL mode is enabled.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (433,32,'UTC_DATE','Syntax:\nUTC_DATE, UTC_DATE()\n\nReturns the current UTC date as a value in \'YYYY-MM-DD\' or YYYYMMDD\nformat, depending on whether the function is used in a string or\nnumeric context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_DATE(), UTC_DATE() + 0;\n        -> \'2003-08-14\', 20030814\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (434,37,'DIMENSION','Dimension(g)\n\nReturns the inherent dimension of the geometry value g. The result can\nbe -1, 0, 1, or 2. The meaning of these values is given in\nhttp://dev.mysql.com/doc/refman/5.5/en/gis-class-geometry.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SELECT Dimension(GeomFromText(\'LineString(1 1,2 2)\'));\n+------------------------------------------------+\n| Dimension(GeomFromText(\'LineString(1 1,2 2)\')) |\n+------------------------------------------------+\n|                                              1 |\n+------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (435,16,'COUNT DISTINCT','Syntax:\nCOUNT(DISTINCT expr,[expr...])\n\nReturns a count of the number of rows with different non-NULL expr\nvalues.\n\nCOUNT(DISTINCT) returns 0 if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT COUNT(DISTINCT results) FROM student;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (436,23,'BIT','BIT[(M)]\n\nA bit-field type. M indicates the number of bits per value, from 1 to\n64. The default is 1 if M is omitted.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (437,8,'XA','Syntax:\nXA {START|BEGIN} xid [JOIN|RESUME]\n\nXA END xid [SUSPEND [FOR MIGRATE]]\n\nXA PREPARE xid\n\nXA COMMIT xid [ONE PHASE]\n\nXA ROLLBACK xid\n\nXA RECOVER\n\nFor XA START, the JOIN and RESUME clauses are not supported.\n\nFor XA END the SUSPEND [FOR MIGRATE] clause is not supported.\n\nEach XA statement begins with the XA keyword, and most of them require\nan xid value. An xid is an XA transaction identifier. It indicates\nwhich transaction the statement applies to. xid values are supplied by\nthe client, or generated by the MySQL server. An xid value has from one\nto three parts:\n\nxid: gtrid [, bqual [, formatID ]]\n\ngtrid is a global transaction identifier, bqual is a branch qualifier,\nand formatID is a number that identifies the format used by the gtrid\nand bqual values. As indicated by the syntax, bqual and formatID are\noptional. The default bqual value is \'\' if not given. The default\nformatID value is 1 if not given.\n\ngtrid and bqual must be string literals, each up to 64 bytes (not\ncharacters) long. gtrid and bqual can be specified in several ways. You\ncan use a quoted string (\'ab\'), hex string (0x6162, X\'ab\'), or bit\nvalue (b\'nnnn\').\n\nformatID is an unsigned integer.\n\nThe gtrid and bqual values are interpreted in bytes by the MySQL\nserver\'s underlying XA support routines. However, while an SQL\nstatement containing an XA statement is being parsed, the server works\nwith some specific character set. To be safe, write gtrid and bqual as\nhex strings.\n\nxid values typically are generated by the Transaction Manager. Values\ngenerated by one TM must be different from values generated by other\nTMs. A given TM must be able to recognize its own xid values in a list\nof values returned by the XA RECOVER statement.\n\nXA START xid starts an XA transaction with the given xid value. Each XA\ntransaction must have a unique xid value, so the value must not\ncurrently be used by another XA transaction. Uniqueness is assessed\nusing the gtrid and bqual values. All following XA statements for the\nXA transaction must be specified using the same xid value as that given\nin the XA START statement. If you use any of those statements but\nspecify an xid value that does not correspond to some existing XA\ntransaction, an error occurs.\n\nOne or more XA transactions can be part of the same global transaction.\nAll XA transactions within a given global transaction must use the same\ngtrid value in the xid value. For this reason, gtrid values must be\nglobally unique so that there is no ambiguity about which global\ntransaction a given XA transaction is part of. The bqual part of the\nxid value must be different for each XA transaction within a global\ntransaction. (The requirement that bqual values be different is a\nlimitation of the current MySQL XA implementation. It is not part of\nthe XA specification.)\n\nThe XA RECOVER statement returns information for those XA transactions\non the MySQL server that are in the PREPARED state. (See\nhttp://dev.mysql.com/doc/refman/5.5/en/xa-states.html.) The output\nincludes a row for each such XA transaction on the server, regardless\nof which client started it.\n\nXA RECOVER output rows look like this (for an example xid value\nconsisting of the parts \'abc\', \'def\', and 7):\n\nmysql> XA RECOVER;\n+----------+--------------+--------------+--------+\n| formatID | gtrid_length | bqual_length | data   |\n+----------+--------------+--------------+--------+\n|        7 |            3 |            3 | abcdef |\n+----------+--------------+--------------+--------+\n\nThe output columns have the following meanings:\n\no formatID is the formatID part of the transaction xid\n\no gtrid_length is the length in bytes of the gtrid part of the xid\n\no bqual_length is the length in bytes of the bqual part of the xid\n\no data is the concatenation of the gtrid and bqual parts of the xid\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/xa-statements.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/xa-statements.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (438,31,'EQUALS','Equals(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 is spatially equal to g2.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/functions-for-testing-spatial-relations-between-geometric-objects.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (439,27,'SHOW CREATE VIEW','Syntax:\nSHOW CREATE VIEW view_name\n\nThis statement shows the CREATE VIEW statement that creates the named\nview.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-create-view.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (440,19,'INTERVAL','Syntax:\nINTERVAL(N,N1,N2,N3,...)\n\nReturns 0 if N < N1, 1 if N < N2 and so on or -1 if N is NULL. All\narguments are treated as integers. It is required that N1 < N2 < N3 <\n... < Nn for this function to work correctly. This is because a binary\nsearch is used (very fast).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT INTERVAL(23, 1, 15, 17, 30, 44, 200);\n        -> 3\nmysql> SELECT INTERVAL(10, 1, 10, 100, 1000);\n        -> 2\nmysql> SELECT INTERVAL(22, 23, 30, 44, 200);\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (441,32,'FROM_DAYS','Syntax:\nFROM_DAYS(N)\n\nGiven a day number N, returns a DATE value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_DAYS(730669);\n        -> \'2007-07-03\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (442,40,'ALTER PROCEDURE','Syntax:\nALTER PROCEDURE proc_name [characteristic ...]\n\ncharacteristic:\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n\nThis statement can be used to change the characteristics of a stored\nprocedure. More than one change may be specified in an ALTER PROCEDURE\nstatement. However, you cannot change the parameters or body of a\nstored procedure using this statement; to make such changes, you must\ndrop and re-create the procedure using DROP PROCEDURE and CREATE\nPROCEDURE.\n\nYou must have the ALTER ROUTINE privilege for the procedure. By\ndefault, that privilege is granted automatically to the procedure\ncreator. This behavior can be changed by disabling the\nautomatic_sp_privileges system variable. See\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-routines-privileges.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-procedure.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (443,20,'BIT_COUNT','Syntax:\nBIT_COUNT(N)\n\nReturns the number of bits that are set in the argument N.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT BIT_COUNT(29), BIT_COUNT(b\'101010\');\n        -> 4, 3\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (444,38,'OCTET_LENGTH','Syntax:\nOCTET_LENGTH(str)\n\nOCTET_LENGTH() is a synonym for LENGTH().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (445,32,'UTC_TIMESTAMP','Syntax:\nUTC_TIMESTAMP, UTC_TIMESTAMP()\n\nReturns the current UTC date and time as a value in \'YYYY-MM-DD\nHH:MM:SS\' or YYYYMMDDHHMMSS.uuuuuu format, depending on whether the\nfunction is used in a string or numeric context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_TIMESTAMP(), UTC_TIMESTAMP() + 0;\n        -> \'2003-08-14 18:08:04\', 20030814180804.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (446,12,'AES_ENCRYPT','Syntax:\nAES_ENCRYPT(str,key_str)\n\nAES_ENCRYPT() and AES_DECRYPT() implement encryption and decryption of\ndata using the official AES (Advanced Encryption Standard) algorithm,\npreviously known as "Rijndael." The AES standard allows various key\nsizes. These functions implement AES with a 128-bit key length, but you\ncan extend them to 256 bits by modifying the source. The key length is\na trade off between performance and security.\n\nAES_ENCRYPT() encrypts the string str using a key key_str and returns a\nbinary string containing the encrypted output. AES_DECRYPT() decrypts\nthe encrypted string crypt_str using a key key_str and returns the\noriginal plaintext string. If either argument is NULL, the results of\nthese functions are also NULL.\n\nThe str and crypt_str arguments can be any length, and padding is\nautomatically added to str so it is a multiple of a block as required\nby block-based algorithms such as AES. This padding is automatically\nremoved by the AES_DECRYPT() function. The length of crypt_str can be\ncalculated using this formula:\n\n16 * (trunc(string_length / 16) + 1)\n\nThe most secure way to pass a key to the key_str argument is to create\na truly random 128-bit value and pass it as a binary value. For\nexample:\n\nINSERT INTO t\nVALUES (1,AES_ENCRYPT(\'text\',UNHEX(\'F3229A0B371ED2D9441B830D21A390C3\')));\n\nA passphrase can be used to generate an AES key by hashing the\npassphrase. For example:\n\nINSERT INTO t VALUES (1,AES_ENCRYPT(\'text\', SHA2(\'My secret passphrase\',512)));\n\nDo not pass a password or passphrase directly to crypt_str, hash it\nfirst. Previous versions of this documentation suggested the former\napproach, but it is no longer recommended as the examples shown here\nare more secure.\n\nIf AES_DECRYPT() detects invalid data or incorrect padding, it returns\nNULL. However, it is possible for AES_DECRYPT() to return a non-NULL\nvalue (possibly garbage) if the input data or the key is invalid.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (447,4,'+','Syntax:\n+\n\nAddition:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3+5;\n        -> 8\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (448,14,'INET_NTOA','Syntax:\nINET_NTOA(expr)\n\nGiven a numeric IPv4 network address in network byte order, returns the\ndotted-quad representation of the address as a string. INET_NTOA()\nreturns NULL if it does not understand its argument.\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT INET_NTOA(167773449);\n        -> \'10.0.5.9\'\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (449,4,'ACOS','Syntax:\nACOS(X)\n\nReturns the arc cosine of X, that is, the value whose cosine is X.\nReturns NULL if X is not in the range -1 to 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ACOS(1);\n        -> 0\nmysql> SELECT ACOS(1.0001);\n        -> NULL\nmysql> SELECT ACOS(0);\n        -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (450,8,'ISOLATION','Syntax:\nSET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL\n  {\n       REPEATABLE READ\n     | READ COMMITTED\n     | READ UNCOMMITTED\n     | SERIALIZABLE\n   }\n\nThis statement sets the transaction isolation level, used for\noperations on InnoDB tables.\n\nScope of the Isolation Level\n\nYou can set the isolation level globally, for the current session, or\nfor the next transaction:\n\no With the GLOBAL keyword, the statement sets the default transaction\n  level globally for all subsequent sessions. Existing sessions are\n  unaffected.\n\no With the SESSION keyword, the statement sets the default transaction\n  level for all subsequent transactions performed within the current\n  session.\n\no Without any SESSION or GLOBAL keyword, the statement sets the\n  isolation level for the next (not started) transaction performed\n  within the current session.\n\nA change to the global default isolation level requires the SUPER\nprivilege. Any session is free to change its session isolation level\n(even in the middle of a transaction), or the isolation level for its\nnext transaction.\n\nSET TRANSACTION ISOLATION LEVEL without GLOBAL or SESSION is not\npermitted while there is an active transaction:\n\nmysql> START TRANSACTION;\nQuery OK, 0 rows affected (0.02 sec)\n\nmysql> SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;\nERROR 1568 (25001): Transaction isolation level can\'t be changed\nwhile a transaction is in progress\n\nTo set the global default isolation level at server startup, use the\n--transaction-isolation=level option to mysqld on the command line or\nin an option file. Values of level for this option use dashes rather\nthan spaces, so the permissible values are READ-UNCOMMITTED,\nREAD-COMMITTED, REPEATABLE-READ, or SERIALIZABLE. For example, to set\nthe default isolation level to REPEATABLE READ, use these lines in the\n[mysqld] section of an option file:\n\n[mysqld]\ntransaction-isolation = REPEATABLE-READ\n\nIt is possible to check or set the global and session transaction\nisolation levels at runtime by using the tx_isolation system variable:\n\nSELECT @@GLOBAL.tx_isolation, @@tx_isolation;\nSET GLOBAL tx_isolation=\'REPEATABLE-READ\';\nSET SESSION tx_isolation=\'SERIALIZABLE\';\n\nDetails and Usage of Isolation Levels\n\nInnoDB supports each of the transaction isolation levels described here\nusing different locking strategies. You can enforce a high degree of\nconsistency with the default REPEATABLE READ level, for operations on\ncrucial data where ACID compliance is important. Or you can relax the\nconsistency rules with READ COMMITTED or even READ UNCOMMITTED, in\nsituations such as bulk reporting where precise consistency and\nrepeatable results are less important than minimizing the amount of\noverhead for locking. SERIALIZABLE enforces even stricter rules than\nREPEATABLE READ, and is used mainly in specialized situations, such as\nwith XA transactions and for troubleshooting issues with concurrency\nand deadlocks.\n\nFor full information about how these isolation levels work with InnoDB\ntransactions, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-transaction-model.html.\nIn particular, for additional information about InnoDB record-level\nlocks and how it uses them to execute various types of statements, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-record-level-locks.html\nand http://dev.mysql.com/doc/refman/5.5/en/innodb-locks-set.html.\n\nThe following list describes how MySQL supports the different\ntransaction levels. The list goes from the most commonly used level to\nthe least used.\n\no REPEATABLE READ\n\n  This is the default isolation level for InnoDB. For consistent reads,\n  there is an important difference from the READ COMMITTED isolation\n  level: All consistent reads within the same transaction read the\n  snapshot established by the first read. This convention means that if\n  you issue several plain (nonlocking) SELECT statements within the\n  same transaction, these SELECT statements are consistent also with\n  respect to each other. See\n  http://dev.mysql.com/doc/refman/5.5/en/innodb-consistent-read.html.\n\n  For locking reads (SELECT with FOR UPDATE or LOCK IN SHARE MODE),\n  UPDATE, and DELETE statements, locking depends on whether the\n  statement uses a unique index with a unique search condition, or a\n  range-type search condition. For a unique index with a unique search\n  condition, InnoDB locks only the index record found, not the gap\n  before it. For other search conditions, InnoDB locks the index range\n  scanned, using gap locks or next-key (gap plus index-record) locks to\n  block insertions by other sessions into the gaps covered by the\n  range.\n\no READ COMMITTED\n\n  A somewhat Oracle-like isolation level with respect to consistent\n  (nonlocking) reads: Each consistent read, even within the same\n  transaction, sets and reads its own fresh snapshot. See\n  http://dev.mysql.com/doc/refman/5.5/en/innodb-consistent-read.html.\n\n  For locking reads (SELECT with FOR UPDATE or LOCK IN SHARE MODE),\n  UPDATE statements, and DELETE statements, InnoDB locks only index\n  records, not the gaps before them, and thus permits the free\n  insertion of new records next to locked records.\n\n  *Note*: In MySQL 5.5, when READ COMMITTED isolation level is used or\n  the innodb_locks_unsafe_for_binlog system variable is enabled, there\n  is no InnoDB gap locking except for foreign-key constraint checking\n  and duplicate-key checking. Also, record locks for nonmatching rows\n  are released after MySQL has evaluated the WHERE condition. If you\n  use READ COMMITTED or enable innodb_locks_unsafe_for_binlog, you must\n  use row-based binary logging.\n\no READ UNCOMMITTED\n\n  SELECT statements are performed in a nonlocking fashion, but a\n  possible earlier version of a row might be used. Thus, using this\n  isolation level, such reads are not consistent. This is also called a\n  "dirty read." Otherwise, this isolation level works like READ\n  COMMITTED.\n\no SERIALIZABLE\n\n  This level is like REPEATABLE READ, but InnoDB implicitly converts\n  all plain SELECT statements to SELECT ... LOCK IN SHARE MODE if\n  autocommit is disabled. If autocommit is enabled, the SELECT is its\n  own transaction. It therefore is known to be read only and can be\n  serialized if performed as a consistent (nonlocking) read and need\n  not block for other transactions. (To force a plain SELECT to block\n  if other transactions have modified the selected rows, disable\n  autocommit.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-transaction.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-transaction.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (451,4,'CEILING','Syntax:\nCEILING(X)\n\nReturns the smallest integer value not less than X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT CEILING(1.23);\n        -> 2\nmysql> SELECT CEILING(-1.23);\n        -> -1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (452,4,'SIN','Syntax:\nSIN(X)\n\nReturns the sine of X, where X is given in radians.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT SIN(PI());\n        -> 1.2246063538224e-16\nmysql> SELECT ROUND(SIN(PI()));\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (453,32,'DAYOFWEEK','Syntax:\nDAYOFWEEK(date)\n\nReturns the weekday index for date (1 = Sunday, 2 = Monday, ..., 7 =\nSaturday). These index values correspond to the ODBC standard.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFWEEK(\'2007-02-03\');\n        -> 7\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (454,27,'SHOW PROCESSLIST','Syntax:\nSHOW [FULL] PROCESSLIST\n\nSHOW PROCESSLIST shows you which threads are running. You can also get\nthis information from the INFORMATION_SCHEMA PROCESSLIST table or the\nmysqladmin processlist command. If you have the PROCESS privilege, you\ncan see all threads. Otherwise, you can see only your own threads (that\nis, threads associated with the MySQL account that you are using). If\nyou do not use the FULL keyword, only the first 100 characters of each\nstatement are shown in the Info field.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-processlist.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-processlist.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (455,33,'LINEFROMWKB','LineFromWKB(wkb[,srid]), LineStringFromWKB(wkb[,srid])\n\nConstructs a LINESTRING value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (456,37,'GEOMETRYTYPE','GeometryType(g)\n\nReturns as a binary string the name of the geometry type of which the\ngeometry instance g is a member. The name corresponds to one of the\ninstantiable Geometry subclasses.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SELECT GeometryType(GeomFromText(\'POINT(1 1)\'));\n+------------------------------------------+\n| GeometryType(GeomFromText(\'POINT(1 1)\')) |\n+------------------------------------------+\n| POINT                                    |\n+------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (457,40,'CREATE VIEW','Syntax:\nCREATE\n    [OR REPLACE]\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = { user | CURRENT_USER }]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThe CREATE VIEW statement creates a new view, or replaces an existing\none if the OR REPLACE clause is given. If the view does not exist,\nCREATE OR REPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR REPLACE VIEW is the same as ALTER VIEW.\n\nThe select_statement is a SELECT statement that provides the definition\nof the view. (When you select from the view, you select in effect using\nthe SELECT statement.) select_statement can select from base tables or\nother views.\n\nThe view definition is "frozen" at creation time, so changes to the\nunderlying tables afterward do not affect the view definition. For\nexample, if a view is defined as SELECT * on a table, new columns added\nto the table later do not become part of the view.\n\nThe ALGORITHM clause affects how MySQL processes the view. The DEFINER\nand SQL SECURITY clauses specify the security context to be used when\nchecking access privileges at view invocation time. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates to rows in\ntables referenced by the view. These clauses are described later in\nthis section.\n\nThe CREATE VIEW statement requires the CREATE VIEW privilege for the\nview, and some privilege for each column selected by the SELECT\nstatement. For columns used elsewhere in the SELECT statement you must\nhave the SELECT privilege. If the OR REPLACE clause is present, you\nmust also have the DROP privilege for the view. CREATE VIEW might also\nrequire the SUPER privilege, depending on the DEFINER value, as\ndescribed later in this section.\n\nWhen a view is referenced, privilege checking occurs as described later\nin this section.\n\nA view belongs to a database. By default, a new view is created in the\ndefault database. To create the view explicitly in a given database,\nspecify the name as db_name.view_name when you create it:\n\nmysql> CREATE VIEW test.v AS SELECT * FROM t;\n\nWithin a database, base tables and views share the same namespace, so a\nbase table and a view cannot have the same name.\n\nColumns retrieved by the SELECT statement can be simple references to\ntable columns. They can also be expressions that use functions,\nconstant values, operators, and so forth.\n\nViews must have unique column names with no duplicates, just like base\ntables. By default, the names of the columns retrieved by the SELECT\nstatement are used for the view column names. To define explicit names\nfor the view columns, the optional column_list clause can be given as a\nlist of comma-separated identifiers. The number of names in column_list\nmust be the same as the number of columns retrieved by the SELECT\nstatement.\n\nUnqualified table or view names in the SELECT statement are interpreted\nwith respect to the default database. A view can refer to tables or\nviews in other databases by qualifying the table or view name with the\nproper database name.\n\nA view can be created from many kinds of SELECT statements. It can\nrefer to base tables or other views. It can use joins, UNION, and\nsubqueries. The SELECT need not even refer to any tables. The following\nexample defines a view that selects two columns from another table, as\nwell as an expression calculated from those columns:\n\nmysql> CREATE TABLE t (qty INT, price INT);\nmysql> INSERT INTO t VALUES(3, 50);\nmysql> CREATE VIEW v AS SELECT qty, price, qty*price AS value FROM t;\nmysql> SELECT * FROM v;\n+------+-------+-------+\n| qty  | price | value |\n+------+-------+-------+\n|    3 |    50 |   150 |\n+------+-------+-------+\n\nA view definition is subject to the following restrictions:\n\no The SELECT statement cannot contain a subquery in the FROM clause.\n\no The SELECT statement cannot refer to system or user variables.\n\no Within a stored program, the definition cannot refer to program\n  parameters or local variables.\n\no The SELECT statement cannot refer to prepared statement parameters.\n\no Any table or view referred to in the definition must exist. However,\n  after a view has been created, it is possible to drop a table or view\n  that the definition refers to. In this case, use of the view results\n  in an error. To check a view definition for problems of this kind,\n  use the CHECK TABLE statement.\n\no The definition cannot refer to a TEMPORARY table, and you cannot\n  create a TEMPORARY view.\n\no Any tables named in the view definition must exist at definition\n  time.\n\no You cannot associate a trigger with a view.\n\no Aliases for column names in the SELECT statement are checked against\n  the maximum column length of 64 characters (not the maximum alias\n  length of 256 characters).\n\nORDER BY is permitted in a view definition, but it is ignored if you\nselect from a view using a statement that has its own ORDER BY.\n\nFor other options or clauses in the definition, they are added to the\noptions or clauses of the statement that references the view, but the\neffect is undefined. For example, if a view definition includes a LIMIT\nclause, and you select from the view using a statement that has its own\nLIMIT clause, it is undefined which limit applies. This same principle\napplies to options such as ALL, DISTINCT, or SQL_SMALL_RESULT that\nfollow the SELECT keyword, and to clauses such as INTO, FOR UPDATE,\nLOCK IN SHARE MODE, and PROCEDURE.\n\nIf you create a view and then change the query processing environment\nby changing system variables, that may affect the results that you get\nfrom the view:\n\nmysql> CREATE VIEW v (mycol) AS SELECT \'abc\';\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SET sql_mode = \'\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol |\n+-------+\n1 row in set (0.01 sec)\n\nmysql> SET sql_mode = \'ANSI_QUOTES\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc   |\n+-------+\n1 row in set (0.00 sec)\n\nThe DEFINER and SQL SECURITY clauses determine which MySQL account to\nuse when checking access privileges for the view when a statement is\nexecuted that references the view. The valid SQL SECURITY\ncharacteristic values are DEFINER and INVOKER. These indicate that the\nrequired privileges must be held by the user who defined or invoked the\nview, respectively. The default SQL SECURITY value is DEFINER.\n\nIf a user value is given for the DEFINER clause, it should be a MySQL\naccount specified as \'user_name\'@\'host_name\' (the same format used in\nthe GRANT statement), CURRENT_USER, or CURRENT_USER(). The default\nDEFINER value is the user who executes the CREATE VIEW statement. This\nis the same as specifying DEFINER = CURRENT_USER explicitly.\n\nIf you specify the DEFINER clause, these rules determine the valid\nDEFINER user values:\n\no If you do not have the SUPER privilege, the only valid user value is\n  your own account, either specified literally or by using\n  CURRENT_USER. You cannot set the definer to some other account.\n\no If you have the SUPER privilege, you can specify any syntactically\n  valid account name. If the account does not actually exist, a warning\n  is generated.\n\no Although it is possible to create a view with a nonexistent DEFINER\n  account, an error occurs when the view is referenced if the SQL\n  SECURITY value is DEFINER but the definer account does not exist.\n\nFor more information about view security, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-security.html.\n\nWithin a view definition, CURRENT_USER returns the view\'s DEFINER value\nby default. For views defined with the SQL SECURITY INVOKER\ncharacteristic, CURRENT_USER returns the account for the view\'s\ninvoker. For information about user auditing within views, see\nhttp://dev.mysql.com/doc/refman/5.5/en/account-activity-auditing.html.\n\nWithin a stored routine that is defined with the SQL SECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER value. This\nalso affects a view defined within such a routine, if the view\ndefinition contains a DEFINER value of CURRENT_USER.\n\nView privileges are checked like this:\n\no At view definition time, the view creator must have the privileges\n  needed to use the top-level objects accessed by the view. For\n  example, if the view definition refers to table columns, the creator\n  must have some privilege for each column in the select list of the\n  definition, and the SELECT privilege for each column used elsewhere\n  in the definition. If the definition refers to a stored function,\n  only the privileges needed to invoke the function can be checked. The\n  privileges required at function invocation time can be checked only\n  as it executes: For different invocations, different execution paths\n  within the function might be taken.\n\no The user who references a view must have appropriate privileges to\n  access it (SELECT to select from it, INSERT to insert into it, and so\n  forth.)\n\no When a view has been referenced, privileges for objects accessed by\n  the view are checked against the privileges held by the view DEFINER\n  account or invoker, depending on whether the SQL SECURITY\n  characteristic is DEFINER or INVOKER, respectively.\n\no If reference to a view causes execution of a stored function,\n  privilege checking for statements executed within the function depend\n  on whether the function SQL SECURITY characteristic is DEFINER or\n  INVOKER. If the security characteristic is DEFINER, the function runs\n  with the privileges of the DEFINER account. If the characteristic is\n  INVOKER, the function runs with the privileges determined by the\n  view\'s SQL SECURITY characteristic.\n\nExample: A view might depend on a stored function, and that function\nmight invoke other stored routines. For example, the following view\ninvokes a stored function f():\n\nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n\nSuppose that f() contains a statement such as this:\n\nIF name IS NULL then\n  CALL p1();\nELSE\n  CALL p2();\nEND IF;\n\nThe privileges required for executing statements within f() need to be\nchecked when f() executes. This might mean that privileges are needed\nfor p1() or p2(), depending on the execution path within f(). Those\nprivileges must be checked at runtime, and the user who must possess\nthe privileges is determined by the SQL SECURITY values of the view v\nand the function f().\n\nThe DEFINER and SQL SECURITY clauses for views are extensions to\nstandard SQL. In standard SQL, views are handled using the rules for\nSQL SECURITY DEFINER. The standard says that the definer of the view,\nwhich is the same as the owner of the view\'s schema, gets applicable\nprivileges on the view (for example, SELECT) and may grant them. MySQL\nhas no concept of a schema "owner", so MySQL adds a clause to identify\nthe definer. The DEFINER clause is an extension where the intent is to\nhave what the standard has; that is, a permanent record of who defined\nthe view. This is why the default DEFINER value is the account of the\nview creator.\n\nThe optional ALGORITHM clause is a MySQL extension to standard SQL. It\naffects how MySQL processes the view. ALGORITHM takes three values:\nMERGE, TEMPTABLE, or UNDEFINED. The default algorithm is UNDEFINED if\nno ALGORITHM clause is present. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/view-algorithms.html.\n\nSome views are updatable. That is, you can use them in statements such\nas UPDATE, DELETE, or INSERT to update the contents of the underlying\ntable. For a view to be updatable, there must be a one-to-one\nrelationship between the rows in the view and the rows in the\nunderlying table. There are also certain other constructs that make a\nview nonupdatable.\n\nThe WITH CHECK OPTION clause can be given for an updatable view to\nprevent inserts or updates to rows except those for which the WHERE\nclause in the select_statement is true.\n\nIn a WITH CHECK OPTION clause for an updatable view, the LOCAL and\nCASCADED keywords determine the scope of check testing when the view is\ndefined in terms of another view. The LOCAL keyword restricts the CHECK\nOPTION only to the view being defined. CASCADED causes the checks for\nunderlying views to be evaluated as well. When neither keyword is\ngiven, the default is CASCADED.\n\nFor more information about updatable views and the WITH CHECK OPTION\nclause, see\nhttp://dev.mysql.com/doc/refman/5.5/en/view-updatability.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-view.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (458,38,'TRIM','Syntax:\nTRIM([{BOTH | LEADING | TRAILING} [remstr] FROM] str), TRIM([remstr\nFROM] str)\n\nReturns the string str with all remstr prefixes or suffixes removed. If\nnone of the specifiers BOTH, LEADING, or TRAILING is given, BOTH is\nassumed. remstr is optional and, if not specified, spaces are removed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT TRIM(\'  bar   \');\n        -> \'bar\'\nmysql> SELECT TRIM(LEADING \'x\' FROM \'xxxbarxxx\');\n        -> \'barxxx\'\nmysql> SELECT TRIM(BOTH \'x\' FROM \'xxxbarxxx\');\n        -> \'bar\'\nmysql> SELECT TRIM(TRAILING \'xyz\' FROM \'barxxyz\');\n        -> \'barx\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (459,19,'IS','Syntax:\nIS boolean_value\n\nTests a value against a boolean value, where boolean_value can be TRUE,\nFALSE, or UNKNOWN.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS TRUE, 0 IS FALSE, NULL IS UNKNOWN;\n        -> 1, 1, 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (460,32,'GET_FORMAT','Syntax:\nGET_FORMAT({DATE|TIME|DATETIME}, {\'EUR\'|\'USA\'|\'JIS\'|\'ISO\'|\'INTERNAL\'})\n\nReturns a format string. This function is useful in combination with\nthe DATE_FORMAT() and the STR_TO_DATE() functions.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATE_FORMAT(\'2003-10-03\',GET_FORMAT(DATE,\'EUR\'));\n        -> \'03.10.2003\'\nmysql> SELECT STR_TO_DATE(\'10.31.2003\',GET_FORMAT(DATE,\'USA\'));\n        -> \'2003-10-31\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (461,23,'TINYBLOB','TINYBLOB\n\nA BLOB column with a maximum length of 255 (28 - 1) bytes. Each\nTINYBLOB value is stored using a 1-byte length prefix that indicates\nthe number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (462,24,'SIGNAL','Syntax:\nSIGNAL condition_value\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value:\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name:\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nSIGNAL is the way to "return" an error. SIGNAL provides error\ninformation to a handler, to an outer portion of the application, or to\nthe client. Also, it provides control over the error\'s characteristics\n(error number, SQLSTATE value, message). Without SIGNAL, it is\nnecessary to resort to workarounds such as deliberately referring to a\nnonexistent table to cause a routine to return an error.\n\nNo special privileges are required to execute the SIGNAL statement.\n\nThe condition_value in a SIGNAL statement indicates the error value to\nbe returned. It can be an SQLSTATE value (a 5-character string literal)\nor a condition_name that refers to a named condition previously defined\nwith DECLARE ... CONDITION (see [HELP DECLARE CONDITION]).\n\nAn SQLSTATE value can indicate errors, warnings, or "not found." The\nfirst two characters of the value indicate its error class, as\ndiscussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/signal.html#signal-condition-inf\normation-items. Some signal values cause statement termination; see\nhttp://dev.mysql.com/doc/refman/5.5/en/signal.html#signal-effects.\n\nThe SQLSTATE value for a SIGNAL statement should not start with \'00\'\nbecause such values indicate success and are not valid for signaling an\nerror. This is true whether the SQLSTATE value is specified directly in\nthe SIGNAL statement or in a named condition referred to in the\nstatement. If the value is invalid, a Bad SQLSTATE error occurs.\n\nTo signal a generic SQLSTATE value, use \'45000\', which means "unhandled\nuser-defined exception."\n\nThe SIGNAL statement optionally includes a SET clause that contains\nmultiple signal items, in a comma-separated list of\ncondition_information_item_name = simple_value_specification\nassignments.\n\nEach condition_information_item_name may be specified only once in the\nSET clause. Otherwise, a Duplicate condition information item error\noccurs.\n\nValid simple_value_specification designators can be specified using\nstored procedure or function parameters, stored program local variables\ndeclared with DECLARE, user-defined variables, system variables, or\nliterals. A character literal may include a _charset introducer.\n\nFor information about permissible condition_information_item_name\nvalues, see\nhttp://dev.mysql.com/doc/refman/5.5/en/signal.html#signal-condition-inf\normation-items.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/signal.html\n\n','CREATE PROCEDURE p (pval INT)\nBEGIN\n  DECLARE specialty CONDITION FOR SQLSTATE \'45000\';\n  IF pval = 0 THEN\n    SIGNAL SQLSTATE \'01000\';\n  ELSEIF pval = 1 THEN\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSEIF pval = 2 THEN\n    SIGNAL specialty\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSE\n    SIGNAL SQLSTATE \'01000\'\n      SET MESSAGE_TEXT = \'A warning occurred\', MYSQL_ERRNO = 1000;\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\', MYSQL_ERRNO = 1001;\n  END IF;\nEND;\n','http://dev.mysql.com/doc/refman/5.5/en/signal.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (463,8,'SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/savepoint.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/savepoint.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (464,17,'USER','Syntax:\nUSER()\n\nReturns the current MySQL user name and host name as a string in the\nutf8 character set.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT USER();\n        -> \'davida@localhost\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (465,24,'LABELS','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nLabels are permitted for BEGIN ... END blocks and for the LOOP, REPEAT,\nand WHILE statements. Label use for those statements follows these\nrules:\n\no begin_label must be followed by a colon.\n\no begin_label can be given without end_label. If end_label is present,\n  it must be the same as begin_label.\n\no end_label cannot be given without begin_label.\n\no Labels at the same nesting level must be distinct.\n\no Labels can be up to 16 characters long.\n\nTo refer to a label within the labeled construct, use an ITERATE or\nLEAVE statement. The following example uses those statements to\ncontinue iterating or terminate the loop:\n\nCREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN ITERATE label1; END IF;\n    LEAVE label1;\n  END LOOP label1;\nEND;\n\nThe scope of a block label does not include the code for handlers\ndeclared within the block. For details, see [HELP DECLARE HANDLER].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/statement-labels.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/statement-labels.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (466,40,'ALTER TABLE','Syntax:\nALTER [ONLINE | OFFLINE] [IGNORE] TABLE tbl_name\n    [alter_specification [, alter_specification] ...]\n    [partition_options]\n\nalter_specification:\n    table_options\n  | ADD [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name ]\n  | ADD [COLUMN] (col_name column_definition,...)\n  | ADD {INDEX|KEY} [index_name]\n        [index_type] (index_col_name,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]] PRIMARY KEY\n        [index_type] (index_col_name,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]]\n        UNIQUE [INDEX|KEY] [index_name]\n        [index_type] (index_col_name,...) [index_option] ...\n  | ADD FULLTEXT [INDEX|KEY] [index_name]\n        (index_col_name,...) [index_option] ...\n  | ADD SPATIAL [INDEX|KEY] [index_name]\n        (index_col_name,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]]\n        FOREIGN KEY [index_name] (index_col_name,...)\n        reference_definition\n  | ALTER [COLUMN] col_name {SET DEFAULT literal | DROP DEFAULT}\n  | CHANGE [COLUMN] old_col_name new_col_name column_definition\n        [FIRST|AFTER col_name]\n  | MODIFY [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name]\n  | DROP [COLUMN] col_name\n  | DROP PRIMARY KEY\n  | DROP {INDEX|KEY} index_name\n  | DROP FOREIGN KEY fk_symbol\n  | DISABLE KEYS\n  | ENABLE KEYS\n  | RENAME [TO|AS] new_tbl_name\n  | ORDER BY col_name [, col_name] ...\n  | CONVERT TO CHARACTER SET charset_name [COLLATE collation_name]\n  | [DEFAULT] CHARACTER SET [=] charset_name [COLLATE [=] collation_name]\n  | DISCARD TABLESPACE\n  | IMPORT TABLESPACE\n  | FORCE\n  | ADD PARTITION (partition_definition)\n  | DROP PARTITION partition_names\n  | TRUNCATE PARTITION {partition_names | ALL}\n  | COALESCE PARTITION number\n  | REORGANIZE PARTITION [partition_names INTO (partition_definitions)]\n  | ANALYZE PARTITION {partition_names | ALL}\n  | CHECK PARTITION {partition_names | ALL}\n  | OPTIMIZE PARTITION {partition_names | ALL}\n  | REBUILD PARTITION {partition_names | ALL}\n  | REPAIR PARTITION {partition_names | ALL}\n  | PARTITION BY partitioning_expression\n  | REMOVE PARTITIONING\n\nindex_col_name:\n    col_name [(length)] [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option:\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n\ntable_options:\n    table_option [[,] table_option] ...  (see CREATE TABLE options)\n\npartition_options:\n    (see CREATE TABLE options)\n\nALTER TABLE changes the structure of a table. For example, you can add\nor delete columns, create or destroy indexes, change the type of\nexisting columns, or rename columns or the table itself. You can also\nchange characteristics such as the storage engine used for the table or\nthe table comment.\n\nPartitioning-related clauses for ALTER TABLE can be used with\npartitioned tables for repartitioning, for adding, dropping, merging,\nand splitting partitions, and for performing partitioning maintenance.\nIt is possible for an ALTER TABLE statement to contain a PARTITION BY\nor REMOVE PARTITIONING clause in an addition to other alter\nspecifications, but the PARTITION BY or REMOVE PARTITIONING clause must\nbe specified last after any other specifications. The ADD PARTITION,\nDROP PARTITION, COALESCE PARTITION, REORGANIZE PARTITION, ANALYZE\nPARTITION, CHECK PARTITION, and REPAIR PARTITION options cannot be\ncombined with other alter specifications in a single ALTER TABLE, since\nthe options just listed act on individual partitions. For more\ninformation, see\nhttp://dev.mysql.com/doc/refman/5.5/en/alter-table-partition-operations\n.html.\n\nFollowing the table name, specify the alterations to be made. If none\nare given, ALTER TABLE does nothing.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (467,33,'MPOINTFROMWKB','MPointFromWKB(wkb[,srid]), MultiPointFromWKB(wkb[,srid])\n\nConstructs a MULTIPOINT value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (468,23,'CHAR BYTE','The CHAR BYTE data type is an alias for the BINARY data type. This is a\ncompatibility feature.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (469,21,'REPAIR TABLE','Syntax:\nREPAIR [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n    tbl_name [, tbl_name] ...\n    [QUICK] [EXTENDED] [USE_FRM]\n\nREPAIR TABLE repairs a possibly corrupted table. By default, it has the\nsame effect as myisamchk --recover tbl_name. REPAIR TABLE works for\nMyISAM, ARCHIVE, and CSV tables. See\nhttp://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/archive-storage-engine.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/csv-storage-engine.html\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nREPAIR TABLE is supported for partitioned tables. However, the USE_FRM\noption cannot be used with this statement on a partitioned table.\n\nYou can use ALTER TABLE ... REPAIR PARTITION to repair one or more\npartitions; for more information, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/repair-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/repair-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (470,18,'MERGE','The MERGE storage engine, also known as the MRG_MyISAM engine, is a\ncollection of identical MyISAM tables that can be used as one.\n"Identical" means that all tables have identical column and index\ninformation. You cannot merge MyISAM tables in which the columns are\nlisted in a different order, do not have exactly the same columns, or\nhave the indexes in different order. However, any or all of the MyISAM\ntables can be compressed with myisampack. See\nhttp://dev.mysql.com/doc/refman/5.5/en/myisampack.html. Differences in\ntable options such as AVG_ROW_LENGTH, MAX_ROWS, or PACK_KEYS do not\nmatter.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/merge-storage-engine.html\n\n','mysql> CREATE TABLE t1 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> CREATE TABLE t2 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> INSERT INTO t1 (message) VALUES (\'Testing\'),(\'table\'),(\'t1\');\nmysql> INSERT INTO t2 (message) VALUES (\'Testing\'),(\'table\'),(\'t2\');\nmysql> CREATE TABLE total (\n    ->    a INT NOT NULL AUTO_INCREMENT,\n    ->    message CHAR(20), INDEX(a))\n    ->    ENGINE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST;\n','http://dev.mysql.com/doc/refman/5.5/en/merge-storage-engine.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (471,40,'CREATE TABLE','Syntax:\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    (create_definition,...)\n    [table_options]\n    [partition_options]\n\nOr:\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    [(create_definition,...)]\n    [table_options]\n    [partition_options]\n    select_statement\n\nOr:\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    { LIKE old_tbl_name | (LIKE old_tbl_name) }\n\ncreate_definition:\n    col_name column_definition\n  | [CONSTRAINT [symbol]] PRIMARY KEY [index_type] (index_col_name,...)\n      [index_option] ...\n  | {INDEX|KEY} [index_name] [index_type] (index_col_name,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] UNIQUE [INDEX|KEY]\n      [index_name] [index_type] (index_col_name,...)\n      [index_option] ...\n  | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name] (index_col_name,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] FOREIGN KEY\n      [index_name] (index_col_name,...) reference_definition\n  | CHECK (expr)\n\ncolumn_definition:\n    data_type [NOT NULL | NULL] [DEFAULT default_value]\n      [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]\n      [COMMENT \'string\']\n      [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]\n      [STORAGE {DISK|MEMORY|DEFAULT}]\n      [reference_definition]\n\ndata_type:\n    BIT[(length)]\n  | TINYINT[(length)] [UNSIGNED] [ZEROFILL]\n  | SMALLINT[(length)] [UNSIGNED] [ZEROFILL]\n  | MEDIUMINT[(length)] [UNSIGNED] [ZEROFILL]\n  | INT[(length)] [UNSIGNED] [ZEROFILL]\n  | INTEGER[(length)] [UNSIGNED] [ZEROFILL]\n  | BIGINT[(length)] [UNSIGNED] [ZEROFILL]\n  | REAL[(length,decimals)] [UNSIGNED] [ZEROFILL]\n  | DOUBLE[(length,decimals)] [UNSIGNED] [ZEROFILL]\n  | FLOAT[(length,decimals)] [UNSIGNED] [ZEROFILL]\n  | DECIMAL[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n  | NUMERIC[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n  | DATE\n  | TIME\n  | TIMESTAMP\n  | DATETIME\n  | YEAR\n  | CHAR[(length)]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | VARCHAR(length)\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | BINARY[(length)]\n  | VARBINARY(length)\n  | TINYBLOB\n  | BLOB\n  | MEDIUMBLOB\n  | LONGBLOB\n  | TINYTEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | TEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | MEDIUMTEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | LONGTEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | ENUM(value1,value2,value3,...)\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | SET(value1,value2,value3,...)\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | spatial_type\n\nindex_col_name:\n    col_name [(length)] [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option:\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n\nreference_definition:\n    REFERENCES tbl_name (index_col_name,...)\n      [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n      [ON DELETE reference_option]\n      [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION\n\ntable_options:\n    table_option [[,] table_option] ...\n\ntable_option:\n    ENGINE [=] engine_name\n  | AUTO_INCREMENT [=] value\n  | AVG_ROW_LENGTH [=] value\n  | [DEFAULT] CHARACTER SET [=] charset_name\n  | CHECKSUM [=] {0 | 1}\n  | [DEFAULT] COLLATE [=] collation_name\n  | COMMENT [=] \'string\'\n  | CONNECTION [=] \'connect_string\'\n  | DATA DIRECTORY [=] \'absolute path to directory\'\n  | DELAY_KEY_WRITE [=] {0 | 1}\n  | INDEX DIRECTORY [=] \'absolute path to directory\'\n  | INSERT_METHOD [=] { NO | FIRST | LAST }\n  | KEY_BLOCK_SIZE [=] value\n  | MAX_ROWS [=] value\n  | MIN_ROWS [=] value\n  | PACK_KEYS [=] {0 | 1 | DEFAULT}\n  | PASSWORD [=] \'string\'\n  | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}\n  | TABLESPACE tablespace_name [STORAGE {DISK|MEMORY|DEFAULT}]\n  | UNION [=] (tbl_name[,tbl_name]...)\n\npartition_options:\n    PARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1|2}] (column_list)\n        | RANGE{(expr) | COLUMNS(column_list)}\n        | LIST{(expr) | COLUMNS(column_list)} }\n    [PARTITIONS num]\n    [SUBPARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1|2}] (column_list) }\n      [SUBPARTITIONS num]\n    ]\n    [(partition_definition [, partition_definition] ...)]\n\npartition_definition:\n    PARTITION partition_name\n        [VALUES \n            {LESS THAN {(expr | value_list) | MAXVALUE} \n            | \n            IN (value_list)}]\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'comment_text\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n        [NODEGROUP [=] node_group_id]\n        [(subpartition_definition [, subpartition_definition] ...)]\n\nsubpartition_definition:\n    SUBPARTITION logical_name\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'comment_text\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n        [NODEGROUP [=] node_group_id]\n\nselect_statement:\n    [IGNORE | REPLACE] [AS] SELECT ...   (Some valid select statement)\n\nCREATE TABLE creates a table with the given name. You must have the\nCREATE privilege for the table.\n\nRules for permissible table names are given in\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html. By default,\nthe table is created in the default database, using the InnoDB storage\nengine. An error occurs if the table exists, if there is no default\ndatabase, or if the database does not exist.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (472,19,'>','Syntax:\n>\n\nGreater than:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 > 2;\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (473,21,'ANALYZE TABLE','Syntax:\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n    tbl_name [, tbl_name] ...\n\nANALYZE TABLE analyzes and stores the key distribution for a table.\nDuring the analysis, the table is locked with a read lock for InnoDB\nand MyISAM. This statement works with InnoDB, NDB, and MyISAM tables.\nFor MyISAM tables, this statement is equivalent to using myisamchk\n--analyze.\n\nFor more information on how the analysis works within InnoDB, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-restrictions.html.\n\nMySQL uses the stored key distribution to decide the order in which\ntables should be joined when you perform a join on something other than\na constant. In addition, key distributions can be used when deciding\nwhich indexes to use for a specific table within a query.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nANALYZE TABLE is supported for partitioned tables, and you can use\nALTER TABLE ... ANALYZE PARTITION to analyze one or more partitions;\nfor more information, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/analyze-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/analyze-table.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (474,32,'MICROSECOND','Syntax:\nMICROSECOND(expr)\n\nReturns the microseconds from the time or datetime expression expr as a\nnumber in the range from 0 to 999999.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MICROSECOND(\'12:00:00.123456\');\n        -> 123456\nmysql> SELECT MICROSECOND(\'2009-12-31 23:59:59.000010\');\n        -> 10\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (475,40,'CONSTRAINT','MySQL supports foreign keys, which let you cross-reference related data\nacross tables, and foreign key constraints, which help keep this\nspread-out data consistent. The essential syntax for a foreign key\nconstraint definition in a CREATE TABLE or ALTER TABLE statement looks\nlike this:\n\n[CONSTRAINT [symbol]] FOREIGN KEY\n    [index_name] (index_col_name, ...)\n    REFERENCES tbl_name (index_col_name,...)\n    [ON DELETE reference_option]\n    [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-table-foreign-keys.html\n\n','CREATE TABLE product (\n    category INT NOT NULL, id INT NOT NULL,\n    price DECIMAL,\n    PRIMARY KEY(category, id)\n)   ENGINE=INNODB;\n\nCREATE TABLE customer (\n    id INT NOT NULL,\n    PRIMARY KEY (id)\n)   ENGINE=INNODB;\n\nCREATE TABLE product_order (\n    no INT NOT NULL AUTO_INCREMENT,\n    product_category INT NOT NULL,\n    product_id INT NOT NULL,\n    customer_id INT NOT NULL,\n\n    PRIMARY KEY(no),\n    INDEX (product_category, product_id),\n    INDEX (customer_id),\n\n    FOREIGN KEY (product_category, product_id)\n      REFERENCES product(category, id)\n      ON UPDATE CASCADE ON DELETE RESTRICT,\n\n    FOREIGN KEY (customer_id)\n      REFERENCES customer(id)\n)   ENGINE=INNODB;\n','http://dev.mysql.com/doc/refman/5.5/en/create-table-foreign-keys.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (476,40,'CREATE SERVER','Syntax:\nCREATE SERVER server_name\n    FOREIGN DATA WRAPPER wrapper_name\n    OPTIONS (option [, option] ...)\n\noption:\n  { HOST character-literal\n  | DATABASE character-literal\n  | USER character-literal\n  | PASSWORD character-literal\n  | SOCKET character-literal\n  | OWNER character-literal\n  | PORT numeric-literal }\n\nThis statement creates the definition of a server for use with the\nFEDERATED storage engine. The CREATE SERVER statement creates a new row\nin the servers table in the mysql database. This statement requires the\nSUPER privilege.\n\nThe server_name should be a unique reference to the server. Server\ndefinitions are global within the scope of the server, it is not\npossible to qualify the server definition to a specific database.\nserver_name has a maximum length of 64 characters (names longer than 64\ncharacters are silently truncated), and is case insensitive. You may\nspecify the name as a quoted string.\n\nThe wrapper_name should be mysql, and may be quoted with single\nquotation marks. Other values for wrapper_name are not currently\nsupported.\n\nFor each option you must specify either a character literal or numeric\nliteral. Character literals are UTF-8, support a maximum length of 64\ncharacters and default to a blank (empty) string. String literals are\nsilently truncated to 64 characters. Numeric literals must be a number\nbetween 0 and 9999, default value is 0.\n\n*Note*: The OWNER option is currently not applied, and has no effect on\nthe ownership or operation of the server connection that is created.\n\nThe CREATE SERVER statement creates an entry in the mysql.servers table\nthat can later be used with the CREATE TABLE statement when creating a\nFEDERATED table. The options that you specify will be used to populate\nthe columns in the mysql.servers table. The table columns are\nServer_name, Host, Db, Username, Password, Port and Socket.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-server.html\n\n','CREATE SERVER s\nFOREIGN DATA WRAPPER mysql\nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE \'test\');\n','http://dev.mysql.com/doc/refman/5.5/en/create-server.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (477,38,'FIELD','Syntax:\nFIELD(str,str1,str2,str3,...)\n\nReturns the index (position) of str in the str1, str2, str3, ... list.\nReturns 0 if str is not found.\n\nIf all arguments to FIELD() are strings, all arguments are compared as\nstrings. If all arguments are numbers, they are compared as numbers.\nOtherwise, the arguments are compared as double.\n\nIf str is NULL, the return value is 0 because NULL fails equality\ncomparison with any value. FIELD() is the complement of ELT().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT FIELD(\'ej\', \'Hej\', \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> 2\nmysql> SELECT FIELD(\'fo\', \'Hej\', \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (478,32,'MAKETIME','Syntax:\nMAKETIME(hour,minute,second)\n\nReturns a time value calculated from the hour, minute, and second\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MAKETIME(12,15,30);\n        -> \'12:15:30\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (479,32,'CURDATE','Syntax:\nCURDATE()\n\nReturns the current date as a value in \'YYYY-MM-DD\' or YYYYMMDD format,\ndepending on whether the function is used in a string or numeric\ncontext.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT CURDATE();\n        -> \'2008-06-13\'\nmysql> SELECT CURDATE() + 0;\n        -> 20080613\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (480,10,'SET PASSWORD','Syntax:\nSET PASSWORD [FOR user] =\n    {\n        PASSWORD(\'cleartext password\')\n      | OLD_PASSWORD(\'cleartext password\')\n      | \'encrypted password\'\n    }\n\nThe SET PASSWORD statement assigns a password to an existing MySQL user\naccount. When the read_only system variable is enabled, the SUPER\nprivilege is required to use SET PASSWORD, in addition to whatever\nother privileges might be required.\n\nIf the password is specified using the PASSWORD() or OLD_PASSWORD()\nfunction, the cleartext (unencrypted) password should be given as the\nargument to the function, which hashes the password and returns the\nencrypted password string. If the password is specified without using\neither function, it should be the already encrypted password value as a\nliteral string. In all cases, the encrypted password string must be in\nthe format required by the authentication method used for the account.\n\nWith no FOR user clause, this statement sets the password for the\ncurrent user. (To see which account the server authenticated you as,\ninvoke the CURRENT_USER() function.) Any client who successfully\nconnects to the server using a nonanonymous account can change the\npassword for that account.\n\nWith a FOR user clause, this statement sets the password for the named\nuser. You must have the UPDATE privilege for the mysql database to do\nthis. The user account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. The user\nvalue should be given as \'user_name\'@\'host_name\', where \'user_name\' and\n\'host_name\' are exactly as listed in the User and Host columns of the\nmysql.user table row. (If you specify only a user name, a host name of\n\'%\' is used.) For example, to set the password for an account with User\nand Host column values of \'bob\' and \'%.example.org\', write the\nstatement like this:\n\nSET PASSWORD FOR \'bob\'@\'%.example.org\' = PASSWORD(\'cleartext password\');\n\nThat is equivalent to the following statements:\n\nUPDATE mysql.user SET Password=PASSWORD(\'cleartext password\')\n  WHERE User=\'bob\' AND Host=\'%.example.org\';\nFLUSH PRIVILEGES;\n\nAnother way to set the password is to use GRANT:\n\nGRANT USAGE ON *.* TO \'bob\'@\'%.example.org\' IDENTIFIED BY \'cleartext password\';\n\nThe old_passwords system variable value determines the hashing method\nused by PASSWORD(). If you specify the password using that function and\nSET PASSWORD rejects the password as not being in the correct format,\nit may be necessary to set old_passwords to change the hashing method.\nFor descriptions of the permitted values, see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-password.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-password.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (481,40,'ALTER TABLESPACE','Syntax:\nALTER TABLESPACE tablespace_name\n    {ADD|DROP} DATAFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n    ENGINE [=] engine_name\n\nThis statement can be used either to add a new data file, or to drop a\ndata file from a tablespace.\n\nThe ADD DATAFILE variant enables you to specify an initial size using\nan INITIAL_SIZE clause, where size is measured in bytes; the default\nvalue is 128M (128 megabytes). You may optionally follow this integer\nvalue with a one-letter abbreviation for an order of magnitude, similar\nto those used in my.cnf. Generally, this is one of the letters M (for\nmegabytes) or G (for gigabytes).\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and an data file with the same name, or an undo log\nfile and a tablespace with the same name.\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is 4G.\n(Bug #29186)\n\nINITIAL_SIZE is rounded, explicitly, as for CREATE TABLESPACE.\n\nOnce a data file has been created, its size cannot be changed; however,\nyou can add more data files to the tablespace using additional ALTER\nTABLESPACE ... ADD DATAFILE statements.\n\nUsing DROP DATAFILE with ALTER TABLESPACE drops the data file\n\'file_name\' from the tablespace. You cannot drop a data file from a\ntablespace which is in use by any table; in other words, the data file\nmust be empty (no extents used). See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data-objects.\nhtml. In addition, any data file to be dropped must previously have\nbeen added to the tablespace with CREATE TABLESPACE or ALTER\nTABLESPACE.\n\nBoth ALTER TABLESPACE ... ADD DATAFILE and ALTER TABLESPACE ... DROP\nDATAFILE require an ENGINE clause which specifies the storage engine\nused by the tablespace. Currently, the only accepted values for\nengine_name are NDB and NDBCLUSTER.\n\nWAIT is parsed but otherwise ignored, and so has no effect in MySQL\n5.5. It is intended for future expansion.\n\nWhen ALTER TABLESPACE ... ADD DATAFILE is used with ENGINE = NDB, a\ndata file is created on each Cluster data node. You can verify that the\ndata files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example, the following query\nshows all data files belonging to the tablespace named newts:\n\nmysql> SELECT LOGFILE_GROUP_NAME, FILE_NAME, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE TABLESPACE_NAME = \'newts\' AND FILE_TYPE = \'DATAFILE\';\n+--------------------+--------------+----------------+\n| LOGFILE_GROUP_NAME | FILE_NAME    | EXTRA          |\n+--------------------+--------------+----------------+\n| lg_3               | newdata.dat  | CLUSTER_NODE=3 |\n| lg_3               | newdata.dat  | CLUSTER_NODE=4 |\n| lg_3               | newdata2.dat | CLUSTER_NODE=3 |\n| lg_3               | newdata2.dat | CLUSTER_NODE=4 |\n+--------------------+--------------+----------------+\n2 rows in set (0.03 sec)\n\nSee http://dev.mysql.com/doc/refman/5.5/en/files-table.html.\n\nALTER TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-tablespace.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (482,7,'IF FUNCTION','Syntax:\nIF(expr1,expr2,expr3)\n\nIf expr1 is TRUE (expr1 <> 0 and expr1 <> NULL) then IF() returns\nexpr2; otherwise it returns expr3. IF() returns a numeric or string\nvalue, depending on the context in which it is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT IF(1>2,2,3);\n        -> 3\nmysql> SELECT IF(1<2,\'yes\',\'no\');\n        -> \'yes\'\nmysql> SELECT IF(STRCMP(\'test\',\'test1\'),\'no\',\'yes\');\n        -> \'no\'\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (483,23,'ENUM','ENUM(\'value1\',\'value2\',...) [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nAn enumeration. A string object that can have only one value, chosen\nfrom the list of values \'value1\', \'value2\', ..., NULL or the special \'\'\nerror value. ENUM values are represented internally as integers.\n\nAn ENUM column can have a maximum of 65,535 distinct elements. (The\npractical limit is less than 3000.) A table can have no more than 255\nunique element list definitions among its ENUM and SET columns\nconsidered as a group. For more information on these limits, see\nhttp://dev.mysql.com/doc/refman/5.5/en/limits-frm-file.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (484,17,'DATABASE','Syntax:\nDATABASE()\n\nReturns the default (current) database name as a string in the utf8\ncharacter set. If there is no default database, DATABASE() returns\nNULL. Within a stored routine, the default database is the database\nthat the routine is associated with, which is not necessarily the same\nas the database that is the default in the calling context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT DATABASE();\n        -> \'test\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (485,33,'POINTFROMWKB','PointFromWKB(wkb[,srid])\n\nConstructs a POINT value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-values.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (486,4,'POWER','Syntax:\nPOWER(X,Y)\n\nThis is a synonym for POW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (487,4,'ATAN','Syntax:\nATAN(X)\n\nReturns the arc tangent of X, that is, the value whose tangent is X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ATAN(2);\n        -> 1.1071487177941\nmysql> SELECT ATAN(-2);\n        -> -1.1071487177941\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (488,38,'STRCMP','Syntax:\nSTRCMP(expr1,expr2)\n\nSTRCMP() returns 0 if the strings are the same, -1 if the first\nargument is smaller than the second according to the current sort\norder, and 1 otherwise.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html\n\n','mysql> SELECT STRCMP(\'text\', \'text2\');\n        -> -1\nmysql> SELECT STRCMP(\'text2\', \'text\');\n        -> 1\nmysql> SELECT STRCMP(\'text\', \'text\');\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (489,28,'INSERT DELAYED','Syntax:\nINSERT DELAYED ...\n\nThe DELAYED option for the INSERT statement is a MySQL extension to\nstandard SQL that is very useful if you have clients that cannot or\nneed not wait for the INSERT to complete. This is a common situation\nwhen you use MySQL for logging and you also periodically run SELECT and\nUPDATE statements that take a long time to complete.\n\nWhen a client uses INSERT DELAYED, it gets an okay from the server at\nonce, and the row is queued to be inserted when the table is not in use\nby any other thread.\n\nAnother major benefit of using INSERT DELAYED is that inserts from many\nclients are bundled together and written in one block. This is much\nfaster than performing many separate inserts.\n\nNote that INSERT DELAYED is slower than a normal INSERT if the table is\nnot otherwise in use. There is also the additional overhead for the\nserver to handle a separate thread for each table for which there are\ndelayed rows. This means that you should use INSERT DELAYED only when\nyou are really sure that you need it.\n\nThe queued rows are held only in memory until they are inserted into\nthe table. This means that if you terminate mysqld forcibly (for\nexample, with kill -9) or if mysqld dies unexpectedly, any queued rows\nthat have not been written to disk are lost.\n\nThere are some constraints on the use of DELAYED:\n\no INSERT DELAYED works only with MyISAM, MEMORY, ARCHIVE, and BLACKHOLE\n  tables. For engines that do not support DELAYED, an error occurs.\n\no An error occurs for INSERT DELAYED if used with a table that has been\n  locked with LOCK TABLES because the insert must be handled by a\n  separate thread, not by the session that holds the lock.\n\no For MyISAM tables, if there are no free blocks in the middle of the\n  data file, concurrent SELECT and INSERT statements are supported.\n  Under these circumstances, you very seldom need to use INSERT DELAYED\n  with MyISAM.\n\no INSERT DELAYED should be used only for INSERT statements that specify\n  value lists. The server ignores DELAYED for INSERT ... SELECT or\n  INSERT ... ON DUPLICATE KEY UPDATE statements.\n\no Because the INSERT DELAYED statement returns immediately, before the\n  rows are inserted, you cannot use LAST_INSERT_ID() to get the\n  AUTO_INCREMENT value that the statement might generate.\n\no DELAYED rows are not visible to SELECT statements until they actually\n  have been inserted.\n\no Prior to MySQL 5.5.7, INSERT DELAYED was treated as a normal INSERT\n  if the statement inserted multiple rows, binary logging was enabled,\n  and the global logging format was statement-based (that is, whenever\n  binlog_format was set to STATEMENT). Beginning with MySQL 5.5.7,\n  INSERT DELAYED is always handled as a simple INSERT (that is, without\n  the DELAYED option) whenever the value of binlog_format is STATEMENT\n  or MIXED. (In the latter case, the statement no longer triggers a\n  switch to row-based logging, and so is logged using the\n  statement-based format.)\n\n  This does not apply when using row-based binary logging mode\n  (binlog_format set to ROW), in which INSERT DELAYED statements are\n  always executed using the DELAYED option as specified, and logged as\n  row-update events.\n\no DELAYED is ignored on slave replication servers, so that INSERT\n  DELAYED is treated as a normal INSERT on slaves. This is because\n  DELAYED could cause the slave to have different data than the master.\n\no Pending INSERT DELAYED statements are lost if a table is write locked\n  and ALTER TABLE is used to modify the table structure.\n\no INSERT DELAYED is not supported for views.\n\no INSERT DELAYED is not supported for partitioned tables.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/insert-delayed.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/insert-delayed.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (490,27,'SHOW PROFILE','Syntax:\nSHOW PROFILE [type [, type] ... ]\n    [FOR QUERY n]\n    [LIMIT row_count [OFFSET offset]]\n\ntype:\n    ALL\n  | BLOCK IO\n  | CONTEXT SWITCHES\n  | CPU\n  | IPC\n  | MEMORY\n  | PAGE FAULTS\n  | SOURCE\n  | SWAPS\n\nThe SHOW PROFILE and SHOW PROFILES statements display profiling\ninformation that indicates resource usage for statements executed\nduring the course of the current session.\n\nProfiling is controlled by the profiling session variable, which has a\ndefault value of 0 (OFF). Profiling is enabled by setting profiling to\n1 or ON:\n\nmysql> SET profiling = 1;\n\nSHOW PROFILES displays a list of the most recent statements sent to the\nserver. The size of the list is controlled by the\nprofiling_history_size session variable, which has a default value of\n15. The maximum value is 100. Setting the value to 0 has the practical\neffect of disabling profiling.\n\nAll statements are profiled except SHOW PROFILE and SHOW PROFILES, so\nyou will find neither of those statements in the profile list.\nMalformed statements are profiled. For example, SHOW PROFILING is an\nillegal statement, and a syntax error occurs if you try to execute it,\nbut it will show up in the profiling list.\n\nSHOW PROFILE displays detailed information about a single statement.\nWithout the FOR QUERY n clause, the output pertains to the most\nrecently executed statement. If FOR QUERY n is included, SHOW PROFILE\ndisplays information for statement n. The values of n correspond to the\nQuery_ID values displayed by SHOW PROFILES.\n\nThe LIMIT row_count clause may be given to limit the output to\nrow_count rows. If LIMIT is given, OFFSET offset may be added to begin\nthe output offset rows into the full set of rows.\n\nBy default, SHOW PROFILE displays Status and Duration columns. The\nStatus values are like the State values displayed by SHOW PROCESSLIST,\nalthough there might be some minor differences in interpretion for the\ntwo statements for some status values (see\nhttp://dev.mysql.com/doc/refman/5.5/en/thread-information.html).\n\nOptional type values may be specified to display specific additional\ntypes of information:\n\no ALL displays all information\n\no BLOCK IO displays counts for block input and output operations\n\no CONTEXT SWITCHES displays counts for voluntary and involuntary\n  context switches\n\no CPU displays user and system CPU usage times\n\no IPC displays counts for messages sent and received\n\no MEMORY is not currently implemented\n\no PAGE FAULTS displays counts for major and minor page faults\n\no SOURCE displays the names of functions from the source code, together\n  with the name and line number of the file in which the function\n  occurs\n\no SWAPS displays swap counts\n\nProfiling is enabled per session. When a session ends, its profiling\ninformation is lost.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-profile.html\n\n','mysql> SELECT @@profiling;\n+-------------+\n| @@profiling |\n+-------------+\n|           0 |\n+-------------+\n1 row in set (0.00 sec)\n\nmysql> SET profiling = 1;\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> DROP TABLE IF EXISTS t1;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> CREATE TABLE T1 (id INT);\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SHOW PROFILES;\n+----------+----------+--------------------------+\n| Query_ID | Duration | Query                    |\n+----------+----------+--------------------------+\n|        0 | 0.000088 | SET PROFILING = 1        |\n|        1 | 0.000136 | DROP TABLE IF EXISTS t1  |\n|        2 | 0.011947 | CREATE TABLE t1 (id INT) |\n+----------+----------+--------------------------+\n3 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE;\n+----------------------+----------+\n| Status               | Duration |\n+----------------------+----------+\n| checking permissions | 0.000040 |\n| creating table       | 0.000056 |\n| After create         | 0.011363 |\n| query end            | 0.000375 |\n| freeing items        | 0.000089 |\n| logging slow query   | 0.000019 |\n| cleaning up          | 0.000005 |\n+----------------------+----------+\n7 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE FOR QUERY 1;\n+--------------------+----------+\n| Status             | Duration |\n+--------------------+----------+\n| query end          | 0.000107 |\n| freeing items      | 0.000008 |\n| logging slow query | 0.000015 |\n| cleaning up        | 0.000006 |\n+--------------------+----------+\n4 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE CPU FOR QUERY 2;\n+----------------------+----------+----------+------------+\n| Status               | Duration | CPU_user | CPU_system |\n+----------------------+----------+----------+------------+\n| checking permissions | 0.000040 | 0.000038 |   0.000002 |\n| creating table       | 0.000056 | 0.000028 |   0.000028 |\n| After create         | 0.011363 | 0.000217 |   0.001571 |\n| query end            | 0.000375 | 0.000013 |   0.000028 |\n| freeing items        | 0.000089 | 0.000010 |   0.000014 |\n| logging slow query   | 0.000019 | 0.000009 |   0.000010 |\n| cleaning up          | 0.000005 | 0.000003 |   0.000002 |\n+----------------------+----------+----------+------------+\n7 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/show-profile.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (491,27,'SHOW PROCEDURE CODE','Syntax:\nSHOW PROCEDURE CODE proc_name\n\nThis statement is a MySQL extension that is available only for servers\nthat have been built with debugging support. It displays a\nrepresentation of the internal implementation of the named stored\nprocedure. A similar statement, SHOW FUNCTION CODE, displays\ninformation about stored functions (see [HELP SHOW FUNCTION CODE]).\n\nBoth statements require that you be the owner of the routine or have\nSELECT access to the mysql.proc table.\n\nIf the named routine is available, each statement produces a result\nset. Each row in the result set corresponds to one "instruction" in the\nroutine. The first column is Pos, which is an ordinal number beginning\nwith 0. The second column is Instruction, which contains an SQL\nstatement (usually changed from the original source), or a directive\nwhich has meaning only to the stored-routine handler.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-procedure-code.html\n\n','mysql> DELIMITER //\nmysql> CREATE PROCEDURE p1 ()\n    -> BEGIN\n    ->   DECLARE fanta INT DEFAULT 55;\n    ->   DROP TABLE t2;\n    ->   LOOP\n    ->     INSERT INTO t3 VALUES (fanta);\n    ->     END LOOP;\n    ->   END//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SHOW PROCEDURE CODE p1//\n+-----+----------------------------------------+\n| Pos | Instruction                            |\n+-----+----------------------------------------+\n|   0 | set fanta@0 55                         |\n|   1 | stmt 9 "DROP TABLE t2"                 |\n|   2 | stmt 5 "INSERT INTO t3 VALUES (fanta)" |\n|   3 | jump 2                                 |\n+-----+----------------------------------------+\n4 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/show-procedure-code.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (492,23,'MEDIUMTEXT','MEDIUMTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 16,777,215 (224 - 1) characters.\nThe effective maximum length is less if the value contains multi-byte\ncharacters. Each MEDIUMTEXT value is stored using a 3-byte length\nprefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (493,4,'LN','Syntax:\nLN(X)\n\nReturns the natural logarithm of X; that is, the base-e logarithm of X.\nIf X is less than or equal to 0, then NULL is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LN(2);\n        -> 0.69314718055995\nmysql> SELECT LN(-2);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (494,24,'RETURN','Syntax:\nRETURN expr\n\nThe RETURN statement terminates execution of a stored function and\nreturns the value expr to the function caller. There must be at least\none RETURN statement in a stored function. There may be more than one\nif the function has multiple exit points.\n\nThis statement is not used in stored procedures, triggers, or events.\nThe LEAVE statement can be used to exit a stored program of those\ntypes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/return.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/return.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (495,27,'SHOW COLLATION','Syntax:\nSHOW COLLATION\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement lists collations supported by the server. By default,\nthe output from SHOW COLLATION includes all available collations. The\nLIKE clause, if present, indicates which collation names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html. For example:\n\nmysql> SHOW COLLATION LIKE \'latin1%\';\n+-------------------+---------+----+---------+----------+---------+\n| Collation         | Charset | Id | Default | Compiled | Sortlen |\n+-------------------+---------+----+---------+----------+---------+\n| latin1_german1_ci | latin1  |  5 |         |          |       0 |\n| latin1_swedish_ci | latin1  |  8 | Yes     | Yes      |       0 |\n| latin1_danish_ci  | latin1  | 15 |         |          |       0 |\n| latin1_german2_ci | latin1  | 31 |         | Yes      |       2 |\n| latin1_bin        | latin1  | 47 |         | Yes      |       0 |\n| latin1_general_ci | latin1  | 48 |         |          |       0 |\n| latin1_general_cs | latin1  | 49 |         |          |       0 |\n| latin1_spanish_ci | latin1  | 94 |         |          |       0 |\n+-------------------+---------+----+---------+----------+---------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-collation.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-collation.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (496,4,'LOG','Syntax:\nLOG(X), LOG(B,X)\n\nIf called with one parameter, this function returns the natural\nlogarithm of X. If X is less than or equal to 0, then NULL is returned.\n\nThe inverse of this function (when called with a single argument) is\nthe EXP() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LOG(2);\n        -> 0.69314718055995\nmysql> SELECT LOG(-2);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (497,8,'SET SQL_LOG_BIN','Syntax:\nSET sql_log_bin = {0|1}\n\nThe sql_log_bin variable controls whether logging to the binary log is\ndone. The default value is 1 (do logging). To change logging for the\ncurrent session, change the session value of this variable. The session\nuser must have the SUPER privilege to set this variable.\n\nBeginning with MySQL 5.5.5, it is no longer possible to set\n@@session.sql_log_bin within a transaction or subquery. (Bug #53437)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-sql-log-bin.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-sql-log-bin.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (498,19,'!=','Syntax:\n<>, !=\n\nNot equal:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT \'.01\' <> \'0.01\';\n        -> 1\nmysql> SELECT .01 <> \'0.01\';\n        -> 0\nmysql> SELECT \'zapp\' <> \'zappp\';\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (499,24,'WHILE','Syntax:\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nThe statement list within a WHILE statement is repeated as long as the\nsearch_condition expression is true. statement_list consists of one or\nmore SQL statements, each terminated by a semicolon (;) statement\ndelimiter.\n\nA WHILE statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/while.html\n\n','CREATE PROCEDURE dowhile()\nBEGIN\n  DECLARE v1 INT DEFAULT 5;\n\n  WHILE v1 > 0 DO\n    ...\n    SET v1 = v1 - 1;\n  END WHILE;\nEND;\n','http://dev.mysql.com/doc/refman/5.5/en/while.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (500,12,'AES_DECRYPT','Syntax:\nAES_DECRYPT(crypt_str,key_str)\n\nThis function decrypts data using the official AES (Advanced Encryption\nStandard) algorithm. For more information, see the description of\nAES_ENCRYPT().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (501,32,'DAYNAME','Syntax:\nDAYNAME(date)\n\nReturns the name of the weekday for date. The language used for the\nname is controlled by the value of the lc_time_names system variable\n(http://dev.mysql.com/doc/refman/5.5/en/locale-support.html).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYNAME(\'2007-02-03\');\n        -> \'Saturday\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (502,17,'COERCIBILITY','Syntax:\nCOERCIBILITY(str)\n\nReturns the collation coercibility value of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT COERCIBILITY(\'abc\' COLLATE latin1_swedish_ci);\n        -> 0\nmysql> SELECT COERCIBILITY(USER());\n        -> 3\nmysql> SELECT COERCIBILITY(\'abc\');\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (503,23,'INT','INT[(M)] [UNSIGNED] [ZEROFILL]\n\nA normal-size integer. The signed range is -2147483648 to 2147483647.\nThe unsigned range is 0 to 4294967295.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (504,13,'GLENGTH','GLength(ls)\n\nReturns as a double-precision number the length of the LineString value\nls in its associated spatial reference.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT GLength(GeomFromText(@ls));\n+----------------------------+\n| GLength(GeomFromText(@ls)) |\n+----------------------------+\n|            2.8284271247462 |\n+----------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/geometry-property-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (505,4,'RADIANS','Syntax:\nRADIANS(X)\n\nReturns the argument X, converted from degrees to radians. (Note that\nπ radians equals 180 degrees.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT RADIANS(90);\n        -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (506,17,'COLLATION','Syntax:\nCOLLATION(str)\n\nReturns the collation of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT COLLATION(\'abc\');\n        -> \'latin1_swedish_ci\'\nmysql> SELECT COLLATION(_utf8\'abc\');\n        -> \'utf8_general_ci\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (507,19,'COALESCE','Syntax:\nCOALESCE(value,...)\n\nReturns the first non-NULL value in the list, or NULL if there are no\nnon-NULL values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT COALESCE(NULL,1);\n        -> 1\nmysql> SELECT COALESCE(NULL,NULL,NULL);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (508,17,'VERSION','Syntax:\nVERSION()\n\nReturns a string that indicates the MySQL server version. The string\nuses the utf8 character set. The value might have a suffix in addition\nto the version number. See the description of the version system\nvariable in\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT VERSION();\n        -> \'5.5.36-standard\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (509,38,'MAKE_SET','Syntax:\nMAKE_SET(bits,str1,str2,...)\n\nReturns a set value (a string containing substrings separated by ","\ncharacters) consisting of the strings that have the corresponding bit\nin bits set. str1 corresponds to bit 0, str2 to bit 1, and so on. NULL\nvalues in str1, str2, ... are not appended to the result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT MAKE_SET(1,\'a\',\'b\',\'c\');\n        -> \'a\'\nmysql> SELECT MAKE_SET(1 | 4,\'hello\',\'nice\',\'world\');\n        -> \'hello,world\'\nmysql> SELECT MAKE_SET(1 | 4,\'hello\',\'nice\',NULL,\'world\');\n        -> \'hello\'\nmysql> SELECT MAKE_SET(0,\'a\',\'b\',\'c\');\n        -> \'\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
-insert into help_topic (help_topic_id,help_category_id,name,description,example,url) values (510,38,'FIND_IN_SET','Syntax:\nFIND_IN_SET(str,strlist)\n\nReturns a value in the range of 1 to N if the string str is in the\nstring list strlist consisting of N substrings. A string list is a\nstring composed of substrings separated by "," characters. If the first\nargument is a constant string and the second is a column of type SET,\nthe FIND_IN_SET() function is optimized to use bit arithmetic. Returns\n0 if str is not in strlist or if strlist is the empty string. Returns\nNULL if either argument is NULL. This function does not work properly\nif the first argument contains a comma (",") character.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT FIND_IN_SET(\'b\',\'a,b,c,d\');\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (1,'Geographic',0,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (2,'Polygon properties',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (3,'Numeric Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (4,'WKT',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (5,'Plugins',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (6,'Control flow functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (7,'MBR',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (8,'Transactions',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (9,'Help Metadata',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (10,'Account Management',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (11,'Point properties',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (12,'Encryption Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (13,'LineString properties',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (14,'Miscellaneous Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (15,'Logical operators',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (16,'Functions and Modifiers for Use with GROUP BY',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (17,'Information Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (18,'Storage Engines',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (19,'Bit Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (20,'Comparison operators',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (21,'Table Maintenance',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (22,'User-Defined Functions',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (23,'Data Types',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (24,'Compound Statements',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (25,'Geometry constructors',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (26,'GeometryCollection properties',1,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (27,'Administration',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (28,'Data Manipulation',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (29,'Utility',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (30,'Language Structure',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (31,'Geometry relations',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (32,'Date and Time Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (33,'WKB',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (34,'Procedures',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (35,'Geographic Features',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (36,'Contents',0,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (37,'Geometry properties',35,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (38,'String Functions',39,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (39,'Functions',36,'');
+INSERT INTO help_category (help_category_id,name,parent_category_id,url) VALUES (40,'Data Definition',36,'');
 
-insert into help_keyword (help_keyword_id,name) values (0,'JOIN');
-insert into help_keyword (help_keyword_id,name) values (1,'HOST');
-insert into help_keyword (help_keyword_id,name) values (2,'REPEAT');
-insert into help_keyword (help_keyword_id,name) values (3,'SERIALIZABLE');
-insert into help_keyword (help_keyword_id,name) values (4,'REPLACE');
-insert into help_keyword (help_keyword_id,name) values (5,'AT');
-insert into help_keyword (help_keyword_id,name) values (6,'SCHEDULE');
-insert into help_keyword (help_keyword_id,name) values (7,'RETURNS');
-insert into help_keyword (help_keyword_id,name) values (8,'STARTS');
-insert into help_keyword (help_keyword_id,name) values (9,'MASTER_SSL_CA');
-insert into help_keyword (help_keyword_id,name) values (10,'NCHAR');
-insert into help_keyword (help_keyword_id,name) values (11,'ONLY');
-insert into help_keyword (help_keyword_id,name) values (12,'COLUMNS');
-insert into help_keyword (help_keyword_id,name) values (13,'COMPLETION');
-insert into help_keyword (help_keyword_id,name) values (14,'WORK');
-insert into help_keyword (help_keyword_id,name) values (15,'DATETIME');
-insert into help_keyword (help_keyword_id,name) values (16,'MODE');
-insert into help_keyword (help_keyword_id,name) values (17,'OPEN');
-insert into help_keyword (help_keyword_id,name) values (18,'INTEGER');
-insert into help_keyword (help_keyword_id,name) values (19,'ESCAPE');
-insert into help_keyword (help_keyword_id,name) values (20,'VALUE');
-insert into help_keyword (help_keyword_id,name) values (21,'MASTER_SSL_VERIFY_SERVER_CERT');
-insert into help_keyword (help_keyword_id,name) values (22,'SQL_BIG_RESULT');
-insert into help_keyword (help_keyword_id,name) values (23,'DROP');
-insert into help_keyword (help_keyword_id,name) values (24,'GEOMETRYCOLLECTIONFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (25,'EVENTS');
-insert into help_keyword (help_keyword_id,name) values (26,'MONTH');
-insert into help_keyword (help_keyword_id,name) values (27,'PROFILES');
-insert into help_keyword (help_keyword_id,name) values (28,'DUPLICATE');
-insert into help_keyword (help_keyword_id,name) values (29,'REPLICATION');
-insert into help_keyword (help_keyword_id,name) values (30,'UNLOCK');
-insert into help_keyword (help_keyword_id,name) values (31,'INNODB');
-insert into help_keyword (help_keyword_id,name) values (32,'YEAR_MONTH');
-insert into help_keyword (help_keyword_id,name) values (33,'SUBJECT');
-insert into help_keyword (help_keyword_id,name) values (34,'PREPARE');
-insert into help_keyword (help_keyword_id,name) values (35,'LOCK');
-insert into help_keyword (help_keyword_id,name) values (36,'NDB');
-insert into help_keyword (help_keyword_id,name) values (37,'CHECK');
-insert into help_keyword (help_keyword_id,name) values (38,'FULL');
-insert into help_keyword (help_keyword_id,name) values (39,'INT4');
-insert into help_keyword (help_keyword_id,name) values (40,'BY');
-insert into help_keyword (help_keyword_id,name) values (41,'NO');
-insert into help_keyword (help_keyword_id,name) values (42,'MINUTE');
-insert into help_keyword (help_keyword_id,name) values (43,'PARTITION');
-insert into help_keyword (help_keyword_id,name) values (44,'DATA');
-insert into help_keyword (help_keyword_id,name) values (45,'DAY');
-insert into help_keyword (help_keyword_id,name) values (46,'SHARE');
-insert into help_keyword (help_keyword_id,name) values (47,'REAL');
-insert into help_keyword (help_keyword_id,name) values (48,'SEPARATOR');
-insert into help_keyword (help_keyword_id,name) values (49,'MESSAGE_TEXT');
-insert into help_keyword (help_keyword_id,name) values (50,'MASTER_HEARTBEAT_PERIOD');
-insert into help_keyword (help_keyword_id,name) values (51,'DELETE');
-insert into help_keyword (help_keyword_id,name) values (52,'ON');
-insert into help_keyword (help_keyword_id,name) values (53,'COLUMN_NAME');
-insert into help_keyword (help_keyword_id,name) values (54,'CONNECTION');
-insert into help_keyword (help_keyword_id,name) values (55,'CLOSE');
-insert into help_keyword (help_keyword_id,name) values (56,'X509');
-insert into help_keyword (help_keyword_id,name) values (57,'USE');
-insert into help_keyword (help_keyword_id,name) values (58,'SUBCLASS_ORIGIN');
-insert into help_keyword (help_keyword_id,name) values (59,'WHERE');
-insert into help_keyword (help_keyword_id,name) values (60,'PRIVILEGES');
-insert into help_keyword (help_keyword_id,name) values (61,'SPATIAL');
-insert into help_keyword (help_keyword_id,name) values (62,'EVENT');
-insert into help_keyword (help_keyword_id,name) values (63,'SUPER');
-insert into help_keyword (help_keyword_id,name) values (64,'SQL_BUFFER_RESULT');
-insert into help_keyword (help_keyword_id,name) values (65,'IGNORE');
-insert into help_keyword (help_keyword_id,name) values (66,'SHA2');
-insert into help_keyword (help_keyword_id,name) values (67,'QUICK');
-insert into help_keyword (help_keyword_id,name) values (68,'SIGNED');
-insert into help_keyword (help_keyword_id,name) values (69,'OFFLINE');
-insert into help_keyword (help_keyword_id,name) values (70,'SECURITY');
-insert into help_keyword (help_keyword_id,name) values (71,'AUTOEXTEND_SIZE');
-insert into help_keyword (help_keyword_id,name) values (72,'NDBCLUSTER');
-insert into help_keyword (help_keyword_id,name) values (73,'POLYGONFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (74,'FALSE');
-insert into help_keyword (help_keyword_id,name) values (75,'LEVEL');
-insert into help_keyword (help_keyword_id,name) values (76,'FORCE');
-insert into help_keyword (help_keyword_id,name) values (77,'BINARY');
-insert into help_keyword (help_keyword_id,name) values (78,'TO');
-insert into help_keyword (help_keyword_id,name) values (79,'CHANGE');
-insert into help_keyword (help_keyword_id,name) values (80,'CURRENT_USER');
-insert into help_keyword (help_keyword_id,name) values (81,'HOUR_MINUTE');
-insert into help_keyword (help_keyword_id,name) values (82,'UPDATE');
-insert into help_keyword (help_keyword_id,name) values (83,'PRESERVE');
-insert into help_keyword (help_keyword_id,name) values (84,'TABLE_NAME');
-insert into help_keyword (help_keyword_id,name) values (85,'INTO');
-insert into help_keyword (help_keyword_id,name) values (86,'FEDERATED');
-insert into help_keyword (help_keyword_id,name) values (87,'VARYING');
-insert into help_keyword (help_keyword_id,name) values (88,'MAX_SIZE');
-insert into help_keyword (help_keyword_id,name) values (89,'HOUR_SECOND');
-insert into help_keyword (help_keyword_id,name) values (90,'VARIABLE');
-insert into help_keyword (help_keyword_id,name) values (91,'ROLLBACK');
-insert into help_keyword (help_keyword_id,name) values (92,'PROCEDURE');
-insert into help_keyword (help_keyword_id,name) values (93,'TIMESTAMP');
-insert into help_keyword (help_keyword_id,name) values (94,'IMPORT');
-insert into help_keyword (help_keyword_id,name) values (95,'AGAINST');
-insert into help_keyword (help_keyword_id,name) values (96,'CHECKSUM');
-insert into help_keyword (help_keyword_id,name) values (97,'COUNT');
-insert into help_keyword (help_keyword_id,name) values (98,'LONGBINARY');
-insert into help_keyword (help_keyword_id,name) values (99,'THEN');
-insert into help_keyword (help_keyword_id,name) values (100,'INSERT');
-insert into help_keyword (help_keyword_id,name) values (101,'ENGINES');
-insert into help_keyword (help_keyword_id,name) values (102,'HANDLER');
-insert into help_keyword (help_keyword_id,name) values (103,'PORT');
-insert into help_keyword (help_keyword_id,name) values (104,'DAY_SECOND');
-insert into help_keyword (help_keyword_id,name) values (105,'EXISTS');
-insert into help_keyword (help_keyword_id,name) values (106,'MUTEX');
-insert into help_keyword (help_keyword_id,name) values (107,'HELP_DATE');
-insert into help_keyword (help_keyword_id,name) values (108,'RELEASE');
-insert into help_keyword (help_keyword_id,name) values (109,'BOOLEAN');
-insert into help_keyword (help_keyword_id,name) values (110,'MOD');
-insert into help_keyword (help_keyword_id,name) values (111,'DEFAULT');
-insert into help_keyword (help_keyword_id,name) values (112,'TYPE');
-insert into help_keyword (help_keyword_id,name) values (113,'NO_WRITE_TO_BINLOG');
-insert into help_keyword (help_keyword_id,name) values (114,'OPTIMIZE');
-insert into help_keyword (help_keyword_id,name) values (115,'SQLSTATE');
-insert into help_keyword (help_keyword_id,name) values (116,'RESET');
-insert into help_keyword (help_keyword_id,name) values (117,'CLASS_ORIGIN');
-insert into help_keyword (help_keyword_id,name) values (118,'INSTALL');
-insert into help_keyword (help_keyword_id,name) values (119,'ITERATE');
-insert into help_keyword (help_keyword_id,name) values (120,'DO');
-insert into help_keyword (help_keyword_id,name) values (121,'BIGINT');
-insert into help_keyword (help_keyword_id,name) values (122,'SET');
-insert into help_keyword (help_keyword_id,name) values (123,'ISSUER');
-insert into help_keyword (help_keyword_id,name) values (124,'DATE');
-insert into help_keyword (help_keyword_id,name) values (125,'STATUS');
-insert into help_keyword (help_keyword_id,name) values (126,'FULLTEXT');
-insert into help_keyword (help_keyword_id,name) values (127,'COMMENT');
-insert into help_keyword (help_keyword_id,name) values (128,'MASTER_CONNECT_RETRY');
-insert into help_keyword (help_keyword_id,name) values (129,'INNER');
-insert into help_keyword (help_keyword_id,name) values (130,'RELAYLOG');
-insert into help_keyword (help_keyword_id,name) values (131,'STOP');
-insert into help_keyword (help_keyword_id,name) values (132,'MASTER_LOG_FILE');
-insert into help_keyword (help_keyword_id,name) values (133,'MRG_MYISAM');
-insert into help_keyword (help_keyword_id,name) values (134,'PRECISION');
-insert into help_keyword (help_keyword_id,name) values (135,'REQUIRE');
-insert into help_keyword (help_keyword_id,name) values (136,'TRAILING');
-insert into help_keyword (help_keyword_id,name) values (137,'PARTITIONS');
-insert into help_keyword (help_keyword_id,name) values (138,'LONG');
-insert into help_keyword (help_keyword_id,name) values (139,'OPTION');
-insert into help_keyword (help_keyword_id,name) values (140,'REORGANIZE');
-insert into help_keyword (help_keyword_id,name) values (141,'ELSE');
-insert into help_keyword (help_keyword_id,name) values (142,'DEALLOCATE');
-insert into help_keyword (help_keyword_id,name) values (143,'IO_THREAD');
-insert into help_keyword (help_keyword_id,name) values (144,'CASE');
-insert into help_keyword (help_keyword_id,name) values (145,'CIPHER');
-insert into help_keyword (help_keyword_id,name) values (146,'CONTINUE');
-insert into help_keyword (help_keyword_id,name) values (147,'FROM');
-insert into help_keyword (help_keyword_id,name) values (148,'READ');
-insert into help_keyword (help_keyword_id,name) values (149,'LEFT');
-insert into help_keyword (help_keyword_id,name) values (150,'ELSEIF');
-insert into help_keyword (help_keyword_id,name) values (151,'MINUTE_SECOND');
-insert into help_keyword (help_keyword_id,name) values (152,'COMPACT');
-insert into help_keyword (help_keyword_id,name) values (153,'DEC');
-insert into help_keyword (help_keyword_id,name) values (154,'FOR');
-insert into help_keyword (help_keyword_id,name) values (155,'WARNINGS');
-insert into help_keyword (help_keyword_id,name) values (156,'MIN_ROWS');
-insert into help_keyword (help_keyword_id,name) values (157,'STRING');
-insert into help_keyword (help_keyword_id,name) values (158,'CONDITION');
-insert into help_keyword (help_keyword_id,name) values (159,'ENCLOSED');
-insert into help_keyword (help_keyword_id,name) values (160,'FUNCTION');
-insert into help_keyword (help_keyword_id,name) values (161,'AGGREGATE');
-insert into help_keyword (help_keyword_id,name) values (162,'FIELDS');
-insert into help_keyword (help_keyword_id,name) values (163,'INT3');
-insert into help_keyword (help_keyword_id,name) values (164,'ARCHIVE');
-insert into help_keyword (help_keyword_id,name) values (165,'AVG_ROW_LENGTH');
-insert into help_keyword (help_keyword_id,name) values (166,'ADD');
-insert into help_keyword (help_keyword_id,name) values (167,'KILL');
-insert into help_keyword (help_keyword_id,name) values (168,'FLOAT4');
-insert into help_keyword (help_keyword_id,name) values (169,'TABLESPACE');
-insert into help_keyword (help_keyword_id,name) values (170,'VIEW');
-insert into help_keyword (help_keyword_id,name) values (171,'REPEATABLE');
-insert into help_keyword (help_keyword_id,name) values (172,'INFILE');
-insert into help_keyword (help_keyword_id,name) values (173,'HELP_VERSION');
-insert into help_keyword (help_keyword_id,name) values (174,'ORDER');
-insert into help_keyword (help_keyword_id,name) values (175,'USING');
-insert into help_keyword (help_keyword_id,name) values (176,'CONSTRAINT_CATALOG');
-insert into help_keyword (help_keyword_id,name) values (177,'MIDDLEINT');
-insert into help_keyword (help_keyword_id,name) values (178,'GRANT');
-insert into help_keyword (help_keyword_id,name) values (179,'UNSIGNED');
-insert into help_keyword (help_keyword_id,name) values (180,'DECIMAL');
-insert into help_keyword (help_keyword_id,name) values (181,'GEOMETRYFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (182,'INDEXES');
-insert into help_keyword (help_keyword_id,name) values (183,'FOREIGN');
-insert into help_keyword (help_keyword_id,name) values (184,'CACHE');
-insert into help_keyword (help_keyword_id,name) values (185,'HOSTS');
-insert into help_keyword (help_keyword_id,name) values (186,'MYSQL_ERRNO');
-insert into help_keyword (help_keyword_id,name) values (187,'COMMIT');
-insert into help_keyword (help_keyword_id,name) values (188,'SCHEMAS');
-insert into help_keyword (help_keyword_id,name) values (189,'LEADING');
-insert into help_keyword (help_keyword_id,name) values (190,'SNAPSHOT');
-insert into help_keyword (help_keyword_id,name) values (191,'CONSTRAINT_NAME');
-insert into help_keyword (help_keyword_id,name) values (192,'DECLARE');
-insert into help_keyword (help_keyword_id,name) values (193,'LOAD');
-insert into help_keyword (help_keyword_id,name) values (194,'SQL_CACHE');
-insert into help_keyword (help_keyword_id,name) values (195,'CONVERT');
-insert into help_keyword (help_keyword_id,name) values (196,'DYNAMIC');
-insert into help_keyword (help_keyword_id,name) values (197,'COLLATE');
-insert into help_keyword (help_keyword_id,name) values (198,'POLYGONFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (199,'BYTE');
-insert into help_keyword (help_keyword_id,name) values (200,'GLOBAL');
-insert into help_keyword (help_keyword_id,name) values (201,'LINESTRINGFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (202,'WHEN');
-insert into help_keyword (help_keyword_id,name) values (203,'HAVING');
-insert into help_keyword (help_keyword_id,name) values (204,'AS');
-insert into help_keyword (help_keyword_id,name) values (205,'STARTING');
-insert into help_keyword (help_keyword_id,name) values (206,'RELOAD');
-insert into help_keyword (help_keyword_id,name) values (207,'AUTOCOMMIT');
-insert into help_keyword (help_keyword_id,name) values (208,'REVOKE');
-insert into help_keyword (help_keyword_id,name) values (209,'GRANTS');
-insert into help_keyword (help_keyword_id,name) values (210,'OUTER');
-insert into help_keyword (help_keyword_id,name) values (211,'CURSOR_NAME');
-insert into help_keyword (help_keyword_id,name) values (212,'FLOOR');
-insert into help_keyword (help_keyword_id,name) values (213,'EXPLAIN');
-insert into help_keyword (help_keyword_id,name) values (214,'WITH');
-insert into help_keyword (help_keyword_id,name) values (215,'AFTER');
-insert into help_keyword (help_keyword_id,name) values (216,'STD');
-insert into help_keyword (help_keyword_id,name) values (217,'CSV');
-insert into help_keyword (help_keyword_id,name) values (218,'DISABLE');
-insert into help_keyword (help_keyword_id,name) values (219,'UNINSTALL');
-insert into help_keyword (help_keyword_id,name) values (220,'OUTFILE');
-insert into help_keyword (help_keyword_id,name) values (221,'LOW_PRIORITY');
-insert into help_keyword (help_keyword_id,name) values (222,'FILE');
-insert into help_keyword (help_keyword_id,name) values (223,'NODEGROUP');
-insert into help_keyword (help_keyword_id,name) values (224,'SCHEMA');
-insert into help_keyword (help_keyword_id,name) values (225,'SONAME');
-insert into help_keyword (help_keyword_id,name) values (226,'POW');
-insert into help_keyword (help_keyword_id,name) values (227,'DUAL');
-insert into help_keyword (help_keyword_id,name) values (228,'MULTIPOINTFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (229,'INDEX');
-insert into help_keyword (help_keyword_id,name) values (230,'MULTIPOINTFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (231,'DEFINER');
-insert into help_keyword (help_keyword_id,name) values (232,'MASTER_BIND');
-insert into help_keyword (help_keyword_id,name) values (233,'REMOVE');
-insert into help_keyword (help_keyword_id,name) values (234,'EXTENDED');
-insert into help_keyword (help_keyword_id,name) values (235,'MULTILINESTRINGFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (236,'CROSS');
-insert into help_keyword (help_keyword_id,name) values (237,'CONTRIBUTORS');
-insert into help_keyword (help_keyword_id,name) values (238,'NATIONAL');
-insert into help_keyword (help_keyword_id,name) values (239,'GROUP');
-insert into help_keyword (help_keyword_id,name) values (240,'SHA');
-insert into help_keyword (help_keyword_id,name) values (241,'ONLINE');
-insert into help_keyword (help_keyword_id,name) values (242,'UNDO');
-insert into help_keyword (help_keyword_id,name) values (243,'IGNORE_SERVER_IDS');
-insert into help_keyword (help_keyword_id,name) values (244,'ZEROFILL');
-insert into help_keyword (help_keyword_id,name) values (245,'CLIENT');
-insert into help_keyword (help_keyword_id,name) values (246,'MASTER_PASSWORD');
-insert into help_keyword (help_keyword_id,name) values (247,'OWNER');
-insert into help_keyword (help_keyword_id,name) values (248,'RELAY_LOG_FILE');
-insert into help_keyword (help_keyword_id,name) values (249,'TRUE');
-insert into help_keyword (help_keyword_id,name) values (250,'CHARACTER');
-insert into help_keyword (help_keyword_id,name) values (251,'MASTER_USER');
-insert into help_keyword (help_keyword_id,name) values (252,'SCHEMA_NAME');
-insert into help_keyword (help_keyword_id,name) values (253,'TABLE');
-insert into help_keyword (help_keyword_id,name) values (254,'ENGINE');
-insert into help_keyword (help_keyword_id,name) values (255,'INSERT_METHOD');
-insert into help_keyword (help_keyword_id,name) values (256,'CASCADE');
-insert into help_keyword (help_keyword_id,name) values (257,'RELAY_LOG_POS');
-insert into help_keyword (help_keyword_id,name) values (258,'SQL_CALC_FOUND_ROWS');
-insert into help_keyword (help_keyword_id,name) values (259,'UNION');
-insert into help_keyword (help_keyword_id,name) values (260,'MYISAM');
-insert into help_keyword (help_keyword_id,name) values (261,'LEAVE');
-insert into help_keyword (help_keyword_id,name) values (262,'MODIFY');
-insert into help_keyword (help_keyword_id,name) values (263,'MATCH');
-insert into help_keyword (help_keyword_id,name) values (264,'MASTER_LOG_POS');
-insert into help_keyword (help_keyword_id,name) values (265,'DISTINCTROW');
-insert into help_keyword (help_keyword_id,name) values (266,'DESC');
-insert into help_keyword (help_keyword_id,name) values (267,'TIME');
-insert into help_keyword (help_keyword_id,name) values (268,'NUMERIC');
-insert into help_keyword (help_keyword_id,name) values (269,'EXPANSION');
-insert into help_keyword (help_keyword_id,name) values (270,'CODE');
-insert into help_keyword (help_keyword_id,name) values (271,'CURSOR');
-insert into help_keyword (help_keyword_id,name) values (272,'GEOMETRYCOLLECTIONFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (273,'CHAIN');
-insert into help_keyword (help_keyword_id,name) values (274,'LOGFILE');
-insert into help_keyword (help_keyword_id,name) values (275,'FLUSH');
-insert into help_keyword (help_keyword_id,name) values (276,'CREATE');
-insert into help_keyword (help_keyword_id,name) values (277,'DESCRIBE');
-insert into help_keyword (help_keyword_id,name) values (278,'EXTENT_SIZE');
-insert into help_keyword (help_keyword_id,name) values (279,'MAX_UPDATES_PER_HOUR');
-insert into help_keyword (help_keyword_id,name) values (280,'INT2');
-insert into help_keyword (help_keyword_id,name) values (281,'PROCESSLIST');
-insert into help_keyword (help_keyword_id,name) values (282,'ENDS');
-insert into help_keyword (help_keyword_id,name) values (283,'LOGS');
-insert into help_keyword (help_keyword_id,name) values (284,'RECOVER');
-insert into help_keyword (help_keyword_id,name) values (285,'DISCARD');
-insert into help_keyword (help_keyword_id,name) values (286,'HEAP');
-insert into help_keyword (help_keyword_id,name) values (287,'SOUNDS');
-insert into help_keyword (help_keyword_id,name) values (288,'BETWEEN');
-insert into help_keyword (help_keyword_id,name) values (289,'MULTILINESTRINGFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (290,'REPAIR');
-insert into help_keyword (help_keyword_id,name) values (291,'PACK_KEYS');
-insert into help_keyword (help_keyword_id,name) values (292,'FAST');
-insert into help_keyword (help_keyword_id,name) values (293,'VALUES');
-insert into help_keyword (help_keyword_id,name) values (294,'CALL');
-insert into help_keyword (help_keyword_id,name) values (295,'LOOP');
-insert into help_keyword (help_keyword_id,name) values (296,'VARCHARACTER');
-insert into help_keyword (help_keyword_id,name) values (297,'BEFORE');
-insert into help_keyword (help_keyword_id,name) values (298,'TRUNCATE');
-insert into help_keyword (help_keyword_id,name) values (299,'SHOW');
-insert into help_keyword (help_keyword_id,name) values (300,'ALL');
-insert into help_keyword (help_keyword_id,name) values (301,'REDUNDANT');
-insert into help_keyword (help_keyword_id,name) values (302,'USER_RESOURCES');
-insert into help_keyword (help_keyword_id,name) values (303,'PARTIAL');
-insert into help_keyword (help_keyword_id,name) values (304,'BINLOG');
-insert into help_keyword (help_keyword_id,name) values (305,'END');
-insert into help_keyword (help_keyword_id,name) values (306,'SECOND');
-insert into help_keyword (help_keyword_id,name) values (307,'AND');
-insert into help_keyword (help_keyword_id,name) values (308,'FLOAT8');
-insert into help_keyword (help_keyword_id,name) values (309,'PREV');
-insert into help_keyword (help_keyword_id,name) values (310,'HOUR');
-insert into help_keyword (help_keyword_id,name) values (311,'SELECT');
-insert into help_keyword (help_keyword_id,name) values (312,'DATABASES');
-insert into help_keyword (help_keyword_id,name) values (313,'OR');
-insert into help_keyword (help_keyword_id,name) values (314,'IDENTIFIED');
-insert into help_keyword (help_keyword_id,name) values (315,'WRAPPER');
-insert into help_keyword (help_keyword_id,name) values (316,'MASTER_SSL_CIPHER');
-insert into help_keyword (help_keyword_id,name) values (317,'SQL_SLAVE_SKIP_COUNTER');
-insert into help_keyword (help_keyword_id,name) values (318,'BOTH');
-insert into help_keyword (help_keyword_id,name) values (319,'BOOL');
-insert into help_keyword (help_keyword_id,name) values (320,'YEAR');
-insert into help_keyword (help_keyword_id,name) values (321,'MASTER_PORT');
-insert into help_keyword (help_keyword_id,name) values (322,'CONCURRENT');
-insert into help_keyword (help_keyword_id,name) values (323,'HELP');
-insert into help_keyword (help_keyword_id,name) values (324,'UNIQUE');
-insert into help_keyword (help_keyword_id,name) values (325,'TRIGGERS');
-insert into help_keyword (help_keyword_id,name) values (326,'PROCESS');
-insert into help_keyword (help_keyword_id,name) values (327,'OPTIONS');
-insert into help_keyword (help_keyword_id,name) values (328,'RESIGNAL');
-insert into help_keyword (help_keyword_id,name) values (329,'CONSISTENT');
-insert into help_keyword (help_keyword_id,name) values (330,'MASTER_SSL');
-insert into help_keyword (help_keyword_id,name) values (331,'DATE_ADD');
-insert into help_keyword (help_keyword_id,name) values (332,'MAX_CONNECTIONS_PER_HOUR');
-insert into help_keyword (help_keyword_id,name) values (333,'LIKE');
-insert into help_keyword (help_keyword_id,name) values (334,'PLUGIN');
-insert into help_keyword (help_keyword_id,name) values (335,'FETCH');
-insert into help_keyword (help_keyword_id,name) values (336,'IN');
-insert into help_keyword (help_keyword_id,name) values (337,'COLUMN');
-insert into help_keyword (help_keyword_id,name) values (338,'DUMPFILE');
-insert into help_keyword (help_keyword_id,name) values (339,'USAGE');
-insert into help_keyword (help_keyword_id,name) values (340,'EXECUTE');
-insert into help_keyword (help_keyword_id,name) values (341,'MEMORY');
-insert into help_keyword (help_keyword_id,name) values (342,'CEIL');
-insert into help_keyword (help_keyword_id,name) values (343,'QUERY');
-insert into help_keyword (help_keyword_id,name) values (344,'MASTER_HOST');
-insert into help_keyword (help_keyword_id,name) values (345,'LINES');
-insert into help_keyword (help_keyword_id,name) values (346,'SQL_THREAD');
-insert into help_keyword (help_keyword_id,name) values (347,'SERVER');
-insert into help_keyword (help_keyword_id,name) values (348,'MAX_QUERIES_PER_HOUR');
-insert into help_keyword (help_keyword_id,name) values (349,'MASTER_SSL_CERT');
-insert into help_keyword (help_keyword_id,name) values (350,'MULTIPOLYGONFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (351,'TRANSACTION');
-insert into help_keyword (help_keyword_id,name) values (352,'DAY_MINUTE');
-insert into help_keyword (help_keyword_id,name) values (353,'STDDEV');
-insert into help_keyword (help_keyword_id,name) values (354,'DATE_SUB');
-insert into help_keyword (help_keyword_id,name) values (355,'REBUILD');
-insert into help_keyword (help_keyword_id,name) values (356,'GEOMETRYFROMWKB');
-insert into help_keyword (help_keyword_id,name) values (357,'INT1');
-insert into help_keyword (help_keyword_id,name) values (358,'RENAME');
-insert into help_keyword (help_keyword_id,name) values (359,'PARSER');
-insert into help_keyword (help_keyword_id,name) values (360,'RIGHT');
-insert into help_keyword (help_keyword_id,name) values (361,'ALTER');
-insert into help_keyword (help_keyword_id,name) values (362,'MAX_ROWS');
-insert into help_keyword (help_keyword_id,name) values (363,'SOCKET');
-insert into help_keyword (help_keyword_id,name) values (364,'STRAIGHT_JOIN');
-insert into help_keyword (help_keyword_id,name) values (365,'NATURAL');
-insert into help_keyword (help_keyword_id,name) values (366,'VARIABLES');
-insert into help_keyword (help_keyword_id,name) values (367,'ESCAPED');
-insert into help_keyword (help_keyword_id,name) values (368,'SHA1');
-insert into help_keyword (help_keyword_id,name) values (369,'KEY_BLOCK_SIZE');
-insert into help_keyword (help_keyword_id,name) values (370,'PASSWORD');
-insert into help_keyword (help_keyword_id,name) values (371,'OFFSET');
-insert into help_keyword (help_keyword_id,name) values (372,'CHAR');
-insert into help_keyword (help_keyword_id,name) values (373,'NEXT');
-insert into help_keyword (help_keyword_id,name) values (374,'ERRORS');
-insert into help_keyword (help_keyword_id,name) values (375,'SQL_LOG_BIN');
-insert into help_keyword (help_keyword_id,name) values (376,'TEMPORARY');
-insert into help_keyword (help_keyword_id,name) values (377,'COMMITTED');
-insert into help_keyword (help_keyword_id,name) values (378,'SQL_SMALL_RESULT');
-insert into help_keyword (help_keyword_id,name) values (379,'UPGRADE');
-insert into help_keyword (help_keyword_id,name) values (380,'XA');
-insert into help_keyword (help_keyword_id,name) values (381,'BEGIN');
-insert into help_keyword (help_keyword_id,name) values (382,'DELAY_KEY_WRITE');
-insert into help_keyword (help_keyword_id,name) values (383,'PROFILE');
-insert into help_keyword (help_keyword_id,name) values (384,'MEDIUM');
-insert into help_keyword (help_keyword_id,name) values (385,'INTERVAL');
-insert into help_keyword (help_keyword_id,name) values (386,'SSL');
-insert into help_keyword (help_keyword_id,name) values (387,'DAY_HOUR');
-insert into help_keyword (help_keyword_id,name) values (388,'NAME');
-insert into help_keyword (help_keyword_id,name) values (389,'REFERENCES');
-insert into help_keyword (help_keyword_id,name) values (390,'AES_ENCRYPT');
-insert into help_keyword (help_keyword_id,name) values (391,'STORAGE');
-insert into help_keyword (help_keyword_id,name) values (392,'ISOLATION');
-insert into help_keyword (help_keyword_id,name) values (393,'CEILING');
-insert into help_keyword (help_keyword_id,name) values (394,'EVERY');
-insert into help_keyword (help_keyword_id,name) values (395,'INT8');
-insert into help_keyword (help_keyword_id,name) values (396,'AUTHORS');
-insert into help_keyword (help_keyword_id,name) values (397,'RESTRICT');
-insert into help_keyword (help_keyword_id,name) values (398,'UNCOMMITTED');
-insert into help_keyword (help_keyword_id,name) values (399,'LINESTRINGFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (400,'IS');
-insert into help_keyword (help_keyword_id,name) values (401,'NOT');
-insert into help_keyword (help_keyword_id,name) values (402,'ANALYSE');
-insert into help_keyword (help_keyword_id,name) values (403,'DATAFILE');
-insert into help_keyword (help_keyword_id,name) values (404,'DES_KEY_FILE');
-insert into help_keyword (help_keyword_id,name) values (405,'SIGNAL');
-insert into help_keyword (help_keyword_id,name) values (406,'COMPRESSED');
-insert into help_keyword (help_keyword_id,name) values (407,'START');
-insert into help_keyword (help_keyword_id,name) values (408,'PLUGINS');
-insert into help_keyword (help_keyword_id,name) values (409,'SAVEPOINT');
-insert into help_keyword (help_keyword_id,name) values (410,'IF');
-insert into help_keyword (help_keyword_id,name) values (411,'ROWS');
-insert into help_keyword (help_keyword_id,name) values (412,'PRIMARY');
-insert into help_keyword (help_keyword_id,name) values (413,'PURGE');
-insert into help_keyword (help_keyword_id,name) values (414,'LAST');
-insert into help_keyword (help_keyword_id,name) values (415,'USER');
-insert into help_keyword (help_keyword_id,name) values (416,'EXIT');
-insert into help_keyword (help_keyword_id,name) values (417,'KEYS');
-insert into help_keyword (help_keyword_id,name) values (418,'LIMIT');
-insert into help_keyword (help_keyword_id,name) values (419,'KEY');
-insert into help_keyword (help_keyword_id,name) values (420,'MERGE');
-insert into help_keyword (help_keyword_id,name) values (421,'UNTIL');
-insert into help_keyword (help_keyword_id,name) values (422,'SQL_NO_CACHE');
-insert into help_keyword (help_keyword_id,name) values (423,'DELAYED');
-insert into help_keyword (help_keyword_id,name) values (424,'CONSTRAINT_SCHEMA');
-insert into help_keyword (help_keyword_id,name) values (425,'ANALYZE');
-insert into help_keyword (help_keyword_id,name) values (426,'CONSTRAINT');
-insert into help_keyword (help_keyword_id,name) values (427,'SERIAL');
-insert into help_keyword (help_keyword_id,name) values (428,'ACTION');
-insert into help_keyword (help_keyword_id,name) values (429,'WRITE');
-insert into help_keyword (help_keyword_id,name) values (430,'INITIAL_SIZE');
-insert into help_keyword (help_keyword_id,name) values (431,'SESSION');
-insert into help_keyword (help_keyword_id,name) values (432,'DATABASE');
-insert into help_keyword (help_keyword_id,name) values (433,'NULL');
-insert into help_keyword (help_keyword_id,name) values (434,'POWER');
-insert into help_keyword (help_keyword_id,name) values (435,'USE_FRM');
-insert into help_keyword (help_keyword_id,name) values (436,'TERMINATED');
-insert into help_keyword (help_keyword_id,name) values (437,'SLAVE');
-insert into help_keyword (help_keyword_id,name) values (438,'NVARCHAR');
-insert into help_keyword (help_keyword_id,name) values (439,'ASC');
-insert into help_keyword (help_keyword_id,name) values (440,'RETURN');
-insert into help_keyword (help_keyword_id,name) values (441,'OPTIONALLY');
-insert into help_keyword (help_keyword_id,name) values (442,'ENABLE');
-insert into help_keyword (help_keyword_id,name) values (443,'DIRECTORY');
-insert into help_keyword (help_keyword_id,name) values (444,'MAX_USER_CONNECTIONS');
-insert into help_keyword (help_keyword_id,name) values (445,'WHILE');
-insert into help_keyword (help_keyword_id,name) values (446,'LOCAL');
-insert into help_keyword (help_keyword_id,name) values (447,'DISTINCT');
-insert into help_keyword (help_keyword_id,name) values (448,'AES_DECRYPT');
-insert into help_keyword (help_keyword_id,name) values (449,'MASTER_SSL_KEY');
-insert into help_keyword (help_keyword_id,name) values (450,'NONE');
-insert into help_keyword (help_keyword_id,name) values (451,'TABLES');
-insert into help_keyword (help_keyword_id,name) values (452,'<>');
-insert into help_keyword (help_keyword_id,name) values (453,'RLIKE');
-insert into help_keyword (help_keyword_id,name) values (454,'TRIGGER');
-insert into help_keyword (help_keyword_id,name) values (455,'COLLATION');
-insert into help_keyword (help_keyword_id,name) values (456,'SHUTDOWN');
-insert into help_keyword (help_keyword_id,name) values (457,'HIGH_PRIORITY');
-insert into help_keyword (help_keyword_id,name) values (458,'BTREE');
-insert into help_keyword (help_keyword_id,name) values (459,'FIRST');
-insert into help_keyword (help_keyword_id,name) values (460,'COALESCE');
-insert into help_keyword (help_keyword_id,name) values (461,'WAIT');
-insert into help_keyword (help_keyword_id,name) values (462,'CATALOG_NAME');
-insert into help_keyword (help_keyword_id,name) values (463,'MASTER');
-insert into help_keyword (help_keyword_id,name) values (464,'FIXED');
-insert into help_keyword (help_keyword_id,name) values (465,'MULTIPOLYGONFROMTEXT');
-insert into help_keyword (help_keyword_id,name) values (466,'ROW_FORMAT');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (0,16,'MIN','Syntax:\nMIN([DISTINCT] expr)\n\nReturns the minimum value of expr. MIN() may take a string argument; in\nsuch cases, it returns the minimum string value. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html. The DISTINCT\nkeyword can be used to find the minimum of the distinct values of expr,\nhowever, this produces the same result as omitting DISTINCT.\n\nMIN() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name, MIN(test_score), MAX(test_score)\n    ->        FROM student\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (1,28,'JOIN','MySQL supports the following JOIN syntaxes for the table_references\npart of SELECT statements and multiple-table DELETE and UPDATE\nstatements:\n\ntable_references:\n    escaped_table_reference [, escaped_table_reference] ...\n\nescaped_table_reference:\n    table_reference\n  | { OJ table_reference }\n\ntable_reference:\n    table_factor\n  | join_table\n\ntable_factor:\n    tbl_name [[AS] alias] [index_hint_list]\n  | table_subquery [AS] alias\n  | ( table_references )\n\njoin_table:\n    table_reference [INNER | CROSS] JOIN table_factor [join_condition]\n  | table_reference STRAIGHT_JOIN table_factor\n  | table_reference STRAIGHT_JOIN table_factor ON conditional_expr\n  | table_reference {LEFT|RIGHT} [OUTER] JOIN table_reference join_condition\n  | table_reference NATURAL [{LEFT|RIGHT} [OUTER]] JOIN table_factor\n\njoin_condition:\n    ON conditional_expr\n  | USING (column_list)\n\nindex_hint_list:\n    index_hint [, index_hint] ...\n\nindex_hint:\n    USE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] ([index_list])\n  | IGNORE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n  | FORCE {INDEX|KEY}\n      [FOR {JOIN|ORDER BY|GROUP BY}] (index_list)\n\nindex_list:\n    index_name [, index_name] ...\n\nA table reference is also known as a join expression.\n\nThe syntax of table_factor is extended in comparison with the SQL\nStandard. The latter accepts only table_reference, not a list of them\ninside a pair of parentheses.\n\nThis is a conservative extension if we consider each comma in a list of\ntable_reference items as equivalent to an inner join. For example:\n\nSELECT * FROM t1 LEFT JOIN (t2, t3, t4)\n                 ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nis equivalent to:\n\nSELECT * FROM t1 LEFT JOIN (t2 CROSS JOIN t3 CROSS JOIN t4)\n                 ON (t2.a=t1.a AND t3.b=t1.b AND t4.c=t1.c)\n\nIn MySQL, JOIN, CROSS JOIN, and INNER JOIN are syntactic equivalents\n(they can replace each other). In standard SQL, they are not\nequivalent. INNER JOIN is used with an ON clause, CROSS JOIN is used\notherwise.\n\nIn general, parentheses can be ignored in join expressions containing\nonly inner join operations. MySQL also supports nested joins (see\nhttp://dev.mysql.com/doc/refman/5.5/en/nested-join-optimization.html).\n\nIndex hints can be specified to affect how the MySQL optimizer makes\nuse of indexes. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/index-hints.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/join.html\n\n','SELECT left_tbl.*\n  FROM left_tbl LEFT JOIN right_tbl ON left_tbl.id = right_tbl.id\n  WHERE right_tbl.id IS NULL;\n','http://dev.mysql.com/doc/refman/5.5/en/join.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (2,38,'HEX','Syntax:\nHEX(str), HEX(N)\n\nFor a string argument str, HEX() returns a hexadecimal string\nrepresentation of str where each byte of each character in str is\nconverted to two hexadecimal digits. (Multibyte characters therefore\nbecome more than two digits.) The inverse of this operation is\nperformed by the UNHEX() function.\n\nFor a numeric argument N, HEX() returns a hexadecimal string\nrepresentation of the value of N treated as a longlong (BIGINT) number.\nThis is equivalent to CONV(N,10,16). The inverse of this operation is\nperformed by CONV(HEX(N),16,10).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT 0x616263, HEX(\'abc\'), UNHEX(HEX(\'abc\'));\n        -> \'abc\', 616263, \'abc\'\nmysql> SELECT HEX(255), CONV(HEX(255),16,10);\n        -> \'FF\', 255\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (3,28,'REPLACE','Syntax:\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name [(col_name,...)]\n    {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name\n    SET col_name={expr | DEFAULT}, ...\n\nOr:\n\nREPLACE [LOW_PRIORITY | DELAYED]\n    [INTO] tbl_name [(col_name,...)]\n    SELECT ...\n\nREPLACE works exactly like INSERT, except that if an old row in the\ntable has the same value as a new row for a PRIMARY KEY or a UNIQUE\nindex, the old row is deleted before the new row is inserted. See [HELP\nINSERT].\n\nREPLACE is a MySQL extension to the SQL standard. It either inserts, or\ndeletes and inserts. For another MySQL extension to standard SQL---that\neither inserts or updates---see\nhttp://dev.mysql.com/doc/refman/5.5/en/insert-on-duplicate.html.\n\n*Note*: REPLACE makes sense only if a table has a PRIMARY KEY or UNIQUE\nindex. Otherwise, it becomes equivalent to INSERT, because there is no\nindex to be used to determine whether a new row duplicates another.\n\nValues for all columns are taken from the values specified in the\nREPLACE statement. Any missing columns are set to their default values,\njust as happens for INSERT. You cannot refer to values from the current\nrow and use them in the new row. If you use an assignment such as SET\ncol_name = col_name + 1, the reference to the column name on the right\nhand side is treated as DEFAULT(col_name), so the assignment is\nequivalent to SET col_name = DEFAULT(col_name) + 1.\n\nTo use REPLACE, you must have both the INSERT and DELETE privileges for\nthe table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/replace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/replace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (4,31,'CONTAINS','Contains(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 completely contains g2. This\ntests the opposite relationship as Within().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (5,37,'SRID','SRID(g)\n\nReturns an integer indicating the Spatial Reference System ID for the\ngeometry value g.\n\nIn MySQL, the SRID value is just an integer associated with the\ngeometry value. All calculations are done assuming Euclidean (planar)\ngeometry.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html\n\n','mysql> SELECT SRID(GeomFromText(\'LineString(1 1,2 2)\',101));\n+-----------------------------------------------+\n| SRID(GeomFromText(\'LineString(1 1,2 2)\',101)) |\n+-----------------------------------------------+\n|                                           101 |\n+-----------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (6,32,'CURRENT_TIMESTAMP','Syntax:\nCURRENT_TIMESTAMP, CURRENT_TIMESTAMP()\n\nCURRENT_TIMESTAMP and CURRENT_TIMESTAMP() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (7,27,'SHOW CONTRIBUTORS','Syntax:\nSHOW CONTRIBUTORS\n\nThe SHOW CONTRIBUTORS statement displays information about the people\nwho contribute to MySQL source or to causes that we support. For each\ncontributor, it displays Name, Location, and Comment values.\n\nThis statement is deprecated as of MySQL 5.5.29 and is removed in MySQL\n5.6.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-contributors.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-contributors.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (8,16,'VARIANCE','Syntax:\nVARIANCE(expr)\n\nReturns the population standard variance of expr. This is an extension\nto standard SQL. The standard SQL function VAR_POP() can be used\ninstead.\n\nVARIANCE() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (9,40,'DROP SERVER','Syntax:\nDROP SERVER [ IF EXISTS ] server_name\n\nDrops the server definition for the server named server_name. The\ncorresponding row in the mysql.servers table is deleted. This statement\nrequires the SUPER privilege.\n\nDropping a server for a table does not affect any FEDERATED tables that\nused this connection information when they were created. See [HELP\nCREATE SERVER].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-server.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-server.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (10,27,'SHOW AUTHORS','Syntax:\nSHOW AUTHORS\n\nThe SHOW AUTHORS statement displays information about the people who\nwork on MySQL. For each author, it displays Name, Location, and Comment\nvalues.\n\nThis statement is deprecated as of MySQL 5.5.29 and is removed in MySQL\n5.6.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-authors.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-authors.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (11,16,'VAR_SAMP','Syntax:\nVAR_SAMP(expr)\n\nReturns the sample variance of expr. That is, the denominator is the\nnumber of rows minus one.\n\nVAR_SAMP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (12,38,'CONCAT','Syntax:\nCONCAT(str1,str2,...)\n\nReturns the string that results from concatenating the arguments. May\nhave one or more arguments. If all arguments are nonbinary strings, the\nresult is a nonbinary string. If the arguments include any binary\nstrings, the result is a binary string. A numeric argument is converted\nto its equivalent string form. This is a nonbinary string as of MySQL\n5.5.3. Before 5.5.3, it is a binary string; to avoid that and produce a\nnonbinary string, you can use an explicit type cast, as in this\nexample:\n\nSELECT CONCAT(CAST(int_col AS CHAR), char_col);\n\nCONCAT() returns NULL if any argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT CONCAT(\'My\', \'S\', \'QL\');\n        -> \'MySQL\'\nmysql> SELECT CONCAT(\'My\', NULL, \'QL\');\n        -> NULL\nmysql> SELECT CONCAT(14.3);\n        -> \'14.3\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (13,35,'GEOMETRY HIERARCHY','Geometry is the base class. It is an abstract class. The instantiable\nsubclasses of Geometry are restricted to zero-, one-, and\ntwo-dimensional geometric objects that exist in two-dimensional\ncoordinate space. All instantiable geometry classes are defined so that\nvalid instances of a geometry class are topologically closed (that is,\nall defined geometries include their boundary).\n\nThe base Geometry class has subclasses for Point, Curve, Surface, and\nGeometryCollection:\n\no Point represents zero-dimensional objects.\n\no Curve represents one-dimensional objects, and has subclass\n  LineString, with sub-subclasses Line and LinearRing.\n\no Surface is designed for two-dimensional objects and has subclass\n  Polygon.\n\no GeometryCollection has specialized zero-, one-, and two-dimensional\n  collection classes named MultiPoint, MultiLineString, and\n  MultiPolygon for modeling geometries corresponding to collections of\n  Points, LineStrings, and Polygons, respectively. MultiCurve and\n  MultiSurface are introduced as abstract superclasses that generalize\n  the collection interfaces to handle Curves and Surfaces.\n\nGeometry, Curve, Surface, MultiCurve, and MultiSurface are defined as\nnoninstantiable classes. They define a common set of methods for their\nsubclasses and are included for extensibility.\n\nPoint, LineString, Polygon, GeometryCollection, MultiPoint,\nMultiLineString, and MultiPolygon are instantiable classes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-geometry-class-hierarchy.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-geometry-class-hierarchy.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (14,38,'CHAR FUNCTION','Syntax:\nCHAR(N,... [USING charset_name])\n\nCHAR() interprets each argument N as an integer and returns a string\nconsisting of the characters given by the code values of those\nintegers. NULL values are skipped.\nBy default, CHAR() returns a binary string. To produce a string in a\ngiven character set, use the optional USING clause:\n\nmysql> SELECT CHARSET(CHAR(0x65)), CHARSET(CHAR(0x65 USING utf8));\n+---------------------+--------------------------------+\n| CHARSET(CHAR(0x65)) | CHARSET(CHAR(0x65 USING utf8)) |\n+---------------------+--------------------------------+\n| binary              | utf8                           |\n+---------------------+--------------------------------+\n\nIf USING is given and the result string is illegal for the given\ncharacter set, a warning is issued. Also, if strict SQL mode is\nenabled, the result from CHAR() becomes NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT CHAR(77,121,83,81,\'76\');\n        -> \'MySQL\'\nmysql> SELECT CHAR(77,77.3,\'77.3\');\n        -> \'MMM\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (15,23,'DATETIME','DATETIME\n\nA date and time combination. The supported range is \'1000-01-01\n00:00:00\' to \'9999-12-31 23:59:59\'. MySQL displays DATETIME values in\n\'YYYY-MM-DD HH:MM:SS\' format, but permits assignment of values to\nDATETIME columns using either strings or numbers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (16,27,'SHOW CREATE TRIGGER','Syntax:\nSHOW CREATE TRIGGER trigger_name\n\nThis statement shows the CREATE TRIGGER statement that creates the\nnamed trigger.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-create-trigger.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (17,27,'SHOW CREATE PROCEDURE','Syntax:\nSHOW CREATE PROCEDURE proc_name\n\nThis statement is a MySQL extension. It returns the exact string that\ncan be used to re-create the named stored procedure. A similar\nstatement, SHOW CREATE FUNCTION, displays information about stored\nfunctions (see [HELP SHOW CREATE FUNCTION]).\n\nTo use either statement, you must be the user named in the routine\nDEFINER clause or have SELECT access to the mysql.proc table. If you do\nnot have privileges for the routine itself, the value displayed for the\nCreate Procedure or Create Function field will be NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-procedure.html\n\n','mysql> SHOW CREATE PROCEDURE test.simpleproc\\G\n*************************** 1. row ***************************\n           Procedure: simpleproc\n            sql_mode:\n    Create Procedure: CREATE PROCEDURE `simpleproc`(OUT param1 INT)\n                      BEGIN\n                      SELECT COUNT(*) INTO param1 FROM t;\n                      END\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n\nmysql> SHOW CREATE FUNCTION test.hello\\G\n*************************** 1. row ***************************\n            Function: hello\n            sql_mode:\n     Create Function: CREATE FUNCTION `hello`(s CHAR(20))\n                      RETURNS CHAR(50)\n                      RETURN CONCAT(\'Hello, \',s,\'!\')\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (18,24,'OPEN','Syntax:\nOPEN cursor_name\n\nThis statement opens a previously declared cursor. For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/open.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/open.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (19,23,'INTEGER','INTEGER[(M)] [UNSIGNED] [ZEROFILL]\n\nThis type is a synonym for INT.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (20,38,'LOWER','Syntax:\nLOWER(str)\n\nReturns the string str with all characters changed to lowercase\naccording to the current character set mapping. The default is latin1\n(cp1252 West European).\n\nmysql> SELECT LOWER(\'QUADRATICALLY\');\n        -> \'quadratically\'\n\nLOWER() (and UPPER()) are ineffective when applied to binary strings\n(BINARY, VARBINARY, BLOB). To perform lettercase conversion, convert\nthe string to a nonbinary string:\n\nmysql> SET @str = BINARY \'New York\';\nmysql> SELECT LOWER(@str), LOWER(CONVERT(@str USING latin1));\n+-------------+-----------------------------------+\n| LOWER(@str) | LOWER(CONVERT(@str USING latin1)) |\n+-------------+-----------------------------------+\n| New York    | new york                          |\n+-------------+-----------------------------------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (21,27,'SHOW COLUMNS','Syntax:\nSHOW [FULL] COLUMNS {FROM | IN} tbl_name [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW COLUMNS displays information about the columns in a given table.\nIt also works for views. The LIKE clause, if present, indicates which\ncolumn names to match. The WHERE clause can be given to select rows\nusing more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nSHOW COLUMNS displays information only for those columns for which you\nhave some privilege.\n\nmysql> SHOW COLUMNS FROM City;\n+------------+----------+------+-----+---------+----------------+\n| Field      | Type     | Null | Key | Default | Extra          |\n+------------+----------+------+-----+---------+----------------+\n| Id         | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name       | char(35) | NO   |     |         |                |\n| Country    | char(3)  | NO   | UNI |         |                |\n| District   | char(20) | YES  | MUL |         |                |\n| Population | int(11)  | NO   |     | 0       |                |\n+------------+----------+------+-----+---------+----------------+\n5 rows in set (0.00 sec)\n\nIf the data types differ from what you expect them to be based on a\nCREATE TABLE statement, note that MySQL sometimes changes data types\nwhen you create or alter a table. The conditions under which this\noccurs are described in\nhttp://dev.mysql.com/doc/refman/5.5/en/silent-column-changes.html.\n\nThe FULL keyword causes the output to include the column collation and\ncomments, as well as the privileges you have for each column.\n\nYou can use db_name.tbl_name as an alternative to the tbl_name FROM\ndb_name syntax. In other words, these two statements are equivalent:\n\nmysql> SHOW COLUMNS FROM mytable FROM mydb;\nmysql> SHOW COLUMNS FROM mydb.mytable;\n\nSHOW COLUMNS displays the following values for each table column:\n\nField indicates the column name.\n\nType indicates the column data type.\n\nCollation indicates the collation for nonbinary string columns, or NULL\nfor other columns. This value is displayed only if you use the FULL\nkeyword.\n\nThe Null field contains YES if NULL values can be stored in the column,\nNO if not.\n\nThe Key field indicates whether the column is indexed:\n\no If Key is empty, the column either is not indexed or is indexed only\n  as a secondary column in a multiple-column, nonunique index.\n\no If Key is PRI, the column is a PRIMARY KEY or is one of the columns\n  in a multiple-column PRIMARY KEY.\n\no If Key is UNI, the column is the first column of a UNIQUE index. (A\n  UNIQUE index permits multiple NULL values, but you can tell whether\n  the column permits NULL by checking the Null field.)\n\no If Key is MUL, the column is the first column of a nonunique index in\n  which multiple occurrences of a given value are permitted within the\n  column.\n\nIf more than one of the Key values applies to a given column of a\ntable, Key displays the one with the highest priority, in the order\nPRI, UNI, MUL.\n\nA UNIQUE index may be displayed as PRI if it cannot contain NULL values\nand there is no PRIMARY KEY in the table. A UNIQUE index may display as\nMUL if several columns form a composite UNIQUE index; although the\ncombination of the columns is unique, each column can still hold\nmultiple occurrences of a given value.\n\nThe Default field indicates the default value that is assigned to the\ncolumn. This is NULL if the column has an explicit default of NULL, or\nif the column definition has no DEFAULT clause.\n\nThe Extra field contains any additional information that is available\nabout a given column. The value is nonempty in these cases:\nauto_increment for columns that have the AUTO_INCREMENT attribute; on\nupdate CURRENT_TIMESTAMP for TIMESTAMP columns that have the ON UPDATE\nCURRENT_TIMESTAMP attribute.\n\nPrivileges indicates the privileges you have for the column. This value\nis displayed only if you use the FULL keyword.\n\nComment indicates any comment the column has. This value is displayed\nonly if you use the FULL keyword.\n\nSHOW FIELDS is a synonym for SHOW COLUMNS. You can also list a table\'s\ncolumns with the mysqlshow db_name tbl_name command.\n\nThe DESCRIBE statement provides information similar to SHOW COLUMNS.\nSee http://dev.mysql.com/doc/refman/5.5/en/describe.html.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-columns.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-columns.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (22,40,'CREATE TRIGGER','Syntax:\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    TRIGGER trigger_name\n    trigger_time trigger_event\n    ON tbl_name FOR EACH ROW\n    trigger_body\n\ntrigger_time: { BEFORE | AFTER }\n\ntrigger_event: { INSERT | UPDATE | DELETE }\n\nThis statement creates a new trigger. A trigger is a named database\nobject that is associated with a table, and that activates when a\nparticular event occurs for the table. The trigger becomes associated\nwith the table named tbl_name, which must refer to a permanent table.\nYou cannot associate a trigger with a TEMPORARY table or a view.\n\nTrigger names exist in the schema namespace, meaning that all triggers\nmust have unique names within a schema. Triggers in different schemas\ncan have the same name.\n\nThis section describes CREATE TRIGGER syntax. For additional\ndiscussion, see\nhttp://dev.mysql.com/doc/refman/5.5/en/trigger-syntax.html.\n\nCREATE TRIGGER requires the TRIGGER privilege for the table associated\nwith the trigger. The statement might also require the SUPER privilege,\ndepending on the DEFINER value, as described later in this section. If\nbinary logging is enabled, CREATE TRIGGER might require the SUPER\nprivilege, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-logging.html.\n\nThe DEFINER clause determines the security context to be used when\nchecking access privileges at trigger activation time, as described\nlater in this section.\n\ntrigger_time is the trigger action time. It can be BEFORE or AFTER to\nindicate that the trigger activates before or after each row to be\nmodified.\n\ntrigger_event indicates the kind of operation that activates the\ntrigger. These trigger_event values are permitted:\n\no INSERT: The trigger activates whenever a new row is inserted into the\n  table; for example, through INSERT, LOAD DATA, and REPLACE\n  statements.\n\no UPDATE: The trigger activates whenever a row is modified; for\n  example, through UPDATE statements.\n\no DELETE: The trigger activates whenever a row is deleted from the\n  table; for example, through DELETE and REPLACE statements. DROP TABLE\n  and TRUNCATE TABLE statements on the table do not activate this\n  trigger, because they do not use DELETE. Dropping a partition does\n  not activate DELETE triggers, either.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-trigger.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (23,32,'MONTH','Syntax:\nMONTH(date)\n\nReturns the month for date, in the range 1 to 12 for January to\nDecember, or 0 for dates such as \'0000-00-00\' or \'2008-00-00\' that have\na zero month part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MONTH(\'2008-02-03\');\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (24,23,'TINYINT','TINYINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA very small integer. The signed range is -128 to 127. The unsigned\nrange is 0 to 255.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (25,27,'SHOW TRIGGERS','Syntax:\nSHOW TRIGGERS [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TRIGGERS lists the triggers currently defined for tables in a\ndatabase (the default database unless a FROM clause is given). This\nstatement returns results only for databases and tables for which you\nhave the TRIGGER privilege. The LIKE clause, if present, indicates\nwhich table names to match (not trigger names) and causes the statement\nto display triggers for those tables. The WHERE clause can be given to\nselect rows using more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nFor the trigger ins_sum as defined in\nhttp://dev.mysql.com/doc/refman/5.5/en/triggers.html, the output of\nthis statement is as shown here:\n\nmysql> SHOW TRIGGERS LIKE \'acc%\'\\G\n*************************** 1. row ***************************\n             Trigger: ins_sum\n               Event: INSERT\n               Table: account\n           Statement: SET @sum = @sum + NEW.amount\n              Timing: BEFORE\n             Created: NULL\n            sql_mode:\n             Definer: myname@localhost\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-triggers.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-triggers.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (26,14,'MASTER_POS_WAIT','Syntax:\nMASTER_POS_WAIT(log_name,log_pos[,timeout])\n\nThis function is useful for control of master/slave synchronization. It\nblocks until the slave has read and applied all updates up to the\nspecified position in the master log. The return value is the number of\nlog events the slave had to wait for to advance to the specified\nposition. The function returns NULL if the slave SQL thread is not\nstarted, the slave\'s master information is not initialized, the\narguments are incorrect, or an error occurs. It returns -1 if the\ntimeout has been exceeded. If the slave SQL thread stops while\nMASTER_POS_WAIT() is waiting, the function returns NULL. If the slave\nis past the specified position, the function returns immediately.\n\nIf a timeout value is specified, MASTER_POS_WAIT() stops waiting when\ntimeout seconds have elapsed. timeout must be greater than 0; a zero or\nnegative timeout means no timeout.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (27,13,'ISCLOSED','IsClosed(ls)\n\nReturns 1 if the LineString value ls is closed (that is, its\nStartPoint() and EndPoint() values are the same) and is simple (does\nnot pass through the same point more than once). Returns 0 if ls is not\nclosed, and -1 if it is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls1 = \'LineString(1 1,2 2,3 3,2 2)\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SET @ls2 = \'LineString(1 1,2 2,3 3,1 1)\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT IsClosed(GeomFromText(@ls1));\n+------------------------------+\n| IsClosed(GeomFromText(@ls1)) |\n+------------------------------+\n|                            0 |\n+------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT IsClosed(GeomFromText(@ls2));\n+------------------------------+\n| IsClosed(GeomFromText(@ls2)) |\n+------------------------------+\n|                            1 |\n+------------------------------+\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (28,38,'REGEXP','Syntax:\nexpr REGEXP pat, expr RLIKE pat\n\nPerforms a pattern match of a string expression expr against a pattern\npat. The pattern can be an extended regular expression, the syntax for\nwhich is discussed later in this section. Returns 1 if expr matches\npat; otherwise it returns 0. If either expr or pat is NULL, the result\nis NULL. RLIKE is a synonym for REGEXP, provided for mSQL\ncompatibility.\n\nThe pattern need not be a literal string. For example, it can be\nspecified as a string expression or table column.\n\n*Note*: Because MySQL uses the C escape syntax in strings (for example,\n"\\n" to represent the newline character), you must double any "\\" that\nyou use in your REGEXP strings.\n\nREGEXP is not case sensitive, except when used with binary strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/regexp.html\n\n','mysql> SELECT \'Monty!\' REGEXP \'.*\';\n        -> 1\nmysql> SELECT \'new*\\n*line\' REGEXP \'new\\\\*.\\\\*line\';\n        -> 1\nmysql> SELECT \'a\' REGEXP \'A\', \'a\' REGEXP BINARY \'A\';\n        -> 1  0\nmysql> SELECT \'a\' REGEXP \'^[a-d]\';\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/regexp.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (29,24,'IF STATEMENT','Syntax:\nIF search_condition THEN statement_list\n    [ELSEIF search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND IF\n\nThe IF statement for stored programs implements a basic conditional\nconstruct.\n\n*Note*: There is also an IF() function, which differs from the IF\nstatement described here. See\nhttp://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html. The\nIF statement can have THEN, ELSE, and ELSEIF clauses, and it is\nterminated with END IF.\n\nIf the search_condition evaluates to true, the corresponding THEN or\nELSEIF clause statement_list executes. If no search_condition matches,\nthe ELSE clause statement_list executes.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/if.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/if.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (30,19,'^','Syntax:\n^\n\nBitwise XOR:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 1 ^ 1;\n        -> 0\nmysql> SELECT 1 ^ 0;\n        -> 1\nmysql> SELECT 11 ^ 3;\n        -> 8\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (31,40,'DROP VIEW','Syntax:\nDROP VIEW [IF EXISTS]\n    view_name [, view_name] ...\n    [RESTRICT | CASCADE]\n\nDROP VIEW removes one or more views. You must have the DROP privilege\nfor each view. If any of the views named in the argument list do not\nexist, MySQL returns an error indicating by name which nonexisting\nviews it was unable to drop, but it also drops all of the views in the\nlist that do exist.\n\nThe IF EXISTS clause prevents an error from occurring for views that\ndon\'t exist. When this clause is given, a NOTE is generated for each\nnonexistent view. See [HELP SHOW WARNINGS].\n\nRESTRICT and CASCADE, if given, are parsed and ignored.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (32,31,'WITHIN','Within(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 is spatially within g2. This\ntests the opposite relationship as Contains().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (33,32,'WEEK','Syntax:\nWEEK(date[,mode])\n\nThis function returns the week number for date. The two-argument form\nof WEEK() enables you to specify whether the week starts on Sunday or\nMonday and whether the return value should be in the range from 0 to 53\nor from 1 to 53. If the mode argument is omitted, the value of the\ndefault_week_format system variable is used. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT WEEK(\'2008-02-20\');\n        -> 7\nmysql> SELECT WEEK(\'2008-02-20\',0);\n        -> 7\nmysql> SELECT WEEK(\'2008-02-20\',1);\n        -> 8\nmysql> SELECT WEEK(\'2008-12-31\',1);\n        -> 53\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (34,27,'SHOW PLUGINS','Syntax:\nSHOW PLUGINS\n\nSHOW PLUGINS displays information about server plugins. Plugin\ninformation is also available in the INFORMATION_SCHEMA.PLUGINS table.\nSee http://dev.mysql.com/doc/refman/5.5/en/plugins-table.html.\n\nExample of SHOW PLUGINS output:\n\nmysql> SHOW PLUGINS\\G\n*************************** 1. row ***************************\n   Name: binlog\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 2. row ***************************\n   Name: CSV\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 3. row ***************************\n   Name: MEMORY\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n*************************** 4. row ***************************\n   Name: MyISAM\n Status: ACTIVE\n   Type: STORAGE ENGINE\nLibrary: NULL\nLicense: GPL\n...\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-plugins.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-plugins.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (35,22,'DROP FUNCTION UDF','Syntax:\nDROP FUNCTION function_name\n\nThis statement drops the user-defined function (UDF) named\nfunction_name.\n\nTo drop a function, you must have the DELETE privilege for the mysql\ndatabase. This is because DROP FUNCTION removes a row from the\nmysql.func system table that records the function\'s name, type, and\nshared library name.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-function-udf.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-function-udf.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (36,8,'PREPARE','Syntax:\nPREPARE stmt_name FROM preparable_stmt\n\nThe PREPARE statement prepares a SQL statement and assigns it a name,\nstmt_name, by which to refer to the statement later. The prepared\nstatement is executed with EXECUTE and released with DEALLOCATE\nPREPARE. For examples, see\nhttp://dev.mysql.com/doc/refman/5.5/en/sql-syntax-prepared-statements.h\ntml.\n\nStatement names are not case sensitive. preparable_stmt is either a\nstring literal or a user variable that contains the text of the SQL\nstatement. The text must represent a single statement, not multiple\nstatements. Within the statement, ? characters can be used as parameter\nmarkers to indicate where data values are to be bound to the query\nlater when you execute it. The ? characters should not be enclosed\nwithin quotation marks, even if you intend to bind them to string\nvalues. Parameter markers can be used only where data values should\nappear, not for SQL keywords, identifiers, and so forth.\n\nIf a prepared statement with the given name already exists, it is\ndeallocated implicitly before the new statement is prepared. This means\nthat if the new statement contains an error and cannot be prepared, an\nerror is returned and no statement with the given name exists.\n\nThe scope of a prepared statement is the session within which it is\ncreated, which as several implications:\n\no A prepared statement created in one session is not available to other\n  sessions.\n\no When a session ends, whether normally or abnormally, its prepared\n  statements no longer exist. If auto-reconnect is enabled, the client\n  is not notified that the connection was lost. For this reason,\n  clients may wish to disable auto-reconnect. See\n  http://dev.mysql.com/doc/refman/5.5/en/auto-reconnect.html.\n\no A prepared statement created within a stored program continues to\n  exist after the program finishes executing and can be executed\n  outside the program later.\n\no A statement prepared in stored program context cannot refer to stored\n  procedure or function parameters or local variables because they go\n  out of scope when the program ends and would be unavailable were the\n  statement to be executed later outside the program. As a workaround,\n  refer instead to user-defined variables, which also have session\n  scope; see\n  http://dev.mysql.com/doc/refman/5.5/en/user-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/prepare.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/prepare.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (37,8,'LOCK','Syntax:\nLOCK TABLES\n    tbl_name [[AS] alias] lock_type\n    [, tbl_name [[AS] alias] lock_type] ...\n\nlock_type:\n    READ [LOCAL]\n  | [LOW_PRIORITY] WRITE\n\nUNLOCK TABLES\n\nMySQL enables client sessions to acquire table locks explicitly for the\npurpose of cooperating with other sessions for access to tables, or to\nprevent other sessions from modifying tables during periods when a\nsession requires exclusive access to them. A session can acquire or\nrelease locks only for itself. One session cannot acquire locks for\nanother session or release locks held by another session.\n\nLocks may be used to emulate transactions or to get more speed when\nupdating tables. This is explained in more detail later in this\nsection.\n\nLOCK TABLES explicitly acquires table locks for the current client\nsession. Table locks can be acquired for base tables or views. You must\nhave the LOCK TABLES privilege, and the SELECT privilege for each\nobject to be locked.\n\nFor view locking, LOCK TABLES adds all base tables used in the view to\nthe set of tables to be locked and locks them automatically. If you\nlock a table explicitly with LOCK TABLES, any tables used in triggers\nare also locked implicitly, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/lock-tables-and-triggers.html.\n\nUNLOCK TABLES explicitly releases any table locks held by the current\nsession. LOCK TABLES implicitly releases any table locks held by the\ncurrent session before acquiring new locks.\n\nAnother use for UNLOCK TABLES is to release the global read lock\nacquired with the FLUSH TABLES WITH READ LOCK statement, which enables\nyou to lock all tables in all databases. See [HELP FLUSH]. (This is a\nvery convenient way to get backups if you have a file system such as\nVeritas that can take snapshots in time.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/lock-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/lock-tables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (38,38,'UPDATEXML','Syntax:\nUpdateXML(xml_target, xpath_expr, new_xml)\n\nThis function replaces a single portion of a given fragment of XML\nmarkup xml_target with a new XML fragment new_xml, and then returns the\nchanged XML. The portion of xml_target that is replaced matches an\nXPath expression xpath_expr supplied by the user. In MySQL 5.5, the\nXPath expression can contain at most 127 characters. (This limitation\nis lifted in MySQL 5.6.)\n\nIf no expression matching xpath_expr is found, or if multiple matches\nare found, the function returns the original xml_target XML fragment.\nAll three arguments should be strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html\n\n','mysql> SELECT\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/a\', \'<e>fff</e>\') AS val1,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/b\', \'<e>fff</e>\') AS val2,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'//b\', \'<e>fff</e>\') AS val3,\n    ->   UpdateXML(\'<a><b>ccc</b><d></d></a>\', \'/a/d\', \'<e>fff</e>\') AS val4,\n    ->   UpdateXML(\'<a><d></d><b>ccc</b><d></d></a>\', \'/a/d\', \'<e>fff</e>\') AS val5\n    -> \\G\n\n*************************** 1. row ***************************\nval1: <e>fff</e>\nval2: <a><b>ccc</b><d></d></a>\nval3: <a><e>fff</e><d></d></a>\nval4: <a><b>ccc</b><e>fff</e></a>\nval5: <a><d></d><b>ccc</b><d></d></a>\n','http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (39,8,'RESET SLAVE','Syntax:\nRESET SLAVE [ALL]\n\nRESET SLAVE makes the slave forget its replication position in the\nmaster\'s binary log. This statement is meant to be used for a clean\nstart: It deletes the master.info and relay-log.info files, all the\nrelay log files, and starts a new relay log file. To use RESET SLAVE,\nthe slave replication threads must be stopped (use STOP SLAVE if\nnecessary).\n\n*Note*: All relay log files are deleted, even if they have not been\ncompletely executed by the slave SQL thread. (This is a condition\nlikely to exist on a replication slave if you have issued a STOP SLAVE\nstatement or if the slave is highly loaded.)\n\nIn MySQL 5.5 (unlike the case in MySQL 5.1 and earlier), RESET SLAVE\ndoes not change any replication connection parameters such as master\nhost, master port, master user, or master password, which are retained\nin memory. This means that START SLAVE can be issued without requiring\na CHANGE MASTER TO statement following RESET SLAVE.\n\nConnection parameters are reset if the slave mysqld is shut down\nfollowing RESET SLAVE. In MySQL 5.5.16 and later, you can instead use\nRESET SLAVE ALL to reset these connection parameters (Bug #11809016).\n\nRESET SLAVE ALL does not clear the IGNORE_SERVER_IDS list set by CHANGE\nMASTER TO. This issue is fixed in MySQL 5.7. (Bug #18816897)\n\nIf the slave SQL thread was in the middle of replicating temporary\ntables when it was stopped, and RESET SLAVE is issued, these replicated\ntemporary tables are deleted on the slave.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/reset-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/reset-slave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (40,27,'SHOW BINARY LOGS','Syntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [HELP PURGE BINARY LOGS], that shows\nhow to determine which logs can be purged.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+\n| Log_name      | File_size |\n+---------------+-----------+\n| binlog.000015 |    724935 |\n| binlog.000016 |    733481 |\n+---------------+-----------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-binary-logs.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-binary-logs.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (41,25,'POLYGON','Polygon(ls1,ls2,...)\n\nConstructs a Polygon value from a number of LineString or WKB\nLineString arguments. If any argument does not represent a LinearRing\n(that is, not a closed and simple LineString), the return value is\nNULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (42,32,'MINUTE','Syntax:\nMINUTE(time)\n\nReturns the minute for time, in the range 0 to 59.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MINUTE(\'2008-02-03 10:05:03\');\n        -> 5\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (43,32,'DAY','Syntax:\nDAY(date)\n\nDAY() is a synonym for DAYOFMONTH().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (44,38,'MID','Syntax:\nMID(str,pos,len)\n\nMID(str,pos,len) is a synonym for SUBSTRING(str,pos,len).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (45,14,'UUID','Syntax:\nUUID()\n\nReturns a Universal Unique Identifier (UUID) generated according to\n"DCE 1.1: Remote Procedure Call" (Appendix A) CAE (Common Applications\nEnvironment) Specifications published by The Open Group in October 1997\n(Document Number C706,\nhttp://www.opengroup.org/public/pubs/catalog/c706.htm).\n\nA UUID is designed as a number that is globally unique in space and\ntime. Two calls to UUID() are expected to generate two different\nvalues, even if these calls are performed on two separate computers\nthat are not connected to each other.\n\nA UUID is a 128-bit number represented by a utf8 string of five\nhexadecimal numbers in aaaaaaaa-bbbb-cccc-dddd-eeeeeeeeeeee format:\n\no The first three numbers are generated from a timestamp.\n\no The fourth number preserves temporal uniqueness in case the timestamp\n  value loses monotonicity (for example, due to daylight saving time).\n\no The fifth number is an IEEE 802 node number that provides spatial\n  uniqueness. A random number is substituted if the latter is not\n  available (for example, because the host computer has no Ethernet\n  card, or we do not know how to find the hardware address of an\n  interface on your operating system). In this case, spatial uniqueness\n  cannot be guaranteed. Nevertheless, a collision should have very low\n  probability.\n\n  Currently, the MAC address of an interface is taken into account only\n  on FreeBSD and Linux. On other operating systems, MySQL uses a\n  randomly generated 48-bit number.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID();\n        -> \'6ccd780c-baba-1026-9564-0040f4311e29\'\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (46,14,'SLEEP','Syntax:\nSLEEP(duration)\n\nSleeps (pauses) for the number of seconds given by the duration\nargument, then returns 0. If SLEEP() is interrupted, it returns 1. The\nduration may have a fractional part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (47,25,'LINESTRING','LineString(pt1,pt2,...)\n\nConstructs a LineString value from a number of Point or WKB Point\narguments. If the number of arguments is less than two, the return\nvalue is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (48,17,'CONNECTION_ID','Syntax:\nCONNECTION_ID()\n\nReturns the connection ID (thread ID) for the connection. Every\nconnection has an ID that is unique among the set of currently\nconnected clients.\n\nThe value returned by CONNECTION_ID() is the same type of value as\ndisplayed in the ID column of the INFORMATION_SCHEMA.PROCESSLIST table,\nthe Id column of SHOW PROCESSLIST output, and the PROCESSLIST_ID column\nof the Performance Schema threads table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT CONNECTION_ID();\n        -> 23786\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (49,40,'CREATE LOGFILE GROUP','Syntax:\nCREATE LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'undo_file\'\n    [INITIAL_SIZE [=] initial_size]\n    [UNDO_BUFFER_SIZE [=] undo_buffer_size]\n    [REDO_BUFFER_SIZE [=] redo_buffer_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] comment_text]\n    ENGINE [=] engine_name\n\nThis statement creates a new log file group named logfile_group having\na single UNDO file named \'undo_file\'. A CREATE LOGFILE GROUP statement\nhas one and only one ADD UNDOFILE clause. For rules covering the naming\nof log file groups, see\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nIn MySQL Cluster NDB 7.2, you can have only one log file group per\nCluster at any given time. (See Bug #16386)\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size;\nif not specified, it defaults to 128M (128 megabytes). The optional\nUNDO_BUFFER_SIZE parameter sets the size used by the UNDO buffer for\nthe log file group; The default value for UNDO_BUFFER_SIZE is 8M (eight\nmegabytes); this value cannot exceed the amount of system memory\navailable. Both of these parameters are specified in bytes. In MySQL\nCluster NDB 7.2.14 and later, you may optionally follow either or both\nof these with a one-letter abbreviation for an order of magnitude,\nsimilar to those used in my.cnf. Generally, this is one of the letters\nM (for megabytes) or G (for gigabytes). Prior to MySQL Cluster NDB\n7.2.14, the values for these options could only be specified using\ndigits. (Bug #13116514, Bug #16104705, Bug #62858)\n\nMemory used for UNDO_BUFFER_SIZE comes from the global pool whose size\nis determined by the value of the SharedGlobalMemory data node\nconfiguration parameter. This includes any default value implied for\nthis option by the setting of the InitialLogFileGroup data node\nconfiguration parameter.\n\nThe maximum permitted for UNDO_BUFFER_SIZE is 629145600 (600 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB).\n\nThe ENGINE option determines the storage engine to be used by this log\nfile group, with engine_name being the name of the storage engine. In\nMySQL 5.5, this must be NDB (or NDBCLUSTER). If ENGINE is not set,\nMySQL tries to use the engine specified by the default_storage_engine\nserver system variable (formerly storage_engine). In any case, if the\nengine is not specified as NDB or NDBCLUSTER, the CREATE LOGFILE GROUP\nstatement appears to succeed but actually fails to create the log file\ngroup, as shown here:\n\nmysql> CREATE LOGFILE GROUP lg1 \n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+-------+------+------------------------------------------------------------------------------------------------+\n| Level | Code | Message                                                                                        |\n+-------+------+------------------------------------------------------------------------------------------------+\n| Error | 1478 | Table storage engine \'InnoDB\' does not support the create option \'TABLESPACE or LOGFILE GROUP\' |\n+-------+------+------------------------------------------------------------------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> DROP LOGFILE GROUP lg1 ENGINE = NDB;              \nERROR 1529 (HY000): Failed to drop LOGFILE GROUP\n\nmysql> CREATE LOGFILE GROUP lg1 \n    ->     ADD UNDOFILE \'undo.dat\' INITIAL_SIZE = 10M\n    ->     ENGINE = NDB;\nQuery OK, 0 rows affected (2.97 sec)\n\nThe fact that the CREATE LOGFILE GROUP statement does not actually\nreturn an error when a non-NDB storage engine is named, but rather\nappears to succeed, is a known issue which we hope to address in a\nfuture release of MySQL Cluster.\n\nREDO_BUFFER_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but ignored,\nand so have no effect in MySQL 5.5. These options are intended for\nfuture expansion.\n\nWhen used with ENGINE [=] NDB, a log file group and associated UNDO log\nfile are created on each Cluster data node. You can verify that the\nUNDO files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, LOGFILE_GROUP_NUMBER, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE FILE_NAME = \'undo_10.dat\';\n+--------------------+----------------------+----------------+\n| LOGFILE_GROUP_NAME | LOGFILE_GROUP_NUMBER | EXTRA          |\n+--------------------+----------------------+----------------+\n| lg_3               |                   11 | CLUSTER_NODE=3 |\n| lg_3               |                   11 | CLUSTER_NODE=4 |\n+--------------------+----------------------+----------------+\n2 rows in set (0.06 sec)\n\nCREATE LOGFILE GROUP is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-logfile-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (50,28,'DELETE','Syntax:\nSingle-table syntax:\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE] FROM tbl_name\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nMultiple-table syntax:\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    tbl_name[.*] [, tbl_name[.*]] ...\n    FROM table_references\n    [WHERE where_condition]\n\nOr:\n\nDELETE [LOW_PRIORITY] [QUICK] [IGNORE]\n    FROM tbl_name[.*] [, tbl_name[.*]] ...\n    USING table_references\n    [WHERE where_condition]\n\nFor the single-table syntax, the DELETE statement deletes rows from\ntbl_name and returns a count of the number of deleted rows. This count\ncan be obtained by calling the ROW_COUNT() function (see\nhttp://dev.mysql.com/doc/refman/5.5/en/information-functions.html). The\nWHERE clause, if given, specifies the conditions that identify which\nrows to delete. With no WHERE clause, all rows are deleted. If the\nORDER BY clause is specified, the rows are deleted in the order that is\nspecified. The LIMIT clause places a limit on the number of rows that\ncan be deleted.\n\nFor the multiple-table syntax, DELETE deletes from each tbl_name the\nrows that satisfy the conditions. In this case, ORDER BY and LIMIT\ncannot be used.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe deleted. It is specified as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nCurrently, you cannot delete from a table and select from the same\ntable in a subquery.\n\nYou need the DELETE privilege on a table to delete rows from it. You\nneed only the SELECT privilege for any columns that are only read, such\nas those named in the WHERE clause.\n\nAs stated, a DELETE statement with no WHERE clause deletes all rows. A\nfaster way to do this, when you do not need to know the number of\ndeleted rows, is to use TRUNCATE TABLE. However, within a transaction\nor if you have a lock on the table, TRUNCATE TABLE cannot be used\nwhereas DELETE can. See [HELP TRUNCATE TABLE], and [HELP LOCK].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/delete.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/delete.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (51,3,'ROUND','Syntax:\nROUND(X), ROUND(X,D)\n\nRounds the argument X to D decimal places. The rounding algorithm\ndepends on the data type of X. D defaults to 0 if not specified. D can\nbe negative to cause D digits left of the decimal point of the value X\nto become zero.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ROUND(-1.23);\n        -> -1\nmysql> SELECT ROUND(-1.58);\n        -> -2\nmysql> SELECT ROUND(1.58);\n        -> 2\nmysql> SELECT ROUND(1.298, 1);\n        -> 1.3\nmysql> SELECT ROUND(1.298, 0);\n        -> 1\nmysql> SELECT ROUND(23.298, -1);\n        -> 20\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (52,6,'NULLIF','Syntax:\nNULLIF(expr1,expr2)\n\nReturns NULL if expr1 = expr2 is true, otherwise returns expr1. This is\nthe same as CASE WHEN expr1 = expr2 THEN NULL ELSE expr1 END.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT NULLIF(1,1);\n        -> NULL\nmysql> SELECT NULLIF(1,2);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (53,24,'CLOSE','Syntax:\nCLOSE cursor_name\n\nThis statement closes a previously opened cursor. For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nAn error occurs if the cursor is not open.\n\nIf not closed explicitly, a cursor is closed at the end of the BEGIN\n... END block in which it was declared.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/close.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/close.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (54,8,'STOP SLAVE','Syntax:\nSTOP SLAVE [thread_types]\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nStops the slave threads. STOP SLAVE requires the SUPER privilege.\nRecommended best practice is to execute STOP SLAVE on the slave before\nstopping the slave server (see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-shutdown.html, for more\ninformation).\n\nWhen using the row-based logging format: You should execute STOP SLAVE\non the slave prior to shutting down the slave server if you are\nreplicating any tables that use a nontransactional storage engine (see\nthe Note later in this section). In MySQL 5.5.9 and later, you can also\nuse STOP SLAVE SQL_THREAD for this purpose.\n\nLike START SLAVE, this statement may be used with the IO_THREAD and\nSQL_THREAD options to name the thread or threads to be stopped.\n\n*Note*: In MySQL 5.5, STOP SLAVE waits until the current replication\nevent group affecting one or more nontransactional tables has finished\nexecuting (if there is any such replication group), or until the user\nissues a KILL QUERY or KILL CONNECTION statement. (Bug #319, Bug\n#38205)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/stop-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/stop-slave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (55,32,'TIMEDIFF','Syntax:\nTIMEDIFF(expr1,expr2)\n\nTIMEDIFF() returns expr1 - expr2 expressed as a time value. expr1 and\nexpr2 are time or date-and-time expressions, but both must be of the\nsame type.\n\nThe result returned by TIMEDIFF() is limited to the range allowed for\nTIME values. Alternatively, you can use either of the functions\nTIMESTAMPDIFF() and UNIX_TIMESTAMP(), both of which return integers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMEDIFF(\'2000:01:01 00:00:00\',\n    ->                 \'2000:01:01 00:00:00.000001\');\n        -> \'-00:00:00.000001\'\nmysql> SELECT TIMEDIFF(\'2008-12-31 23:59:59.000001\',\n    ->                 \'2008-12-30 01:01:01.000002\');\n        -> \'46:58:57.999999\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (56,38,'REPLACE FUNCTION','Syntax:\nREPLACE(str,from_str,to_str)\n\nReturns the string str with all occurrences of the string from_str\nreplaced by the string to_str. REPLACE() performs a case-sensitive\nmatch when searching for from_str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT REPLACE(\'www.mysql.com\', \'w\', \'Ww\');\n        -> \'WwWwWw.mysql.com\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (57,29,'USE','Syntax:\nUSE db_name\n\nThe USE db_name statement tells MySQL to use the db_name database as\nthe default (current) database for subsequent statements. The database\nremains the default until the end of the session or another USE\nstatement is issued:\n\nUSE db1;\nSELECT COUNT(*) FROM mytable;   # selects from db1.mytable\nUSE db2;\nSELECT COUNT(*) FROM mytable;   # selects from db2.mytable\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/use.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/use.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (58,4,'LINEFROMTEXT','LineFromText(wkt[,srid]), LineStringFromText(wkt[,srid])\n\nConstructs a LineString value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (59,6,'CASE OPERATOR','Syntax:\nCASE value WHEN [compare_value] THEN result [WHEN [compare_value] THEN\nresult ...] [ELSE result] END\n\nCASE WHEN [condition] THEN result [WHEN [condition] THEN result ...]\n[ELSE result] END\n\nThe first version returns the result where value=compare_value. The\nsecond version returns the result for the first condition that is true.\nIf there was no matching result value, the result after ELSE is\nreturned, or NULL if there is no ELSE part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT CASE 1 WHEN 1 THEN \'one\'\n    ->     WHEN 2 THEN \'two\' ELSE \'more\' END;\n        -> \'one\'\nmysql> SELECT CASE WHEN 1>0 THEN \'true\' ELSE \'false\' END;\n        -> \'true\'\nmysql> SELECT CASE BINARY \'B\'\n    ->     WHEN \'a\' THEN 1 WHEN \'b\' THEN 2 END;\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (60,27,'SHOW MASTER STATUS','Syntax:\nSHOW MASTER STATUS\n\nThis statement provides status information about the binary log files\nof the master. It requires either the SUPER or REPLICATION CLIENT\nprivilege.\n\nExample:\n\nmysql> SHOW MASTER STATUS;\n+---------------+----------+--------------+------------------+\n| File          | Position | Binlog_Do_DB | Binlog_Ignore_DB |\n+---------------+----------+--------------+------------------+\n| mysql-bin.003 | 73       | test         | manual,mysql     |\n+---------------+----------+--------------+------------------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-master-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-master-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (61,32,'ADDTIME','Syntax:\nADDTIME(expr1,expr2)\n\nADDTIME() adds expr2 to expr1 and returns the result. expr1 is a time\nor datetime expression, and expr2 is a time expression.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT ADDTIME(\'2007-12-31 23:59:59.999999\', \'1 1:1:1.000002\');\n        -> \'2008-01-02 01:01:01.000001\'\nmysql> SELECT ADDTIME(\'01:00:00.999999\', \'02:00:00.999998\');\n        -> \'03:00:01.999997\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (62,32,'TO_SECONDS','Syntax:\nTO_SECONDS(expr)\n\nGiven a date or datetime expr, returns a the number of seconds since\nthe year 0. If expr is not a valid date or datetime value, returns\nNULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TO_SECONDS(950501);\n        -> 62966505600\nmysql> SELECT TO_SECONDS(\'2009-11-29\');\n        -> 63426672000\nmysql> SELECT TO_SECONDS(\'2009-11-29 13:43:32\');\n        -> 63426721412\nmysql> SELECT TO_SECONDS( NOW() );\n        -> 63426721458\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (63,32,'TIMESTAMPDIFF','Syntax:\nTIMESTAMPDIFF(unit,datetime_expr1,datetime_expr2)\n\nReturns datetime_expr2 - datetime_expr1, where datetime_expr1 and\ndatetime_expr2 are date or datetime expressions. One expression may be\na date and the other a datetime; a date value is treated as a datetime\nhaving the time part \'00:00:00\' where necessary. The unit for the\nresult (an integer) is given by the unit argument. The legal values for\nunit are the same as those listed in the description of the\nTIMESTAMPADD() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMESTAMPDIFF(MONTH,\'2003-02-01\',\'2003-05-01\');\n        -> 3\nmysql> SELECT TIMESTAMPDIFF(YEAR,\'2002-05-01\',\'2001-01-01\');\n        -> -1\nmysql> SELECT TIMESTAMPDIFF(MINUTE,\'2003-02-01\',\'2003-05-01 12:05:55\');\n        -> 128885\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (64,38,'UPPER','Syntax:\nUPPER(str)\n\nReturns the string str with all characters changed to uppercase\naccording to the current character set mapping. The default is latin1\n(cp1252 West European).\n\nmysql> SELECT UPPER(\'Hej\');\n        -> \'HEJ\'\n\nSee the description of LOWER() for information that also applies to\nUPPER(), such as information about how to perform lettercase conversion\nof binary strings (BINARY, VARBINARY, BLOB) for which these functions\nare ineffective.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (65,35,'SPATIAL','For MyISAM tables, MySQL can create spatial indexes using syntax\nsimilar to that for creating regular indexes, but using the SPATIAL\nkeyword. Columns in spatial indexes must be declared NOT NULL. The\nfollowing examples demonstrate how to create spatial indexes:\n\no With CREATE TABLE:\n\nCREATE TABLE geom (g GEOMETRY NOT NULL, SPATIAL INDEX(g)) ENGINE=MyISAM;\n\no With ALTER TABLE:\n\nALTER TABLE geom ADD SPATIAL INDEX(g);\n\no With CREATE INDEX:\n\nCREATE SPATIAL INDEX sp_index ON geom (g);\n\nSPATIAL INDEX creates an R-tree index. For storage engines that support\nnonspatial indexing of spatial columns, the engine creates a B-tree\nindex. A B-tree index on spatial values is useful for exact-value\nlookups, but not for range scans.\n\nFor more information on indexing spatial columns, see [HELP CREATE\nINDEX].\n\nTo drop spatial indexes, use ALTER TABLE or DROP INDEX:\n\no With ALTER TABLE:\n\nALTER TABLE geom DROP INDEX g;\n\no With DROP INDEX:\n\nDROP INDEX sp_index ON geom;\n\nExample: Suppose that a table geom contains more than 32,000\ngeometries, which are stored in the column g of type GEOMETRY. The\ntable also has an AUTO_INCREMENT column fid for storing object ID\nvalues.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-indexes.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-indexes.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (66,32,'FROM_UNIXTIME','Syntax:\nFROM_UNIXTIME(unix_timestamp), FROM_UNIXTIME(unix_timestamp,format)\n\nReturns a representation of the unix_timestamp argument as a value in\n\'YYYY-MM-DD HH:MM:SS\' or YYYYMMDDHHMMSS.uuuuuu format, depending on\nwhether the function is used in a string or numeric context. The value\nis expressed in the current time zone. unix_timestamp is an internal\ntimestamp value such as is produced by the UNIX_TIMESTAMP() function.\n\nIf format is given, the result is formatted according to the format\nstring, which is used the same way as listed in the entry for the\nDATE_FORMAT() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_UNIXTIME(1196440219);\n        -> \'2007-11-30 10:30:19\'\nmysql> SELECT FROM_UNIXTIME(1196440219) + 0;\n        -> 20071130103019.000000\nmysql> SELECT FROM_UNIXTIME(UNIX_TIMESTAMP(),\n    ->                      \'%Y %D %M %h:%i:%s %x\');\n        -> \'2007 30th November 10:30:59 2007\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (67,23,'MEDIUMBLOB','MEDIUMBLOB\n\nA BLOB column with a maximum length of 16,777,215 (224 - 1) bytes. Each\nMEDIUMBLOB value is stored using a 3-byte length prefix that indicates\nthe number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (68,12,'SHA2','Syntax:\nSHA2(str, hash_length)\n\nCalculates the SHA-2 family of hash functions (SHA-224, SHA-256,\nSHA-384, and SHA-512). The first argument is the cleartext string to be\nhashed. The second argument indicates the desired bit length of the\nresult, which must have a value of 224, 256, 384, 512, or 0 (which is\nequivalent to 256). If either argument is NULL or the hash length is\nnot one of the permitted values, the return value is NULL. Otherwise,\nthe function result is a hash value containing the desired number of\nbits. See the notes at the beginning of this section about storing hash\nvalues efficiently.\n\nAs of MySQL 5.5.6, the return value is a nonbinary string in the\nconnection character set. Before 5.5.6, the return value is a binary\nstring; see the notes at the beginning of this section about using the\nvalue as a nonbinary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT SHA2(\'abc\', 224);\n        -> \'23097d223405d8228642a477bda255b32aadbce4bda0b3f7e36c9da7\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (69,6,'IFNULL','Syntax:\nIFNULL(expr1,expr2)\n\nIf expr1 is not NULL, IFNULL() returns expr1; otherwise it returns\nexpr2. IFNULL() returns a numeric or string value, depending on the\ncontext in which it is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT IFNULL(1,0);\n        -> 1\nmysql> SELECT IFNULL(NULL,10);\n        -> 10\nmysql> SELECT IFNULL(1/0,10);\n        -> 10\nmysql> SELECT IFNULL(1/0,\'yes\');\n        -> \'yes\'\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (70,27,'SHOW FUNCTION CODE','Syntax:\nSHOW FUNCTION CODE func_name\n\nThis statement is similar to SHOW PROCEDURE CODE but for stored\nfunctions. See [HELP SHOW PROCEDURE CODE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-function-code.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-function-code.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (71,27,'SHOW ERRORS','Syntax:\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW COUNT(*) ERRORS\n\nSHOW ERRORS is a diagnostic statement that is similar to SHOW WARNINGS,\nexcept that it displays information only for errors, rather than for\nerrors, warnings, and notes.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nThe SHOW COUNT(*) ERRORS statement displays the number of errors. You\ncan also retrieve this number from the error_count variable:\n\nSHOW COUNT(*) ERRORS;\nSELECT @@error_count;\n\nSHOW ERRORS and error_count apply only to errors, not warnings or\nnotes. In other respects, they are similar to SHOW WARNINGS and\nwarning_count. In particular, SHOW ERRORS cannot display information\nfor more than max_error_count messages, and error_count can exceed the\nvalue of max_error_count if the number of errors exceeds\nmax_error_count.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-errors.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-errors.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (72,20,'LEAST','Syntax:\nLEAST(value1,value2,...)\n\nWith two or more arguments, returns the smallest (minimum-valued)\nargument. The arguments are compared using the following rules:\n\no If any argument is NULL, the result is NULL. No comparison is needed.\n\no If the return value is used in an INTEGER context or all arguments\n  are integer-valued, they are compared as integers.\n\no If the return value is used in a REAL context or all arguments are\n  real-valued, they are compared as reals.\n\no If the arguments comprise a mix of numbers and strings, they are\n  compared as numbers.\n\no If any argument is a nonbinary (character) string, the arguments are\n  compared as nonbinary strings.\n\no In all other cases, the arguments are compared as binary strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT LEAST(2,0);\n        -> 0\nmysql> SELECT LEAST(34.0,3.0,5.0,767.0);\n        -> 3.0\nmysql> SELECT LEAST(\'B\',\'A\',\'C\');\n        -> \'A\'\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (73,20,'=','=\n\nEqual:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 = 0;\n        -> 0\nmysql> SELECT \'0\' = 0;\n        -> 1\nmysql> SELECT \'0.0\' = 0;\n        -> 1\nmysql> SELECT \'0.01\' = 0;\n        -> 0\nmysql> SELECT \'.01\' = 0.01;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (74,38,'REVERSE','Syntax:\nREVERSE(str)\n\nReturns the string str with the order of the characters reversed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT REVERSE(\'abc\');\n        -> \'cba\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (75,20,'ISNULL','Syntax:\nISNULL(expr)\n\nIf expr is NULL, ISNULL() returns 1, otherwise it returns 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT ISNULL(1+1);\n        -> 0\nmysql> SELECT ISNULL(1/0);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (76,23,'BINARY','BINARY(M)\n\nThe BINARY type is similar to the CHAR type, but stores binary byte\nstrings rather than nonbinary character strings. M represents the\ncolumn length in bytes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (77,23,'BLOB DATA TYPE','A BLOB is a binary large object that can hold a variable amount of\ndata. The four BLOB types are TINYBLOB, BLOB, MEDIUMBLOB, and LONGBLOB.\nThese differ only in the maximum length of the values they can hold.\nThe four TEXT types are TINYTEXT, TEXT, MEDIUMTEXT, and LONGTEXT. These\ncorrespond to the four BLOB types and have the same maximum lengths and\nstorage requirements. See\nhttp://dev.mysql.com/doc/refman/5.5/en/storage-requirements.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/blob.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/blob.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (78,10,'CREATE USER','Syntax:\nCREATE USER user_specification [, user_specification] ...\n\nuser_specification:\n    user\n    [\n      | IDENTIFIED WITH auth_plugin [AS \'auth_string\']\n        IDENTIFIED BY [PASSWORD] \'password\'\n    ]\n\nThe CREATE USER statement creates new MySQL accounts. An error occurs\nfor accounts that already exist. To use this statement, you must have\nthe global CREATE USER privilege or the INSERT privilege for the mysql\ndatabase. For each account, CREATE USER creates a new row in the\nmysql.user table with no privileges and (as of MySQL 5.5.7) assigns the\naccount an authentication plugin. Depending on the syntax used, CREATE\nUSER may also assign the account a password.\n\nEach user_specification clause consists of an account name and\ninformation about how authentication occurs for clients that use the\naccount. This part of CREATE USER syntax is shared with GRANT, so the\ndescription here applies to GRANT as well.\n\nEach account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nThe server assigns an authentication plugin and password to each\naccount as follows, depending on whether the user specification clause\nincludes IDENTIFIED WITH to specify a plugin or IDENTIFIED BY to\nspecify a password:\n\n*Note*: IDENTIFIED WITH is available as of MySQL 5.5.7. Before 5.5.7,\nauthentication plugins are not used, so only the remarks about\nIDENTIFIED BY apply.\n\no With IDENTIFIED WITH, the server assigns the specified plugin and the\n  account has no password.\n\no With IDENTIFIED BY, the server assigns no plugin and assigns the\n  specified password.\n\no With neither IDENTIFIED WITH nor IDENTIFIED BY, the server assigns no\n  plugin and the account has no password.\n\nIf the account has no password, the Password column in the account\'s\nmysql.user table row remains empty, which is insecure. To set the\npassword, use SET PASSWORD. See [HELP SET PASSWORD].\n\nIf the server assigns no plugin to the account, the plugin column in\nthe account\'s mysql.user table row remains empty.\n\nFor client connections that use a given account, the server invokes the\nauthentication plugin assigned to the account and the client must\nprovide credentials as required by the authentication method that the\nplugin implements. If the server cannot find the plugin, either at\naccount-creation time or connect time, an error occurs.\n\nIf an account\'s mysql.user table row has a nonempty plugin column:\n\no The server authenticates client connection attempts using the named\n  plugin.\n\no Changes to the account password using SET PASSWORD with PASSWORD()\n  must be made with the old_passwords system variable set to the value\n  required by the authentication plugin, so that PASSWORD() uses the\n  appropriate password hashing method. If the plugin is\n  mysql_old_password, the password can also be changed using SET\n  PASSWORD with OLD_PASSWORD(), which uses pre-4.1 password hashing\n  regardless of the value of old_passwords.\n\nIf an account\'s mysql.user table row has an empty plugin column:\n\no The server authenticates client connection attempts using the\n  mysql_native_password or mysql_old_password authentication plugin,\n  depending on the hash format of the password stored in the Password\n  column.\n\no Changes to the account password using SET PASSWORD can be made with\n  PASSWORD(), with old_passwords set to 0 or 1 for 4.1 or pre-4.1\n  password hashing, respectively, or with OLD_PASSWORD(), which uses\n  pre-4.1 password hashing regardless of the value of old_passwords.\n\nCREATE USER examples:\n\no To specify an authentication plugin for an account, use IDENTIFIED\n  WITH auth_plugin. The plugin name can be a quoted string literal or\n  an unquoted name. \'auth_string\' is an optional quoted string literal\n  to pass to the plugin. The plugin interprets the meaning of the\n  string, so its format is plugin specific. Consult the documentation\n  for a given plugin for information about the authentication string\n  values it accepts, if any.\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED WITH mysql_native_password;\n\n  The server assigns the given authentication plugin to the account but\n  no password. Clients must provide no password when they connect.\n  However, an account with no password is insecure. To ensure that an\n  account uses a specific authentication plugin and has a password with\n  the corresponding hash format, specify the plugin explicitly with\n  IDENTIFIED WITH, then use SET PASSWORD to set the password:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED WITH mysql_native_password;\nSET old_passwords = 0;\nSET PASSWORD FOR \'jeffrey\'@\'localhost\' = PASSWORD(\'mypass\');\n\n  Changes to the account password using SET PASSWORD with PASSWORD()\n  must be made with the old_passwords system variable set to the value\n  required by the account\'s authentication plugin, so that PASSWORD()\n  uses the appropriate password hashing method. Therefore, to use the\n  mysql_old_password plugin instead, name that plugin in the CREATE\n  USER statement and set old_passwords to 1 before using SET PASSWORD.\n\no To specify a password for an account at account-creation time, use\n  IDENTIFIED BY with the literal plaintext password value:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\n\n  The server assigns the given password to the account but no\n  authentication plugin. Clients must provide the password when they\n  connect.\n\no To avoid specifying the plaintext password if you know its hash value\n  (the value that PASSWORD() would return for the password), specify\n  the hash value preceded by the keyword PASSWORD:\n\nCREATE USER \'jeffrey\'@\'localhost\'\nIDENTIFIED BY PASSWORD \'*90E462C37378CED12064BB3388827D2BA3A9B689\';\n\n  The server assigns the given password to the account but no\n  authentication plugin. Clients must provide the password when they\n  connect.\n\no To enable the user to connect with no password, include no IDENTIFIED\n  BY clause:\n\nCREATE USER \'jeffrey\'@\'localhost\';\n\n  The server assigns no authentication plugin or password to the\n  account. Clients must provide no password when they connect. However,\n  an account with no password is insecure. To avoid this, use SET\n  PASSWORD to set the account password.\n\nFor additional information about setting passwords and authentication\nplugins, see\nhttp://dev.mysql.com/doc/refman/5.5/en/assigning-passwords.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/pluggable-authentication.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-user.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (79,25,'POINT','Point(x,y)\n\nConstructs a Point using its coordinates.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (80,17,'CURRENT_USER','Syntax:\nCURRENT_USER, CURRENT_USER()\n\nReturns the user name and host name combination for the MySQL account\nthat the server used to authenticate the current client. This account\ndetermines your access privileges. The return value is a string in the\nutf8 character set.\n\nThe value of CURRENT_USER() can differ from the value of USER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT USER();\n        -> \'davida@localhost\'\nmysql> SELECT * FROM mysql.user;\nERROR 1044: Access denied for user \'\'@\'localhost\' to\ndatabase \'mysql\'\nmysql> SELECT CURRENT_USER();\n        -> \'@localhost\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (81,38,'LCASE','Syntax:\nLCASE(str)\n\nLCASE() is a synonym for LOWER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (82,20,'<=','Syntax:\n<=\n\nLess than or equal:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 0.1 <= 2;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (83,27,'SHOW PROFILES','Syntax:\nSHOW PROFILES\n\nThe SHOW PROFILES statement, together with SHOW PROFILE, displays\nprofiling information that indicates resource usage for statements\nexecuted during the course of the current session. For more\ninformation, see [HELP SHOW PROFILE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-profiles.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-profiles.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (84,28,'UPDATE','Syntax:\nSingle-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_reference\n    SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ...\n    [WHERE where_condition]\n    [ORDER BY ...]\n    [LIMIT row_count]\n\nMultiple-table syntax:\n\nUPDATE [LOW_PRIORITY] [IGNORE] table_references\n    SET col_name1={expr1|DEFAULT} [, col_name2={expr2|DEFAULT}] ...\n    [WHERE where_condition]\n\nFor the single-table syntax, the UPDATE statement updates columns of\nexisting rows in the named table with new values. The SET clause\nindicates which columns to modify and the values they should be given.\nEach value can be given as an expression, or the keyword DEFAULT to set\na column explicitly to its default value. The WHERE clause, if given,\nspecifies the conditions that identify which rows to update. With no\nWHERE clause, all rows are updated. If the ORDER BY clause is\nspecified, the rows are updated in the order that is specified. The\nLIMIT clause places a limit on the number of rows that can be updated.\n\nFor the multiple-table syntax, UPDATE updates rows in each table named\nin table_references that satisfy the conditions. Each matching row is\nupdated once, even if it matches the conditions multiple times. For\nmultiple-table syntax, ORDER BY and LIMIT cannot be used.\n\nwhere_condition is an expression that evaluates to true for each row to\nbe updated. For expression syntax, see\nhttp://dev.mysql.com/doc/refman/5.5/en/expressions.html.\n\ntable_references and where_condition are specified as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nYou need the UPDATE privilege only for columns referenced in an UPDATE\nthat are actually updated. You need only the SELECT privilege for any\ncolumns that are read but not modified.\n\nThe UPDATE statement supports the following modifiers:\n\no With the LOW_PRIORITY keyword, execution of the UPDATE is delayed\n  until no other clients are reading from the table. This affects only\n  storage engines that use only table-level locking (such as MyISAM,\n  MEMORY, and MERGE).\n\no With the IGNORE keyword, the update statement does not abort even if\n  errors occur during the update. Rows for which duplicate-key\n  conflicts occur on a unique key value are not updated. Rows updated\n  to values that would cause data conversion errors are updated to the\n  closest valid values instead.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/update.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/update.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (85,20,'IS NOT NULL','Syntax:\nIS NOT NULL\n\nTests whether a value is not NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NOT NULL, 0 IS NOT NULL, NULL IS NOT NULL;\n        -> 1, 1, 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (86,24,'CASE STATEMENT','Syntax:\nCASE case_value\n    WHEN when_value THEN statement_list\n    [WHEN when_value THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nOr:\n\nCASE\n    WHEN search_condition THEN statement_list\n    [WHEN search_condition THEN statement_list] ...\n    [ELSE statement_list]\nEND CASE\n\nThe CASE statement for stored programs implements a complex conditional\nconstruct.\n\n*Note*: There is also a CASE expression, which differs from the CASE\nstatement described here. See\nhttp://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html. The\nCASE statement cannot have an ELSE NULL clause, and it is terminated\nwith END CASE instead of END.\n\nFor the first syntax, case_value is an expression. This value is\ncompared to the when_value expression in each WHEN clause until one of\nthem is equal. When an equal when_value is found, the corresponding\nTHEN clause statement_list executes. If no when_value is equal, the\nELSE clause statement_list executes, if there is one.\n\nThis syntax cannot be used to test for equality with NULL because NULL\n= NULL is false. See\nhttp://dev.mysql.com/doc/refman/5.5/en/working-with-null.html.\n\nFor the second syntax, each WHEN clause search_condition expression is\nevaluated until one is true, at which point its corresponding THEN\nclause statement_list executes. If no search_condition is equal, the\nELSE clause statement_list executes, if there is one.\n\nIf no when_value or search_condition matches the value tested and the\nCASE statement contains no ELSE clause, a Case not found for CASE\nstatement error results.\n\nEach statement_list consists of one or more SQL statements; an empty\nstatement_list is not permitted.\n\nTo handle situations where no value is matched by any WHEN clause, use\nan ELSE containing an empty BEGIN ... END block, as shown in this\nexample. (The indentation used here in the ELSE clause is for purposes\nof clarity only, and is not otherwise significant.)\n\nDELIMITER |\n\nCREATE PROCEDURE p()\n  BEGIN\n    DECLARE v INT DEFAULT 1;\n\n    CASE v\n      WHEN 2 THEN SELECT v;\n      WHEN 3 THEN SELECT 0;\n      ELSE\n        BEGIN\n        END;\n    END CASE;\n  END;\n  |\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/case.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/case.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (87,8,'EXECUTE STATEMENT','Syntax:\nEXECUTE stmt_name\n    [USING @var_name [, @var_name] ...]\n\nAfter preparing a statement with PREPARE, you execute it with an\nEXECUTE statement that refers to the prepared statement name. If the\nprepared statement contains any parameter markers, you must supply a\nUSING clause that lists user variables containing the values to be\nbound to the parameters. Parameter values can be supplied only by user\nvariables, and the USING clause must name exactly as many variables as\nthe number of parameter markers in the statement.\n\nYou can execute a given prepared statement multiple times, passing\ndifferent variables to it or setting the variables to different values\nbefore each execution.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/execute.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/execute.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (88,40,'DROP INDEX','Syntax:\nDROP [ONLINE|OFFLINE] INDEX index_name ON tbl_name\n\nDROP INDEX drops the index named index_name from the table tbl_name.\nThis statement is mapped to an ALTER TABLE statement to drop the index.\nSee [HELP ALTER TABLE].\n\nTo drop a primary key, the index name is always PRIMARY, which must be\nspecified as a quoted identifier because PRIMARY is a reserved word:\n\nDROP INDEX `PRIMARY` ON t;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (89,38,'MATCH AGAINST','Syntax:\nMATCH (col1,col2,...) AGAINST (expr [search_modifier])\n\nMySQL has support for full-text indexing and searching:\n\no A full-text index in MySQL is an index of type FULLTEXT.\n\no Full-text indexes can be used only with MyISAM tables. (In MySQL 5.6\n  and up, they can also be used with InnoDB tables.) Full-text indexes\n  can be created only for CHAR, VARCHAR, or TEXT columns.\n\no A FULLTEXT index definition can be given in the CREATE TABLE\n  statement when a table is created, or added later using ALTER TABLE\n  or CREATE INDEX.\n\no For large data sets, it is much faster to load your data into a table\n  that has no FULLTEXT index and then create the index after that, than\n  to load data into a table that has an existing FULLTEXT index.\n\nFull-text searching is performed using MATCH() ... AGAINST syntax.\nMATCH() takes a comma-separated list that names the columns to be\nsearched. AGAINST takes a string to search for, and an optional\nmodifier that indicates what type of search to perform. The search\nstring must be a string value that is constant during query evaluation.\nThis rules out, for example, a table column because that can differ for\neach row.\n\nThere are three types of full-text searches:\n\no A natural language search interprets the search string as a phrase in\n  natural human language (a phrase in free text). There are no special\n  operators. The stopword list applies. In addition, words that are\n  present in 50% or more of the rows are considered common and do not\n  match.\n\n  Full-text searches are natural language searches if the IN NATURAL\n  LANGUAGE MODE modifier is given or if no modifier is given. For more\n  information, see\n  http://dev.mysql.com/doc/refman/5.5/en/fulltext-natural-language.html\n  .\n\no A boolean search interprets the search string using the rules of a\n  special query language. The string contains the words to search for.\n  It can also contain operators that specify requirements such that a\n  word must be present or absent in matching rows, or that it should be\n  weighted higher or lower than usual. Common words such as "some" or\n  "then" are stopwords and do not match if present in the search\n  string. The IN BOOLEAN MODE modifier specifies a boolean search. For\n  more information, see\n  http://dev.mysql.com/doc/refman/5.5/en/fulltext-boolean.html.\n\no A query expansion search is a modification of a natural language\n  search. The search string is used to perform a natural language\n  search. Then words from the most relevant rows returned by the search\n  are added to the search string and the search is done again. The\n  query returns the rows from the second search. The IN NATURAL\n  LANGUAGE MODE WITH QUERY EXPANSION or WITH QUERY EXPANSION modifier\n  specifies a query expansion search. For more information, see\n  http://dev.mysql.com/doc/refman/5.5/en/fulltext-query-expansion.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/fulltext-search.html\n\n','mysql> SELECT id, body, MATCH (title,body) AGAINST\n    -> (\'Security implications of running MySQL as root\'\n    -> IN NATURAL LANGUAGE MODE) AS score\n    -> FROM articles WHERE MATCH (title,body) AGAINST\n    -> (\'Security implications of running MySQL as root\'\n    -> IN NATURAL LANGUAGE MODE);\n+----+-------------------------------------+-----------------+\n| id | body                                | score           |\n+----+-------------------------------------+-----------------+\n|  4 | 1. Never run mysqld as root. 2. ... | 1.5219271183014 |\n|  6 | When configured properly, MySQL ... | 1.3114095926285 |\n+----+-------------------------------------+-----------------+\n2 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/fulltext-search.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (90,40,'CREATE EVENT','Syntax:\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    EVENT\n    [IF NOT EXISTS]\n    event_name\n    ON SCHEDULE schedule\n    [ON COMPLETION [NOT] PRESERVE]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'comment\']\n    DO event_body;\n\nschedule:\n    AT timestamp [+ INTERVAL interval] ...\n  | EVERY interval\n    [STARTS timestamp [+ INTERVAL interval] ...]\n    [ENDS timestamp [+ INTERVAL interval] ...]\n\ninterval:\n    quantity {YEAR | QUARTER | MONTH | DAY | HOUR | MINUTE |\n              WEEK | SECOND | YEAR_MONTH | DAY_HOUR | DAY_MINUTE |\n              DAY_SECOND | HOUR_MINUTE | HOUR_SECOND | MINUTE_SECOND}\n\nThis statement creates and schedules a new event. The event will not\nrun unless the Event Scheduler is enabled. For information about\nchecking Event Scheduler status and enabling it if necessary, see\nhttp://dev.mysql.com/doc/refman/5.5/en/events-configuration.html.\n\nCREATE EVENT requires the EVENT privilege for the schema in which the\nevent is to be created. It might also require the SUPER privilege,\ndepending on the DEFINER value, as described later in this section.\n\nThe minimum requirements for a valid CREATE EVENT statement are as\nfollows:\n\no The keywords CREATE EVENT plus an event name, which uniquely\n  identifies the event in a database schema.\n\no An ON SCHEDULE clause, which determines when and how often the event\n  executes.\n\no A DO clause, which contains the SQL statement to be executed by an\n  event.\n\nThis is an example of a minimal CREATE EVENT statement:\n\nCREATE EVENT myevent\n    ON SCHEDULE AT CURRENT_TIMESTAMP + INTERVAL 1 HOUR\n    DO\n      UPDATE myschema.mytable SET mycol = mycol + 1;\n\nThe previous statement creates an event named myevent. This event\nexecutes once---one hour following its creation---by running an SQL\nstatement that increments the value of the myschema.mytable table\'s\nmycol column by 1.\n\nThe event_name must be a valid MySQL identifier with a maximum length\nof 64 characters. Event names are not case sensitive, so you cannot\nhave two events named myevent and MyEvent in the same schema. In\ngeneral, the rules governing event names are the same as those for\nnames of stored routines. See\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\nAn event is associated with a schema. If no schema is indicated as part\nof event_name, the default (current) schema is assumed. To create an\nevent in a specific schema, qualify the event name with a schema using\nschema_name.event_name syntax.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-event.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (91,3,'ABS','Syntax:\nABS(X)\n\nReturns the absolute value of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ABS(2);\n        -> 2\nmysql> SELECT ABS(-32);\n        -> 32\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (92,33,'POLYFROMWKB','PolyFromWKB(wkb[,srid]), PolygonFromWKB(wkb[,srid])\n\nConstructs a Polygon value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (93,38,'NOT LIKE','Syntax:\nexpr NOT LIKE pat [ESCAPE \'escape_char\']\n\nThis is the same as NOT (expr LIKE pat [ESCAPE \'escape_char\']).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (94,38,'SPACE','Syntax:\nSPACE(N)\n\nReturns a string consisting of N space characters.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SPACE(6);\n        -> \'      \'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (95,7,'MBR DEFINITION','Its MBR (minimum bounding rectangle), or envelope. This is the bounding\ngeometry, formed by the minimum and maximum (X,Y) coordinates:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-class-geometry.html\n\n','((MINX MINY, MAXX MINY, MAXX MAXY, MINX MAXY, MINX MINY))\n','http://dev.mysql.com/doc/refman/5.5/en/gis-class-geometry.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (96,16,'MAX','Syntax:\nMAX([DISTINCT] expr)\n\nReturns the maximum value of expr. MAX() may take a string argument; in\nsuch cases, it returns the maximum string value. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html. The DISTINCT\nkeyword can be used to find the maximum of the distinct values of expr,\nhowever, this produces the same result as omitting DISTINCT.\n\nMAX() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name, MIN(test_score), MAX(test_score)\n    ->        FROM student\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (97,25,'GEOMETRYCOLLECTION','GeometryCollection(g1,g2,...)\n\nConstructs a GeometryCollection.\n\nIf the argument contains a nonsupported geometry, the return value is\nNULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (98,22,'CREATE FUNCTION UDF','Syntax:\nCREATE [AGGREGATE] FUNCTION function_name RETURNS {STRING|INTEGER|REAL|DECIMAL}\n    SONAME shared_library_name\n\nA user-defined function (UDF) is a way to extend MySQL with a new\nfunction that works like a native (built-in) MySQL function such as\nABS() or CONCAT().\n\nfunction_name is the name that should be used in SQL statements to\ninvoke the function. The RETURNS clause indicates the type of the\nfunction\'s return value. DECIMAL is a legal value after RETURNS, but\ncurrently DECIMAL functions return string values and should be written\nlike STRING functions.\n\nshared_library_name is the basename of the shared object file that\ncontains the code that implements the function. The file must be\nlocated in the plugin directory. This directory is given by the value\nof the plugin_dir system variable. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/udf-compiling.html.\n\nTo create a function, you must have the INSERT privilege for the mysql\ndatabase. This is necessary because CREATE FUNCTION adds a row to the\nmysql.func system table that records the function\'s name, type, and\nshared library name. If you do not have this table, you should run the\nmysql_upgrade command to create it. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-upgrade.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-function-udf.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-function-udf.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (99,3,'*','Syntax:\n*\n\nMultiplication:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3*5;\n        -> 15\nmysql> SELECT 18014398509481984*18014398509481984.0;\n        -> 324518553658426726783156020576256.0\nmysql> SELECT 18014398509481984*18014398509481984;\n        -> out-of-range error\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (100,23,'TIMESTAMP','TIMESTAMP\n\nA timestamp. The range is \'1970-01-01 00:00:01\' UTC to \'2038-01-19\n03:14:07\' UTC. TIMESTAMP values are stored as the number of seconds\nsince the epoch (\'1970-01-01 00:00:00\' UTC). A TIMESTAMP cannot\nrepresent the value \'1970-01-01 00:00:00\' because that is equivalent to\n0 seconds from the epoch and the value 0 is reserved for representing\n\'0000-00-00 00:00:00\', the "zero" TIMESTAMP value.\n\nUnless specified otherwise, the first TIMESTAMP column in a table is\ndefined to be automatically set to the date and time of the most recent\nmodification if not explicitly assigned a value. This makes TIMESTAMP\nuseful for recording the timestamp of an INSERT or UPDATE operation.\nYou can also set any TIMESTAMP column to the current date and time by\nassigning it a NULL value, unless it has been defined with the NULL\nattribute to permit NULL values. The automatic initialization and\nupdating to the current date and time can be specified using DEFAULT\nCURRENT_TIMESTAMP and ON UPDATE CURRENT_TIMESTAMP clauses, as described\nin\nhttp://dev.mysql.com/doc/refman/5.5/en/timestamp-initialization.html.\n\n*Note*: The TIMESTAMP format that was used prior to MySQL 4.1 is not\nsupported in MySQL 5.5; see MySQL 3.23, 4.0, 4.1 Reference Manual for\ninformation regarding the old format.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (101,12,'DES_DECRYPT','Syntax:\nDES_DECRYPT(crypt_str[,key_str])\n\nDecrypts a string encrypted with DES_ENCRYPT(). If an error occurs,\nthis function returns NULL.\n\nThis function works only if MySQL has been configured with SSL support.\nSee http://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html.\n\nIf no key_str argument is given, DES_DECRYPT() examines the first byte\nof the encrypted string to determine the DES key number that was used\nto encrypt the original string, and then reads the key from the DES key\nfile to decrypt the message. For this to work, the user must have the\nSUPER privilege. The key file can be specified with the --des-key-file\nserver option.\n\nIf you pass this function a key_str argument, that string is used as\nthe key for decrypting the message.\n\nIf the crypt_str argument does not appear to be an encrypted string,\nMySQL returns the given crypt_str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (102,27,'CACHE INDEX','Syntax:\nCACHE INDEX\n  tbl_index_list [, tbl_index_list] ...\n  [PARTITION (partition_list | ALL)]\n  IN key_cache_name\n\ntbl_index_list:\n  tbl_name [[INDEX|KEY] (index_name[, index_name] ...)]\n\npartition_list:\n  partition_name[, partition_name][, ...]\n\nThe CACHE INDEX statement assigns table indexes to a specific key\ncache. It is used only for MyISAM tables. After the indexes have been\nassigned, they can be preloaded into the cache if desired with LOAD\nINDEX INTO CACHE.\n\nThe following statement assigns indexes from the tables t1, t2, and t3\nto the key cache named hot_cache:\n\nmysql> CACHE INDEX t1, t2, t3 IN hot_cache;\n+---------+--------------------+----------+----------+\n| Table   | Op                 | Msg_type | Msg_text |\n+---------+--------------------+----------+----------+\n| test.t1 | assign_to_keycache | status   | OK       |\n| test.t2 | assign_to_keycache | status   | OK       |\n| test.t3 | assign_to_keycache | status   | OK       |\n+---------+--------------------+----------+----------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cache-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/cache-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (103,13,'ENDPOINT','EndPoint(ls)\n\nReturns the Point that is the endpoint of the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(EndPoint(GeomFromText(@ls)));\n+-------------------------------------+\n| AsText(EndPoint(GeomFromText(@ls))) |\n+-------------------------------------+\n| POINT(3 3)                          |\n+-------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (104,12,'COMPRESS','Syntax:\nCOMPRESS(string_to_compress)\n\nCompresses a string and returns the result as a binary string. This\nfunction requires MySQL to have been compiled with a compression\nlibrary such as zlib. Otherwise, the return value is always NULL. The\ncompressed string can be uncompressed with UNCOMPRESS().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT LENGTH(COMPRESS(REPEAT(\'a\',1000)));\n        -> 21\nmysql> SELECT LENGTH(COMPRESS(\'\'));\n        -> 0\nmysql> SELECT LENGTH(COMPRESS(\'a\'));\n        -> 13\nmysql> SELECT LENGTH(COMPRESS(REPEAT(\'a\',16)));\n        -> 15\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (105,28,'INSERT','Syntax:\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name [(col_name,...)]\n    {VALUES | VALUE} ({expr | DEFAULT},...),(...),...\n    [ ON DUPLICATE KEY UPDATE\n      col_name=expr\n        [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name\n    SET col_name={expr | DEFAULT}, ...\n    [ ON DUPLICATE KEY UPDATE\n      col_name=expr\n        [, col_name=expr] ... ]\n\nOr:\n\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name [(col_name,...)]\n    SELECT ...\n    [ ON DUPLICATE KEY UPDATE\n      col_name=expr\n        [, col_name=expr] ... ]\n\nINSERT inserts new rows into an existing table. The INSERT ... VALUES\nand INSERT ... SET forms of the statement insert rows based on\nexplicitly specified values. The INSERT ... SELECT form inserts rows\nselected from another table or tables. INSERT ... SELECT is discussed\nfurther in [HELP INSERT SELECT].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/insert.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/insert.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (106,16,'COUNT','Syntax:\nCOUNT(expr)\n\nReturns a count of the number of non-NULL values of expr in the rows\nretrieved by a SELECT statement. The result is a BIGINT value.\n\nCOUNT() returns 0 if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student.student_name,COUNT(*)\n    ->        FROM student,course\n    ->        WHERE student.student_id=course.student_id\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (107,28,'HANDLER','Syntax:\nHANDLER tbl_name OPEN [ [AS] alias]\n\nHANDLER tbl_name READ index_name { = | <= | >= | < | > } (value1,value2,...)\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ index_name { FIRST | NEXT | PREV | LAST }\n    [ WHERE where_condition ] [LIMIT ... ]\nHANDLER tbl_name READ { FIRST | NEXT }\n    [ WHERE where_condition ] [LIMIT ... ]\n\nHANDLER tbl_name CLOSE\n\nThe HANDLER statement provides direct access to table storage engine\ninterfaces. It is available for InnoDB and MyISAM tables.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/handler.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/handler.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (108,4,'MLINEFROMTEXT','MLineFromText(wkt[,srid]), MultiLineStringFromText(wkt[,srid])\n\nConstructs a MultiLineString value using its WKT representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (109,33,'GEOMCOLLFROMWKB','GeomCollFromWKB(wkb[,srid]), GeometryCollectionFromWKB(wkb[,srid])\n\nConstructs a GeometryCollection value using its WKB representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (110,9,'HELP_DATE','This help information was generated from the MySQL 5.5 Reference Manual\non: 2015-02-26\n','','');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (111,40,'RENAME TABLE','Syntax:\nRENAME TABLE tbl_name TO new_tbl_name\n    [, tbl_name2 TO new_tbl_name2] ...\n\nThis statement renames one or more tables.\n\nThe rename operation is done atomically, which means that no other\nsession can access any of the tables while the rename is running. For\nexample, if you have an existing table old_table, you can create\nanother table new_table that has the same structure but is empty, and\nthen replace the existing table with the empty one as follows (assuming\nthat backup_table does not already exist):\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/rename-table.html\n\n','CREATE TABLE new_table (...);\nRENAME TABLE old_table TO backup_table, new_table TO old_table;\n','http://dev.mysql.com/doc/refman/5.5/en/rename-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (112,23,'BOOLEAN','BOOL, BOOLEAN\n\nThese types are synonyms for TINYINT(1). A value of zero is considered\nfalse. Nonzero values are considered true:\n\nmysql> SELECT IF(0, \'true\', \'false\');\n+------------------------+\n| IF(0, \'true\', \'false\') |\n+------------------------+\n| false                  |\n+------------------------+\n\nmysql> SELECT IF(1, \'true\', \'false\');\n+------------------------+\n| IF(1, \'true\', \'false\') |\n+------------------------+\n| true                   |\n+------------------------+\n\nmysql> SELECT IF(2, \'true\', \'false\');\n+------------------------+\n| IF(2, \'true\', \'false\') |\n+------------------------+\n| true                   |\n+------------------------+\n\nHowever, the values TRUE and FALSE are merely aliases for 1 and 0,\nrespectively, as shown here:\n\nmysql> SELECT IF(0 = FALSE, \'true\', \'false\');\n+--------------------------------+\n| IF(0 = FALSE, \'true\', \'false\') |\n+--------------------------------+\n| true                           |\n+--------------------------------+\n\nmysql> SELECT IF(1 = TRUE, \'true\', \'false\');\n+-------------------------------+\n| IF(1 = TRUE, \'true\', \'false\') |\n+-------------------------------+\n| true                          |\n+-------------------------------+\n\nmysql> SELECT IF(2 = TRUE, \'true\', \'false\');\n+-------------------------------+\n| IF(2 = TRUE, \'true\', \'false\') |\n+-------------------------------+\n| false                         |\n+-------------------------------+\n\nmysql> SELECT IF(2 = FALSE, \'true\', \'false\');\n+--------------------------------+\n| IF(2 = FALSE, \'true\', \'false\') |\n+--------------------------------+\n| false                          |\n+--------------------------------+\n\nThe last two statements display the results shown because 2 is equal to\nneither 1 nor 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (113,14,'DEFAULT','Syntax:\nDEFAULT(col_name)\n\nReturns the default value for a table column. An error results if the\ncolumn has no default value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> UPDATE t SET i = DEFAULT(i)+1 WHERE id < 100;\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (114,3,'MOD','Syntax:\nMOD(N,M), N % M, N MOD M\n\nModulo operation. Returns the remainder of N divided by M.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT MOD(234, 10);\n        -> 4\nmysql> SELECT 253 % 7;\n        -> 1\nmysql> SELECT MOD(29,9);\n        -> 2\nmysql> SELECT 29 MOD 9;\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (115,23,'TINYTEXT','TINYTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 255 (28 - 1) characters. The\neffective maximum length is less if the value contains multibyte\ncharacters. Each TINYTEXT value is stored using a 1-byte length prefix\nthat indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (116,21,'OPTIMIZE TABLE','Syntax:\nOPTIMIZE [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n    tbl_name [, tbl_name] ...\n\nReorganizes the physical storage of table data and associated index\ndata, to reduce storage space and improve I/O efficiency when accessing\nthe table. The exact changes made to each table depend on the storage\nengine used by that table.\n\nUse OPTIMIZE TABLE in these cases, depending on the type of table:\n\no After doing substantial insert, update, or delete operations on an\n  InnoDB table that has its own .ibd file because it was created with\n  the innodb_file_per_table option enabled. The table and indexes are\n  reorganized, and disk space can be reclaimed for use by the operating\n  system.\n\no After deleting a large part of a MyISAM or ARCHIVE table, or making\n  many changes to a MyISAM or ARCHIVE table with variable-length rows\n  (tables that have VARCHAR, VARBINARY, BLOB, or TEXT columns). Deleted\n  rows are maintained in a linked list and subsequent INSERT operations\n  reuse old row positions. You can use OPTIMIZE TABLE to reclaim the\n  unused space and to defragment the data file. After extensive changes\n  to a table, this statement may also improve performance of statements\n  that use the table, sometimes significantly.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nOPTIMIZE TABLE is also supported for partitioned tables. For\ninformation about using this statement with partitioned tables and\ntable partitions, see\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/optimize-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/optimize-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (117,12,'DECODE','Syntax:\nDECODE(crypt_str,pass_str)\n\nDecrypts the encrypted string crypt_str using pass_str as the password.\ncrypt_str should be a string returned from ENCODE().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (118,20,'<=>','Syntax:\n<=>\n\nNULL-safe equal. This operator performs an equality comparison like the\n= operator, but returns 1 rather than NULL if both operands are NULL,\nand 0 rather than NULL if one operand is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 <=> 1, NULL <=> NULL, 1 <=> NULL;\n        -> 1, 1, 0\nmysql> SELECT 1 = 1, NULL = NULL, 1 = NULL;\n        -> 1, NULL, NULL\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (119,29,'HELP STATEMENT','Syntax:\nHELP \'search_string\'\n\nThe HELP statement returns online information from the MySQL Reference\nmanual. Its proper operation requires that the help tables in the mysql\ndatabase be initialized with help topic information (see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-side-help-support.html).\n\nThe HELP statement searches the help tables for the given search string\nand displays the result of the search. The search string is not case\nsensitive.\n\nThe search string can contain the wildcard characters "%" and "_".\nThese have the same meaning as for pattern-matching operations\nperformed with the LIKE operator. For example, HELP \'rep%\' returns a\nlist of topics that begin with rep.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/help.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/help.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (120,27,'RESET','Syntax:\nRESET reset_option [, reset_option] ...\n\nThe RESET statement is used to clear the state of various server\noperations. You must have the RELOAD privilege to execute RESET.\n\nRESET acts as a stronger version of the FLUSH statement. See [HELP\nFLUSH].\n\nThe RESET statement causes an implicit commit. See\nhttp://dev.mysql.com/doc/refman/5.5/en/implicit-commit.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/reset.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/reset.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (121,14,'GET_LOCK','Syntax:\nGET_LOCK(str,timeout)\n\nTries to obtain a lock with a name given by the string str, using a\ntimeout of timeout seconds. Before MySQL 5.5.8, a negative timeout\nvalue means infinite timeout on Windows. As of 5.5.8, this behavior\napplies on all platforms.\n\nReturns 1 if the lock was obtained successfully, 0 if the attempt timed\nout (for example, because another client has previously locked the\nname), or NULL if an error occurred (such as running out of memory or\nthe thread was killed with mysqladmin kill). If you have a lock\nobtained with GET_LOCK(), it is released when you execute\nRELEASE_LOCK(), execute a new GET_LOCK(), or your connection terminates\n(either normally or abnormally). Locks obtained with GET_LOCK() do not\ninteract with transactions. That is, committing a transaction does not\nrelease any such locks obtained during the transaction.\n\nGET_LOCK() can be used to implement application locks or to simulate\nrecord locks. Names are locked on a server-wide basis. If a name has\nbeen locked within one session, GET_LOCK() blocks any request by\nanother session for a lock with the same name. This enables clients\nthat agree on a given lock name to use the name to perform cooperative\nadvisory locking. But be aware that it also enables a client that is\nnot among the set of cooperating clients to lock a name, either\ninadvertently or deliberately, and thus prevent any of the cooperating\nclients from locking that name. One way to reduce the likelihood of\nthis is to use lock names that are database-specific or\napplication-specific. For example, use lock names of the form\ndb_name.str or app_name.str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT GET_LOCK(\'lock1\',10);\n        -> 1\nmysql> SELECT IS_FREE_LOCK(\'lock2\');\n        -> 1\nmysql> SELECT GET_LOCK(\'lock2\',10);\n        -> 1\nmysql> SELECT RELEASE_LOCK(\'lock2\');\n        -> 1\nmysql> SELECT RELEASE_LOCK(\'lock1\');\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (122,38,'UCASE','Syntax:\nUCASE(str)\n\nUCASE() is a synonym for UPPER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (123,27,'SHOW BINLOG EVENTS','Syntax:\nSHOW BINLOG EVENTS\n   [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nShows the events in the binary log. If you do not specify \'log_name\',\nthe first binary log is displayed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-binlog-events.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-binlog-events.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (124,33,'MPOLYFROMWKB','MPolyFromWKB(wkb[,srid]), MultiPolygonFromWKB(wkb[,srid])\n\nConstructs a MultiPolygon value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (125,24,'ITERATE','Syntax:\nITERATE label\n\nITERATE can appear only within LOOP, REPEAT, and WHILE statements.\nITERATE means "start the loop again."\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/iterate.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/iterate.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (126,28,'DO','Syntax:\nDO expr [, expr] ...\n\nDO executes the expressions but does not return any results. In most\nrespects, DO is shorthand for SELECT expr, ..., but has the advantage\nthat it is slightly faster when you do not care about the result.\n\nDO is useful primarily with functions that have side effects, such as\nRELEASE_LOCK().\n\nExample: This SELECT statement pauses, but also produces a result set:\n\nmysql> SELECT SLEEP(5);\n+----------+\n| SLEEP(5) |\n+----------+\n|        0 |\n+----------+\n1 row in set (5.02 sec)\n\nDO, on the other hand, pauses without producing a result set.:\n\nmysql> DO SLEEP(5);\nQuery OK, 0 rows affected (4.99 sec)\n\nThis could be useful, for example in a stored function or trigger,\nwhich prohibit statements that produce result sets.\n\nDO only executes expressions. It cannot be used in all cases where\nSELECT can be used. For example, DO id FROM t1 is invalid because it\nreferences a table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/do.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/do.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (127,32,'CURTIME','Syntax:\nCURTIME()\n\nReturns the current time as a value in \'HH:MM:SS\' or HHMMSS.uuuuuu\nformat, depending on whether the function is used in a string or\nnumeric context. The value is expressed in the current time zone.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT CURTIME();\n        -> \'23:50:26\'\nmysql> SELECT CURTIME() + 0;\n        -> 235026.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (128,38,'CHAR_LENGTH','Syntax:\nCHAR_LENGTH(str)\n\nReturns the length of the string str, measured in characters. A\nmultibyte character counts as a single character. This means that for a\nstring containing five 2-byte characters, LENGTH() returns 10, whereas\nCHAR_LENGTH() returns 5.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (129,23,'BIGINT','BIGINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA large integer. The signed range is -9223372036854775808 to\n9223372036854775807. The unsigned range is 0 to 18446744073709551615.\n\nSERIAL is an alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (130,27,'SET','Syntax:\nSET variable_assignment [, variable_assignment] ...\n\nvariable_assignment:\n      user_var_name = expr\n    | [GLOBAL | SESSION] system_var_name = expr\n    | [@@global. | @@session. | @@]system_var_name = expr\n\nThe SET statement assigns values to different types of variables that\naffect the operation of the server or your client. Older versions of\nMySQL employed SET OPTION, but this syntax is deprecated in favor of\nSET without OPTION.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-statement.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-statement.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (131,28,'LOAD XML','Syntax:\nLOAD XML [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE [db_name.]tbl_name\n    [CHARACTER SET charset_name]\n    [ROWS IDENTIFIED BY \'<tagname>\']\n    [IGNORE number {LINES | ROWS}]\n    [(column_or_user_var,...)]\n    [SET col_name = expr,...]\n\nThe LOAD XML statement reads data from an XML file into a table. The\nfile_name must be given as a literal string. The tagname in the\noptional ROWS IDENTIFIED BY clause must also be given as a literal\nstring, and must be surrounded by angle brackets (< and >).\n\nLOAD XML acts as the complement of running the mysql client in XML\noutput mode (that is, starting the client with the --xml option). To\nwrite data from a table to an XML file, use a command such as the\nfollowing one from the system shell:\n\nshell> mysql --xml -e \'SELECT * FROM mytable\' > file.xml\n\nTo read the file back into a table, use LOAD XML INFILE. By default,\nthe <row> element is considered to be the equivalent of a database\ntable row; this can be changed using the ROWS IDENTIFIED BY clause.\n\nThis statement supports three different XML formats:\n\no Column names as attributes and column values as attribute values:\n\n<row column1="value1" column2="value2" .../>\n\no Column names as tags and column values as the content of these tags:\n\n<row>\n  <column1>value1</column1>\n  <column2>value2</column2>\n</row>\n\no Column names are the name attributes of <field> tags, and values are\n  the contents of these tags:\n\n<row>\n  <field name=\'column1\'>value1</field>\n  <field name=\'column2\'>value2</field>\n</row>\n\n  This is the format used by other MySQL tools, such as mysqldump.\n\nAll three formats can be used in the same XML file; the import routine\nautomatically detects the format for each row and interprets it\ncorrectly. Tags are matched based on the tag or attribute name and the\ncolumn name.\n\nThe following clauses work essentially the same way for LOAD XML as\nthey do for LOAD DATA:\n\no LOW_PRIORITY or CONCURRENT\n\no LOCAL\n\no REPLACE or IGNORE\n\no CHARACTER SET\n\no (column_or_user_var,...)\n\no SET\n\nSee [HELP LOAD DATA], for more information about these clauses.\n\nThe IGNORE number LINES or IGNORE number ROWS clause causes the first\nnumber rows in the XML file to be skipped. It is analogous to the LOAD\nDATA statement\'s IGNORE ... LINES clause.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/load-xml.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/load-xml.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (132,3,'CONV','Syntax:\nCONV(N,from_base,to_base)\n\nConverts numbers between different number bases. Returns a string\nrepresentation of the number N, converted from base from_base to base\nto_base. Returns NULL if any argument is NULL. The argument N is\ninterpreted as an integer, but may be specified as an integer or a\nstring. The minimum base is 2 and the maximum base is 36. If to_base is\na negative number, N is regarded as a signed number. Otherwise, N is\ntreated as unsigned. CONV() works with 64-bit precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT CONV(\'a\',16,2);\n        -> \'1010\'\nmysql> SELECT CONV(\'6E\',18,8);\n        -> \'172\'\nmysql> SELECT CONV(-17,10,-18);\n        -> \'-H\'\nmysql> SELECT CONV(10+\'10\'+\'10\'+0xa,10,10);\n        -> \'40\'\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (133,23,'DATE','DATE\n\nA date. The supported range is \'1000-01-01\' to \'9999-12-31\'. MySQL\ndisplays DATE values in \'YYYY-MM-DD\' format, but permits assignment of\nvalues to DATE columns using either strings or numbers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (134,15,'ASSIGN-VALUE','Syntax:\n:=\n\nAssignment operator. Causes the user variable on the left hand side of\nthe operator to take on the value to its right. The value on the right\nhand side may be a literal value, another variable storing a value, or\nany legal expression that yields a scalar value, including the result\nof a query (provided that this value is a scalar value). You can\nperform multiple assignments in the same SET statement. You can perform\nmultiple assignments in the same statement-\n\nUnlike =, the := operator is never interpreted as a comparison\noperator. This means you can use := in any valid SQL statement (not\njust in SET statements) to assign a value to a variable.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n        -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n        -> 1, 1\nmysql> SELECT @var1, @var2;\n        -> 1, 1\n\nmysql> SELECT @var1:=COUNT(*) FROM t1;\n        -> 4\nmysql> SELECT @var1;\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (135,27,'SHOW OPEN TABLES','Syntax:\nSHOW OPEN TABLES [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW OPEN TABLES lists the non-TEMPORARY tables that are currently open\nin the table cache. See\nhttp://dev.mysql.com/doc/refman/5.5/en/table-cache.html. The FROM\nclause, if present, restricts the tables shown to those present in the\ndb_name database. The LIKE clause, if present, indicates which table\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-open-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-open-tables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (136,32,'EXTRACT','Syntax:\nEXTRACT(unit FROM date)\n\nThe EXTRACT() function uses the same kinds of unit specifiers as\nDATE_ADD() or DATE_SUB(), but extracts parts from the date rather than\nperforming date arithmetic.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT EXTRACT(YEAR FROM \'2009-07-02\');\n       -> 2009\nmysql> SELECT EXTRACT(YEAR_MONTH FROM \'2009-07-02 01:02:03\');\n       -> 200907\nmysql> SELECT EXTRACT(DAY_MINUTE FROM \'2009-07-02 01:02:03\');\n       -> 20102\nmysql> SELECT EXTRACT(MICROSECOND\n    ->                FROM \'2003-01-02 10:30:00.000123\');\n        -> 123\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (137,12,'ENCRYPT','Syntax:\nENCRYPT(str[,salt])\n\nEncrypts str using the Unix crypt() system call and returns a binary\nstring. The salt argument must be a string with at least two characters\nor the result will be NULL. If no salt argument is given, a random\nvalue is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT ENCRYPT(\'hello\');\n        -> \'VxuFAJXVARROc\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (138,27,'SHOW STATUS','Syntax:\nSHOW [GLOBAL | SESSION] STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW STATUS provides server status information. This information also\ncan be obtained using the mysqladmin extended-status command. The LIKE\nclause, if present, indicates which variable names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in http://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\nThis statement does not require any privilege. It requires only the\nability to connect to the server.\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern:\n\nmysql> SHOW STATUS LIKE \'Key%\';\n+--------------------+----------+\n| Variable_name      | Value    |\n+--------------------+----------+\n| Key_blocks_used    | 14955    |\n| Key_read_requests  | 96854827 |\n| Key_reads          | 162040   |\n| Key_write_requests | 7589728  |\n| Key_writes         | 3813196  |\n+--------------------+----------+\n\nWith the GLOBAL modifier, SHOW STATUS displays the status values for\nall connections to MySQL. With SESSION, it displays the status values\nfor the current connection. If no modifier is present, the default is\nSESSION. LOCAL is a synonym for SESSION.\n\nSome status variables have only a global value. For these, you get the\nsame value for both GLOBAL and SESSION. The scope for each status\nvariable is listed at\nhttp://dev.mysql.com/doc/refman/5.5/en/server-status-variables.html.\n\nEach invocation of the SHOW STATUS statement uses an internal temporary\ntable and increments the global Created_tmp_tables value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (139,38,'EXTRACTVALUE','Syntax:\nExtractValue(xml_frag, xpath_expr)\n\nExtractValue() takes two string arguments, a fragment of XML markup\nxml_frag and an XPath expression xpath_expr (also known as a locator);\nit returns the text (CDATA) of the first text node which is a child of\nthe elements or elements matched by the XPath expression. In MySQL 5.5,\nthe XPath expression can contain at most 127 characters. (This\nlimitation is lifted in MySQL 5.6.)\n\nUsing this function is the equivalent of performing a match using the\nxpath_expr after appending /text(). In other words,\nExtractValue(\'<a><b>Sakila</b></a>\', \'/a/b\') and\nExtractValue(\'<a><b>Sakila</b></a>\', \'/a/b/text()\') produce the same\nresult.\n\nIf multiple matches are found, the content of the first child text node\nof each matching element is returned (in the order matched) as a\nsingle, space-delimited string.\n\nIf no matching text node is found for the expression (including the\nimplicit /text())---for whatever reason, as long as xpath_expr is\nvalid, and xml_frag consists of elements which are properly nested and\nclosed---an empty string is returned. No distinction is made between a\nmatch on an empty element and no match at all. This is by design.\n\nIf you need to determine whether no matching element was found in\nxml_frag or such an element was found but contained no child text\nnodes, you should test the result of an expression that uses the XPath\ncount() function. For example, both of these statements return an empty\nstring, as shown here:\n\nmysql> SELECT ExtractValue(\'<a><b/></a>\', \'/a/b\');\n+-------------------------------------+\n| ExtractValue(\'<a><b/></a>\', \'/a/b\') |\n+-------------------------------------+\n|                                     |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT ExtractValue(\'<a><c/></a>\', \'/a/b\');\n+-------------------------------------+\n| ExtractValue(\'<a><c/></a>\', \'/a/b\') |\n+-------------------------------------+\n|                                     |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nHowever, you can determine whether there was actually a matching\nelement using the following:\n\nmysql> SELECT ExtractValue(\'<a><b/></a>\', \'count(/a/b)\');\n+-------------------------------------+\n| ExtractValue(\'<a><b/></a>\', \'count(/a/b)\') |\n+-------------------------------------+\n| 1                                   |\n+-------------------------------------+\n1 row in set (0.00 sec)\n\nmysql> SELECT ExtractValue(\'<a><c/></a>\', \'count(/a/b)\');\n+-------------------------------------+\n| ExtractValue(\'<a><c/></a>\', \'count(/a/b)\') |\n+-------------------------------------+\n| 0                                   |\n+-------------------------------------+\n1 row in set (0.01 sec)\n\n*Important*: ExtractValue() returns only CDATA, and does not return any\ntags that might be contained within a matching tag, nor any of their\ncontent (see the result returned as val1 in the following example).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html\n\n','mysql> SELECT\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/a\') AS val1,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/a/b\') AS val2,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'//b\') AS val3,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b></a>\', \'/b\') AS val4,\n    ->   ExtractValue(\'<a>ccc<b>ddd</b><b>eee</b></a>\', \'//b\') AS val5;\n\n+------+------+------+------+---------+\n| val1 | val2 | val3 | val4 | val5    |\n+------+------+------+------+---------+\n| ccc  | ddd  | ddd  |      | ddd eee |\n+------+------+------+------+---------+\n','http://dev.mysql.com/doc/refman/5.5/en/xml-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (140,12,'OLD_PASSWORD','Syntax:\nOLD_PASSWORD(str)\n\nOLD_PASSWORD() was added when the implementation of PASSWORD() was\nchanged in MySQL 4.1 to improve security. OLD_PASSWORD() returns the\nvalue of the pre-4.1 implementation of PASSWORD() as a string, and is\nintended to permit you to reset passwords for any pre-4.1 clients that\nneed to connect to your version 5.5 MySQL server without locking them\nout. See http://dev.mysql.com/doc/refman/5.5/en/password-hashing.html.\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring.\n\n*Note*: Passwords that use the pre-4.1 hashing method are less secure\nthan passwords that use the native password hashing method and should\nbe avoided.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (141,38,'FORMAT','Syntax:\nFORMAT(X,D[,locale])\n\nFormats the number X to a format like \'#,###,###.##\', rounded to D\ndecimal places, and returns the result as a string. If D is 0, the\nresult has no decimal point or fractional part.\n\nThe optional third parameter enables a locale to be specified to be\nused for the result number\'s decimal point, thousands separator, and\ngrouping between separators. Permissible locale values are the same as\nthe legal values for the lc_time_names system variable (see\nhttp://dev.mysql.com/doc/refman/5.5/en/locale-support.html). If no\nlocale is specified, the default is \'en_US\'.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT FORMAT(12332.123456, 4);\n        -> \'12,332.1235\'\nmysql> SELECT FORMAT(12332.1,4);\n        -> \'12,332.1000\'\nmysql> SELECT FORMAT(12332.2,0);\n        -> \'12,332\'\nmysql> SELECT FORMAT(12332.2,2,\'de_DE\');\n        -> \'12.332,20\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (142,15,'||','Syntax:\nOR, ||\n\nLogical OR. When both operands are non-NULL, the result is 1 if any\noperand is nonzero, and 0 otherwise. With a NULL operand, the result is\n1 if the other operand is nonzero, and NULL otherwise. If both operands\nare NULL, the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT 1 || 1;\n        -> 1\nmysql> SELECT 1 || 0;\n        -> 1\nmysql> SELECT 0 || 0;\n        -> 0\nmysql> SELECT 0 || NULL;\n        -> NULL\nmysql> SELECT 1 || NULL;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (143,38,'BIT_LENGTH','Syntax:\nBIT_LENGTH(str)\n\nReturns the length of the string str in bits.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT BIT_LENGTH(\'text\');\n        -> 32\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (144,2,'EXTERIORRING','ExteriorRing(poly)\n\nReturns the exterior ring of the Polygon value poly as a LineString.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html\n\n','mysql> SET @poly =\n    -> \'Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))\';\nmysql> SELECT AsText(ExteriorRing(GeomFromText(@poly)));\n+-------------------------------------------+\n| AsText(ExteriorRing(GeomFromText(@poly))) |\n+-------------------------------------------+\n| LINESTRING(0 0,0 3,3 3,3 0,0 0)           |\n+-------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (145,33,'GEOMFROMWKB','GeomFromWKB(wkb[,srid]), GeometryFromWKB(wkb[,srid])\n\nConstructs a geometry value of any type using its WKB representation\nand SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (146,27,'SHOW SLAVE HOSTS','Syntax:\nSHOW SLAVE HOSTS\n\nDisplays a list of replication slaves currently registered with the\nmaster. (Before MySQL 5.5.3, only slaves started with the\n--report-host=host_name option are visible in this list.)\n\nSHOW SLAVE HOSTS should be executed on a server that acts as a\nreplication master. The statement displays information about servers\nthat are or have been connected as replication slaves, with each row of\nthe result corresponding to one slave server, as shown here:\n\nmysql> SHOW SLAVE HOSTS;\n+------------+-----------+------+-----------+\n| Server_id  | Host      | Port | Master_id |\n+------------+-----------+------+-----------+\n|  192168010 | iconnect2 | 3306 | 192168011 |\n| 1921680101 | athena    | 3306 | 192168011 |\n+------------+-----------+------+-----------+\n\no Server_id: The unique server ID of the slave server, as configured in\n  the slave server\'s option file, or on the command line with\n  --server-id=value.\n\no Host: The host name of the slave server as specified on the slave\n  with the --report-host option. This can differ from the machine name\n  as configured in the operating system.\n\no User: The slave server user name as, specified on the slave with the\n  --report-user option. Statement output includes this column only if\n  the master server is started with the --show-slave-auth-info option.\n\no Password: The slave server password as, specified on the slave with\n  the --report-password option. Statement output includes this column\n  only if the master server is started with the --show-slave-auth-info\n  option.\n\no Port: The port on the master to which the slave server is listening,\n  as specified on the slave with the --report-port option.\n\n  In MySQL 5.5.23 and later, a zero in this column means that the slave\n  port (--report-port) was not set. Prior to MySQL 5.5.23, 3306 was\n  used as the default in such cases (Bug #13333431).\n\no Master_id: The unique server ID of the master server that the slave\n  server is replicating from. This is the server ID of the server on\n  which SHOW SLAVE HOSTS is executed, so this same value is listed for\n  each row in the result.\n\nSome MySQL versions report another variable, Rpl_recovery_rank. This\nvariable was never used, and was removed in MySQL 5.5.3. (Bug #13963)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-slave-hosts.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-slave-hosts.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (147,8,'START TRANSACTION','Syntax:\nSTART TRANSACTION [WITH CONSISTENT SNAPSHOT]\nBEGIN [WORK]\nCOMMIT [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nROLLBACK [WORK] [AND [NO] CHAIN] [[NO] RELEASE]\nSET autocommit = {0 | 1}\n\nThese statements provide control over use of transactions:\n\no START TRANSACTION or BEGIN start a new transaction.\n\no COMMIT commits the current transaction, making its changes permanent.\n\no ROLLBACK rolls back the current transaction, canceling its changes.\n\no SET autocommit disables or enables the default autocommit mode for\n  the current session.\n\nBy default, MySQL runs with autocommit mode enabled. This means that as\nsoon as you execute a statement that updates (modifies) a table, MySQL\nstores the update on disk to make it permanent. The change cannot be\nrolled back.\n\nTo disable autocommit mode implicitly for a single series of\nstatements, use the START TRANSACTION statement:\n\nSTART TRANSACTION;\nSELECT @A:=SUM(salary) FROM table1 WHERE type=1;\nUPDATE table2 SET summary=@A WHERE type=1;\nCOMMIT;\n\nWith START TRANSACTION, autocommit remains disabled until you end the\ntransaction with COMMIT or ROLLBACK. The autocommit mode then reverts\nto its previous state.\n\nYou can also begin a transaction like this:\n\nSTART TRANSACTION WITH CONSISTENT SNAPSHOT;\n\nThe WITH CONSISTENT SNAPSHOT option starts a consistent read for\nstorage engines that are capable of it. This applies only to InnoDB.\nThe effect is the same as issuing a START TRANSACTION followed by a\nSELECT from any InnoDB table. See\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-consistent-read.html. The\nWITH CONSISTENT SNAPSHOT option does not change the current transaction\nisolation level, so it provides a consistent snapshot only if the\ncurrent isolation level is one that permits a consistent read. The only\nisolation level that permits a consistent read is REPEATABLE READ. For\nall other isolation levels, the WITH CONSISTENT SNAPSHOT clause is\nignored. As of MySQL 5.5.34, a warning is generated when the WITH\nCONSISTENT SNAPSHOT is ignored.\n\n*Important*: Many APIs used for writing MySQL client applications (such\nas JDBC) provide their own methods for starting transactions that can\n(and sometimes should) be used instead of sending a START TRANSACTION\nstatement from the client. See\nhttp://dev.mysql.com/doc/refman/5.5/en/connectors-apis.html, or the\ndocumentation for your API, for more information.\n\nTo disable autocommit mode explicitly, use the following statement:\n\nSET autocommit=0;\n\nAfter disabling autocommit mode by setting the autocommit variable to\nzero, changes to transaction-safe tables (such as those for InnoDB or\nNDBCLUSTER) are not made permanent immediately. You must use COMMIT to\nstore your changes to disk or ROLLBACK to ignore the changes.\n\nautocommit is a session variable and must be set for each session. To\ndisable autocommit mode for each new connection, see the description of\nthe autocommit system variable at\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nBEGIN and BEGIN WORK are supported as aliases of START TRANSACTION for\ninitiating a transaction. START TRANSACTION is standard SQL syntax and\nis the recommended way to start an ad-hoc transaction.\n\nThe BEGIN statement differs from the use of the BEGIN keyword that\nstarts a BEGIN ... END compound statement. The latter does not begin a\ntransaction. See [HELP BEGIN END].\n\n*Note*: Within all stored programs (stored procedures and functions,\ntriggers, and events), the parser treats BEGIN [WORK] as the beginning\nof a BEGIN ... END block. Begin a transaction in this context with\nSTART TRANSACTION instead.\n\nThe optional WORK keyword is supported for COMMIT and ROLLBACK, as are\nthe CHAIN and RELEASE clauses. CHAIN and RELEASE can be used for\nadditional control over transaction completion. The value of the\ncompletion_type system variable determines the default completion\nbehavior. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nThe AND CHAIN clause causes a new transaction to begin as soon as the\ncurrent one ends, and the new transaction has the same isolation level\nas the just-terminated transaction. The RELEASE clause causes the\nserver to disconnect the current client session after terminating the\ncurrent transaction. Including the NO keyword suppresses CHAIN or\nRELEASE completion, which can be useful if the completion_type system\nvariable is set to cause chaining or release completion by default.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/commit.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/commit.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (148,20,'BETWEEN AND','Syntax:\nexpr BETWEEN min AND max\n\nIf expr is greater than or equal to min and expr is less than or equal\nto max, BETWEEN returns 1, otherwise it returns 0. This is equivalent\nto the expression (min <= expr AND expr <= max) if all the arguments\nare of the same type. Otherwise type conversion takes place according\nto the rules described in\nhttp://dev.mysql.com/doc/refman/5.5/en/type-conversion.html, but\napplied to all the three arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 BETWEEN 1 AND 3, 2 BETWEEN 3 and 1;\n        -> 1, 0\nmysql> SELECT 1 BETWEEN 2 AND 3;\n        -> 0\nmysql> SELECT \'b\' BETWEEN \'a\' AND \'c\';\n        -> 1\nmysql> SELECT 2 BETWEEN 2 AND \'3\';\n        -> 1\nmysql> SELECT 2 BETWEEN 2 AND \'x-3\';\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (149,25,'MULTIPOLYGON','MultiPolygon(poly1,poly2,...)\n\nConstructs a MultiPolygon value from a set of Polygon or WKB Polygon\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (150,32,'TIME_FORMAT','Syntax:\nTIME_FORMAT(time,format)\n\nThis is used like the DATE_FORMAT() function, but the format string may\ncontain format specifiers only for hours, minutes, seconds, and\nmicroseconds. Other specifiers produce a NULL value or 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIME_FORMAT(\'100:00:00\', \'%H %k %h %I %l\');\n        -> \'100 100 04 04 4\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (151,38,'LEFT','Syntax:\nLEFT(str,len)\n\nReturns the leftmost len characters from the string str, or NULL if any\nargument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LEFT(\'foobarbar\', 5);\n        -> \'fooba\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (152,27,'FLUSH QUERY CACHE','You can defragment the query cache to better utilize its memory with\nthe FLUSH QUERY CACHE statement. The statement does not remove any\nqueries from the cache.\n\nThe RESET QUERY CACHE statement removes all query results from the\nquery cache. The FLUSH TABLES statement also does this.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/query-cache-status-and-maintenance.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/query-cache-status-and-maintenance.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (153,23,'SET DATA TYPE','SET(\'value1\',\'value2\',...) [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nA set. A string object that can have zero or more values, each of which\nmust be chosen from the list of values \'value1\', \'value2\', ... SET\nvalues are represented internally as integers.\n\nA SET column can have a maximum of 64 distinct members. A table can\nhave no more than 255 unique element list definitions among its ENUM\nand SET columns considered as a group. For more information on this\nlimit, see http://dev.mysql.com/doc/refman/5.5/en/limits-frm-file.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (154,3,'RAND','Syntax:\nRAND(), RAND(N)\n\nReturns a random floating-point value v in the range 0 <= v < 1.0. If a\nconstant integer argument N is specified, it is used as the seed value,\nwhich produces a repeatable sequence of column values. In the following\nexample, note that the sequences of values produced by RAND(3) is the\nsame both places where it occurs.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> CREATE TABLE t (i INT);\nQuery OK, 0 rows affected (0.42 sec)\n\nmysql> INSERT INTO t VALUES(1),(2),(3);\nQuery OK, 3 rows affected (0.00 sec)\nRecords: 3  Duplicates: 0  Warnings: 0\n\nmysql> SELECT i, RAND() FROM t;\n+------+------------------+\n| i    | RAND()           |\n+------+------------------+\n|    1 | 0.61914388706828 |\n|    2 | 0.93845168309142 |\n|    3 | 0.83482678498591 |\n+------+------------------+\n3 rows in set (0.00 sec)\n\nmysql> SELECT i, RAND(3) FROM t;\n+------+------------------+\n| i    | RAND(3)          |\n+------+------------------+\n|    1 | 0.90576975597606 |\n|    2 | 0.37307905813035 |\n|    3 | 0.14808605345719 |\n+------+------------------+\n3 rows in set (0.00 sec)\n\nmysql> SELECT i, RAND() FROM t;\n+------+------------------+\n| i    | RAND()           |\n+------+------------------+\n|    1 | 0.35877890638893 |\n|    2 | 0.28941420772058 |\n|    3 | 0.37073435016976 |\n+------+------------------+\n3 rows in set (0.00 sec)\n\nmysql> SELECT i, RAND(3) FROM t;\n+------+------------------+\n| i    | RAND(3)          |\n+------+------------------+\n|    1 | 0.90576975597606 |\n|    2 | 0.37307905813035 |\n|    3 | 0.14808605345719 |\n+------+------------------+\n3 rows in set (0.01 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (155,38,'RPAD','Syntax:\nRPAD(str,len,padstr)\n\nReturns the string str, right-padded with the string padstr to a length\nof len characters. If str is longer than len, the return value is\nshortened to len characters.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT RPAD(\'hi\',5,\'?\');\n        -> \'hi???\'\nmysql> SELECT RPAD(\'hi\',1,\'?\');\n        -> \'h\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (156,40,'CREATE DATABASE','Syntax:\nCREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n    [create_specification] ...\n\ncreate_specification:\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n\nCREATE DATABASE creates a database with the given name. To use this\nstatement, you need the CREATE privilege for the database. CREATE\nSCHEMA is a synonym for CREATE DATABASE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-database.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (157,23,'DEC','DEC[(M[,D])] [UNSIGNED] [ZEROFILL], NUMERIC[(M[,D])] [UNSIGNED]\n[ZEROFILL], FIXED[(M[,D])] [UNSIGNED] [ZEROFILL]\n\nThese types are synonyms for DECIMAL. The FIXED synonym is available\nfor compatibility with other database systems.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (158,16,'VAR_POP','Syntax:\nVAR_POP(expr)\n\nReturns the population standard variance of expr. It considers rows as\nthe whole population, not as a sample, so it has the number of rows as\nthe denominator. You can also use VARIANCE(), which is equivalent but\nis not standard SQL.\n\nVAR_POP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (159,38,'ELT','Syntax:\nELT(N,str1,str2,str3,...)\n\nELT() returns the Nth element of the list of strings: str1 if N = 1,\nstr2 if N = 2, and so on. Returns NULL if N is less than 1 or greater\nthan the number of arguments. ELT() is the complement of FIELD().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT ELT(1, \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> \'ej\'\nmysql> SELECT ELT(4, \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> \'foo\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (160,40,'ALTER VIEW','Syntax:\nALTER\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = { user | CURRENT_USER }]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThis statement changes the definition of a view, which must exist. The\nsyntax is similar to that for CREATE VIEW and the effect is the same as\nfor CREATE OR REPLACE VIEW. See [HELP CREATE VIEW]. This statement\nrequires the CREATE VIEW and DROP privileges for the view, and some\nprivilege for each column referred to in the SELECT statement. ALTER\nVIEW is permitted only to the definer or users with the SUPER\nprivilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (161,27,'SHOW DATABASES','Syntax:\nSHOW {DATABASES | SCHEMAS}\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW DATABASES lists the databases on the MySQL server host. SHOW\nSCHEMAS is a synonym for SHOW DATABASES. The LIKE clause, if present,\nindicates which database names to match. The WHERE clause can be given\nto select rows using more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nYou see only those databases for which you have some kind of privilege,\nunless you have the global SHOW DATABASES privilege. You can also get\nthis list using the mysqlshow command.\n\nIf the server was started with the --skip-show-database option, you\ncannot use this statement at all unless you have the SHOW DATABASES\nprivilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-databases.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-databases.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (162,19,'~','Syntax:\n~\n\nInvert all bits.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 5 & ~1;\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (163,23,'TEXT','TEXT[(M)] [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 65,535 (216 - 1) characters. The\neffective maximum length is less if the value contains multibyte\ncharacters. Each TEXT value is stored using a 2-byte length prefix that\nindicates the number of bytes in the value.\n\nAn optional length M can be given for this type. If this is done, MySQL\ncreates the column as the smallest TEXT type large enough to hold\nvalues M characters long.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (164,38,'CONCAT_WS','Syntax:\nCONCAT_WS(separator,str1,str2,...)\n\nCONCAT_WS() stands for Concatenate With Separator and is a special form\nof CONCAT(). The first argument is the separator for the rest of the\narguments. The separator is added between the strings to be\nconcatenated. The separator can be a string, as can the rest of the\narguments. If the separator is NULL, the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT CONCAT_WS(\',\',\'First name\',\'Second name\',\'Last Name\');\n        -> \'First name,Second name,Last Name\'\nmysql> SELECT CONCAT_WS(\',\',\'First name\',NULL,\'Last Name\');\n        -> \'First name,Last Name\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (165,17,'ROW_COUNT','Syntax:\nROW_COUNT()\n\nBefore MySQL 5.5.5, ROW_COUNT() returns the number of rows changed,\ndeleted, or inserted by the last statement if it was an UPDATE, DELETE,\nor INSERT. For other statements, the value may not be meaningful.\n\nAs of MySQL 5.5.5, ROW_COUNT() returns a value as follows:\n\no DDL statements: 0. This applies to statements such as CREATE TABLE or\n  DROP TABLE.\n\no DML statements other than SELECT: The number of affected rows. This\n  applies to statements such as UPDATE, INSERT, or DELETE (as before),\n  but now also to statements such as ALTER TABLE and LOAD DATA INFILE.\n\no SELECT: -1 if the statement returns a result set, or the number of\n  rows "affected" if it does not. For example, for SELECT * FROM t1,\n  ROW_COUNT() returns -1. For SELECT * FROM t1 INTO OUTFILE\n  \'file_name\', ROW_COUNT() returns the number of rows written to the\n  file.\n\no SIGNAL statements: 0.\n\nFor UPDATE statements, the affected-rows value by default is the number\nof rows actually changed. If you specify the CLIENT_FOUND_ROWS flag to\nmysql_real_connect() when connecting to mysqld, the affected-rows value\nis the number of rows "found"; that is, matched by the WHERE clause.\n\nFor REPLACE statements, the affected-rows value is 2 if the new row\nreplaced an old row, because in this case, one row was inserted after\nthe duplicate was deleted.\n\nFor INSERT ... ON DUPLICATE KEY UPDATE statements, the affected-rows\nvalue per row is 1 if the row is inserted as a new row, 2 if an\nexisting row is updated, and 0 if an existing row is set to its current\nvalues. If you specify the CLIENT_FOUND_ROWS flag, the affected-rows\nvalue is 1 (not 0) if an existing row is set to its current values.\n\nThe ROW_COUNT() value is similar to the value from the\nmysql_affected_rows() C API function and the row count that the mysql\nclient displays following statement execution.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> INSERT INTO t VALUES(1),(2),(3);\nQuery OK, 3 rows affected (0.00 sec)\nRecords: 3  Duplicates: 0  Warnings: 0\n\nmysql> SELECT ROW_COUNT();\n+-------------+\n| ROW_COUNT() |\n+-------------+\n|           3 |\n+-------------+\n1 row in set (0.00 sec)\n\nmysql> DELETE FROM t WHERE i IN(1,2);\nQuery OK, 2 rows affected (0.00 sec)\n\nmysql> SELECT ROW_COUNT();\n+-------------+\n| ROW_COUNT() |\n+-------------+\n|           2 |\n+-------------+\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (166,3,'ASIN','Syntax:\nASIN(X)\n\nReturns the arc sine of X, that is, the value whose sine is X. Returns\nNULL if X is not in the range -1 to 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ASIN(0.2);\n        -> 0.20135792079033\nmysql> SELECT ASIN(\'foo\');\n\n+-------------+\n| ASIN(\'foo\') |\n+-------------+\n|           0 |\n+-------------+\n1 row in set, 1 warning (0.00 sec)\n\nmysql> SHOW WARNINGS;\n+---------+------+-----------------------------------------+\n| Level   | Code | Message                                 |\n+---------+------+-----------------------------------------+\n| Warning | 1292 | Truncated incorrect DOUBLE value: \'foo\' |\n+---------+------+-----------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (167,3,'SIGN','Syntax:\nSIGN(X)\n\nReturns the sign of the argument as -1, 0, or 1, depending on whether X\nis negative, zero, or positive.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT SIGN(-32);\n        -> -1\nmysql> SELECT SIGN(0);\n        -> 0\nmysql> SELECT SIGN(234);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (168,32,'SEC_TO_TIME','Syntax:\nSEC_TO_TIME(seconds)\n\nReturns the seconds argument, converted to hours, minutes, and seconds,\nas a TIME value. The range of the result is constrained to that of the\nTIME data type. A warning occurs if the argument corresponds to a value\noutside that range.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT SEC_TO_TIME(2378);\n        -> \'00:39:38\'\nmysql> SELECT SEC_TO_TIME(2378) + 0;\n        -> 3938\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (169,23,'FLOAT','FLOAT[(M,D)] [UNSIGNED] [ZEROFILL]\n\nA small (single-precision) floating-point number. Permissible values\nare -3.402823466E+38 to -1.175494351E-38, 0, and 1.175494351E-38 to\n3.402823466E+38. These are the theoretical limits, based on the IEEE\nstandard. The actual range might be slightly smaller depending on your\nhardware or operating system.\n\nM is the total number of digits and D is the number of digits following\nthe decimal point. If M and D are omitted, values are stored to the\nlimits permitted by the hardware. A single-precision floating-point\nnumber is accurate to approximately 7 decimal places.\n\nUNSIGNED, if specified, disallows negative values.\n\nUsing FLOAT might give you some unexpected problems because all\ncalculations in MySQL are done with double precision. See\nhttp://dev.mysql.com/doc/refman/5.5/en/no-matching-rows.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (170,38,'LOCATE','Syntax:\nLOCATE(substr,str), LOCATE(substr,str,pos)\n\nThe first syntax returns the position of the first occurrence of\nsubstring substr in string str. The second syntax returns the position\nof the first occurrence of substring substr in string str, starting at\nposition pos. Returns 0 if substr is not in str.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LOCATE(\'bar\', \'foobarbar\');\n        -> 4\nmysql> SELECT LOCATE(\'xbar\', \'foobar\');\n        -> 0\nmysql> SELECT LOCATE(\'bar\', \'foobarbar\', 5);\n        -> 7\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (171,27,'SHOW EVENTS','Syntax:\nSHOW EVENTS [{FROM | IN} schema_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement displays information about Event Manager events. It\nrequires the EVENT privilege for the database from which the events are\nto be shown.\n\nIn its simplest form, SHOW EVENTS lists all of the events in the\ncurrent schema:\n\nmysql> SELECT CURRENT_USER(), SCHEMA();\n+----------------+----------+\n| CURRENT_USER() | SCHEMA() |\n+----------------+----------+\n| jon@ghidora    | myschema |\n+----------------+----------+\n1 row in set (0.00 sec)\n\nmysql> SHOW EVENTS\\G\n*************************** 1. row ***************************\n                  Db: myschema\n                Name: e_daily\n             Definer: jon@ghidora\n           Time zone: SYSTEM\n                Type: RECURRING\n          Execute at: NULL\n      Interval value: 10\n      Interval field: SECOND\n              Starts: 2006-02-09 10:41:23\n                Ends: NULL\n              Status: ENABLED\n          Originator: 0\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n\nTo see events for a specific schema, use the FROM clause. For example,\nto see events for the test schema, use the following statement:\n\nSHOW EVENTS FROM test;\n\nThe LIKE clause, if present, indicates which event names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-events.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-events.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (172,17,'CHARSET','Syntax:\nCHARSET(str)\n\nReturns the character set of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT CHARSET(\'abc\');\n        -> \'latin1\'\nmysql> SELECT CHARSET(CONVERT(\'abc\' USING utf8));\n        -> \'utf8\'\nmysql> SELECT CHARSET(USER());\n        -> \'utf8\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (173,32,'SUBDATE','Syntax:\nSUBDATE(date,INTERVAL expr unit), SUBDATE(expr,days)\n\nWhen invoked with the INTERVAL form of the second argument, SUBDATE()\nis a synonym for DATE_SUB(). For information on the INTERVAL unit\nargument, see the discussion for DATE_ADD().\n\nmysql> SELECT DATE_SUB(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2007-12-02\'\nmysql> SELECT SUBDATE(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2007-12-02\'\n\nThe second form enables the use of an integer value for days. In such\ncases, it is interpreted as the number of days to be subtracted from\nthe date or datetime expression expr.\n\nmysql> SELECT SUBDATE(\'2008-01-02 12:00:00\', 31);\n        -> \'2007-12-02 12:00:00\'\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (174,32,'DAYOFYEAR','Syntax:\nDAYOFYEAR(date)\n\nReturns the day of the year for date, in the range 1 to 366.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFYEAR(\'2007-02-03\');\n        -> 34\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (175,3,'%','Syntax:\nN % M, N MOD M\n\nModulo operation. Returns the remainder of N divided by M. For more\ninformation, see the description for the MOD() function in\nhttp://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (176,23,'LONGTEXT','LONGTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 4,294,967,295 or 4GB (232 - 1)\ncharacters. The effective maximum length is less if the value contains\nmultibyte characters. The effective maximum length of LONGTEXT columns\nalso depends on the configured maximum packet size in the client/server\nprotocol and available memory. Each LONGTEXT value is stored using a\n4-byte length prefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (177,27,'KILL','Syntax:\nKILL [CONNECTION | QUERY] processlist_id\n\nEach connection to mysqld runs in a separate thread. You can kill a\nthread with the KILL processlist_id statement.\n\nThread processlist identifiers can be determined from the ID column of\nthe INFORMATION_SCHEMA.PROCESSLIST table, the Id column of SHOW\nPROCESSLIST output, and the PROCESSLIST_ID column of the Performance\nSchema threads table. The value for the current thread is returned by\nthe CONNECTION_ID() function.\n\nKILL permits an optional CONNECTION or QUERY modifier:\n\no KILL CONNECTION is the same as KILL with no modifier: It terminates\n  the connection associated with the given processlist_id, after\n  terminating any statement the connection is executing.\n\no KILL QUERY terminates the statement the connection is currently\n  executing, but leaves the connection itself intact.\n\nIf you have the PROCESS privilege, you can see all threads. If you have\nthe SUPER privilege, you can kill all threads and statements.\nOtherwise, you can see and kill only your own threads and statements.\n\nYou can also use the mysqladmin processlist and mysqladmin kill\ncommands to examine and kill threads.\n\n*Note*: You cannot use KILL with the Embedded MySQL Server library\nbecause the embedded server merely runs inside the threads of the host\napplication. It does not create any connection threads of its own.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/kill.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/kill.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (178,31,'DISJOINT','Disjoint(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 is spatially disjoint from (does\nnot intersect) g2.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (179,4,'ASTEXT','AsText(g), AsWKT(g)\n\nConverts a value in internal geometry format to its WKT representation\nand returns the string result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-format-conversion-functions.html\n\n','mysql> SET @g = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(GeomFromText(@g));\n+--------------------------+\n| AsText(GeomFromText(@g)) |\n+--------------------------+\n| LINESTRING(1 1,2 2,3 3)  |\n+--------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-format-conversion-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (180,38,'LPAD','Syntax:\nLPAD(str,len,padstr)\n\nReturns the string str, left-padded with the string padstr to a length\nof len characters. If str is longer than len, the return value is\nshortened to len characters.\n\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LPAD(\'hi\',4,\'??\');\n        -> \'??hi\'\nmysql> SELECT LPAD(\'hi\',1,\'??\');\n        -> \'h\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (181,24,'DECLARE CONDITION','Syntax:\nDECLARE condition_name CONDITION FOR condition_value\n\ncondition_value:\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n\nThe DECLARE ... CONDITION statement declares a named error condition,\nassociating a name with a condition that needs specific handling. The\nname can be referred to in a subsequent DECLARE ... HANDLER statement\n(see [HELP DECLARE HANDLER]).\n\nCondition declarations must appear before cursor or handler\ndeclarations.\n\nThe condition_value for DECLARE ... CONDITION can be a MySQL error code\n(a number) or an SQLSTATE value (a 5-character string literal). You\nshould not use MySQL error code 0 or SQLSTATE values that begin with\n\'00\', because those indicate success rather than an error condition.\nFor a list of MySQL error codes and SQLSTATE values, see\nhttp://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-condition.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/declare-condition.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (182,31,'OVERLAPS','Overlaps(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially overlaps g2. The term\nspatially overlaps is used if two geometries intersect and their\nintersection results in a geometry of the same dimension but not equal\nto either of the given geometries.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (183,8,'SET GLOBAL SQL_SLAVE_SKIP_COUNTER','Syntax:\nSET GLOBAL sql_slave_skip_counter = N\n\nThis statement skips the next N events from the master. This is useful\nfor recovering from replication stops caused by a statement.\n\nThis statement is valid only when the slave threads are not running.\nOtherwise, it produces an error.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-global-sql-slave-skip-counter.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-global-sql-slave-skip-counter.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (184,26,'NUMGEOMETRIES','NumGeometries(gc)\n\nReturns the number of geometries in the GeometryCollection value gc.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-geometrycollection-property-functions.html\n\n','mysql> SET @gc = \'GeometryCollection(Point(1 1),LineString(2 2, 3 3))\';\nmysql> SELECT NumGeometries(GeomFromText(@gc));\n+----------------------------------+\n| NumGeometries(GeomFromText(@gc)) |\n+----------------------------------+\n|                                2 |\n+----------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-geometrycollection-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (185,32,'MONTHNAME','Syntax:\nMONTHNAME(date)\n\nReturns the full name of the month for date. The language used for the\nname is controlled by the value of the lc_time_names system variable\n(http://dev.mysql.com/doc/refman/5.5/en/locale-support.html).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MONTHNAME(\'2008-02-03\');\n        -> \'February\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (186,8,'CHANGE MASTER TO','Syntax:\nCHANGE MASTER TO option [, option] ...\n\noption:\n    MASTER_BIND = \'interface_name\'\n  | MASTER_HOST = \'host_name\'\n  | MASTER_USER = \'user_name\'\n  | MASTER_PASSWORD = \'password\'\n  | MASTER_PORT = port_num\n  | MASTER_CONNECT_RETRY = interval\n  | MASTER_HEARTBEAT_PERIOD = interval\n  | MASTER_LOG_FILE = \'master_log_name\'\n  | MASTER_LOG_POS = master_log_pos\n  | RELAY_LOG_FILE = \'relay_log_name\'\n  | RELAY_LOG_POS = relay_log_pos\n  | MASTER_SSL = {0|1}\n  | MASTER_SSL_CA = \'ca_file_name\'\n  | MASTER_SSL_CAPATH = \'ca_directory_name\'\n  | MASTER_SSL_CERT = \'cert_file_name\'\n  | MASTER_SSL_KEY = \'key_file_name\'\n  | MASTER_SSL_CIPHER = \'cipher_list\'\n  | MASTER_SSL_VERIFY_SERVER_CERT = {0|1}\n  | IGNORE_SERVER_IDS = (server_id_list)\n\nserver_id_list:\n    [server_id [, server_id] ... ]\n\nCHANGE MASTER TO changes the parameters that the slave server uses for\nconnecting to the master server, for reading the master binary log, and\nreading the slave relay log. It also updates the contents of the\nmaster.info and relay-log.info files. To use CHANGE MASTER TO, the\nslave replication threads must be stopped (use STOP SLAVE if\nnecessary).\n\nOptions not specified retain their value, except as indicated in the\nfollowing discussion. Thus, in most cases, there is no need to specify\noptions that do not change. For example, if the password to connect to\nyour MySQL master has changed, you just need to issue these statements\nto tell the slave about the new password:\n\nSTOP SLAVE; -- if replication was running\nCHANGE MASTER TO MASTER_PASSWORD=\'new3cret\';\nSTART SLAVE; -- if you want to restart replication\n\nMASTER_HOST, MASTER_USER, MASTER_PASSWORD, and MASTER_PORT provide\ninformation to the slave about how to connect to its master:\n\no MASTER_HOST and MASTER_PORT are the host name (or IP address) of the\n  master host and its TCP/IP port.\n\n  *Note*: Replication cannot use Unix socket files. You must be able to\n  connect to the master MySQL server using TCP/IP.\n\n  If you specify the MASTER_HOST or MASTER_PORT option, the slave\n  assumes that the master server is different from before (even if the\n  option value is the same as its current value.) In this case, the old\n  values for the master binary log file name and position are\n  considered no longer applicable, so if you do not specify\n  MASTER_LOG_FILE and MASTER_LOG_POS in the statement,\n  MASTER_LOG_FILE=\'\' and MASTER_LOG_POS=4 are silently appended to it.\n\n  Setting MASTER_HOST=\'\' (that is, setting its value explicitly to an\n  empty string) is not the same as not setting MASTER_HOST at all.\n  Beginning with MySQL 5.5, trying to set MASTER_HOST to an empty\n  string fails with an error. Previously, setting MASTER_HOST to an\n  empty string caused START SLAVE subsequently to fail. (Bug #28796)\n\no MASTER_USER and MASTER_PASSWORD are the user name and password of the\n  account to use for connecting to the master.\n\n  In MySQL 5.5.20 and later, MASTER_USER cannot be made empty; setting\n  MASTER_USER = \'\' or leaving it unset when setting a value for\n  MASTER_PASSWORD causes an error (Bug #13427949).\n\n  The password used for a MySQL Replication slave account in a CHANGE\n  MASTER TO statement is limited to 32 characters in length; if the\n  password is longer, the statement succeeds, but any excess characters\n  are silently truncated. This is an issue specific to MySQL\n  Replication, which is fixed in MySQL 5.7. (Bug #11752299, Bug #43439)\n\n  The text of a running CHANGE MASTER TO statement, including values\n  for MASTER_USER and MASTER_PASSWORD, can be seen in the output of a\n  concurrent SHOW PROCESSLIST statement.\n\nThe MASTER_SSL_xxx options provide information about using SSL for the\nconnection. They correspond to the --ssl-xxx options described in\nhttp://dev.mysql.com/doc/refman/5.5/en/ssl-options.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/replication-solutions-ssl.html.\nThese options can be changed even on slaves that are compiled without\nSSL support. They are saved to the master.info file, but are ignored if\nthe slave does not have SSL support enabled.\n\nMASTER_CONNECT_RETRY specifies how many seconds to wait between connect\nretries. The default is 60. The number of reconnection attempts is\nlimited by the --master-retry-count server option; for more\ninformation, see\nhttp://dev.mysql.com/doc/refman/5.5/en/replication-options.html.\n\nThe MASTER_BIND option is available in MySQL Cluster NDB 7.2 and later,\nbut is not supported in mainline MySQL 5.5.\n\nMASTER_BIND is for use on replication slaves having multiple network\ninterfaces, and determines which of the slave\'s network interfaces is\nchosen for connecting to the master.\n\nMASTER_HEARTBEAT_PERIOD sets the interval in seconds between\nreplication heartbeats. Whenever the master\'s binary log is updated\nwith an event, the waiting period for the next heartbeat is reset.\ninterval is a decimal value having the range 0 to 4294967 seconds and a\nresolution in milliseconds; the smallest nonzero value is 0.001.\nHeartbeats are sent by the master only if there are no unsent events in\nthe binary log file for a period longer than interval.\n\nSetting interval to 0 disables heartbeats altogether. The default value\nfor interval is equal to the value of slave_net_timeout divided by 2.\n\nSetting @@global.slave_net_timeout to a value less than that of the\ncurrent heartbeat interval results in a warning being issued. The\neffect of issuing RESET SLAVE on the heartbeat interval is to reset it\nto the default value.\n\nMASTER_LOG_FILE and MASTER_LOG_POS are the coordinates at which the\nslave I/O thread should begin reading from the master the next time the\nthread starts. RELAY_LOG_FILE and RELAY_LOG_POS are the coordinates at\nwhich the slave SQL thread should begin reading from the relay log the\nnext time the thread starts. If you specify either of MASTER_LOG_FILE\nor MASTER_LOG_POS, you cannot specify RELAY_LOG_FILE or RELAY_LOG_POS.\nIf neither of MASTER_LOG_FILE or MASTER_LOG_POS is specified, the slave\nuses the last coordinates of the slave SQL thread before CHANGE MASTER\nTO was issued. This ensures that there is no discontinuity in\nreplication, even if the slave SQL thread was late compared to the\nslave I/O thread, when you merely want to change, say, the password to\nuse.\n\nCHANGE MASTER TO deletes all relay log files and starts a new one,\nunless you specify RELAY_LOG_FILE or RELAY_LOG_POS. In that case, relay\nlog files are kept; the relay_log_purge global variable is set silently\nto 0.\n\nPrior to MySQL 5.5, RELAY_LOG_FILE required an absolute path. In MySQL\n5.5, the path can be relative, in which case the path is assumed to be\nrelative to the slave\'s data directory. (Bug #12190)\n\nIGNORE_SERVER_IDS was added in MySQL 5.5. This option takes a\ncomma-separated list of 0 or more server IDs. Events originating from\nthe corresponding servers are ignored, with the exception of log\nrotation and deletion events, which are still recorded in the relay\nlog.\n\nIn circular replication, the originating server normally acts as the\nterminator of its own events, so that they are not applied more than\nonce. Thus, this option is useful in circular replication when one of\nthe servers in the circle is removed. Suppose that you have a circular\nreplication setup with 4 servers, having server IDs 1, 2, 3, and 4, and\nserver 3 fails. When bridging the gap by starting replication from\nserver 2 to server 4, you can include IGNORE_SERVER_IDS = (3) in the\nCHANGE MASTER TO statement that you issue on server 4 to tell it to use\nserver 2 as its master instead of server 3. Doing so causes it to\nignore and not to propagate any statements that originated with the\nserver that is no longer in use.\n\nWhen a CHANGE MASTER TO statement is issued without any\nIGNORE_SERVER_IDS option, any existing list is preserved. To clear the\nlist of ignored servers, it is necessary to use the option with an\nempty list:\n\nCHANGE MASTER TO IGNORE_SERVER_IDS = ();\n\nRESET SLAVE ALL has no effect on the server ID list. This issue is\nfixed in MySQL 5.7. (Bug #18816897)\n\nIf IGNORE_SERVER_IDS contains the server\'s own ID and the server was\nstarted with the --replicate-same-server-id option enabled, an error\nresults.\n\nAlso beginning with MySQL 5.5, the master.info file and the output of\nSHOW SLAVE STATUS are extended to provide the list of servers that are\ncurrently ignored. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/slave-logs-status.html, and\n[HELP SHOW SLAVE STATUS].\n\nBeginning with MySQL 5.5.5, invoking CHANGE MASTER TO causes the\nprevious values for MASTER_HOST, MASTER_PORT, MASTER_LOG_FILE, and\nMASTER_LOG_POS to be written to the error log, along with other\ninformation about the slave\'s state prior to execution.\n\nCHANGE MASTER TO is useful for setting up a slave when you have the\nsnapshot of the master and have recorded the master binary log\ncoordinates corresponding to the time of the snapshot. After loading\nthe snapshot into the slave to synchronize it with the master, you can\nrun CHANGE MASTER TO MASTER_LOG_FILE=\'log_name\', MASTER_LOG_POS=log_pos\non the slave to specify the coordinates at which the slave should begin\nreading the master binary log.\n\nThe following example changes the master server the slave uses and\nestablishes the master binary log coordinates from which the slave\nbegins reading. This is used when you want to set up the slave to\nreplicate the master:\n\nCHANGE MASTER TO\n  MASTER_HOST=\'master2.mycompany.com\',\n  MASTER_USER=\'replication\',\n  MASTER_PASSWORD=\'bigs3cret\',\n  MASTER_PORT=3306,\n  MASTER_LOG_FILE=\'master2-bin.001\',\n  MASTER_LOG_POS=4,\n  MASTER_CONNECT_RETRY=10;\n\nThe next example shows an operation that is less frequently employed.\nIt is used when the slave has relay log files that you want it to\nexecute again for some reason. To do this, the master need not be\nreachable. You need only use CHANGE MASTER TO and start the SQL thread\n(START SLAVE SQL_THREAD):\n\nCHANGE MASTER TO\n  RELAY_LOG_FILE=\'slave-relay-bin.006\',\n  RELAY_LOG_POS=4025;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/change-master-to.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/change-master-to.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (187,40,'DROP DATABASE','Syntax:\nDROP {DATABASE | SCHEMA} [IF EXISTS] db_name\n\nDROP DATABASE drops all tables in the database and deletes the\ndatabase. Be very careful with this statement! To use DROP DATABASE,\nyou need the DROP privilege on the database. DROP SCHEMA is a synonym\nfor DROP DATABASE.\n\n*Important*: When a database is dropped, user privileges on the\ndatabase are not automatically dropped. See [HELP GRANT].\n\nIF EXISTS is used to prevent an error from occurring if the database\ndoes not exist.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-database.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (188,7,'MBREQUAL','MBREqual(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 are the same.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (189,32,'TIMESTAMP FUNCTION','Syntax:\nTIMESTAMP(expr), TIMESTAMP(expr1,expr2)\n\nWith a single argument, this function returns the date or datetime\nexpression expr as a datetime value. With two arguments, it adds the\ntime expression expr2 to the date or datetime expression expr1 and\nreturns the result as a datetime value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMESTAMP(\'2003-12-31\');\n        -> \'2003-12-31 00:00:00\'\nmysql> SELECT TIMESTAMP(\'2003-12-31 12:00:00\',\'12:00:00\');\n        -> \'2004-01-01 00:00:00\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (190,34,'PROCEDURE ANALYSE','Syntax:\nANALYSE([max_elements[,max_memory]])\n\nANALYSE() examines the result from a query and returns an analysis of\nthe results that suggests optimal data types for each column that may\nhelp reduce table sizes. To obtain this analysis, append PROCEDURE\nANALYSE to the end of a SELECT statement:\n\nSELECT ... FROM ... WHERE ... PROCEDURE ANALYSE([max_elements,[max_memory]])\n\nFor example:\n\nSELECT col1, col2 FROM table1 PROCEDURE ANALYSE(10, 2000);\n\nThe results show some statistics for the values returned by the query,\nand propose an optimal data type for the columns. This can be helpful\nfor checking your existing tables, or after importing new data. You may\nneed to try different settings for the arguments so that PROCEDURE\nANALYSE() does not suggest the ENUM data type when it is not\nappropriate.\n\nThe arguments are optional and are used as follows:\n\no max_elements (default 256) is the maximum number of distinct values\n  that ANALYSE() notices per column. This is used by ANALYSE() to check\n  whether the optimal data type should be of type ENUM; if there are\n  more than max_elements distinct values, then ENUM is not a suggested\n  type.\n\no max_memory (default 8192) is the maximum amount of memory that\n  ANALYSE() should allocate per column while trying to find all\n  distinct values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/procedure-analyse.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/procedure-analyse.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (191,9,'HELP_VERSION','This help information was generated from the MySQL 5.5 Reference Manual\non: 2015-02-26 (revision: 41792)\n\nThis information applies to MySQL 5.5 through 5.5.44.\n','','');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (192,38,'CHARACTER_LENGTH','Syntax:\nCHARACTER_LENGTH(str)\n\nCHARACTER_LENGTH() is a synonym for CHAR_LENGTH().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (193,27,'SHOW GRANTS','Syntax:\nSHOW GRANTS [FOR user]\n\nThis statement lists the GRANT statement or statements that must be\nissued to duplicate the privileges that are granted to a MySQL user\naccount. The account is named using the same format as for the GRANT\nstatement; for example, \'jeffrey\'@\'localhost\'. If you specify only the\nuser name part of the account name, a host name part of \'%\' is used.\nFor additional information about specifying account names, see [HELP\nGRANT].\n\nmysql> SHOW GRANTS FOR \'root\'@\'localhost\';\n+---------------------------------------------------------------------+\n| Grants for root@localhost                                           |\n+---------------------------------------------------------------------+\n| GRANT ALL PRIVILEGES ON *.* TO \'root\'@\'localhost\' WITH GRANT OPTION |\n+---------------------------------------------------------------------+\n\nTo list the privileges granted to the account that you are using to\nconnect to the server, you can use any of the following statements:\n\nSHOW GRANTS;\nSHOW GRANTS FOR CURRENT_USER;\nSHOW GRANTS FOR CURRENT_USER();\n\nIf SHOW GRANTS FOR CURRENT_USER (or any of the equivalent syntaxes) is\nused in DEFINER context, such as within a stored procedure that is\ndefined with SQL SECURITY DEFINER), the grants displayed are those of\nthe definer and not the invoker.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-grants.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-grants.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (194,27,'SHOW PRIVILEGES','Syntax:\nSHOW PRIVILEGES\n\nSHOW PRIVILEGES shows the list of system privileges that the MySQL\nserver supports. The exact list of privileges depends on the version of\nyour server.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-privileges.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-privileges.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (195,40,'CREATE TABLESPACE','Syntax:\nCREATE TABLESPACE tablespace_name\n    ADD DATAFILE \'file_name\'\n    USE LOGFILE GROUP logfile_group\n    [EXTENT_SIZE [=] extent_size]\n    [INITIAL_SIZE [=] initial_size]\n    [AUTOEXTEND_SIZE [=] autoextend_size]\n    [MAX_SIZE [=] max_size]\n    [NODEGROUP [=] nodegroup_id]\n    [WAIT]\n    [COMMENT [=] comment_text]\n    ENGINE [=] engine_name\n\nThis statement is used to create a tablespace, which can contain one or\nmore data files, providing storage space for tables. One data file is\ncreated and added to the tablespace using this statement. Additional\ndata files may be added to the tablespace by using the ALTER TABLESPACE\nstatement (see [HELP ALTER TABLESPACE]). For rules covering the naming\nof tablespaces, see\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and a log file group with the same name, or a\ntablespace and a data file with the same name.\n\nA log file group of one or more UNDO log files must be assigned to the\ntablespace to be created with the USE LOGFILE GROUP clause.\nlogfile_group must be an existing log file group created with CREATE\nLOGFILE GROUP (see [HELP CREATE LOGFILE GROUP]). Multiple tablespaces\nmay use the same log file group for UNDO logging.\n\nThe EXTENT_SIZE sets the size, in bytes, of the extents used by any\nfiles belonging to the tablespace. The default value is 1M. The minimum\nsize is 32K, and theoretical maximum is 2G, although the practical\nmaximum size depends on a number of factors. In most cases, changing\nthe extent size does not have any measurable effect on performance, and\nthe default value is recommended for all but the most unusual\nsituations.\n\nAn extent is a unit of disk space allocation. One extent is filled with\nas much data as that extent can contain before another extent is used.\nIn theory, up to 65,535 (64K) extents may used per data file; however,\nthe recommended maximum is 32,768 (32K). The recommended maximum size\nfor a single data file is 32G---that is, 32K extents x 1 MB per extent.\nIn addition, once an extent is allocated to a given partition, it\ncannot be used to store data from a different partition; an extent\ncannot store data from more than one partition. This means, for example\nthat a tablespace having a single datafile whose INITIAL_SIZE is 256 MB\nand whose EXTENT_SIZE is 128M has just two extents, and so can be used\nto store data from at most two different disk data table partitions.\n\nYou can see how many extents remain free in a given data file by\nquerying the INFORMATION_SCHEMA.FILES table, and so derive an estimate\nfor how much space remains free in the file. For further discussion and\nexamples, see http://dev.mysql.com/doc/refman/5.5/en/files-table.html.\n\nThe INITIAL_SIZE parameter sets the data file\'s total size in bytes.\nOnce the file has been created, its size cannot be changed; however,\nyou can add more data files to the tablespace using ALTER TABLESPACE\n... ADD DATAFILE. See [HELP ALTER TABLESPACE].\n\nINITIAL_SIZE is optional; its default value is 134217728 (128 MB).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nWhen setting EXTENT_SIZE, you may optionally follow the number with a\none-letter abbreviation for an order of magnitude, similar to those\nused in my.cnf. Generally, this is one of the letters M (for megabytes)\nor G (for gigabytes). In MySQL Cluster NDB 7.2.14 and later, these\nabbreviations are also supported when specifying INITIAL_SIZE as well.\n(Bug #13116514, Bug #16104705, Bug #62858)\n\nINITIAL_SIZE, EXTENT_SIZE, and UNDO_BUFFER_SIZE are subject to rounding\nas follows:\n\no EXTENT_SIZE and UNDO_BUFFER_SIZE are each rounded up to the nearest\n  whole multiple of 32K.\n\no INITIAL_SIZE is rounded down to the nearest whole multiple of 32K.\n\n  For data files, INITIAL_SIZE is subject to further rounding; the\n  result just obtained is rounded up to the nearest whole multiple of\n  EXTENT_SIZE (after any rounding).\n\nThe rounding just described is done explicitly, and a warning is issued\nby the MySQL Server when any such rounding is performed. The rounded\nvalues are also used by the NDB kernel for calculating\nINFORMATION_SCHEMA.FILES column values and other purposes. However, to\navoid an unexpected result, we suggest that you always use whole\nmultiples of 32K in specifying these options.\n\nAUTOEXTEND_SIZE, MAX_SIZE, NODEGROUP, WAIT, and COMMENT are parsed but\nignored, and so currently have no effect. These options are intended\nfor future expansion.\n\nThe ENGINE parameter determines the storage engine which uses this\ntablespace, with engine_name being the name of the storage engine.\nCurrently, engine_name must be one of the values NDB or NDBCLUSTER.\n\nWhen CREATE TABLESPACE is used with ENGINE = NDB, a tablespace and\nassociated data file are created on each Cluster data node. You can\nverify that the data files were created and obtain information about\nthem by querying the INFORMATION_SCHEMA.FILES table. For example:\n\nmysql> SELECT LOGFILE_GROUP_NAME, FILE_NAME, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE TABLESPACE_NAME = \'newts\' AND FILE_TYPE = \'DATAFILE\';\n+--------------------+-------------+----------------+\n| LOGFILE_GROUP_NAME | FILE_NAME   | EXTRA          |\n+--------------------+-------------+----------------+\n| lg_3               | newdata.dat | CLUSTER_NODE=3 |\n| lg_3               | newdata.dat | CLUSTER_NODE=4 |\n+--------------------+-------------+----------------+\n2 rows in set (0.01 sec)\n\n(See http://dev.mysql.com/doc/refman/5.5/en/files-table.html.)\n\nCREATE TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-tablespace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (196,38,'INSERT FUNCTION','Syntax:\nINSERT(str,pos,len,newstr)\n\nReturns the string str, with the substring beginning at position pos\nand len characters long replaced by the string newstr. Returns the\noriginal string if pos is not within the length of the string. Replaces\nthe rest of the string from position pos if len is not within the\nlength of the rest of the string. Returns NULL if any argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT INSERT(\'Quadratic\', 3, 4, \'What\');\n        -> \'QuWhattic\'\nmysql> SELECT INSERT(\'Quadratic\', -1, 4, \'What\');\n        -> \'Quadratic\'\nmysql> SELECT INSERT(\'Quadratic\', 3, 100, \'What\');\n        -> \'QuWhat\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (197,3,'CRC32','Syntax:\nCRC32(expr)\n\nComputes a cyclic redundancy check value and returns a 32-bit unsigned\nvalue. The result is NULL if the argument is NULL. The argument is\nexpected to be a string and (if possible) is treated as one if it is\nnot.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT CRC32(\'MySQL\');\n        -> 3259397556\nmysql> SELECT CRC32(\'mysql\');\n        -> 2501908538\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (198,15,'XOR','Syntax:\nXOR\n\nLogical XOR. Returns NULL if either operand is NULL. For non-NULL\noperands, evaluates to 1 if an odd number of operands is nonzero,\notherwise 0 is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT 1 XOR 1;\n        -> 0\nmysql> SELECT 1 XOR 0;\n        -> 1\nmysql> SELECT 1 XOR NULL;\n        -> NULL\nmysql> SELECT 1 XOR 1 XOR 1;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (199,13,'STARTPOINT','StartPoint(ls)\n\nReturns the Point that is the start point of the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(StartPoint(GeomFromText(@ls)));\n+---------------------------------------+\n| AsText(StartPoint(GeomFromText(@ls))) |\n+---------------------------------------+\n| POINT(1 1)                            |\n+---------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (200,10,'GRANT','Syntax:\nGRANT\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    TO user_specification [, user_specification] ...\n    [REQUIRE {NONE | ssl_option [[AND] ssl_option] ...}]\n    [WITH with_option ...]\n\nGRANT PROXY ON user_specification\n    TO user_specification [, user_specification] ...\n    [WITH GRANT OPTION]\n\nobject_type:\n    TABLE\n  | FUNCTION\n  | PROCEDURE\n\npriv_level:\n    *\n  | *.*\n  | db_name.*\n  | db_name.tbl_name\n  | tbl_name\n  | db_name.routine_name\n\nuser_specification:\n    user\n    [\n      | IDENTIFIED WITH auth_plugin [AS \'auth_string\']\n        IDENTIFIED BY [PASSWORD] \'password\'\n    ]\n\nssl_option:\n    SSL\n  | X509\n  | CIPHER \'cipher\'\n  | ISSUER \'issuer\'\n  | SUBJECT \'subject\'\n\nwith_option:\n    GRANT OPTION\n  | MAX_QUERIES_PER_HOUR count\n  | MAX_UPDATES_PER_HOUR count\n  | MAX_CONNECTIONS_PER_HOUR count\n  | MAX_USER_CONNECTIONS count\n\nThe GRANT statement grants privileges to MySQL user accounts. GRANT\nalso serves to specify other account characteristics such as use of\nsecure connections and limits on access to server resources. To use\nGRANT, you must have the GRANT OPTION privilege, and you must have the\nprivileges that you are granting.\n\nNormally, a database administrator first uses CREATE USER to create an\naccount, then GRANT to define its privileges and characteristics. For\nexample:\n\nCREATE USER \'jeffrey\'@\'localhost\' IDENTIFIED BY \'mypass\';\nGRANT ALL ON db1.* TO \'jeffrey\'@\'localhost\';\nGRANT SELECT ON db2.invoice TO \'jeffrey\'@\'localhost\';\nGRANT USAGE ON *.* TO \'jeffrey\'@\'localhost\' WITH MAX_QUERIES_PER_HOUR 90;\n\nHowever, if an account named in a GRANT statement does not already\nexist, GRANT may create it under the conditions described later in the\ndiscussion of the NO_AUTO_CREATE_USER SQL mode.\n\nThe REVOKE statement is related to GRANT and enables administrators to\nremove account privileges. See [HELP REVOKE].\n\nWhen successfully executed from the mysql program, GRANT responds with\nQuery OK, 0 rows affected. To determine what privileges result from the\noperation, use SHOW GRANTS. See [HELP SHOW GRANTS].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/grant.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/grant.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (201,24,'DECLARE VARIABLE','Syntax:\nDECLARE var_name [, var_name] ... type [DEFAULT value]\n\nThis statement declares local variables within stored programs. To\nprovide a default value for a variable, include a DEFAULT clause. The\nvalue can be specified as an expression; it need not be a constant. If\nthe DEFAULT clause is missing, the initial value is NULL.\n\nLocal variables are treated like stored routine parameters with respect\nto data type and overflow checking. See [HELP CREATE PROCEDURE].\n\nVariable declarations must appear before cursor or handler\ndeclarations.\n\nLocal variable names are not case sensitive. Permissible characters and\nquoting rules are the same as for other identifiers, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html.\n\nThe scope of a local variable is the BEGIN ... END block within which\nit is declared. The variable can be referred to in blocks nested within\nthe declaring block, except those blocks that declare a variable with\nthe same name.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-local-variable.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/declare-local-variable.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (202,4,'MPOLYFROMTEXT','MPolyFromText(wkt[,srid]), MultiPolygonFromText(wkt[,srid])\n\nConstructs a MultiPolygon value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (203,16,'BIT_OR','Syntax:\nBIT_OR(expr)\n\nReturns the bitwise OR of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (204,7,'MBRINTERSECTS','MBRIntersects(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 intersect.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (205,32,'YEARWEEK','Syntax:\nYEARWEEK(date), YEARWEEK(date,mode)\n\nReturns year and week for a date. The mode argument works exactly like\nthe mode argument to WEEK(). The year in the result may be different\nfrom the year in the date argument for the first and the last week of\nthe year.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT YEARWEEK(\'1987-01-01\');\n        -> 198653\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (206,20,'NOT BETWEEN','Syntax:\nexpr NOT BETWEEN min AND max\n\nThis is the same as NOT (expr BETWEEN min AND max).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (207,20,'IS NOT','Syntax:\nIS NOT boolean_value\n\nTests a value against a boolean value, where boolean_value can be TRUE,\nFALSE, or UNKNOWN.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NOT UNKNOWN, 0 IS NOT UNKNOWN, NULL IS NOT UNKNOWN;\n        -> 1, 1, 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (208,3,'LOG10','Syntax:\nLOG10(X)\n\nReturns the base-10 logarithm of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LOG10(2);\n        -> 0.30102999566398\nmysql> SELECT LOG10(100);\n        -> 2\nmysql> SELECT LOG10(-100);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (209,3,'SQRT','Syntax:\nSQRT(X)\n\nReturns the square root of a nonnegative number X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT SQRT(4);\n        -> 2\nmysql> SELECT SQRT(20);\n        -> 4.4721359549996\nmysql> SELECT SQRT(-16);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (210,23,'DECIMAL','DECIMAL[(M[,D])] [UNSIGNED] [ZEROFILL]\n\nA packed "exact" fixed-point number. M is the total number of digits\n(the precision) and D is the number of digits after the decimal point\n(the scale). The decimal point and (for negative numbers) the "-" sign\nare not counted in M. If D is 0, values have no decimal point or\nfractional part. The maximum number of digits (M) for DECIMAL is 65.\nThe maximum number of supported decimals (D) is 30. If D is omitted,\nthe default is 0. If M is omitted, the default is 10.\n\nUNSIGNED, if specified, disallows negative values.\n\nAll basic calculations (+, -, *, /) with DECIMAL columns are done with\na precision of 65 digits.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (211,40,'CREATE INDEX','Syntax:\nCREATE [ONLINE|OFFLINE] [UNIQUE|FULLTEXT|SPATIAL] INDEX index_name\n    [index_type]\n    ON tbl_name (index_col_name,...)\n    [index_option] ...\n\nindex_col_name:\n    col_name [(length)] [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option:\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n\nCREATE INDEX is mapped to an ALTER TABLE statement to create indexes.\nSee [HELP ALTER TABLE]. CREATE INDEX cannot be used to create a PRIMARY\nKEY; use ALTER TABLE instead. For more information about indexes, see\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-indexes.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (212,40,'CREATE FUNCTION','The CREATE FUNCTION statement is used to create stored functions and\nuser-defined functions (UDFs):\n\no For information about creating stored functions, see [HELP CREATE\n  PROCEDURE].\n\no For information about creating user-defined functions, see [HELP\n  CREATE FUNCTION UDF].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-function.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (213,40,'ALTER DATABASE','Syntax:\nALTER {DATABASE | SCHEMA} [db_name]\n    alter_specification ...\nALTER {DATABASE | SCHEMA} db_name\n    UPGRADE DATA DIRECTORY NAME\n\nalter_specification:\n    [DEFAULT] CHARACTER SET [=] charset_name\n  | [DEFAULT] COLLATE [=] collation_name\n\nALTER DATABASE enables you to change the overall characteristics of a\ndatabase. These characteristics are stored in the db.opt file in the\ndatabase directory. To use ALTER DATABASE, you need the ALTER privilege\non the database. ALTER SCHEMA is a synonym for ALTER DATABASE.\n\nThe database name can be omitted from the first syntax, in which case\nthe statement applies to the default database.\n\nNational Language Characteristics\n\nThe CHARACTER SET clause changes the default database character set.\nThe COLLATE clause changes the default database collation.\nhttp://dev.mysql.com/doc/refman/5.5/en/charset.html, discusses\ncharacter set and collation names.\n\nYou can see what character sets and collations are available using,\nrespectively, the SHOW CHARACTER SET and SHOW COLLATION statements. See\n[HELP SHOW CHARACTER SET], and [HELP SHOW COLLATION], for more\ninformation.\n\nIf you change the default character set or collation for a database,\nstored routines that use the database defaults must be dropped and\nrecreated so that they use the new defaults. (In a stored routine,\nvariables with character data types use the database defaults if the\ncharacter set or collation are not specified explicitly. See [HELP\nCREATE PROCEDURE].)\n\nUpgrading from Versions Older than MySQL 5.1\n\nThe syntax that includes the UPGRADE DATA DIRECTORY NAME clause updates\nthe name of the directory associated with the database to use the\nencoding implemented in MySQL 5.1 for mapping database names to\ndatabase directory names (see\nhttp://dev.mysql.com/doc/refman/5.5/en/identifier-mapping.html). This\nclause is for use under these conditions:\n\no It is intended when upgrading MySQL to 5.1 or later from older\n  versions.\n\no It is intended to update a database directory name to the current\n  encoding format if the name contains special characters that need\n  encoding.\n\no The statement is used by mysqlcheck (as invoked by mysql_upgrade).\n\nFor example, if a database in MySQL 5.0 has the name a-b-c, the name\ncontains instances of the - (dash) character. In MySQL 5.0, the\ndatabase directory is also named a-b-c, which is not necessarily safe\nfor all file systems. In MySQL 5.1 and later, the same database name is\nencoded as a@002db@002dc to produce a file system-neutral directory\nname.\n\nWhen a MySQL installation is upgraded to MySQL 5.1 or later from an\nolder version,the server displays a name such as a-b-c (which is in the\nold format) as #mysql50#a-b-c, and you must refer to the name using the\n#mysql50# prefix. Use UPGRADE DATA DIRECTORY NAME in this case to\nexplicitly tell the server to re-encode the database directory name to\nthe current encoding format:\n\nALTER DATABASE `#mysql50#a-b-c` UPGRADE DATA DIRECTORY NAME;\n\nAfter executing this statement, you can refer to the database as a-b-c\nwithout the special #mysql50# prefix.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-database.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (214,26,'GEOMETRYN','GeometryN(gc,N)\n\nReturns the N-th geometry in the GeometryCollection value gc.\nGeometries are numbered beginning with 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-geometrycollection-property-functions.html\n\n','mysql> SET @gc = \'GeometryCollection(Point(1 1),LineString(2 2, 3 3))\';\nmysql> SELECT AsText(GeometryN(GeomFromText(@gc),1));\n+----------------------------------------+\n| AsText(GeometryN(GeomFromText(@gc),1)) |\n+----------------------------------------+\n| POINT(1 1)                             |\n+----------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-geometrycollection-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (215,19,'<<','Syntax:\n<<\n\nShifts a longlong (BIGINT) number to the left.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 1 << 2;\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (216,27,'SHOW TABLE STATUS','Syntax:\nSHOW TABLE STATUS [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLE STATUS works likes SHOW TABLES, but provides a lot of\ninformation about each non-TEMPORARY table. You can also get this list\nusing the mysqlshow --status db_name command. The LIKE clause, if\npresent, indicates which table names to match. The WHERE clause can be\ngiven to select rows using more general conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-table-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (217,12,'MD5','Syntax:\nMD5(str)\n\nCalculates an MD5 128-bit checksum for the string. The value is\nreturned as a string of 32 hex digits, or NULL if the argument was\nNULL. The return value can, for example, be used as a hash key. See the\nnotes at the beginning of this section about storing hash values\nefficiently.\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring; see the notes at the beginning of this section about using the\nvalue as a nonbinary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT MD5(\'testing\');\n        -> \'ae2b1fca515949e5d54fb22b8ed95575\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (218,20,'<','Syntax:\n<\n\nLess than:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 < 2;\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (219,32,'UNIX_TIMESTAMP','Syntax:\nUNIX_TIMESTAMP(), UNIX_TIMESTAMP(date)\n\nIf called with no argument, returns a Unix timestamp (seconds since\n\'1970-01-01 00:00:00\' UTC) as an unsigned integer. If UNIX_TIMESTAMP()\nis called with a date argument, it returns the value of the argument as\nseconds since \'1970-01-01 00:00:00\' UTC. date may be a DATE string, a\nDATETIME string, a TIMESTAMP, or a number in the format YYMMDD or\nYYYYMMDD. The server interprets date as a value in the current time\nzone and converts it to an internal value in UTC. Clients can set their\ntime zone as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UNIX_TIMESTAMP();\n        -> 1196440210\nmysql> SELECT UNIX_TIMESTAMP(\'2007-11-30 10:30:19\');\n        -> 1196440219\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (220,32,'DAYOFMONTH','Syntax:\nDAYOFMONTH(date)\n\nReturns the day of the month for date, in the range 1 to 31, or 0 for\ndates such as \'0000-00-00\' or \'2008-00-00\' that have a zero day part.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFMONTH(\'2007-02-03\');\n        -> 3\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (221,38,'ASCII','Syntax:\nASCII(str)\n\nReturns the numeric value of the leftmost character of the string str.\nReturns 0 if str is the empty string. Returns NULL if str is NULL.\nASCII() works for 8-bit characters.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT ASCII(\'2\');\n        -> 50\nmysql> SELECT ASCII(2);\n        -> 50\nmysql> SELECT ASCII(\'dx\');\n        -> 100\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (222,3,'DIV','Syntax:\nDIV\n\nInteger division. Similar to FLOOR(), but is safe with BIGINT values.\n\nAs of MySQL 5.5.3, if either operand has a noninteger type, the\noperands are converted to DECIMAL and divided using DECIMAL arithmetic\nbefore converting the result to BIGINT. If the result exceeds BIGINT\nrange, an error occurs. Before MySQL 5.5.3, incorrect results may occur\nfor noninteger operands that exceed BIGINT range.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 5 DIV 2;\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (223,10,'RENAME USER','Syntax:\nRENAME USER old_user TO new_user\n    [, old_user TO new_user] ...\n\nThe RENAME USER statement renames existing MySQL accounts. An error\noccurs for old accounts that do not exist or new accounts that already\nexist. To use this statement, you must have the global CREATE USER\nprivilege or the UPDATE privilege for the mysql database.\n\nEach account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nRENAME USER \'jeffrey\'@\'localhost\' TO \'jeff\'@\'127.0.0.1\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nRENAME USER causes the privileges held by the old user to be those held\nby the new user. However, RENAME USER does not automatically drop or\ninvalidate databases or objects within them that the old user created.\nThis includes stored programs or views for which the DEFINER attribute\nnames the old user. Attempts to access such objects may produce an\nerror if they execute in definer security context. (For information\nabout security context, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-security.html.)\n\nThe privilege changes take effect as indicated in\nhttp://dev.mysql.com/doc/refman/5.5/en/privilege-changes.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/rename-user.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/rename-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (224,27,'SHOW SLAVE STATUS','Syntax:\nSHOW SLAVE STATUS\n\nThis statement provides status information on essential parameters of\nthe slave threads. It requires either the SUPER or REPLICATION CLIENT\nprivilege.\n\nIf you issue this statement using the mysql client, you can use a \\G\nstatement terminator rather than a semicolon to obtain a more readable\nvertical layout:\n\nmysql> SHOW SLAVE STATUS\\G\n*************************** 1. row ***************************\n               Slave_IO_State: Waiting for master to send event\n                  Master_Host: localhost\n                  Master_User: root\n                  Master_Port: 3306\n                Connect_Retry: 3\n              Master_Log_File: gbichot-bin.005\n          Read_Master_Log_Pos: 79\n               Relay_Log_File: gbichot-relay-bin.005\n                Relay_Log_Pos: 548\n        Relay_Master_Log_File: gbichot-bin.005\n             Slave_IO_Running: Yes\n            Slave_SQL_Running: Yes\n              Replicate_Do_DB:\n          Replicate_Ignore_DB:\n           Replicate_Do_Table:\n       Replicate_Ignore_Table:\n      Replicate_Wild_Do_Table:\n  Replicate_Wild_Ignore_Table:\n                   Last_Errno: 0\n                   Last_Error:\n                 Skip_Counter: 0\n          Exec_Master_Log_Pos: 79\n              Relay_Log_Space: 552\n              Until_Condition: None\n               Until_Log_File:\n                Until_Log_Pos: 0\n           Master_SSL_Allowed: No\n           Master_SSL_CA_File:\n           Master_SSL_CA_Path:\n              Master_SSL_Cert:\n            Master_SSL_Cipher:\n               Master_SSL_Key:\n        Seconds_Behind_Master: 8\nMaster_SSL_Verify_Server_Cert: No\n                Last_IO_Errno: 0\n                Last_IO_Error:\n               Last_SQL_Errno: 0\n               Last_SQL_Error:\n  Replicate_Ignore_Server_Ids: 0\n             Master_Server_Id: 1\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-slave-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-slave-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (225,35,'GEOMETRY','MySQL provides a standard way of creating spatial columns for geometry\ntypes, for example, with CREATE TABLE or ALTER TABLE. Spatial columns\nare supported for MyISAM, InnoDB, NDB, and ARCHIVE tables. See also the\nnotes about spatial indexes under [HELP SPATIAL].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-columns.html\n\n','CREATE TABLE geom (g GEOMETRY);\n','http://dev.mysql.com/doc/refman/5.5/en/creating-spatial-columns.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (226,13,'NUMPOINTS','NumPoints(ls)\n\nReturns the number of Point objects in the LineString value ls.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT NumPoints(GeomFromText(@ls));\n+------------------------------+\n| NumPoints(GeomFromText(@ls)) |\n+------------------------------+\n|                            3 |\n+------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (227,40,'ALTER LOGFILE GROUP','Syntax:\nALTER LOGFILE GROUP logfile_group\n    ADD UNDOFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n    ENGINE [=] engine_name\n\nThis statement adds an UNDO file named \'file_name\' to an existing log\nfile group logfile_group. An ALTER LOGFILE GROUP statement has one and\nonly one ADD UNDOFILE clause. No DROP UNDOFILE clause is currently\nsupported.\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and an undo log file with the same name, or an undo\nlog file and a data file with the same name.\n\nThe optional INITIAL_SIZE parameter sets the UNDO file\'s initial size\nin bytes; if not specified, the initial size defaults to 134217728 (128\nMB). Prior to MySQL Cluster NDB 7.2.14, this value was required to be\nspecified using digits (Bug #13116514, Bug #16104705, Bug #62858); in\nMySQL Cluster NDB 7.2.14 and later, you may optionally follow size with\na one-letter abbreviation for an order of magnitude, similar to those\nused in my.cnf. Generally, this is one of the letters M (megabytes) or\nG (gigabytes).\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nThe minimum allowed value for INITIAL_SIZE is 1048576 (1 MB). (Bug\n#29574)\n\n*Note*: WAIT is parsed but otherwise ignored. This keyword currently\nhas no effect, and is intended for future expansion.\n\nThe ENGINE parameter (required) determines the storage engine which is\nused by this log file group, with engine_name being the name of the\nstorage engine. Currently, the only accepted values for engine_name are\n"NDBCLUSTER" and "NDB". The two values are equivalent.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-logfile-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (228,19,'&','Syntax:\n&\n\nBitwise AND:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 29 & 15;\n        -> 13\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (229,32,'LOCALTIMESTAMP','Syntax:\nLOCALTIMESTAMP, LOCALTIMESTAMP()\n\nLOCALTIMESTAMP and LOCALTIMESTAMP() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (230,15,'ASSIGN-EQUAL','Syntax:\n=\n\nThis operator is used to perform value assignments in two cases,\ndescribed in the next two paragraphs.\n\nWithin a SET statement, = is treated as an assignment operator that\ncauses the user variable on the left hand side of the operator to take\non the value to its right. (In other words, when used in a SET\nstatement, = is treated identically to :=.) The value on the right hand\nside may be a literal value, another variable storing a value, or any\nlegal expression that yields a scalar value, including the result of a\nquery (provided that this value is a scalar value). You can perform\nmultiple assignments in the same SET statement.\n\nIn the SET clause of an UPDATE statement, = also acts as an assignment\noperator; in this case, however, it causes the column named on the left\nhand side of the operator to assume the value given to the right,\nprovided any WHERE conditions that are part of the UPDATE are met. You\ncan make multiple assignments in the same SET clause of an UPDATE\nstatement.\n\nIn any other context, = is treated as a comparison operator.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html\n\n','mysql> SELECT @var1, @var2;\n        -> NULL, NULL\nmysql> SELECT @var1 := 1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2;\n        -> 1, NULL\nmysql> SELECT @var1, @var2 := @var1;\n        -> 1, 1\nmysql> SELECT @var1, @var2;\n        -> 1, 1\n','http://dev.mysql.com/doc/refman/5.5/en/assignment-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (231,38,'CONVERT','Syntax:\nCONVERT(expr,type), CONVERT(expr USING transcoding_name)\n\nThe CONVERT() and CAST() functions take an expression of any type and\nproduce a result value of a specified type.\n\nThe type for the result can be one of the following values:\n\no BINARY[(N)]\n\no CHAR[(N)]\n\no DATE\n\no DATETIME\n\no DECIMAL[(M[,D])]\n\no SIGNED [INTEGER]\n\no TIME\n\no UNSIGNED [INTEGER]\n\nBINARY produces a string with the BINARY data type. See\nhttp://dev.mysql.com/doc/refman/5.5/en/binary-varbinary.html for a\ndescription of how this affects comparisons. If the optional length N\nis given, BINARY(N) causes the cast to use no more than N bytes of the\nargument. Values shorter than N bytes are padded with 0x00 bytes to a\nlength of N.\n\nCHAR(N) causes the cast to use no more than N characters of the\nargument.\n\nCAST() and CONVERT(... USING ...) are standard SQL syntax. The\nnon-USING form of CONVERT() is ODBC syntax.\n\nCONVERT() with USING is used to convert data between different\ncharacter sets. In MySQL, transcoding names are the same as the\ncorresponding character set names. For example, this statement converts\nthe string \'abc\' in the default character set to the corresponding\nstring in the utf8 character set:\n\nSELECT CONVERT(\'abc\' USING utf8);\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html\n\n','SELECT enum_col FROM tbl_name ORDER BY CAST(enum_col AS CHAR);\n','http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (232,40,'DROP LOGFILE GROUP','Syntax:\nDROP LOGFILE GROUP logfile_group\n    ENGINE [=] engine_name\n\nThis statement drops the log file group named logfile_group. The log\nfile group must already exist or an error results. (For information on\ncreating log file groups, see [HELP CREATE LOGFILE GROUP].)\n\n*Important*: Before dropping a log file group, you must drop all\ntablespaces that use that log file group for UNDO logging.\n\nThe required ENGINE clause provides the name of the storage engine used\nby the log file group to be dropped. Currently, the only permitted\nvalues for engine_name are NDB and NDBCLUSTER.\n\nDROP LOGFILE GROUP is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-logfile-group.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-logfile-group.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (233,32,'ADDDATE','Syntax:\nADDDATE(date,INTERVAL expr unit), ADDDATE(expr,days)\n\nWhen invoked with the INTERVAL form of the second argument, ADDDATE()\nis a synonym for DATE_ADD(). The related function SUBDATE() is a\nsynonym for DATE_SUB(). For information on the INTERVAL unit argument,\nsee the discussion for DATE_ADD().\n\nmysql> SELECT DATE_ADD(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2008-02-02\'\nmysql> SELECT ADDDATE(\'2008-01-02\', INTERVAL 31 DAY);\n        -> \'2008-02-02\'\n\nWhen invoked with the days form of the second argument, MySQL treats it\nas an integer number of days to be added to expr.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT ADDDATE(\'2008-01-02\', 31);\n        -> \'2008-02-02\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (234,24,'REPEAT LOOP','Syntax:\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\nThe statement list within a REPEAT statement is repeated until the\nsearch_condition expression is true. Thus, a REPEAT always enters the\nloop at least once. statement_list consists of one or more statements,\neach terminated by a semicolon (;) statement delimiter.\n\nA REPEAT statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/repeat.html\n\n','mysql> delimiter //\n\nmysql> CREATE PROCEDURE dorepeat(p1 INT)\n    -> BEGIN\n    ->   SET @x = 0;\n    ->   REPEAT\n    ->     SET @x = @x + 1;\n    ->   UNTIL @x > p1 END REPEAT;\n    -> END\n    -> //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL dorepeat(1000)//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @x//\n+------+\n| @x   |\n+------+\n| 1001 |\n+------+\n1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/repeat.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (235,40,'ALTER FUNCTION','Syntax:\nALTER FUNCTION func_name [characteristic ...]\n\ncharacteristic:\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n\nThis statement can be used to change the characteristics of a stored\nfunction. More than one change may be specified in an ALTER FUNCTION\nstatement. However, you cannot change the parameters or body of a\nstored function using this statement; to make such changes, you must\ndrop and re-create the function using DROP FUNCTION and CREATE\nFUNCTION.\n\nYou must have the ALTER ROUTINE privilege for the function. (That\nprivilege is granted automatically to the function creator.) If binary\nlogging is enabled, the ALTER FUNCTION statement might also require the\nSUPER privilege, as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-logging.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-function.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (236,23,'SMALLINT','SMALLINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA small integer. The signed range is -32768 to 32767. The unsigned\nrange is 0 to 65535.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (237,23,'DOUBLE PRECISION','DOUBLE PRECISION[(M,D)] [UNSIGNED] [ZEROFILL], REAL[(M,D)] [UNSIGNED]\n[ZEROFILL]\n\nThese types are synonyms for DOUBLE. Exception: If the REAL_AS_FLOAT\nSQL mode is enabled, REAL is a synonym for FLOAT rather than DOUBLE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (238,38,'ORD','Syntax:\nORD(str)\n\nIf the leftmost character of the string str is a multibyte character,\nreturns the code for that character, calculated from the numeric values\nof its constituent bytes using this formula:\n\n  (1st byte code)\n+ (2nd byte code * 256)\n+ (3rd byte code * 2562) ...\n\nIf the leftmost character is not a multibyte character, ORD() returns\nthe same value as the ASCII() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT ORD(\'2\');\n        -> 50\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (239,8,'DEALLOCATE PREPARE','Syntax:\n{DEALLOCATE | DROP} PREPARE stmt_name\n\nTo deallocate a prepared statement produced with PREPARE, use a\nDEALLOCATE PREPARE statement that refers to the prepared statement\nname. Attempting to execute a prepared statement after deallocating it\nresults in an error.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/deallocate-prepare.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/deallocate-prepare.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (240,14,'IS_FREE_LOCK','Syntax:\nIS_FREE_LOCK(str)\n\nChecks whether the lock named str is free to use (that is, not locked).\nReturns 1 if the lock is free (no one is using the lock), 0 if the lock\nis in use, and NULL if an error occurs (such as an incorrect argument).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (241,37,'ENVELOPE','Envelope(g)\n\nReturns the minimum bounding rectangle (MBR) for the geometry value g.\nThe result is returned as a Polygon value that is defined by the corner\npoints of the bounding box:\n\nPOLYGON((MINX MINY, MAXX MINY, MAXX MAXY, MINX MAXY, MINX MINY))\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html\n\n','mysql> SELECT AsText(Envelope(GeomFromText(\'LineString(1 1,2 2)\')));\n+-------------------------------------------------------+\n| AsText(Envelope(GeomFromText(\'LineString(1 1,2 2)\'))) |\n+-------------------------------------------------------+\n| POLYGON((1 1,2 1,2 2,1 2,1 1))                        |\n+-------------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (242,31,'TOUCHES','Touches(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially touches g2. Two\ngeometries spatially touch if the interiors of the geometries do not\nintersect, but the boundary of one of the geometries intersects either\nthe boundary or the interior of the other.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (243,14,'INET_ATON','Syntax:\nINET_ATON(expr)\n\nGiven the dotted-quad representation of an IPv4 network address as a\nstring, returns an integer that represents the numeric value of the\naddress in network byte order (big endian). INET_ATON() returns NULL if\nit does not understand its argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT INET_ATON(\'10.0.5.9\');\n        -> 167773449\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (244,12,'UNCOMPRESS','Syntax:\nUNCOMPRESS(string_to_uncompress)\n\nUncompresses a string compressed by the COMPRESS() function. If the\nargument is not a compressed value, the result is NULL. This function\nrequires MySQL to have been compiled with a compression library such as\nzlib. Otherwise, the return value is always NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT UNCOMPRESS(COMPRESS(\'any string\'));\n        -> \'any string\'\nmysql> SELECT UNCOMPRESS(\'any string\');\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (245,23,'AUTO_INCREMENT','The AUTO_INCREMENT attribute can be used to generate a unique identity\nfor new rows:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/example-auto-increment.html\n\n','CREATE TABLE animals (\n     id MEDIUMINT NOT NULL AUTO_INCREMENT,\n     name CHAR(30) NOT NULL,\n     PRIMARY KEY (id)\n);\n\nINSERT INTO animals (name) VALUES\n    (\'dog\'),(\'cat\'),(\'penguin\'),\n    (\'lax\'),(\'whale\'),(\'ostrich\');\n\nSELECT * FROM animals;\n','http://dev.mysql.com/doc/refman/5.5/en/example-auto-increment.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (246,37,'ISSIMPLE','IsSimple(g)\n\nIn MySQL 5.5, this function is a placeholder that always returns 0.\n\nThe description of each instantiable geometric class given earlier in\nthe chapter includes the specific conditions that cause an instance of\nthat class to be classified as not simple. (See [HELP Geometry\nhierarchy].)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (247,3,'- BINARY','Syntax:\n-\n\nSubtraction:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3-5;\n        -> -2\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (248,4,'GEOMCOLLFROMTEXT','GeomCollFromText(wkt[,srid]), GeometryCollectionFromText(wkt[,srid])\n\nConstructs a GeometryCollection value using its WKT representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (249,32,'CURRENT_TIME','Syntax:\nCURRENT_TIME, CURRENT_TIME()\n\nCURRENT_TIME and CURRENT_TIME() are synonyms for CURTIME().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (250,4,'WKT DEFINITION','The Well-Known Text (WKT) representation of geometry values is designed\nfor exchanging geometry data in ASCII form. The OpenGIS specification\nprovides a Backus-Naur grammar that specifies the formal production\nrules for writing WKT values (see\nhttp://dev.mysql.com/doc/refman/5.5/en/spatial-extensions.html).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-data-formats.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-data-formats.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (251,10,'REVOKE','Syntax:\nREVOKE\n    priv_type [(column_list)]\n      [, priv_type [(column_list)]] ...\n    ON [object_type] priv_level\n    FROM user [, user] ...\n\nREVOKE ALL PRIVILEGES, GRANT OPTION\n    FROM user [, user] ...\n\nREVOKE PROXY ON user\n    FROM user [, user] ...\n\nThe REVOKE statement enables system administrators to revoke privileges\nfrom MySQL accounts. Each account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nREVOKE INSERT ON *.* FROM \'jeffrey\'@\'localhost\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nFor details on the levels at which privileges exist, the permissible\npriv_type and priv_level values, and the syntax for specifying users\nand passwords, see [HELP GRANT]\n\nTo use the first REVOKE syntax, you must have the GRANT OPTION\nprivilege, and you must have the privileges that you are revoking.\n\nTo revoke all privileges, use the second syntax, which drops all\nglobal, database, table, column, and routine privileges for the named\nuser or users:\n\nREVOKE ALL PRIVILEGES, GRANT OPTION FROM user [, user] ...\n\nTo use this REVOKE syntax, you must have the global CREATE USER\nprivilege or the UPDATE privilege for the mysql database.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/revoke.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/revoke.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (252,17,'LAST_INSERT_ID','Syntax:\nLAST_INSERT_ID(), LAST_INSERT_ID(expr)\n\nWith no argument, LAST_INSERT_ID() returns a 64-bit value representing\nthe first automatically generated value successfully inserted for an\nAUTO_INCREMENT column as a result of the most recently executed INSERT\nstatement. The value has a type of BIGINT UNSIGNED as of MySQL 5.5.29,\nBIGINT (signed) before that. The value of LAST_INSERT_ID() remains\nunchanged if no rows are successfully inserted.\n\nWith an argument, LAST_INSERT_ID() returns an unsigned integer as of\nMySQL 5.5.29, a signed integer before that.\n\nFor example, after inserting a row that generates an AUTO_INCREMENT\nvalue, you can get the value like this:\n\nmysql> SELECT LAST_INSERT_ID();\n        -> 195\n\nThe currently executing statement does not affect the value of\nLAST_INSERT_ID(). Suppose that you generate an AUTO_INCREMENT value\nwith one statement, and then refer to LAST_INSERT_ID() in a\nmultiple-row INSERT statement that inserts rows into a table with its\nown AUTO_INCREMENT column. The value of LAST_INSERT_ID() will remain\nstable in the second statement; its value for the second and later rows\nis not affected by the earlier row insertions. (However, if you mix\nreferences to LAST_INSERT_ID() and LAST_INSERT_ID(expr), the effect is\nundefined.)\n\nIf the previous statement returned an error, the value of\nLAST_INSERT_ID() is undefined. For transactional tables, if the\nstatement is rolled back due to an error, the value of LAST_INSERT_ID()\nis left undefined. For manual ROLLBACK, the value of LAST_INSERT_ID()\nis not restored to that before the transaction; it remains as it was at\nthe point of the ROLLBACK.\n\nPrior to MySQL 5.5.35, this function was not replicated correctly if\nreplication filtering rules were in use. (Bug #17234370, Bug #69861)\n\nWithin the body of a stored routine (procedure or function) or a\ntrigger, the value of LAST_INSERT_ID() changes the same way as for\nstatements executed outside the body of these kinds of objects. The\neffect of a stored routine or trigger upon the value of\nLAST_INSERT_ID() that is seen by following statements depends on the\nkind of routine:\n\no If a stored procedure executes statements that change the value of\n  LAST_INSERT_ID(), the changed value is seen by statements that follow\n  the procedure call.\n\no For stored functions and triggers that change the value, the value is\n  restored when the function or trigger ends, so following statements\n  will not see a changed value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (253,32,'LAST_DAY','Syntax:\nLAST_DAY(date)\n\nTakes a date or datetime value and returns the corresponding value for\nthe last day of the month. Returns NULL if the argument is invalid.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT LAST_DAY(\'2003-02-05\');\n        -> \'2003-02-28\'\nmysql> SELECT LAST_DAY(\'2004-02-05\');\n        -> \'2004-02-29\'\nmysql> SELECT LAST_DAY(\'2004-01-01 01:01:01\');\n        -> \'2004-01-31\'\nmysql> SELECT LAST_DAY(\'2003-03-32\');\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (254,23,'MEDIUMINT','MEDIUMINT[(M)] [UNSIGNED] [ZEROFILL]\n\nA medium-sized integer. The signed range is -8388608 to 8388607. The\nunsigned range is 0 to 16777215.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (255,3,'FLOOR','Syntax:\nFLOOR(X)\n\nReturns the largest integer value not greater than X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT FLOOR(1.23);\n        -> 1\nmysql> SELECT FLOOR(-1.23);\n        -> -2\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (256,38,'RTRIM','Syntax:\nRTRIM(str)\n\nReturns the string str with trailing space characters removed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT RTRIM(\'barbar   \');\n        -> \'barbar\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (257,29,'EXPLAIN','Syntax:\n{EXPLAIN | DESCRIBE | DESC}\n    tbl_name [col_name | wild]\n\n{EXPLAIN | DESCRIBE | DESC}\n    [explain_type] SELECT select_options\n\nexplain_type: {EXTENDED | PARTITIONS}\n\nThe DESCRIBE and EXPLAIN statements are synonyms. In practice, the\nDESCRIBE keyword is more often used to obtain information about table\nstructure, whereas EXPLAIN is used to obtain a query execution plan\n(that is, an explanation of how MySQL would execute a query). The\nfollowing discussion uses the DESCRIBE and EXPLAIN keywords in\naccordance with those uses, but the MySQL parser treats them as\ncompletely synonymous.\n\nObtaining Table Structure Information\n\nDESCRIBE provides information about the columns in a table:\n\nmysql> DESCRIBE City;\n+------------+----------+------+-----+---------+----------------+\n| Field      | Type     | Null | Key | Default | Extra          |\n+------------+----------+------+-----+---------+----------------+\n| Id         | int(11)  | NO   | PRI | NULL    | auto_increment |\n| Name       | char(35) | NO   |     |         |                |\n| Country    | char(3)  | NO   | UNI |         |                |\n| District   | char(20) | YES  | MUL |         |                |\n| Population | int(11)  | NO   |     | 0       |                |\n+------------+----------+------+-----+---------+----------------+\n\nDESCRIBE is a shortcut for SHOW COLUMNS. These statements also display\ninformation for views. The description for SHOW COLUMNS provides more\ninformation about the output columns. See [HELP SHOW COLUMNS].\n\nBy default, DESCRIBE displays information about all columns in the\ntable. col_name, if given, is the name of a column in the table. In\nthis case, the statement displays information only for the named\ncolumn. wild, if given, is a pattern string. It can contain the SQL "%"\nand "_" wildcard characters. In this case, the statement displays\noutput only for the columns with names matching the string. There is no\nneed to enclose the string within quotation marks unless it contains\nspaces or other special characters.\n\nThe DESCRIBE statement is provided for compatibility with Oracle.\n\nThe SHOW CREATE TABLE, SHOW TABLE STATUS, and SHOW INDEX statements\nalso provide information about tables. See [HELP SHOW].\n\nObtaining Execution Plan Information\n\nThe EXPLAIN statement provides information about how MySQL executes\nstatements:\n\no When you precede a SELECT statement with the keyword EXPLAIN, MySQL\n  displays information from the optimizer about the statement execution\n  plan. That is, MySQL explains how it would process the statement,\n  including information about how tables are joined and in which order.\n  For information about using EXPLAIN to obtain execution plan\n  information, see\n  http://dev.mysql.com/doc/refman/5.5/en/explain-output.html.\n\no EXPLAIN EXTENDED can be used to obtain additional execution plan\n  information. See\n  http://dev.mysql.com/doc/refman/5.5/en/explain-extended.html.\n\no EXPLAIN PARTITIONS is useful for examining queries involving\n  partitioned tables. See\n  http://dev.mysql.com/doc/refman/5.5/en/partitioning-info.html.\n\nWith the help of EXPLAIN, you can see where you should add indexes to\ntables so that the statement executes faster by using indexes to find\nrows. You can also use EXPLAIN to check whether the optimizer joins the\ntables in an optimal order. To give a hint to the optimizer to use a\njoin order corresponding to the order in which the tables are named in\na SELECT statement, begin the statement with SELECT STRAIGHT_JOIN\nrather than just SELECT. (See\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.)\n\nIf you have a problem with indexes not being used when you believe that\nthey should be, run ANALYZE TABLE to update table statistics, such as\ncardinality of keys, that can affect the choices the optimizer makes.\nSee [HELP ANALYZE TABLE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/explain.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/explain.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (258,3,'DEGREES','Syntax:\nDEGREES(X)\n\nReturns the argument X, converted from radians to degrees.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT DEGREES(PI());\n        -> 180\nmysql> SELECT DEGREES(PI() / 2);\n        -> 90\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (259,3,'- UNARY','Syntax:\n-\n\nUnary minus. This operator changes the sign of the operand.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT - 2;\n        -> -2\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (260,23,'VARCHAR','[NATIONAL] VARCHAR(M) [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nA variable-length string. M represents the maximum column length in\ncharacters. The range of M is 0 to 65,535. The effective maximum length\nof a VARCHAR is subject to the maximum row size (65,535 bytes, which is\nshared among all columns) and the character set used. For example, utf8\ncharacters can require up to three bytes per character, so a VARCHAR\ncolumn that uses the utf8 character set can be declared to be a maximum\nof 21,844 characters. See\nhttp://dev.mysql.com/doc/refman/5.5/en/column-count-limit.html.\n\nMySQL stores VARCHAR values as a 1-byte or 2-byte length prefix plus\ndata. The length prefix indicates the number of bytes in the value. A\nVARCHAR column uses one length byte if values require no more than 255\nbytes, two length bytes if values may require more than 255 bytes.\n\n*Note*: MySQL 5.5 follows the standard SQL specification, and does not\nremove trailing spaces from VARCHAR values.\n\nVARCHAR is shorthand for CHARACTER VARYING. NATIONAL VARCHAR is the\nstandard SQL way to define that a VARCHAR column should use some\npredefined character set. MySQL 4.1 and up uses utf8 as this predefined\ncharacter set.\nhttp://dev.mysql.com/doc/refman/5.5/en/charset-national.html. NVARCHAR\nis shorthand for NATIONAL VARCHAR.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (261,38,'UNHEX','Syntax:\n\nUNHEX(str)\n\nFor a string argument str, UNHEX(str) interprets each pair of\ncharacters in the argument as a hexadecimal number and converts it to\nthe byte represented by the number. The return value is a binary\nstring.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT UNHEX(\'4D7953514C\');\n        -> \'MySQL\'\nmysql> SELECT 0x4D7953514C;\n        -> \'MySQL\'\nmysql> SELECT UNHEX(HEX(\'string\'));\n        -> \'string\'\nmysql> SELECT HEX(UNHEX(\'1267\'));\n        -> \'1267\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (262,16,'STD','Syntax:\nSTD(expr)\n\nReturns the population standard deviation of expr. This is an extension\nto standard SQL. The standard SQL function STDDEV_POP() can be used\ninstead.\n\nThis function returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (263,3,'COS','Syntax:\nCOS(X)\n\nReturns the cosine of X, where X is given in radians.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT COS(PI());\n        -> -1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (264,32,'DATE FUNCTION','Syntax:\nDATE(expr)\n\nExtracts the date part of the date or datetime expression expr.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATE(\'2003-12-31 01:02:03\');\n        -> \'2003-12-31\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (265,40,'DROP TRIGGER','Syntax:\nDROP TRIGGER [IF EXISTS] [schema_name.]trigger_name\n\nThis statement drops a trigger. The schema (database) name is optional.\nIf the schema is omitted, the trigger is dropped from the default\nschema. DROP TRIGGER requires the TRIGGER privilege for the table\nassociated with the trigger.\n\nUse IF EXISTS to prevent an error from occurring for a trigger that\ndoes not exist. A NOTE is generated for a nonexistent trigger when\nusing IF EXISTS. See [HELP SHOW WARNINGS].\n\nTriggers for a table are also dropped if you drop the table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-trigger.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-trigger.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (266,8,'RESET MASTER','Syntax:\nRESET MASTER\n\nDeletes all binary log files listed in the index file, resets the\nbinary log index file to be empty, and creates a new binary log file.\nThis statement is intended to be used only when the master is started\nfor the first time.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/reset-master.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/reset-master.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (267,3,'TAN','Syntax:\nTAN(X)\n\nReturns the tangent of X, where X is given in radians.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT TAN(PI());\n        -> -1.2246063538224e-16\nmysql> SELECT TAN(PI()+1);\n        -> 1.5574077246549\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (268,3,'PI','Syntax:\nPI()\n\nReturns the value of π (pi). The default number of decimal places\ndisplayed is seven, but MySQL uses the full double-precision value\ninternally.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT PI();\n        -> 3.141593\nmysql> SELECT PI()+0.000000000000000000;\n        -> 3.141592653589793116\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (269,32,'WEEKOFYEAR','Syntax:\nWEEKOFYEAR(date)\n\nReturns the calendar week of the date as a number in the range from 1\nto 53. WEEKOFYEAR() is a compatibility function that is equivalent to\nWEEK(date,3).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT WEEKOFYEAR(\'2008-02-20\');\n        -> 8\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (270,3,'/','Syntax:\n/\n\nDivision:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3/5;\n        -> 0.60\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (271,8,'PURGE BINARY LOGS','Syntax:\nPURGE { BINARY | MASTER } LOGS\n    { TO \'log_name\' | BEFORE datetime_expr }\n\nThe binary log is a set of files that contain information about data\nmodifications made by the MySQL server. The log consists of a set of\nbinary log files, plus an index file (see\nhttp://dev.mysql.com/doc/refman/5.5/en/binary-log.html).\n\nThe PURGE BINARY LOGS statement deletes all the binary log files listed\nin the log index file prior to the specified log file name or date.\nBINARY and MASTER are synonyms. Deleted log files also are removed from\nthe list recorded in the index file, so that the given log file becomes\nthe first in the list.\n\nThis statement has no effect if the server was not started with the\n--log-bin option to enable binary logging.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/purge-binary-logs.html\n\n','PURGE BINARY LOGS TO \'mysql-bin.010\';\nPURGE BINARY LOGS BEFORE \'2008-04-02 22:46:26\';\n','http://dev.mysql.com/doc/refman/5.5/en/purge-binary-logs.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (272,16,'STDDEV_SAMP','Syntax:\nSTDDEV_SAMP(expr)\n\nReturns the sample standard deviation of expr (the square root of\nVAR_SAMP().\n\nSTDDEV_SAMP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (273,17,'SCHEMA','Syntax:\nSCHEMA()\n\nThis function is a synonym for DATABASE().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (274,33,'MLINEFROMWKB','MLineFromWKB(wkb[,srid]), MultiLineStringFromWKB(wkb[,srid])\n\nConstructs a MultiLineString value using its WKB representation and\nSRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (275,3,'LOG2','Syntax:\nLOG2(X)\n\nReturns the base-2 logarithm of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LOG2(65536);\n        -> 16\nmysql> SELECT LOG2(-100);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (276,32,'SUBTIME','Syntax:\nSUBTIME(expr1,expr2)\n\nSUBTIME() returns expr1 - expr2 expressed as a value in the same format\nas expr1. expr1 is a time or datetime expression, and expr2 is a time\nexpression.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT SUBTIME(\'2007-12-31 23:59:59.999999\',\'1 1:1:1.000002\');\n        -> \'2007-12-30 22:58:58.999997\'\nmysql> SELECT SUBTIME(\'01:00:00.999999\', \'02:00:00.999998\');\n        -> \'-00:59:59.999999\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (277,12,'UNCOMPRESSED_LENGTH','Syntax:\nUNCOMPRESSED_LENGTH(compressed_string)\n\nReturns the length that the compressed string had before being\ncompressed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT UNCOMPRESSED_LENGTH(COMPRESS(REPEAT(\'a\',30)));\n        -> 30\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (278,40,'DROP TABLE','Syntax:\nDROP [TEMPORARY] TABLE [IF EXISTS]\n    tbl_name [, tbl_name] ...\n    [RESTRICT | CASCADE]\n\nDROP TABLE removes one or more tables. You must have the DROP privilege\nfor each table. All table data and the table definition are removed, so\nbe careful with this statement! If any of the tables named in the\nargument list do not exist, MySQL returns an error indicating by name\nwhich nonexisting tables it was unable to drop, but it also drops all\nof the tables in the list that do exist.\n\n*Important*: When a table is dropped, user privileges on the table are\nnot automatically dropped. See [HELP GRANT].\n\nFor a partitioned table, DROP TABLE permanently removes the table\ndefinition, all of its partitions, and all of the data which was stored\nin those partitions. It also removes the partitioning definition (.par)\nfile associated with the dropped table.\n\nUse IF EXISTS to prevent an error from occurring for tables that do not\nexist. A NOTE is generated for each nonexistent table when using IF\nEXISTS. See [HELP SHOW WARNINGS].\n\nRESTRICT and CASCADE are permitted to make porting easier. In MySQL\n5.5, they do nothing.\n\n*Note*: DROP TABLE automatically commits the current active\ntransaction, unless you use the TEMPORARY keyword.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (279,3,'POW','Syntax:\nPOW(X,Y)\n\nReturns the value of X raised to the power of Y.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT POW(2,2);\n        -> 4\nmysql> SELECT POW(2,-2);\n        -> 0.25\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (280,27,'SHOW CREATE TABLE','Syntax:\nSHOW CREATE TABLE tbl_name\n\nShows the CREATE TABLE statement that creates the named table. To use\nthis statement, you must have some privilege for the table. This\nstatement also works with views.\nSHOW CREATE TABLE quotes table and column names according to the value\nof the sql_quote_show_create option. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-table.html\n\n','mysql> SHOW CREATE TABLE t\\G\n*************************** 1. row ***************************\n       Table: t\nCreate Table: CREATE TABLE t (\n  id INT(11) default NULL auto_increment,\n  s char(60) default NULL,\n  PRIMARY KEY (id)\n) ENGINE=MyISAM\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (281,28,'DUAL','You are permitted to specify DUAL as a dummy table name in situations\nwhere no tables are referenced:\n\nmysql> SELECT 1 + 1 FROM DUAL;\n        -> 2\n\nDUAL is purely for the convenience of people who require that all\nSELECT statements should have FROM and possibly other clauses. MySQL\nmay ignore the clauses. MySQL does not require FROM DUAL if no tables\nare referenced.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/select.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/select.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (282,38,'INSTR','Syntax:\nINSTR(str,substr)\n\nReturns the position of the first occurrence of substring substr in\nstring str. This is the same as the two-argument form of LOCATE(),\nexcept that the order of the arguments is reversed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT INSTR(\'foobarbar\', \'bar\');\n        -> 4\nmysql> SELECT INSTR(\'xbar\', \'foobar\');\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (283,32,'NOW','Syntax:\nNOW()\n\nReturns the current date and time as a value in \'YYYY-MM-DD HH:MM:SS\'\nor YYYYMMDDHHMMSS.uuuuuu format, depending on whether the function is\nused in a string or numeric context. The value is expressed in the\ncurrent time zone.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT NOW();\n        -> \'2007-12-15 23:50:26\'\nmysql> SELECT NOW() + 0;\n        -> 20071215235026.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (284,27,'SHOW ENGINES','Syntax:\nSHOW [STORAGE] ENGINES\n\nSHOW ENGINES displays status information about the server\'s storage\nengines. This is particularly useful for checking whether a storage\nengine is supported, or to see what the default engine is. This\ninformation can also be obtained from the INFORMATION_SCHEMA ENGINES\ntable. See http://dev.mysql.com/doc/refman/5.5/en/engines-table.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-engines.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-engines.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (285,20,'>=','Syntax:\n>=\n\nGreater than or equal:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 >= 2;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (286,3,'EXP','Syntax:\nEXP(X)\n\nReturns the value of e (the base of natural logarithms) raised to the\npower of X. The inverse of this function is LOG() (using a single\nargument only) or LN().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT EXP(2);\n        -> 7.3890560989307\nmysql> SELECT EXP(-2);\n        -> 0.13533528323661\nmysql> SELECT EXP(0);\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (287,23,'LONGBLOB','LONGBLOB\n\nA BLOB column with a maximum length of 4,294,967,295 or 4GB (232 - 1)\nbytes. The effective maximum length of LONGBLOB columns depends on the\nconfigured maximum packet size in the client/server protocol and\navailable memory. Each LONGBLOB value is stored using a 4-byte length\nprefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (288,13,'POINTN','PointN(ls,N)\n\nReturns the N-th Point in the Linestring value ls. Points are numbered\nbeginning with 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT AsText(PointN(GeomFromText(@ls),2));\n+-------------------------------------+\n| AsText(PointN(GeomFromText(@ls),2)) |\n+-------------------------------------+\n| POINT(2 2)                          |\n+-------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (289,23,'YEAR DATA TYPE','YEAR[(2|4)]\n\nA year in two-digit or four-digit format. The default is four-digit\nformat. YEAR(2) or YEAR(4) differ in display format, but have the same\nrange of values. In four-digit format, values display as 1901 to 2155,\nand 0000. In two-digit format, values display as 70 to 69, representing\nyears from 1970 to 2069. MySQL displays YEAR values in YYYY or YY\nformat, but permits assignment of values to YEAR columns using either\nstrings or numbers.\n\n*Note*: The YEAR(2) data type has certain issues that you should\nconsider before choosing to use it. As of MySQL 5.5.27, YEAR(2) is\ndeprecated. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/migrating-to-year4.html.\n\nFor additional information about YEAR display format and interpretation\nof input values, see http://dev.mysql.com/doc/refman/5.5/en/year.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (290,16,'SUM','Syntax:\nSUM([DISTINCT] expr)\n\nReturns the sum of expr. If the return set has no rows, SUM() returns\nNULL. The DISTINCT keyword can be used to sum only the distinct values\nof expr.\n\nSUM() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (291,38,'OCT','Syntax:\nOCT(N)\n\nReturns a string representation of the octal value of N, where N is a\nlonglong (BIGINT) number. This is equivalent to CONV(N,10,8). Returns\nNULL if N is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT OCT(12);\n        -> \'14\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (292,32,'SYSDATE','Syntax:\nSYSDATE()\n\nReturns the current date and time as a value in \'YYYY-MM-DD HH:MM:SS\'\nor YYYYMMDDHHMMSS.uuuuuu format, depending on whether the function is\nused in a string or numeric context.\n\nSYSDATE() returns the time at which it executes. This differs from the\nbehavior for NOW(), which returns a constant time that indicates the\ntime at which the statement began to execute. (Within a stored function\nor trigger, NOW() returns the time at which the function or triggering\nstatement began to execute.)\n\nmysql> SELECT NOW(), SLEEP(2), NOW();\n+---------------------+----------+---------------------+\n| NOW()               | SLEEP(2) | NOW()               |\n+---------------------+----------+---------------------+\n| 2006-04-12 13:47:36 |        0 | 2006-04-12 13:47:36 |\n+---------------------+----------+---------------------+\n\nmysql> SELECT SYSDATE(), SLEEP(2), SYSDATE();\n+---------------------+----------+---------------------+\n| SYSDATE()           | SLEEP(2) | SYSDATE()           |\n+---------------------+----------+---------------------+\n| 2006-04-12 13:47:44 |        0 | 2006-04-12 13:47:46 |\n+---------------------+----------+---------------------+\n\nIn addition, the SET TIMESTAMP statement affects the value returned by\nNOW() but not by SYSDATE(). This means that timestamp settings in the\nbinary log have no effect on invocations of SYSDATE().\n\nBecause SYSDATE() can return different values even within the same\nstatement, and is not affected by SET TIMESTAMP, it is nondeterministic\nand therefore unsafe for replication if statement-based binary logging\nis used. If that is a problem, you can use row-based logging.\n\nAlternatively, you can use the --sysdate-is-now option to cause\nSYSDATE() to be an alias for NOW(). This works if the option is used on\nboth the master and the slave.\n\nThe nondeterministic nature of SYSDATE() also means that indexes cannot\nbe used for evaluating expressions that refer to it.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (293,5,'UNINSTALL PLUGIN','Syntax:\nUNINSTALL PLUGIN plugin_name\n\nThis statement removes an installed server plugin. It requires the\nDELETE privilege for the mysql.plugin table.\n\nplugin_name must be the name of some plugin that is listed in the\nmysql.plugin table. The server executes the plugin\'s deinitialization\nfunction and removes the row for the plugin from the mysql.plugin\ntable, so that subsequent server restarts will not load and initialize\nthe plugin. UNINSTALL PLUGIN does not remove the plugin\'s shared\nlibrary file.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/uninstall-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/uninstall-plugin.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (294,33,'ASBINARY','AsBinary(g), AsWKB(g)\n\nConverts a value in internal geometry format to its WKB representation\nand returns the binary result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-format-conversion-functions.html\n\n','SELECT AsBinary(g) FROM geom;\n','http://dev.mysql.com/doc/refman/5.5/en/gis-format-conversion-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (295,38,'REPEAT FUNCTION','Syntax:\nREPEAT(str,count)\n\nReturns a string consisting of the string str repeated count times. If\ncount is less than 1, returns an empty string. Returns NULL if str or\ncount are NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT REPEAT(\'MySQL\', 3);\n        -> \'MySQLMySQLMySQL\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (296,27,'SHOW TABLES','Syntax:\nSHOW [FULL] TABLES [{FROM | IN} db_name]\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW TABLES lists the non-TEMPORARY tables in a given database. You can\nalso get this list using the mysqlshow db_name command. The LIKE\nclause, if present, indicates which table names to match. The WHERE\nclause can be given to select rows using more general conditions, as\ndiscussed in http://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nMatching performed by the LIKE clause is dependent on the setting of\nthe lower_case_table_names system variable.\n\nThis statement also lists any views in the database. The FULL modifier\nis supported such that SHOW FULL TABLES displays a second output\ncolumn. Values for the second column are BASE TABLE for a table and\nVIEW for a view.\n\nIf you have no privileges for a base table or view, it does not show up\nin the output from SHOW TABLES or mysqlshow db_name.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-tables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-tables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (297,32,'MAKEDATE','Syntax:\nMAKEDATE(year,dayofyear)\n\nReturns a date, given year and day-of-year values. dayofyear must be\ngreater than 0 or the result is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MAKEDATE(2011,31), MAKEDATE(2011,32);\n        -> \'2011-01-31\', \'2011-02-01\'\nmysql> SELECT MAKEDATE(2011,365), MAKEDATE(2014,365);\n        -> \'2011-12-31\', \'2014-12-31\'\nmysql> SELECT MAKEDATE(2011,0);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (298,38,'BINARY OPERATOR','Syntax:\nBINARY\n\nThe BINARY operator casts the string following it to a binary string.\nThis is an easy way to force a column comparison to be done byte by\nbyte rather than character by character. This causes the comparison to\nbe case sensitive even if the column is not defined as BINARY or BLOB.\nBINARY also causes trailing spaces to be significant.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html\n\n','mysql> SELECT \'a\' = \'A\';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'A\';\n        -> 0\nmysql> SELECT \'a\' = \'a \';\n        -> 1\nmysql> SELECT BINARY \'a\' = \'a \';\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (299,7,'MBROVERLAPS','MBROverlaps(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 overlap. The term spatially overlaps is\nused if two geometries intersect and their intersection results in a\ngeometry of the same dimension but not equal to either of the given\ngeometries.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (300,38,'SOUNDEX','Syntax:\nSOUNDEX(str)\n\nReturns a soundex string from str. Two strings that sound almost the\nsame should have identical soundex strings. A standard soundex string\nis four characters long, but the SOUNDEX() function returns an\narbitrarily long string. You can use SUBSTRING() on the result to get a\nstandard soundex string. All nonalphabetic characters in str are\nignored. All international alphabetic characters outside the A-Z range\nare treated as vowels.\n\n*Important*: When using SOUNDEX(), you should be aware of the following\nlimitations:\n\no This function, as currently implemented, is intended to work well\n  with strings that are in the English language only. Strings in other\n  languages may not produce reliable results.\n\no This function is not guaranteed to provide consistent results with\n  strings that use multibyte character sets, including utf-8.\n\n  We hope to remove these limitations in a future release. See Bug\n  #22638 for more information.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SOUNDEX(\'Hello\');\n        -> \'H400\'\nmysql> SELECT SOUNDEX(\'Quadratically\');\n        -> \'Q36324\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (301,7,'MBRTOUCHES','MBRTouches(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 touch. Two geometries spatially touch if\nthe interiors of the geometries do not intersect, but the boundary of\none of the geometries intersects either the boundary or the interior of\nthe other.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (302,40,'DROP EVENT','Syntax:\nDROP EVENT [IF EXISTS] event_name\n\nThis statement drops the event named event_name. The event immediately\nceases being active, and is deleted completely from the server.\n\nIf the event does not exist, the error ERROR 1517 (HY000): Unknown\nevent \'event_name\' results. You can override this and cause the\nstatement to generate a warning for nonexistent events instead using IF\nEXISTS.\n\nThis statement requires the EVENT privilege for the schema to which the\nevent to be dropped belongs.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-event.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (303,28,'INSERT SELECT','Syntax:\nINSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]\n    [INTO] tbl_name [(col_name,...)]\n    SELECT ...\n    [ ON DUPLICATE KEY UPDATE col_name=expr, ... ]\n\nWith INSERT ... SELECT, you can quickly insert many rows into a table\nfrom one or many tables. For example:\n\nINSERT INTO tbl_temp2 (fld_id)\n  SELECT tbl_temp1.fld_order_id\n  FROM tbl_temp1 WHERE tbl_temp1.fld_order_id > 100;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/insert-select.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/insert-select.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (304,40,'CREATE PROCEDURE','Syntax:\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    PROCEDURE sp_name ([proc_parameter[,...]])\n    [characteristic ...] routine_body\n\nCREATE\n    [DEFINER = { user | CURRENT_USER }]\n    FUNCTION sp_name ([func_parameter[,...]])\n    RETURNS type\n    [characteristic ...] routine_body\n\nproc_parameter:\n    [ IN | OUT | INOUT ] param_name type\n\nfunc_parameter:\n    param_name type\n\ntype:\n    Any valid MySQL data type\n\ncharacteristic:\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | [NOT] DETERMINISTIC\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n\nroutine_body:\n    Valid SQL routine statement\n\nThese statements create stored routines. By default, a routine is\nassociated with the default database. To associate the routine\nexplicitly with a given database, specify the name as db_name.sp_name\nwhen you create it.\n\nThe CREATE FUNCTION statement is also used in MySQL to support UDFs\n(user-defined functions). See\nhttp://dev.mysql.com/doc/refman/5.5/en/adding-functions.html. A UDF can\nbe regarded as an external stored function. Stored functions share\ntheir namespace with UDFs. See\nhttp://dev.mysql.com/doc/refman/5.5/en/function-resolution.html, for\nthe rules describing how the server interprets references to different\nkinds of functions.\n\nTo invoke a stored procedure, use the CALL statement (see [HELP CALL]).\nTo invoke a stored function, refer to it in an expression. The function\nreturns a value during expression evaluation.\n\nCREATE PROCEDURE and CREATE FUNCTION require the CREATE ROUTINE\nprivilege. They might also require the SUPER privilege, depending on\nthe DEFINER value, as described later in this section. If binary\nlogging is enabled, CREATE FUNCTION might require the SUPER privilege,\nas described in\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-logging.html.\n\nBy default, MySQL automatically grants the ALTER ROUTINE and EXECUTE\nprivileges to the routine creator. This behavior can be changed by\ndisabling the automatic_sp_privileges system variable. See\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-routines-privileges.html.\n\nThe DEFINER and SQL SECURITY clauses specify the security context to be\nused when checking access privileges at routine execution time, as\ndescribed later in this section.\n\nIf the routine name is the same as the name of a built-in SQL function,\na syntax error occurs unless you use a space between the name and the\nfollowing parenthesis when defining the routine or invoking it later.\nFor this reason, avoid using the names of existing SQL functions for\nyour own stored routines.\n\nThe IGNORE_SPACE SQL mode applies to built-in functions, not to stored\nroutines. It is always permissible to have spaces after a stored\nroutine name, regardless of whether IGNORE_SPACE is enabled.\n\nThe parameter list enclosed within parentheses must always be present.\nIf there are no parameters, an empty parameter list of () should be\nused. Parameter names are not case sensitive.\n\nEach parameter is an IN parameter by default. To specify otherwise for\na parameter, use the keyword OUT or INOUT before the parameter name.\n\n*Note*: Specifying a parameter as IN, OUT, or INOUT is valid only for a\nPROCEDURE. For a FUNCTION, parameters are always regarded as IN\nparameters.\n\nAn IN parameter passes a value into a procedure. The procedure might\nmodify the value, but the modification is not visible to the caller\nwhen the procedure returns. An OUT parameter passes a value from the\nprocedure back to the caller. Its initial value is NULL within the\nprocedure, and its value is visible to the caller when the procedure\nreturns. An INOUT parameter is initialized by the caller, can be\nmodified by the procedure, and any change made by the procedure is\nvisible to the caller when the procedure returns.\n\nFor each OUT or INOUT parameter, pass a user-defined variable in the\nCALL statement that invokes the procedure so that you can obtain its\nvalue when the procedure returns. If you are calling the procedure from\nwithin another stored procedure or function, you can also pass a\nroutine parameter or local routine variable as an IN or INOUT\nparameter.\n\nRoutine parameters cannot be referenced in statements prepared within\nthe routine; see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-program-restrictions.html\n.\n\nThe following example shows a simple stored procedure that uses an OUT\nparameter:\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE simpleproc (OUT param1 INT)\n    -> BEGIN\n    ->   SELECT COUNT(*) INTO param1 FROM t;\n    -> END//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter ;\n\nmysql> CALL simpleproc(@a);\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT @a;\n+------+\n| @a   |\n+------+\n| 3    |\n+------+\n1 row in set (0.00 sec)\n\nThe example uses the mysql client delimiter command to change the\nstatement delimiter from ; to // while the procedure is being defined.\nThis enables the ; delimiter used in the procedure body to be passed\nthrough to the server rather than being interpreted by mysql itself.\nSee\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-defining.html.\n\nThe RETURNS clause may be specified only for a FUNCTION, for which it\nis mandatory. It indicates the return type of the function, and the\nfunction body must contain a RETURN value statement. If the RETURN\nstatement returns a value of a different type, the value is coerced to\nthe proper type. For example, if a function specifies an ENUM or SET\nvalue in the RETURNS clause, but the RETURN statement returns an\ninteger, the value returned from the function is the string for the\ncorresponding ENUM member of set of SET members.\n\nThe following example function takes a parameter, performs an operation\nusing an SQL function, and returns the result. In this case, it is\nunnecessary to use delimiter because the function definition contains\nno internal ; statement delimiters:\n\nmysql> CREATE FUNCTION hello (s CHAR(20))\nmysql> RETURNS CHAR(50) DETERMINISTIC\n    -> RETURN CONCAT(\'Hello, \',s,\'!\');\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT hello(\'world\');\n+----------------+\n| hello(\'world\') |\n+----------------+\n| Hello, world!  |\n+----------------+\n1 row in set (0.00 sec)\n\nParameter types and function return types can be declared to use any\nvalid data type, except that the COLLATE attribute cannot be used prior\nto MySQL 5.5.3. As of 5.5.3, COLLATE can be used if preceded by the\nCHARACTER SET attribute.\n\nThe routine_body consists of a valid SQL routine statement. This can be\na simple statement such as SELECT or INSERT, or a compound statement\nwritten using BEGIN and END. Compound statements can contain\ndeclarations, loops, and other control structure statements. The syntax\nfor these statements is described in\nhttp://dev.mysql.com/doc/refman/5.5/en/sql-syntax-compound-statements.h\ntml.\n\nMySQL permits routines to contain DDL statements, such as CREATE and\nDROP. MySQL also permits stored procedures (but not stored functions)\nto contain SQL transaction statements such as COMMIT. Stored functions\nmay not contain statements that perform explicit or implicit commit or\nrollback. Support for these statements is not required by the SQL\nstandard, which states that each DBMS vendor may decide whether to\npermit them.\n\nStatements that return a result set can be used within a stored\nprocedure but not within a stored function. This prohibition includes\nSELECT statements that do not have an INTO var_list clause and other\nstatements such as SHOW, EXPLAIN, and CHECK TABLE. For statements that\ncan be determined at function definition time to return a result set, a\nNot allowed to return a result set from a function error occurs\n(ER_SP_NO_RETSET). For statements that can be determined only at\nruntime to return a result set, a PROCEDURE %s can\'t return a result\nset in the given context error occurs (ER_SP_BADSELECT).\n\nUSE statements within stored routines are not permitted. When a routine\nis invoked, an implicit USE db_name is performed (and undone when the\nroutine terminates). The causes the routine to have the given default\ndatabase while it executes. References to objects in databases other\nthan the routine default database should be qualified with the\nappropriate database name.\n\nFor additional information about statements that are not permitted in\nstored routines, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-program-restrictions.html\n.\n\nFor information about invoking stored procedures from within programs\nwritten in a language that has a MySQL interface, see [HELP CALL].\n\nMySQL stores the sql_mode system variable setting in effect when a\nroutine is created or altered, and always executes the routine with\nthis setting in force, regardless of the current server SQL mode when\nthe routine begins executing.\n\nThe switch from the SQL mode of the invoker to that of the routine\noccurs after evaluation of arguments and assignment of the resulting\nvalues to routine parameters. If you define a routine in strict SQL\nmode but invoke it in nonstrict mode, assignment of arguments to\nroutine parameters does not take place in strict mode. If you require\nthat expressions passed to a routine be assigned in strict SQL mode,\nyou should invoke the routine with strict mode in effect.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (305,23,'VARBINARY','VARBINARY(M)\n\nThe VARBINARY type is similar to the VARCHAR type, but stores binary\nbyte strings rather than nonbinary character strings. M represents the\nmaximum column length in bytes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (306,27,'LOAD INDEX','Syntax:\nLOAD INDEX INTO CACHE\n  tbl_index_list [, tbl_index_list] ...\n\ntbl_index_list:\n  tbl_name\n    [PARTITION (partition_list | ALL)]\n    [[INDEX|KEY] (index_name[, index_name] ...)]\n    [IGNORE LEAVES]\n\npartition_list:\n    partition_name[, partition_name][, ...]\n\nThe LOAD INDEX INTO CACHE statement preloads a table index into the key\ncache to which it has been assigned by an explicit CACHE INDEX\nstatement, or into the default key cache otherwise.\n\nLOAD INDEX INTO CACHE is used only for MyISAM tables. In MySQL 5.5, it\nis also supported for partitioned MyISAM tables; in addition, indexes\non partitioned tables can be preloaded for one, several, or all\npartitions.\n\nThe IGNORE LEAVES modifier causes only blocks for the nonleaf nodes of\nthe index to be preloaded.\n\nIGNORE LEAVES is also supported for partitioned MyISAM tables.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/load-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/load-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (307,28,'UNION','Syntax:\nSELECT ...\nUNION [ALL | DISTINCT] SELECT ...\n[UNION [ALL | DISTINCT] SELECT ...]\n\nUNION is used to combine the result from multiple SELECT statements\ninto a single result set.\n\nThe column names from the first SELECT statement are used as the column\nnames for the results returned. Selected columns listed in\ncorresponding positions of each SELECT statement should have the same\ndata type. (For example, the first column selected by the first\nstatement should have the same type as the first column selected by the\nother statements.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/union.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/union.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (308,32,'TO_DAYS','Syntax:\nTO_DAYS(date)\n\nGiven a date date, returns a day number (the number of days since year\n0).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TO_DAYS(950501);\n        -> 728779\nmysql> SELECT TO_DAYS(\'2007-10-07\');\n        -> 733321\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (309,38,'NOT REGEXP','Syntax:\nexpr NOT REGEXP pat, expr NOT RLIKE pat\n\nThis is the same as NOT (expr REGEXP pat).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/regexp.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/regexp.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (310,27,'SHOW INDEX','Syntax:\nSHOW {INDEX | INDEXES | KEYS}\n    {FROM | IN} tbl_name\n    [{FROM | IN} db_name]\n    [WHERE expr]\n\nSHOW INDEX returns table index information. The format resembles that\nof the SQLStatistics call in ODBC. This statement requires some\nprivilege for any column in the table.\nYou can use db_name.tbl_name as an alternative to the tbl_name FROM\ndb_name syntax. These two statements are equivalent:\n\nSHOW INDEX FROM mytable FROM mydb;\nSHOW INDEX FROM mydb.mytable;\n\nThe WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nYou can also list a table\'s indexes with the mysqlshow -k db_name\ntbl_name command.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-index.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-index.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (311,27,'SHOW CREATE DATABASE','Syntax:\nSHOW CREATE {DATABASE | SCHEMA} [IF NOT EXISTS] db_name\n\nShows the CREATE DATABASE statement that creates the named database. If\nthe SHOW statement includes an IF NOT EXISTS clause, the output too\nincludes such a clause. SHOW CREATE SCHEMA is a synonym for SHOW CREATE\nDATABASE.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-database.html\n\n','mysql> SHOW CREATE DATABASE test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test`\n                 /*!40100 DEFAULT CHARACTER SET latin1 */\n\nmysql> SHOW CREATE SCHEMA test\\G\n*************************** 1. row ***************************\n       Database: test\nCreate Database: CREATE DATABASE `test`\n                 /*!40100 DEFAULT CHARACTER SET latin1 */\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-database.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (312,24,'LEAVE','Syntax:\nLEAVE label\n\nThis statement is used to exit the flow control construct that has the\ngiven label. If the label is for the outermost stored program block,\nLEAVE exits the program.\n\nLEAVE can be used within BEGIN ... END or loop constructs (LOOP,\nREPEAT, WHILE).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/leave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/leave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (313,20,'NOT IN','Syntax:\nexpr NOT IN (value,...)\n\nThis is the same as NOT (expr IN (value,...)).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (314,15,'!','Syntax:\nNOT, !\n\nLogical NOT. Evaluates to 1 if the operand is 0, to 0 if the operand is\nnonzero, and NOT NULL returns NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT NOT 10;\n        -> 0\nmysql> SELECT NOT 0;\n        -> 1\nmysql> SELECT NOT NULL;\n        -> NULL\nmysql> SELECT ! (1+1);\n        -> 0\nmysql> SELECT ! 1+1;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (315,24,'DECLARE HANDLER','Syntax:\nDECLARE handler_action HANDLER\n    FOR condition_value [, condition_value] ...\n    statement\n\nhandler_action:\n    CONTINUE\n  | EXIT\n  | UNDO\n\ncondition_value:\n    mysql_error_code\n  | SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n  | SQLWARNING\n  | NOT FOUND\n  | SQLEXCEPTION\n\nThe DECLARE ... HANDLER statement specifies a handler that deals with\none or more conditions. If one of these conditions occurs, the\nspecified statement executes. statement can be a simple statement such\nas SET var_name = value, or a compound statement written using BEGIN\nand END (see [HELP BEGIN END]).\n\nHandler declarations must appear after variable or condition\ndeclarations.\n\nThe handler_action value indicates what action the handler takes after\nexecution of the handler statement:\n\no CONTINUE: Execution of the current program continues.\n\no EXIT: Execution terminates for the BEGIN ... END compound statement\n  in which the handler is declared. This is true even if the condition\n  occurs in an inner block.\n\no UNDO: Not supported.\n\nThe condition_value for DECLARE ... HANDLER indicates the specific\ncondition or class of conditions that activates the handler:\n\no A MySQL error code (a number) or an SQLSTATE value (a 5-character\n  string literal). You should not use MySQL error code 0 or SQLSTATE\n  values that begin with \'00\', because those indicate success rather\n  than an error condition. For a list of MySQL error codes and SQLSTATE\n  values, see\n  http://dev.mysql.com/doc/refman/5.5/en/error-messages-server.html.\n\no A condition name previously specified with DECLARE ... CONDITION. A\n  condition name can be associated with a MySQL error code or SQLSTATE\n  value. See [HELP DECLARE CONDITION].\n\no SQLWARNING is shorthand for the class of SQLSTATE values that begin\n  with \'01\'.\n\no NOT FOUND is shorthand for the class of SQLSTATE values that begin\n  with \'02\'. This is relevant within the context of cursors and is used\n  to control what happens when a cursor reaches the end of a data set.\n  If no more rows are available, a No Data condition occurs with\n  SQLSTATE value \'02000\'. To detect this condition, you can set up a\n  handler for it (or for a NOT FOUND condition). For an example, see\n  http://dev.mysql.com/doc/refman/5.5/en/cursors.html. This condition\n  also occurs for SELECT ... INTO var_list statements that retrieve no\n  rows.\n\no SQLEXCEPTION is shorthand for the class of SQLSTATE values that do\n  not begin with \'00\', \'01\', or \'02\'.\n\nIf a condition occurs for which no handler has been declared, the\naction taken depends on the condition class:\n\no For SQLEXCEPTION conditions, the stored program terminates at the\n  statement that raised the condition, as if there were an EXIT\n  handler. If the program was called by another stored program, the\n  calling program handles the condition using the handler selection\n  rules applied to its own handlers.\n\no For SQLWARNING conditions, the program continues executing, as if\n  there were a CONTINUE handler.\n\no For NOT FOUND conditions, if the condition was raised normally, the\n  action is CONTINUE. If it was raised by SIGNAL or RESIGNAL, the\n  action is EXIT.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-handler.html\n\n','mysql> CREATE TABLE test.t (s1 INT, PRIMARY KEY (s1));\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> delimiter //\n\nmysql> CREATE PROCEDURE handlerdemo ()\n    -> BEGIN\n    ->   DECLARE CONTINUE HANDLER FOR SQLSTATE \'23000\' SET @x2 = 1;\n    ->   SET @x = 1;\n    ->   INSERT INTO test.t VALUES (1);\n    ->   SET @x = 2;\n    ->   INSERT INTO test.t VALUES (1);\n    ->   SET @x = 3;\n    -> END;\n    -> //\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> CALL handlerdemo()//\nQuery OK, 0 rows affected, 1 warning (0.01 sec)\n\nmysql> SHOW WARNINGS//\n+-------+------+---------------------------------------+\n| Level | Code | Message                               |\n+-------+------+---------------------------------------+\n| Error | 1062 | Duplicate entry \'1\' for key \'PRIMARY\' |\n+-------+------+---------------------------------------+\n1 row in set (0.00 sec)\n\n\nmysql> SELECT @x//\n    +------+\n    | @x   |\n    +------+\n    | 3    |\n    +------+\n    1 row in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/declare-handler.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (316,23,'DOUBLE','DOUBLE[(M,D)] [UNSIGNED] [ZEROFILL]\n\nA normal-size (double-precision) floating-point number. Permissible\nvalues are -1.7976931348623157E+308 to -2.2250738585072014E-308, 0, and\n2.2250738585072014E-308 to 1.7976931348623157E+308. These are the\ntheoretical limits, based on the IEEE standard. The actual range might\nbe slightly smaller depending on your hardware or operating system.\n\nM is the total number of digits and D is the number of digits following\nthe decimal point. If M and D are omitted, values are stored to the\nlimits permitted by the hardware. A double-precision floating-point\nnumber is accurate to approximately 15 decimal places.\n\nUNSIGNED, if specified, disallows negative values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (317,23,'TIME','TIME\n\nA time. The range is \'-838:59:59\' to \'838:59:59\'. MySQL displays TIME\nvalues in \'HH:MM:SS\' format, but permits assignment of values to TIME\ncolumns using either strings or numbers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (318,15,'&&','Syntax:\nAND, &&\n\nLogical AND. Evaluates to 1 if all operands are nonzero and not NULL,\nto 0 if one or more operands are 0, otherwise NULL is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html\n\n','mysql> SELECT 1 && 1;\n        -> 1\nmysql> SELECT 1 && 0;\n        -> 0\nmysql> SELECT 1 && NULL;\n        -> NULL\nmysql> SELECT 0 && NULL;\n        -> 0\nmysql> SELECT NULL && 0;\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/logical-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (319,11,'X','X(p)\n\nReturns the X-coordinate value for the Point object p as a\ndouble-precision number.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-point-property-functions.html\n\n','mysql> SELECT X(POINT(56.7, 53.34));\n+-----------------------+\n| X(POINT(56.7, 53.34)) |\n+-----------------------+\n|                  56.7 |\n+-----------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-point-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (320,17,'SYSTEM_USER','Syntax:\nSYSTEM_USER()\n\nSYSTEM_USER() is a synonym for USER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (321,17,'FOUND_ROWS','Syntax:\nFOUND_ROWS()\n\nA SELECT statement may include a LIMIT clause to restrict the number of\nrows the server returns to the client. In some cases, it is desirable\nto know how many rows the statement would have returned without the\nLIMIT, but without running the statement again. To obtain this row\ncount, include a SQL_CALC_FOUND_ROWS option in the SELECT statement,\nand then invoke FOUND_ROWS() afterward:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT SQL_CALC_FOUND_ROWS * FROM tbl_name\n    -> WHERE id > 100 LIMIT 10;\nmysql> SELECT FOUND_ROWS();\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (322,31,'CROSSES','Crosses(g1,g2)\n\nReturns 1 if g1 spatially crosses g2. Returns NULL if g1 is a Polygon\nor a MultiPolygon, or if g2 is a Point or a MultiPoint. Otherwise,\nreturns 0.\n\nThe term spatially crosses denotes a spatial relation between two given\ngeometries that has the following properties:\n\no The two geometries intersect\n\no Their intersection results in a geometry that has a dimension that is\n  one less than the maximum dimension of the two given geometries\n\no Their intersection is not equal to either of the two given geometries\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (323,40,'TRUNCATE TABLE','Syntax:\nTRUNCATE [TABLE] tbl_name\n\nTRUNCATE TABLE empties a table completely. It requires the DROP\nprivilege.\n\nLogically, TRUNCATE TABLE is similar to a DELETE statement that deletes\nall rows, or a sequence of DROP TABLE and CREATE TABLE statements. To\nachieve high performance, it bypasses the DML method of deleting data.\nThus, it cannot be rolled back, it does not cause ON DELETE triggers to\nfire, and it cannot be performed for InnoDB tables with parent-child\nforeign key relationships.\n\nAlthough TRUNCATE TABLE is similar to DELETE, it is classified as a DDL\nstatement rather than a DML statement. It differs from DELETE in the\nfollowing ways in MySQL 5.5:\n\no Truncate operations drop and re-create the table, which is much\n  faster than deleting rows one by one, particularly for large tables.\n\no Truncate operations cause an implicit commit, and so cannot be rolled\n  back.\n\no Truncation operations cannot be performed if the session holds an\n  active table lock.\n\no TRUNCATE TABLE fails for an InnoDB table if there are any FOREIGN KEY\n  constraints from other tables that reference the table. Foreign key\n  constraints between columns of the same table are permitted.\n\no Truncation operations do not return a meaningful value for the number\n  of deleted rows. The usual result is "0 rows affected," which should\n  be interpreted as "no information."\n\no As long as the table format file tbl_name.frm is valid, the table can\n  be re-created as an empty table with TRUNCATE TABLE, even if the data\n  or index files have become corrupted.\n\no Any AUTO_INCREMENT value is reset to its start value. This is true\n  even for MyISAM and InnoDB, which normally do not reuse sequence\n  values.\n\no When used with partitioned tables, TRUNCATE TABLE preserves the\n  partitioning; that is, the data and index files are dropped and\n  re-created, while the partition definitions (.par) file is\n  unaffected.\n\no The TRUNCATE TABLE statement does not invoke ON DELETE triggers.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/truncate-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/truncate-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (324,16,'BIT_XOR','Syntax:\nBIT_XOR(expr)\n\nReturns the bitwise XOR of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (325,32,'CURRENT_DATE','Syntax:\nCURRENT_DATE, CURRENT_DATE()\n\nCURRENT_DATE and CURRENT_DATE() are synonyms for CURDATE().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (326,8,'START SLAVE','Syntax:\nSTART SLAVE [thread_types]\n\nSTART SLAVE [SQL_THREAD] UNTIL\n    MASTER_LOG_FILE = \'log_name\', MASTER_LOG_POS = log_pos\n\nSTART SLAVE [SQL_THREAD] UNTIL\n    RELAY_LOG_FILE = \'log_name\', RELAY_LOG_POS = log_pos\n\nthread_types:\n    [thread_type [, thread_type] ... ]\n\nthread_type: IO_THREAD | SQL_THREAD\n\nSTART SLAVE with no thread_type options starts both of the slave\nthreads. The I/O thread reads events from the master server and stores\nthem in the relay log. The SQL thread reads events from the relay log\nand executes them. START SLAVE requires the SUPER privilege.\n\nIf START SLAVE succeeds in starting the slave threads, it returns\nwithout any error. However, even in that case, it might be that the\nslave threads start and then later stop (for example, because they do\nnot manage to connect to the master or read its binary log, or some\nother problem). START SLAVE does not warn you about this. You must\ncheck the slave\'s error log for error messages generated by the slave\nthreads, or check that they are running satisfactorily with SHOW SLAVE\nSTATUS.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/start-slave.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/start-slave.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (327,2,'AREA','Area(poly)\n\nReturns a double-precision number indicating the area of the argument,\nas measured in its spatial reference system. For arguments of dimension\n0 or 1, the result is 0.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html\n\n','mysql> SET @poly = \'Polygon((0 0,0 3,3 0,0 0),(1 1,1 2,2 1,1 1))\';\nmysql> SELECT Area(GeomFromText(@poly));\n+---------------------------+\n| Area(GeomFromText(@poly)) |\n+---------------------------+\n|                         4 |\n+---------------------------+\n\nmysql> SET @mpoly =\n    -> \'MultiPolygon(((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1)))\';\nmysql> SELECT Area(GeomFromText(@mpoly));\n+----------------------------+\n| Area(GeomFromText(@mpoly)) |\n+----------------------------+\n|                          8 |\n+----------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (328,27,'FLUSH','Syntax:\nFLUSH [NO_WRITE_TO_BINLOG | LOCAL]\n    flush_option [, flush_option] ...\n\nThe FLUSH statement has several variant forms that clear or reload\nvarious internal caches, flush tables, or acquire locks. To execute\nFLUSH, you must have the RELOAD privilege. Specific flush options might\nrequire additional privileges, as described later.\n\nBy default, the server writes FLUSH statements to the binary log so\nthat they replicate to replication slaves. To suppress logging, specify\nthe optional NO_WRITE_TO_BINLOG keyword or its alias LOCAL.\n\n*Note*: FLUSH LOGS, FLUSH MASTER, FLUSH SLAVE, and FLUSH TABLES WITH\nREAD LOCK (with or without a table list) are not written to the binary\nlog in any case because they would cause problems if replicated to a\nslave.\n\nSending a SIGHUP signal to the server causes several flush operations\nto occur that are similar to various forms of the FLUSH statement. See\nhttp://dev.mysql.com/doc/refman/5.5/en/server-signal-response.html.\n\nThe FLUSH statement causes an implicit commit. See\nhttp://dev.mysql.com/doc/refman/5.5/en/implicit-commit.html.\n\nThe RESET statement is similar to FLUSH. See [HELP RESET], for\ninformation about using the RESET statement with replication.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/flush.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/flush.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (329,24,'BEGIN END','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\nBEGIN ... END syntax is used for writing compound statements, which can\nappear within stored programs (stored procedures and functions,\ntriggers, and events). A compound statement can contain multiple\nstatements, enclosed by the BEGIN and END keywords. statement_list\nrepresents a list of one or more statements, each terminated by a\nsemicolon (;) statement delimiter. The statement_list itself is\noptional, so the empty compound statement (BEGIN END) is legal.\n\nBEGIN ... END blocks can be nested.\n\nUse of multiple statements requires that a client is able to send\nstatement strings containing the ; statement delimiter. In the mysql\ncommand-line client, this is handled with the delimiter command.\nChanging the ; end-of-statement delimiter (for example, to //) permit ;\nto be used in a program body. For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-defining.html.\n\nA BEGIN ... END block can be labeled. See [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/begin-end.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/begin-end.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (330,27,'SHOW PROCEDURE STATUS','Syntax:\nSHOW PROCEDURE STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is a MySQL extension. It returns characteristics of a\nstored procedure, such as the database, name, type, creator, creation\nand modification dates, and character set information. A similar\nstatement, SHOW FUNCTION STATUS, displays information about stored\nfunctions (see [HELP SHOW FUNCTION STATUS]).\n\nThe LIKE clause, if present, indicates which procedure or function\nnames to match. The WHERE clause can be given to select rows using more\ngeneral conditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-procedure-status.html\n\n','mysql> SHOW PROCEDURE STATUS LIKE \'sp1\'\\G\n*************************** 1. row ***************************\n                  Db: test\n                Name: sp1\n                Type: PROCEDURE\n             Definer: testuser@localhost\n            Modified: 2004-08-03 15:29:37\n             Created: 2004-08-03 15:29:37\n       Security_type: DEFINER\n             Comment:\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.5/en/show-procedure-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (331,27,'SHOW WARNINGS','Syntax:\nSHOW WARNINGS [LIMIT [offset,] row_count]\nSHOW COUNT(*) WARNINGS\n\nSHOW WARNINGS is a diagnostic statement that displays information about\nthe conditions (errors, warnings, and notes) resulting from executing a\nstatement in the current session. Warnings are generated for DML\nstatements such as INSERT, UPDATE, and LOAD DATA INFILE as well as DDL\nstatements such as CREATE TABLE and ALTER TABLE.\n\nThe LIMIT clause has the same syntax as for the SELECT statement. See\nhttp://dev.mysql.com/doc/refman/5.5/en/select.html.\n\nSHOW WARNINGS is also used following EXPLAIN EXTENDED, to display the\nextra information generated by EXPLAIN when the EXTENDED keyword is\nused. See http://dev.mysql.com/doc/refman/5.5/en/explain-extended.html.\n\nSHOW WARNINGS displays information about the conditions resulting from\nthe most recent statement in the current session that generated\nmessages. It shows nothing if the most recent statement used a table\nand generated no messages. (That is, statements that use a table but\ngenerate no messages clear the message list.) Statements that do not\nuse tables and do not generate messages have no effect on the message\nlist.\n\nThe SHOW COUNT(*) WARNINGS diagnostic statement displays the total\nnumber of errors, warnings, and notes. You can also retrieve this\nnumber from the warning_count system variable:\n\nSHOW COUNT(*) WARNINGS;\nSELECT @@warning_count;\n\nA related diagnostic statement, SHOW ERRORS, shows only error\nconditions (it excludes warnings and notes), and SHOW COUNT(*) ERRORS\nstatement displays the total number of errors. See [HELP SHOW ERRORS].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-warnings.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-warnings.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (332,10,'DROP USER','Syntax:\nDROP USER user [, user] ...\n\nThe DROP USER statement removes one or more MySQL accounts and their\nprivileges. It removes privilege rows for the account from all grant\ntables. An error occurs for accounts that do not exist. To use this\nstatement, you must have the global CREATE USER privilege or the DELETE\nprivilege for the mysql database.\n\nEach account name uses the format described in\nhttp://dev.mysql.com/doc/refman/5.5/en/account-names.html. For example:\n\nDROP USER \'jeffrey\'@\'localhost\';\n\nIf you specify only the user name part of the account name, a host name\npart of \'%\' is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-user.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-user.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (333,16,'STDDEV_POP','Syntax:\nSTDDEV_POP(expr)\n\nReturns the population standard deviation of expr (the square root of\nVAR_POP()). You can also use STD() or STDDEV(), which are equivalent\nbut not standard SQL.\n\nSTDDEV_POP() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (334,27,'SHOW CHARACTER SET','Syntax:\nSHOW CHARACTER SET\n    [LIKE \'pattern\' | WHERE expr]\n\nThe SHOW CHARACTER SET statement shows all available character sets.\nThe LIKE clause, if present, indicates which character set names to\nmatch. The WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html. For example:\n\nmysql> SHOW CHARACTER SET LIKE \'latin%\';\n+---------+-----------------------------+-------------------+--------+\n| Charset | Description                 | Default collation | Maxlen |\n+---------+-----------------------------+-------------------+--------+\n| latin1  | cp1252 West European        | latin1_swedish_ci |      1 |\n| latin2  | ISO 8859-2 Central European | latin2_general_ci |      1 |\n| latin5  | ISO 8859-9 Turkish          | latin5_turkish_ci |      1 |\n| latin7  | ISO 8859-13 Baltic          | latin7_general_ci |      1 |\n+---------+-----------------------------+-------------------+--------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-character-set.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-character-set.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (335,38,'SUBSTRING','Syntax:\nSUBSTRING(str,pos), SUBSTRING(str FROM pos), SUBSTRING(str,pos,len),\nSUBSTRING(str FROM pos FOR len)\n\nThe forms without a len argument return a substring from string str\nstarting at position pos. The forms with a len argument return a\nsubstring len characters long from string str, starting at position\npos. The forms that use FROM are standard SQL syntax. It is also\npossible to use a negative value for pos. In this case, the beginning\nof the substring is pos characters from the end of the string, rather\nthan the beginning. A negative value may be used for pos in any of the\nforms of this function.\n\nFor all forms of SUBSTRING(), the position of the first character in\nthe string from which the substring is to be extracted is reckoned as\n1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SUBSTRING(\'Quadratically\',5);\n        -> \'ratically\'\nmysql> SELECT SUBSTRING(\'foobarbar\' FROM 4);\n        -> \'barbar\'\nmysql> SELECT SUBSTRING(\'Quadratically\',5,6);\n        -> \'ratica\'\nmysql> SELECT SUBSTRING(\'Sakila\', -3);\n        -> \'ila\'\nmysql> SELECT SUBSTRING(\'Sakila\', -5, 3);\n        -> \'aki\'\nmysql> SELECT SUBSTRING(\'Sakila\' FROM -4 FOR 2);\n        -> \'ki\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (336,37,'ISEMPTY','IsEmpty(g)\n\nThis function is a placeholder that returns 0 for any valid geometry\nvalue, 1 for any invalid geometry value or NULL.\n\nMySQL does not support GIS EMPTY values such as POINT EMPTY.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (337,27,'SHOW FUNCTION STATUS','Syntax:\nSHOW FUNCTION STATUS\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement is similar to SHOW PROCEDURE STATUS but for stored\nfunctions. See [HELP SHOW PROCEDURE STATUS].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-function-status.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-function-status.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (338,38,'LTRIM','Syntax:\nLTRIM(str)\n\nReturns the string str with leading space characters removed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LTRIM(\'  barbar\');\n        -> \'barbar\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (339,31,'INTERSECTS','Intersects(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 spatially intersects g2.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (340,28,'CALL','Syntax:\nCALL sp_name([parameter[,...]])\nCALL sp_name[()]\n\nThe CALL statement invokes a stored procedure that was defined\npreviously with CREATE PROCEDURE.\n\nStored procedures that take no arguments can be invoked without\nparentheses. That is, CALL p() and CALL p are equivalent.\n\nCALL can pass back values to its caller using parameters that are\ndeclared as OUT or INOUT parameters. When the procedure returns, a\nclient program can also obtain the number of rows affected for the\nfinal statement executed within the routine: At the SQL level, call the\nROW_COUNT() function; from the C API, call the mysql_affected_rows()\nfunction.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/call.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/call.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (341,14,'VALUES','Syntax:\nVALUES(col_name)\n\nIn an INSERT ... ON DUPLICATE KEY UPDATE statement, you can use the\nVALUES(col_name) function in the UPDATE clause to refer to column\nvalues from the INSERT portion of the statement. In other words,\nVALUES(col_name) in the UPDATE clause refers to the value of col_name\nthat would be inserted, had no duplicate-key conflict occurred. This\nfunction is especially useful in multiple-row inserts. The VALUES()\nfunction is meaningful only in the ON DUPLICATE KEY UPDATE clause of\nINSERT statements and returns NULL otherwise. See\nhttp://dev.mysql.com/doc/refman/5.5/en/insert-on-duplicate.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> INSERT INTO table (a,b,c) VALUES (1,2,3),(4,5,6)\n    -> ON DUPLICATE KEY UPDATE c=VALUES(a)+VALUES(b);\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (342,7,'MBRDISJOINT','MBRDisjoint(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangles of\nthe two geometries g1 and g2 are disjoint (do not intersect).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (343,38,'SUBSTRING_INDEX','Syntax:\nSUBSTRING_INDEX(str,delim,count)\n\nReturns the substring from string str before count occurrences of the\ndelimiter delim. If count is positive, everything to the left of the\nfinal delimiter (counting from the left) is returned. If count is\nnegative, everything to the right of the final delimiter (counting from\nthe right) is returned. SUBSTRING_INDEX() performs a case-sensitive\nmatch when searching for delim.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT SUBSTRING_INDEX(\'www.mysql.com\', \'.\', 2);\n        -> \'www.mysql\'\nmysql> SELECT SUBSTRING_INDEX(\'www.mysql.com\', \'.\', -2);\n        -> \'mysql.com\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (344,12,'ENCODE','Syntax:\nENCODE(str,pass_str)\n\nEncrypt str using pass_str as the password. The result is a binary\nstring of the same length as str. To decrypt the result, use DECODE().\n\nThe ENCODE() function should no longer be used. If you still need to\nuse ENCODE(), a salt value must be used with it to reduce risk. For\nexample:\n\nENCODE(\'plaintext\', CONCAT(\'my_random_salt\',\'my_secret_password\'))\n\nA new random salt value must be used whenever a password is updated.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (345,24,'LOOP','Syntax:\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\nLOOP implements a simple loop construct, enabling repeated execution of\nthe statement list, which consists of one or more statements, each\nterminated by a semicolon (;) statement delimiter. The statements\nwithin the loop are repeated until the loop is terminated. Usually,\nthis is accomplished with a LEAVE statement. Within a stored function,\nRETURN can also be used, which exits the function entirely.\n\nNeglecting to include a loop-termination statement results in an\ninfinite loop.\n\nA LOOP statement can be labeled. For the rules regarding label use, see\n[HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/loop.html\n\n','CREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN\n      ITERATE label1;\n    END IF;\n    LEAVE label1;\n  END LOOP label1;\n  SET @x = p1;\nEND;\n','http://dev.mysql.com/doc/refman/5.5/en/loop.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (346,3,'TRUNCATE','Syntax:\nTRUNCATE(X,D)\n\nReturns the number X, truncated to D decimal places. If D is 0, the\nresult has no decimal point or fractional part. D can be negative to\ncause D digits left of the decimal point of the value X to become zero.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT TRUNCATE(1.223,1);\n        -> 1.2\nmysql> SELECT TRUNCATE(1.999,1);\n        -> 1.9\nmysql> SELECT TRUNCATE(1.999,0);\n        -> 1\nmysql> SELECT TRUNCATE(-1.999,1);\n        -> -1.9\nmysql> SELECT TRUNCATE(122,-2);\n       -> 100\nmysql> SELECT TRUNCATE(10.28*100,0);\n       -> 1028\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (347,32,'TIMESTAMPADD','Syntax:\nTIMESTAMPADD(unit,interval,datetime_expr)\n\nAdds the integer expression interval to the date or datetime expression\ndatetime_expr. The unit for interval is given by the unit argument,\nwhich should be one of the following values: MICROSECOND\n(microseconds), SECOND, MINUTE, HOUR, DAY, WEEK, MONTH, QUARTER, or\nYEAR.\n\nIt is possible to use FRAC_SECOND in place of MICROSECOND, but\nFRAC_SECOND is deprecated. FRAC_SECOND was removed in MySQL 5.5.3.\n\nThe unit value may be specified using one of keywords as shown, or with\na prefix of SQL_TSI_. For example, DAY and SQL_TSI_DAY both are legal.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIMESTAMPADD(MINUTE,1,\'2003-01-02\');\n        -> \'2003-01-02 00:01:00\'\nmysql> SELECT TIMESTAMPADD(WEEK,1,\'2003-01-02\');\n        -> \'2003-01-09\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (348,27,'SHOW','SHOW has many forms that provide information about databases, tables,\ncolumns, or status information about the server. This section describes\nthose following:\n\nSHOW AUTHORS\nSHOW {BINARY | MASTER} LOGS\nSHOW BINLOG EVENTS [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\nSHOW CHARACTER SET [like_or_where]\nSHOW COLLATION [like_or_where]\nSHOW [FULL] COLUMNS FROM tbl_name [FROM db_name] [like_or_where]\nSHOW CONTRIBUTORS\nSHOW CREATE DATABASE db_name\nSHOW CREATE EVENT event_name\nSHOW CREATE FUNCTION func_name\nSHOW CREATE PROCEDURE proc_name\nSHOW CREATE TABLE tbl_name\nSHOW CREATE TRIGGER trigger_name\nSHOW CREATE VIEW view_name\nSHOW DATABASES [like_or_where]\nSHOW ENGINE engine_name {STATUS | MUTEX}\nSHOW [STORAGE] ENGINES\nSHOW ERRORS [LIMIT [offset,] row_count]\nSHOW EVENTS\nSHOW FUNCTION CODE func_name\nSHOW FUNCTION STATUS [like_or_where]\nSHOW GRANTS FOR user\nSHOW INDEX FROM tbl_name [FROM db_name]\nSHOW MASTER STATUS\nSHOW OPEN TABLES [FROM db_name] [like_or_where]\nSHOW PLUGINS\nSHOW PROCEDURE CODE proc_name\nSHOW PROCEDURE STATUS [like_or_where]\nSHOW PRIVILEGES\nSHOW [FULL] PROCESSLIST\nSHOW PROFILE [types] [FOR QUERY n] [OFFSET n] [LIMIT n]\nSHOW PROFILES\nSHOW SLAVE HOSTS\nSHOW SLAVE STATUS\nSHOW [GLOBAL | SESSION] STATUS [like_or_where]\nSHOW TABLE STATUS [FROM db_name] [like_or_where]\nSHOW [FULL] TABLES [FROM db_name] [like_or_where]\nSHOW TRIGGERS [FROM db_name] [like_or_where]\nSHOW [GLOBAL | SESSION] VARIABLES [like_or_where]\nSHOW WARNINGS [LIMIT [offset,] row_count]\n\nlike_or_where:\n    LIKE \'pattern\'\n  | WHERE expr\n\nIf the syntax for a given SHOW statement includes a LIKE \'pattern\'\npart, \'pattern\' is a string that can contain the SQL "%" and "_"\nwildcard characters. The pattern is useful for restricting statement\noutput to matching values.\n\nSeveral SHOW statements also accept a WHERE clause that provides more\nflexibility in specifying which rows to display. See\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (349,20,'GREATEST','Syntax:\nGREATEST(value1,value2,...)\n\nWith two or more arguments, returns the largest (maximum-valued)\nargument. The arguments are compared using the same rules as for\nLEAST().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT GREATEST(2,0);\n        -> 2\nmysql> SELECT GREATEST(34.0,3.0,5.0,767.0);\n        -> 767.0\nmysql> SELECT GREATEST(\'B\',\'A\',\'C\');\n        -> \'C\'\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (350,27,'SHOW VARIABLES','Syntax:\nSHOW [GLOBAL | SESSION] VARIABLES\n    [LIKE \'pattern\' | WHERE expr]\n\nSHOW VARIABLES shows the values of MySQL system variables. This\ninformation also can be obtained using the mysqladmin variables\ncommand. The LIKE clause, if present, indicates which variable names to\nmatch. The WHERE clause can be given to select rows using more general\nconditions, as discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html. This\nstatement does not require any privilege. It requires only the ability\nto connect to the server.\n\nWith the GLOBAL modifier, SHOW VARIABLES displays the values that are\nused for new connections to MySQL. As of MySQL 5.5.3, if a variable has\nno global value, no value is displayed. Before 5.5.3, the session value\nis displayed. With SESSION, SHOW VARIABLES displays the values that are\nin effect for the current connection. If no modifier is present, the\ndefault is SESSION. LOCAL is a synonym for SESSION.\nWith a LIKE clause, the statement displays only rows for those\nvariables with names that match the pattern. To obtain the row for a\nspecific variable, use a LIKE clause as shown:\n\nSHOW VARIABLES LIKE \'max_join_size\';\nSHOW SESSION VARIABLES LIKE \'max_join_size\';\n\nTo get a list of variables whose name match a pattern, use the "%"\nwildcard character in a LIKE clause:\n\nSHOW VARIABLES LIKE \'%size%\';\nSHOW GLOBAL VARIABLES LIKE \'%size%\';\n\nWildcard characters can be used in any position within the pattern to\nbe matched. Strictly speaking, because "_" is a wildcard that matches\nany single character, you should escape it as "\\_" to match it\nliterally. In practice, this is rarely necessary.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-variables.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-variables.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (351,27,'BINLOG','Syntax:\nBINLOG \'str\'\n\nBINLOG is an internal-use statement. It is generated by the mysqlbinlog\nprogram as the printable representation of certain events in binary log\nfiles. (See http://dev.mysql.com/doc/refman/5.5/en/mysqlbinlog.html.)\nThe \'str\' value is a base 64-encoded string the that server decodes to\ndetermine the data change indicated by the corresponding event. This\nstatement requires the SUPER privilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/binlog.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/binlog.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (352,16,'BIT_AND','Syntax:\nBIT_AND(expr)\n\nReturns the bitwise AND of all bits in expr. The calculation is\nperformed with 64-bit (BIGINT) precision.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (353,32,'SECOND','Syntax:\nSECOND(time)\n\nReturns the second for time, in the range 0 to 59.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT SECOND(\'10:05:03\');\n        -> 3\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (354,3,'ATAN2','Syntax:\nATAN(Y,X), ATAN2(Y,X)\n\nReturns the arc tangent of the two variables X and Y. It is similar to\ncalculating the arc tangent of Y / X, except that the signs of both\narguments are used to determine the quadrant of the result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ATAN(-2,2);\n        -> -0.78539816339745\nmysql> SELECT ATAN2(PI(),0);\n        -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (355,7,'MBRCONTAINS','MBRContains(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangle of g1\ncontains the minimum bounding rectangle of g2. This tests the opposite\nrelationship as MBRWithin().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','mysql> SET @g1 = GeomFromText(\'Polygon((0 0,0 3,3 3,3 0,0 0))\');\nmysql> SET @g2 = GeomFromText(\'Point(1 1)\');\nmysql> SELECT MBRContains(@g1,@g2), MBRWithin(@g2,@g1);\n+----------------------+--------------------+\n| MBRContains(@g1,@g2) | MBRWithin(@g2,@g1) |\n+----------------------+--------------------+\n|                    1 |                  1 |\n+----------------------+--------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (356,32,'HOUR','Syntax:\nHOUR(time)\n\nReturns the hour for time. The range of the return value is 0 to 23 for\ntime-of-day values. However, the range of TIME values actually is much\nlarger, so HOUR can return values greater than 23.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT HOUR(\'10:05:03\');\n        -> 10\nmysql> SELECT HOUR(\'272:59:59\');\n        -> 272\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (357,28,'SELECT','Syntax:\nSELECT\n    [ALL | DISTINCT | DISTINCTROW ]\n      [HIGH_PRIORITY]\n      [STRAIGHT_JOIN]\n      [SQL_SMALL_RESULT] [SQL_BIG_RESULT] [SQL_BUFFER_RESULT]\n      [SQL_CACHE | SQL_NO_CACHE] [SQL_CALC_FOUND_ROWS]\n    select_expr [, select_expr ...]\n    [FROM table_references\n    [WHERE where_condition]\n    [GROUP BY {col_name | expr | position}\n      [ASC | DESC], ... [WITH ROLLUP]]\n    [HAVING where_condition]\n    [ORDER BY {col_name | expr | position}\n      [ASC | DESC], ...]\n    [LIMIT {[offset,] row_count | row_count OFFSET offset}]\n    [PROCEDURE procedure_name(argument_list)]\n    [INTO OUTFILE \'file_name\'\n        [CHARACTER SET charset_name]\n        export_options\n      | INTO DUMPFILE \'file_name\'\n      | INTO var_name [, var_name]]\n    [FOR UPDATE | LOCK IN SHARE MODE]]\n\nSELECT is used to retrieve rows selected from one or more tables, and\ncan include UNION statements and subqueries. See [HELP UNION], and\nhttp://dev.mysql.com/doc/refman/5.5/en/subqueries.html.\n\nThe most commonly used clauses of SELECT statements are these:\n\no Each select_expr indicates a column that you want to retrieve. There\n  must be at least one select_expr.\n\no table_references indicates the table or tables from which to retrieve\n  rows. Its syntax is described in [HELP JOIN].\n\no The WHERE clause, if given, indicates the condition or conditions\n  that rows must satisfy to be selected. where_condition is an\n  expression that evaluates to true for each row to be selected. The\n  statement selects all rows if there is no WHERE clause.\n\n  In the WHERE expression, you can use any of the functions and\n  operators that MySQL supports, except for aggregate (summary)\n  functions. See\n  http://dev.mysql.com/doc/refman/5.5/en/expressions.html, and\n  http://dev.mysql.com/doc/refman/5.5/en/functions.html.\n\nSELECT can also be used to retrieve rows computed without reference to\nany table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/select.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/select.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (358,3,'COT','Syntax:\nCOT(X)\n\nReturns the cotangent of X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT COT(12);\n        -> -1.5726734063977\nmysql> SELECT COT(0);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (359,27,'SHOW CREATE EVENT','Syntax:\nSHOW CREATE EVENT event_name\n\nThis statement displays the CREATE EVENT statement needed to re-create\na given event. It requires the EVENT privilege for the database from\nwhich the event is to be shown. For example (using the same event\ne_daily defined and then altered in [HELP SHOW EVENTS]):\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-event.html\n\n','mysql> SHOW CREATE EVENT test.e_daily\\G\n*************************** 1. row ***************************\n               Event: e_daily\n            sql_mode:\n           time_zone: SYSTEM\n        Create Event: CREATE EVENT `e_daily`\n                        ON SCHEDULE EVERY 1 DAY\n                        STARTS CURRENT_TIMESTAMP + INTERVAL 6 HOUR\n                        ON COMPLETION NOT PRESERVE\n                        ENABLE\n                        COMMENT \'Saves total number of sessions then\n                                clears the table each day\'\n                        DO BEGIN\n                          INSERT INTO site_activity.totals (time, total)\n                            SELECT CURRENT_TIMESTAMP, COUNT(*)\n                            FROM site_activity.sessions;\n                          DELETE FROM site_activity.sessions;\n                        END\ncharacter_set_client: latin1\ncollation_connection: latin1_swedish_ci\n  Database Collation: latin1_swedish_ci\n','http://dev.mysql.com/doc/refman/5.5/en/show-create-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (360,38,'LOAD_FILE','Syntax:\nLOAD_FILE(file_name)\n\nReads the file and returns the file contents as a string. To use this\nfunction, the file must be located on the server host, you must specify\nthe full path name to the file, and you must have the FILE privilege.\nThe file must be readable by all and its size less than\nmax_allowed_packet bytes. If the secure_file_priv system variable is\nset to a nonempty directory name, the file to be loaded must be located\nin that directory.\n\nIf the file does not exist or cannot be read because one of the\npreceding conditions is not satisfied, the function returns NULL.\n\nThe character_set_filesystem system variable controls interpretation of\nfile names that are given as literal strings.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> UPDATE t\n            SET blob_col=LOAD_FILE(\'/tmp/picture\')\n            WHERE id=1;\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (361,16,'GROUP_CONCAT','Syntax:\nGROUP_CONCAT(expr)\n\nThis function returns a string result with the concatenated non-NULL\nvalues from a group. It returns NULL if there are no non-NULL values.\nThe full syntax is as follows:\n\nGROUP_CONCAT([DISTINCT] expr [,expr ...]\n             [ORDER BY {unsigned_integer | col_name | expr}\n                 [ASC | DESC] [,col_name ...]]\n             [SEPARATOR str_val])\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name,\n    ->     GROUP_CONCAT(test_score)\n    ->     FROM student\n    ->     GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (362,4,'POINTFROMTEXT','PointFromText(wkt[,srid])\n\nConstructs a Point value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (363,32,'DATE_FORMAT','Syntax:\nDATE_FORMAT(date,format)\n\nFormats the date value according to the format string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATE_FORMAT(\'2009-10-04 22:23:00\', \'%W %M %Y\');\n        -> \'Sunday October 2009\'\nmysql> SELECT DATE_FORMAT(\'2007-10-04 22:23:00\', \'%H:%i:%s\');\n        -> \'22:23:00\'\nmysql> SELECT DATE_FORMAT(\'1900-10-04 22:23:00\',\n    ->                 \'%D %y %a %d %m %b %j\');\n        -> \'4th 00 Thu 04 10 Oct 277\'\nmysql> SELECT DATE_FORMAT(\'1997-10-04 22:23:00\',\n    ->                 \'%H %k %I %r %T %S %w\');\n        -> \'22 22 10 10:23:00 PM 22:23:00 00 6\'\nmysql> SELECT DATE_FORMAT(\'1999-01-01\', \'%X %V\');\n        -> \'1998 52\'\nmysql> SELECT DATE_FORMAT(\'2006-06-00\', \'%d\');\n        -> \'00\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (364,17,'BENCHMARK','Syntax:\nBENCHMARK(count,expr)\n\nThe BENCHMARK() function executes the expression expr repeatedly count\ntimes. It may be used to time how quickly MySQL processes the\nexpression. The result value is always 0. The intended use is from\nwithin the mysql client, which reports query execution times:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT BENCHMARK(1000000,ENCODE(\'hello\',\'goodbye\'));\n+----------------------------------------------+\n| BENCHMARK(1000000,ENCODE(\'hello\',\'goodbye\')) |\n+----------------------------------------------+\n|                                            0 |\n+----------------------------------------------+\n1 row in set (4.74 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (365,32,'YEAR','Syntax:\nYEAR(date)\n\nReturns the year for date, in the range 1000 to 9999, or 0 for the\n"zero" date.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT YEAR(\'1987-01-01\');\n        -> 1987\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (366,27,'SHOW ENGINE','Syntax:\nSHOW ENGINE engine_name {STATUS | MUTEX}\n\nSHOW ENGINE displays operational information about a storage engine. It\nrequires the PROCESS privilege. The statement has these variants:\n\nSHOW ENGINE INNODB STATUS\nSHOW ENGINE INNODB MUTEX\nSHOW ENGINE {NDB | NDBCLUSTER} STATUS\nSHOW ENGINE PERFORMANCE_SCHEMA STATUS\n\nSHOW ENGINE INNODB STATUS displays extensive information from the\nstandard InnoDB Monitor about the state of the InnoDB storage engine.\nFor information about the standard monitor and other InnoDB Monitors\nthat provide information about InnoDB processing, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-monitors.html.\n\nSHOW ENGINE INNODB MUTEX displays InnoDB mutex and rw-lock statistics.\nStatement output has the following columns:\n\no Type\n\n  Always InnoDB.\n\no Name\n\n  The source file where the mutex is implemented, and the line number\n  in the file where the mutex is created. The line number is specific\n  to your version of MySQL.\n\no Status\n\n  The mutex status. This field displays several values if UNIV_DEBUG\n  was defined at MySQL compilation time (for example, in include/univ.i\n  in the InnoDB part of the MySQL source tree). If UNIV_DEBUG was not\n  defined, the statement displays only the os_waits value. In the\n  latter case (without UNIV_DEBUG), the information on which the output\n  is based is insufficient to distinguish regular mutexes and mutexes\n  that protect rw-locks (which permit multiple readers or a single\n  writer). Consequently, the output may appear to contain multiple rows\n  for the same mutex.\n\n  o count indicates how many times the mutex was requested.\n\n  o spin_waits indicates how many times the spinlock had to run.\n\n  o spin_rounds indicates the number of spinlock rounds. (spin_rounds\n    divided by spin_waits provides the average round count.)\n\n  o os_waits indicates the number of operating system waits. This\n    occurs when the spinlock did not work (the mutex was not locked\n    during the spinlock and it was necessary to yield to the operating\n    system and wait).\n\n  o os_yields indicates the number of times a thread trying to lock a\n    mutex gave up its timeslice and yielded to the operating system (on\n    the presumption that permitting other threads to run will free the\n    mutex so that it can be locked).\n\n  o os_wait_times indicates the amount of time (in ms) spent in\n    operating system waits. In MySQL 5.5 timing is disabled and this\n    value is always 0.\n\nAs of MySQL 5.5, SHOW ENGINE INNODB MUTEX skips the mutexes and\nrw-locks of buffer pool blocks, as the amount of output can be\noverwhelming on systems with a large buffer pool. (There is one mutex\nand one rw-lock in each 16K buffer pool block, and there are 65,536\nblocks per gigabyte.) SHOW ENGINE INNODB MUTEX also does not list any\nmutexes or rw-locks that have never been waited on (os_waits=0). Thus,\nSHOW ENGINE INNODB MUTEX only displays information about mutexes and\nrw-locks outside of the buffer pool that have caused at least one\nOS-level wait.\n\nSHOW ENGINE INNODB MUTEX information can be used to diagnose system\nproblems. For example, large values of spin_waits and spin_rounds may\nindicate scalability problems.\n\nUse SHOW ENGINE PERFORMANCE_SCHEMA STATUS to inspect the internal\noperation of the Performance Schema code:\n\nmysql> SHOW ENGINE PERFORMANCE_SCHEMA STATUS\\G\n...\n*************************** 3. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.row_size\nStatus: 76\n*************************** 4. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.row_count\nStatus: 10000\n*************************** 5. row ***************************\n  Type: performance_schema\n  Name: events_waits_history.memory\nStatus: 760000\n...\n*************************** 57. row ***************************\n  Type: performance_schema\n  Name: performance_schema.memory\nStatus: 26459600\n...\n\nThis statement is intended to help the DBA understand the effects that\ndifferent Performance Schema options have on memory requirements.\n\nName values consist of two parts, which name an internal buffer and a\nbuffer attribute, respectively. Interpret buffer names as follows:\n\no An internal buffer that is not exposed as a table is named within\n  parentheses. Examples: (pfs_cond_class).row_size,\n  (pfs_mutex_class).memory.\n\no An internal buffer that is exposed as a table in the\n  performance_schema database is named after the table, without\n  parentheses. Examples: events_waits_history.row_size,\n  mutex_instances.row_count.\n\no A value that applies to the Performance Schema as a whole begins with\n  performance_schema. Example: performance_schema.memory.\n\nBuffer attributes have these meanings:\n\no row_size is the size of the internal record used by the\n  implementation, such as the size of a row in a table. row_size values\n  cannot be changed.\n\no row_count is the number of internal records, such as the number of\n  rows in a table. row_count values can be changed using Performance\n  Schema configuration options.\n\no For a table, tbl_name.memory is the product of row_size and\n  row_count. For the Performance Schema as a whole,\n  performance_schema.memory is the sum of all the memory used (the sum\n  of all other memory values).\n\nIn some cases, there is a direct relationship between a Performance\nSchema configuration parameter and a SHOW ENGINE value. For example,\nevents_waits_history_long.row_count corresponds to\nperformance_schema_events_waits_history_long_size. In other cases, the\nrelationship is more complex. For example,\nevents_waits_history.row_count corresponds to\nperformance_schema_events_waits_history_size (the number of rows per\nthread) multiplied by performance_schema_max_thread_instances ( the\nnumber of threads).\n\nIf the server has the NDBCLUSTER storage engine enabled, SHOW ENGINE\nNDB STATUS displays cluster status information such as the number of\nconnected data nodes, the cluster connectstring, and cluster binary log\nepochs, as well as counts of various Cluster API objects created by the\nMySQL Server when connected to the cluster. Sample output from this\nstatement is shown here:\n\nmysql> SHOW ENGINE NDB STATUS;\n+------------+-----------------------+--------------------------------------------------+\n| Type       | Name                  | Status                                           |\n+------------+-----------------------+--------------------------------------------------+\n| ndbcluster | connection            | cluster_node_id=7,\n  connected_host=192.168.0.103, connected_port=1186, number_of_data_nodes=4,\n  number_of_ready_data_nodes=3, connect_count=0                                         |\n| ndbcluster | NdbTransaction        | created=6, free=0, sizeof=212                    |\n| ndbcluster | NdbOperation          | created=8, free=8, sizeof=660                    |\n| ndbcluster | NdbIndexScanOperation | created=1, free=1, sizeof=744                    |\n| ndbcluster | NdbIndexOperation     | created=0, free=0, sizeof=664                    |\n| ndbcluster | NdbRecAttr            | created=1285, free=1285, sizeof=60               |\n| ndbcluster | NdbApiSignal          | created=16, free=16, sizeof=136                  |\n| ndbcluster | NdbLabel              | created=0, free=0, sizeof=196                    |\n| ndbcluster | NdbBranch             | created=0, free=0, sizeof=24                     |\n| ndbcluster | NdbSubroutine         | created=0, free=0, sizeof=68                     |\n| ndbcluster | NdbCall               | created=0, free=0, sizeof=16                     |\n| ndbcluster | NdbBlob               | created=1, free=1, sizeof=264                    |\n| ndbcluster | NdbReceiver           | created=4, free=0, sizeof=68                     |\n| ndbcluster | binlog                | latest_epoch=155467, latest_trans_epoch=148126,\n  latest_received_binlog_epoch=0, latest_handled_binlog_epoch=0,\n  latest_applied_binlog_epoch=0                                                         |\n+------------+-----------------------+--------------------------------------------------+\n\nThe rows with connection and binlog in the Name column were added to\nthe output of this statement in MySQL 5.1. The Status column in each of\nthese rows provides information about the MySQL server\'s connection to\nthe cluster and about the cluster binary log\'s status, respectively.\nThe Status information is in the form of comma-delimited set of\nname/value pairs.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-engine.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-engine.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (367,14,'NAME_CONST','Syntax:\nNAME_CONST(name,value)\n\nReturns the given value. When used to produce a result set column,\nNAME_CONST() causes the column to have the given name. The arguments\nshould be constants.\n\nmysql> SELECT NAME_CONST(\'myname\', 14);\n+--------+\n| myname |\n+--------+\n|     14 |\n+--------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (368,14,'RELEASE_LOCK','Syntax:\nRELEASE_LOCK(str)\n\nReleases the lock named by the string str that was obtained with\nGET_LOCK(). Returns 1 if the lock was released, 0 if the lock was not\nestablished by this thread (in which case the lock is not released),\nand NULL if the named lock did not exist. The lock does not exist if it\nwas never obtained by a call to GET_LOCK() or if it has previously been\nreleased.\n\nThe DO statement is convenient to use with RELEASE_LOCK(). See [HELP\nDO].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (369,20,'IS NULL','Syntax:\nIS NULL\n\nTests whether a value is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS NULL, 0 IS NULL, NULL IS NULL;\n        -> 0, 0, 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (370,32,'CONVERT_TZ','Syntax:\nCONVERT_TZ(dt,from_tz,to_tz)\n\nCONVERT_TZ() converts a datetime value dt from the time zone given by\nfrom_tz to the time zone given by to_tz and returns the resulting\nvalue. Time zones are specified as described in\nhttp://dev.mysql.com/doc/refman/5.5/en/time-zone-support.html. This\nfunction returns NULL if the arguments are invalid.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT CONVERT_TZ(\'2004-01-01 12:00:00\',\'GMT\',\'MET\');\n        -> \'2004-01-01 13:00:00\'\nmysql> SELECT CONVERT_TZ(\'2004-01-01 12:00:00\',\'+00:00\',\'+10:00\');\n        -> \'2004-01-01 22:00:00\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (371,32,'TIME_TO_SEC','Syntax:\nTIME_TO_SEC(time)\n\nReturns the time argument, converted to seconds.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIME_TO_SEC(\'22:23:00\');\n        -> 80580\nmysql> SELECT TIME_TO_SEC(\'00:39:38\');\n        -> 2378\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (372,32,'WEEKDAY','Syntax:\nWEEKDAY(date)\n\nReturns the weekday index for date (0 = Monday, 1 = Tuesday, ... 6 =\nSunday).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT WEEKDAY(\'2008-02-03 22:23:00\');\n        -> 6\nmysql> SELECT WEEKDAY(\'2007-11-06\');\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (373,38,'EXPORT_SET','Syntax:\nEXPORT_SET(bits,on,off[,separator[,number_of_bits]])\n\nReturns a string such that for every bit set in the value bits, you get\nan on string and for every bit not set in the value, you get an off\nstring. Bits in bits are examined from right to left (from low-order to\nhigh-order bits). Strings are added to the result from left to right,\nseparated by the separator string (the default being the comma\ncharacter ","). The number of bits examined is given by number_of_bits,\nwhich has a default of 64 if not specified. number_of_bits is silently\nclipped to 64 if larger than 64. It is treated as an unsigned integer,\nso a value of -1 is effectively the same as 64.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT EXPORT_SET(5,\'Y\',\'N\',\',\',4);\n        -> \'Y,N,Y,N\'\nmysql> SELECT EXPORT_SET(6,\'1\',\'0\',\',\',10);\n        -> \'0,1,1,0,0,0,0,0,0,0\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (374,40,'ALTER SERVER','Syntax:\nALTER SERVER  server_name\n    OPTIONS (option [, option] ...)\n\nAlters the server information for server_name, adjusting any of the\noptions permitted in the CREATE SERVER statement. The corresponding\nfields in the mysql.servers table are updated accordingly. This\nstatement requires the SUPER privilege.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-server.html\n\n','ALTER SERVER s OPTIONS (USER \'sally\');\n','http://dev.mysql.com/doc/refman/5.5/en/alter-server.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (375,24,'RESIGNAL','Syntax:\nRESIGNAL [condition_value]\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value:\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name:\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nRESIGNAL passes on the error condition information that is available\nduring execution of a condition handler within a compound statement\ninside a stored procedure or function, trigger, or event. RESIGNAL may\nchange some or all information before passing it on. RESIGNAL is\nrelated to SIGNAL, but instead of originating a condition as SIGNAL\ndoes, RESIGNAL relays existing condition information, possibly after\nmodifying it.\n\nRESIGNAL makes it possible to both handle an error and return the error\ninformation. Otherwise, by executing an SQL statement within the\nhandler, information that caused the handler\'s activation is destroyed.\nRESIGNAL also can make some procedures shorter if a given handler can\nhandle part of a situation, then pass the condition "up the line" to\nanother handler.\n\nNo special privileges are required to execute the RESIGNAL statement.\n\nAll forms of RESIGNAL require that the current context be a condition\nhandler. Otherwise, RESIGNAL is illegal and a RESIGNAL when handler not\nactive error occurs.\n\nFor condition_value and signal_information_item, the definitions and\nrules are the same for RESIGNAL as for SIGNAL. For example, the\ncondition_value can be an SQLSTATE value, and the value can indicate\nerrors, warnings, or "not found." For additional information, see [HELP\nSIGNAL].\n\nThe RESIGNAL statement takes condition_value and SET clauses, both of\nwhich are optional. This leads to several possible uses:\n\no RESIGNAL alone:\n\nRESIGNAL;\n\no RESIGNAL with new signal information:\n\nRESIGNAL SET signal_information_item [, signal_information_item] ...;\n\no RESIGNAL with a condition value and possibly new signal information:\n\nRESIGNAL condition_value\n    [SET signal_information_item [, signal_information_item] ...];\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/resignal.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/resignal.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (376,32,'TIME FUNCTION','Syntax:\nTIME(expr)\n\nExtracts the time part of the time or datetime expression expr and\nreturns it as a string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT TIME(\'2003-12-31 01:02:03\');\n        -> \'01:02:03\'\nmysql> SELECT TIME(\'2003-12-31 01:02:03.000123\');\n        -> \'01:02:03.000123\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (377,32,'DATE_ADD','Syntax:\nDATE_ADD(date,INTERVAL expr unit), DATE_SUB(date,INTERVAL expr unit)\n\nThese functions perform date arithmetic. The date argument specifies\nthe starting date or datetime value. expr is an expression specifying\nthe interval value to be added or subtracted from the starting date.\nexpr is a string; it may start with a "-" for negative intervals. unit\nis a keyword indicating the units in which the expression should be\ninterpreted.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT \'2008-12-31 23:59:59\' + INTERVAL 1 SECOND;\n        -> \'2009-01-01 00:00:00\'\nmysql> SELECT INTERVAL 1 DAY + \'2008-12-31\';\n        -> \'2009-01-01\'\nmysql> SELECT \'2005-01-01\' - INTERVAL 1 SECOND;\n        -> \'2004-12-31 23:59:59\'\nmysql> SELECT DATE_ADD(\'2000-12-31 23:59:59\',\n    ->                 INTERVAL 1 SECOND);\n        -> \'2001-01-01 00:00:00\'\nmysql> SELECT DATE_ADD(\'2010-12-31 23:59:59\',\n    ->                 INTERVAL 1 DAY);\n        -> \'2011-01-01 23:59:59\'\nmysql> SELECT DATE_ADD(\'2100-12-31 23:59:59\',\n    ->                 INTERVAL \'1:1\' MINUTE_SECOND);\n        -> \'2101-01-01 00:01:00\'\nmysql> SELECT DATE_SUB(\'2005-01-01 00:00:00\',\n    ->                 INTERVAL \'1 1:1:1\' DAY_SECOND);\n        -> \'2004-12-30 22:58:59\'\nmysql> SELECT DATE_ADD(\'1900-01-01 00:00:00\',\n    ->                 INTERVAL \'-1 10\' DAY_HOUR);\n        -> \'1899-12-30 14:00:00\'\nmysql> SELECT DATE_SUB(\'1998-01-02\', INTERVAL 31 DAY);\n        -> \'1997-12-02\'\nmysql> SELECT DATE_ADD(\'1992-12-31 23:59:59.000002\',\n    ->            INTERVAL \'1.999999\' SECOND_MICROSECOND);\n        -> \'1993-01-01 00:00:01.000001\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (378,38,'CAST','Syntax:\nCAST(expr AS type)\n\nThe CAST() function takes an expression of any type and produces a\nresult value of a specified type, similar to CONVERT(). See the\ndescription of CONVERT() for more information.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/cast-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (379,38,'SOUNDS LIKE','Syntax:\nexpr1 SOUNDS LIKE expr2\n\nThis is the same as SOUNDEX(expr1) = SOUNDEX(expr2).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (380,32,'PERIOD_DIFF','Syntax:\nPERIOD_DIFF(P1,P2)\n\nReturns the number of months between periods P1 and P2. P1 and P2\nshould be in the format YYMM or YYYYMM. Note that the period arguments\nP1 and P2 are not date values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT PERIOD_DIFF(200802,200703);\n        -> 11\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (381,38,'LIKE','Syntax:\nexpr LIKE pat [ESCAPE \'escape_char\']\n\nPattern matching using SQL simple regular expression comparison.\nReturns 1 (TRUE) or 0 (FALSE). If either expr or pat is NULL, the\nresult is NULL.\n\nThe pattern need not be a literal string. For example, it can be\nspecified as a string expression or table column.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html\n\n','mysql> SELECT \'David!\' LIKE \'David_\';\n        -> 1\nmysql> SELECT \'David!\' LIKE \'%D%v%\';\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (382,25,'MULTIPOINT','MultiPoint(pt1,pt2,...)\n\nConstructs a MultiPoint value using Point or WKB Point arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (383,19,'>>','Syntax:\n>>\n\nShifts a longlong (BIGINT) number to the right.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 4 >> 2;\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (384,24,'FETCH','Syntax:\nFETCH [[NEXT] FROM] cursor_name INTO var_name [, var_name] ...\n\nThis statement fetches the next row for the SELECT statement associated\nwith the specified cursor (which must be open), and advances the cursor\npointer. If a row exists, the fetched columns are stored in the named\nvariables. The number of columns retrieved by the SELECT statement must\nmatch the number of output variables specified in the FETCH statement.\n\nIf no more rows are available, a No Data condition occurs with SQLSTATE\nvalue \'02000\'. To detect this condition, you can set up a handler for\nit (or for a NOT FOUND condition). For an example, see\nhttp://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/fetch.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/fetch.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (385,16,'AVG','Syntax:\nAVG([DISTINCT] expr)\n\nReturns the average value of expr. The DISTINCT option can be used to\nreturn the average of the distinct values of expr.\n\nAVG() returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT student_name, AVG(test_score)\n    ->        FROM student\n    ->        GROUP BY student_name;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (386,30,'TRUE FALSE','The constants TRUE and FALSE evaluate to 1 and 0, respectively. The\nconstant names can be written in any lettercase.\n\nmysql> SELECT TRUE, true, FALSE, false;\n        -> 1, 1, 0, 0\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/boolean-literals.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/boolean-literals.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (387,7,'MBRWITHIN','MBRWithin(g1,g2)\n\nReturns 1 or 0 to indicate whether the minimum bounding rectangle of g1\nis within the minimum bounding rectangle of g2. This tests the opposite\nrelationship as MBRContains().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html\n\n','mysql> SET @g1 = GeomFromText(\'Polygon((0 0,0 3,3 3,3 0,0 0))\');\nmysql> SET @g2 = GeomFromText(\'Polygon((0 0,0 5,5 5,5 0,0 0))\');\nmysql> SELECT MBRWithin(@g1,@g2), MBRWithin(@g2,@g1);\n+--------------------+--------------------+\n| MBRWithin(@g1,@g2) | MBRWithin(@g2,@g1) |\n+--------------------+--------------------+\n|                  1 |                  0 |\n+--------------------+--------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mysql-specific.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (388,17,'SESSION_USER','Syntax:\nSESSION_USER()\n\nSESSION_USER() is a synonym for USER().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (389,20,'IN','Syntax:\nexpr IN (value,...)\n\nReturns 1 if expr is equal to any of the values in the IN list, else\nreturns 0. If all values are constants, they are evaluated according to\nthe type of expr and sorted. The search for the item then is done using\na binary search. This means IN is very quick if the IN value list\nconsists entirely of constants. Otherwise, type conversion takes place\naccording to the rules described in\nhttp://dev.mysql.com/doc/refman/5.5/en/type-conversion.html, but\napplied to all the arguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 IN (0,3,5,7);\n        -> 0\nmysql> SELECT \'wefwf\' IN (\'wee\',\'wefwf\',\'weg\');\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (390,38,'QUOTE','Syntax:\nQUOTE(str)\n\nQuotes a string to produce a result that can be used as a properly\nescaped data value in an SQL statement. The string is returned enclosed\nby single quotation marks and with each instance of backslash ("\\"),\nsingle quote ("\'"), ASCII NUL, and Control+Z preceded by a backslash.\nIf the argument is NULL, the return value is the word "NULL" without\nenclosing single quotation marks.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT QUOTE(\'Don\\\'t!\');\n        -> \'Don\\\'t!\'\nmysql> SELECT QUOTE(NULL);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (391,27,'HELP COMMAND','Syntax:\nmysql> help search_string\n\nIf you provide an argument to the help command, mysql uses it as a\nsearch string to access server-side help from the contents of the MySQL\nReference Manual. The proper operation of this command requires that\nthe help tables in the mysql database be initialized with help topic\ninformation (see\nhttp://dev.mysql.com/doc/refman/5.5/en/server-side-help-support.html).\n\nIf there is no match for the search string, the search fails:\n\nmysql> help me\n\nNothing found\nPlease try to run \'help contents\' for a list of all accessible topics\n\nUse help contents to see a list of the help categories:\n\nmysql> help contents\nYou asked for help about help category: "Contents"\nFor more information, type \'help <item>\', where <item> is one of the\nfollowing categories:\n   Account Management\n   Administration\n   Data Definition\n   Data Manipulation\n   Data Types\n   Functions\n   Functions and Modifiers for Use with GROUP BY\n   Geographic Features\n   Language Structure\n   Plugins\n   Storage Engines\n   Stored Routines\n   Table Maintenance\n   Transactions\n   Triggers\n\nIf the search string matches multiple items, mysql shows a list of\nmatching topics:\n\nmysql> help logs\nMany help items for your request exist.\nTo make a more specific request, please type \'help <item>\',\nwhere <item> is one of the following topics:\n   SHOW\n   SHOW BINARY LOGS\n   SHOW ENGINE\n   SHOW LOGS\n\nUse a topic as the search string to see the help entry for that topic:\n\nmysql> help show binary logs\nName: \'SHOW BINARY LOGS\'\nDescription:\nSyntax:\nSHOW BINARY LOGS\nSHOW MASTER LOGS\n\nLists the binary log files on the server. This statement is used as\npart of the procedure described in [purge-binary-logs], that shows how\nto determine which logs can be purged.\n\nmysql> SHOW BINARY LOGS;\n+---------------+-----------+\n| Log_name      | File_size |\n+---------------+-----------+\n| binlog.000015 |    724935 |\n| binlog.000016 |    733481 |\n+---------------+-----------+\n\nThe search string can contain the wildcard characters "%" and "_".\nThese have the same meaning as for pattern-matching operations\nperformed with the LIKE operator. For example, HELP rep% returns a list\nof topics that begin with rep:\n\nmysql> HELP rep%\nMany help items for your request exist.\nTo make a more specific request, please type \'help <item>\',\nwhere <item> is one of the following\ntopics:\n   REPAIR TABLE\n   REPEAT FUNCTION\n   REPEAT LOOP\n   REPLACE\n   REPLACE FUNCTION\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mysql-server-side-help.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/mysql-server-side-help.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (392,32,'QUARTER','Syntax:\nQUARTER(date)\n\nReturns the quarter of the year for date, in the range 1 to 4.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT QUARTER(\'2008-04-01\');\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (393,38,'POSITION','Syntax:\nPOSITION(substr IN str)\n\nPOSITION(substr IN str) is a synonym for LOCATE(substr,str).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (394,27,'SHOW CREATE FUNCTION','Syntax:\nSHOW CREATE FUNCTION func_name\n\nThis statement is similar to SHOW CREATE PROCEDURE but for stored\nfunctions. See [HELP SHOW CREATE PROCEDURE].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-create-function.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (395,14,'IS_USED_LOCK','Syntax:\nIS_USED_LOCK(str)\n\nChecks whether the lock named str is in use (that is, locked). If so,\nit returns the connection identifier of the client that holds the lock.\nOtherwise, it returns NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (396,4,'POLYFROMTEXT','PolyFromText(wkt[,srid]), PolygonFromText(wkt[,srid])\n\nConstructs a Polygon value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (397,12,'DES_ENCRYPT','Syntax:\nDES_ENCRYPT(str[,{key_num|key_str}])\n\nEncrypts the string with the given key using the Triple-DES algorithm.\n\nThis function works only if MySQL has been configured with SSL support.\nSee http://dev.mysql.com/doc/refman/5.5/en/ssl-connections.html.\n\nThe encryption key to use is chosen based on the second argument to\nDES_ENCRYPT(), if one was given. With no argument, the first key from\nthe DES key file is used. With a key_num argument, the given key number\n(0 to 9) from the DES key file is used. With a key_str argument, the\ngiven key string is used to encrypt str.\n\nThe key file can be specified with the --des-key-file server option.\n\nThe return string is a binary string where the first character is\nCHAR(128 | key_num). If an error occurs, DES_ENCRYPT() returns NULL.\n\nThe 128 is added to make it easier to recognize an encrypted key. If\nyou use a string key, key_num is 127.\n\nThe string length for the result is given by this formula:\n\nnew_len = orig_len + (8 - (orig_len % 8)) + 1\n\nEach line in the DES key file has the following format:\n\nkey_num des_key_str\n\nEach key_num value must be a number in the range from 0 to 9. Lines in\nthe file may be in any order. des_key_str is the string that is used to\nencrypt the message. There should be at least one space between the\nnumber and the key. The first key is the default key that is used if\nyou do not specify any key argument to DES_ENCRYPT().\n\nYou can tell MySQL to read new key values from the key file with the\nFLUSH DES_KEY_FILE statement. This requires the RELOAD privilege.\n\nOne benefit of having a set of default keys is that it gives\napplications a way to check for the existence of encrypted column\nvalues, without giving the end user the right to decrypt those values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT customer_address FROM customer_table \n     > WHERE crypted_credit_card = DES_ENCRYPT(\'credit_card_number\');\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (398,3,'CEIL','Syntax:\nCEIL(X)\n\nCEIL() is a synonym for CEILING().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (399,38,'LENGTH','Syntax:\nLENGTH(str)\n\nReturns the length of the string str, measured in bytes. A multibyte\ncharacter counts as multiple bytes. This means that for a string\ncontaining five 2-byte characters, LENGTH() returns 10, whereas\nCHAR_LENGTH() returns 5.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT LENGTH(\'text\');\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (400,32,'STR_TO_DATE','Syntax:\nSTR_TO_DATE(str,format)\n\nThis is the inverse of the DATE_FORMAT() function. It takes a string\nstr and a format string format. STR_TO_DATE() returns a DATETIME value\nif the format string contains both date and time parts, or a DATE or\nTIME value if the string contains only date or time parts. If the date,\ntime, or datetime value extracted from str is illegal, STR_TO_DATE()\nreturns NULL and produces a warning.\n\nThe server scans str attempting to match format to it. The format\nstring can contain literal characters and format specifiers beginning\nwith %. Literal characters in format must match literally in str.\nFormat specifiers in format must match a date or time part in str. For\nthe specifiers that can be used in format, see the DATE_FORMAT()\nfunction description.\n\nmysql> SELECT STR_TO_DATE(\'01,5,2013\',\'%d,%m,%Y\');\n        -> \'2013-05-01\'\nmysql> SELECT STR_TO_DATE(\'May 1, 2013\',\'%M %d,%Y\');\n        -> \'2013-05-01\'\n\nScanning starts at the beginning of str and fails if format is found\nnot to match. Extra characters at the end of str are ignored.\n\nmysql> SELECT STR_TO_DATE(\'a09:30:17\',\'a%h:%i:%s\');\n        -> \'09:30:17\'\nmysql> SELECT STR_TO_DATE(\'a09:30:17\',\'%h:%i:%s\');\n        -> NULL\nmysql> SELECT STR_TO_DATE(\'09:30:17a\',\'%h:%i:%s\');\n        -> \'09:30:17\'\n\nUnspecified date or time parts have a value of 0, so incompletely\nspecified values in str produce a result with some or all parts set to\n0:\n\nmysql> SELECT STR_TO_DATE(\'abc\',\'abc\');\n        -> \'0000-00-00\'\nmysql> SELECT STR_TO_DATE(\'9\',\'%m\');\n        -> \'0000-09-00\'\nmysql> SELECT STR_TO_DATE(\'9\',\'%s\');\n        -> \'00:00:09\'\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (401,11,'Y','Y(p)\n\nReturns the Y-coordinate value for the Point object p as a\ndouble-precision number.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-point-property-functions.html\n\n','mysql> SELECT Y(POINT(56.7, 53.34));\n+-----------------------+\n| Y(POINT(56.7, 53.34)) |\n+-----------------------+\n|                 53.34 |\n+-----------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-point-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (402,21,'CHECKSUM TABLE','Syntax:\nCHECKSUM TABLE tbl_name [, tbl_name] ... [ QUICK | EXTENDED ]\n\nCHECKSUM TABLE reports a table checksum. During the checksum operation,\nthe table is locked with a read lock for InnoDB and MyISAM. This\nstatement requires the SELECT privilege for the table.\n\nWith QUICK, the live table checksum is reported if it is available, or\nNULL otherwise. This is very fast. A live checksum is enabled by\nspecifying the CHECKSUM=1 table option when you create the table;\ncurrently, this is supported only for MyISAM tables. See [HELP CREATE\nTABLE].\n\nWith EXTENDED, the entire table is read row by row and the checksum is\ncalculated. This can be very slow for large tables.\n\nIf neither QUICK nor EXTENDED is specified, MySQL returns a live\nchecksum if the table storage engine supports it and scans the table\notherwise.\n\nFor a nonexistent table, CHECKSUM TABLE returns NULL and generates a\nwarning.\n\nIn MySQL 5.5, CHECKSUM TABLE returns 0 for partitioned tables unless\nyou include the EXTENDED option. This issue is resolved in MySQL 5.6.\n(Bug #11933226, Bug #60681)\n\nThe checksum value depends on the table row format. If the row format\nchanges, the checksum also changes. For example, the storage format for\nVARCHAR changed between MySQL 4.1 and 5.0, so if a 4.1 table is\nupgraded to MySQL 5.0, the checksum value may change.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/checksum-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/checksum-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (403,2,'NUMINTERIORRINGS','NumInteriorRings(poly)\n\nReturns the number of interior rings in the Polygon value poly.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html\n\n','mysql> SET @poly =\n    -> \'Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))\';\nmysql> SELECT NumInteriorRings(GeomFromText(@poly));\n+---------------------------------------+\n| NumInteriorRings(GeomFromText(@poly)) |\n+---------------------------------------+\n|                                     1 |\n+---------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (404,2,'INTERIORRINGN','InteriorRingN(poly,N)\n\nReturns the N-th interior ring for the Polygon value poly as a\nLineString. Rings are numbered beginning with 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html\n\n','mysql> SET @poly =\n    -> \'Polygon((0 0,0 3,3 3,3 0,0 0),(1 1,1 2,2 2,2 1,1 1))\';\nmysql> SELECT AsText(InteriorRingN(GeomFromText(@poly),1));\n+----------------------------------------------+\n| AsText(InteriorRingN(GeomFromText(@poly),1)) |\n+----------------------------------------------+\n| LINESTRING(1 1,1 2,2 2,2 1,1 1)              |\n+----------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-polygon-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (405,32,'UTC_TIME','Syntax:\nUTC_TIME, UTC_TIME()\n\nReturns the current UTC time as a value in \'HH:MM:SS\' or HHMMSS.uuuuuu\nformat, depending on whether the function is used in a string or\nnumeric context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_TIME(), UTC_TIME() + 0;\n        -> \'18:07:53\', 180753.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (406,40,'DROP FUNCTION','The DROP FUNCTION statement is used to drop stored functions and\nuser-defined functions (UDFs):\n\no For information about dropping stored functions, see [HELP DROP\n  PROCEDURE].\n\no For information about dropping user-defined functions, see [HELP DROP\n  FUNCTION UDF].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-function.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-function.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (407,40,'ALTER EVENT','Syntax:\nALTER\n    [DEFINER = { user | CURRENT_USER }]\n    EVENT event_name\n    [ON SCHEDULE schedule]\n    [ON COMPLETION [NOT] PRESERVE]\n    [RENAME TO new_event_name]\n    [ENABLE | DISABLE | DISABLE ON SLAVE]\n    [COMMENT \'comment\']\n    [DO event_body]\n\nThe ALTER EVENT statement changes one or more of the characteristics of\nan existing event without the need to drop and recreate it. The syntax\nfor each of the DEFINER, ON SCHEDULE, ON COMPLETION, COMMENT, ENABLE /\nDISABLE, and DO clauses is exactly the same as when used with CREATE\nEVENT. (See [HELP CREATE EVENT].)\n\nAny user can alter an event defined on a database for which that user\nhas the EVENT privilege. When a user executes a successful ALTER EVENT\nstatement, that user becomes the definer for the affected event.\n\nALTER EVENT works only with an existing event:\n\nmysql> ALTER EVENT no_such_event \n     >     ON SCHEDULE \n     >       EVERY \'2:3\' DAY_HOUR;\nERROR 1517 (HY000): Unknown event \'no_such_event\'\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-event.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-event.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (408,16,'STDDEV','Syntax:\nSTDDEV(expr)\n\nReturns the population standard deviation of expr. This function is\nprovided for compatibility with Oracle. The standard SQL function\nSTDDEV_POP() can be used instead.\n\nThis function returns NULL if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (409,32,'DATE_SUB','Syntax:\nDATE_SUB(date,INTERVAL expr unit)\n\nSee the description for DATE_ADD().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (410,32,'PERIOD_ADD','Syntax:\nPERIOD_ADD(P,N)\n\nAdds N months to period P (in the format YYMM or YYYYMM). Returns a\nvalue in the format YYYYMM. Note that the period argument P is not a\ndate value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT PERIOD_ADD(200801,2);\n        -> 200803\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (411,19,'|','Syntax:\n|\n\nBitwise OR:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT 29 | 15;\n        -> 31\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (412,14,'UUID_SHORT','Syntax:\nUUID_SHORT()\n\nReturns a "short" universal identifier as a 64-bit unsigned integer\n(rather than a string-form 128-bit identifier as returned by the UUID()\nfunction).\n\nThe value of UUID_SHORT() is guaranteed to be unique if the following\nconditions hold:\n\no The server_id of the current host is unique among your set of master\n  and slave servers\n\no server_id is between 0 and 255\n\no You do not set back your system time for your server between mysqld\n  restarts\n\no You do not invoke UUID_SHORT() on average more than 16 million times\n  per second between mysqld restarts\n\nThe UUID_SHORT() return value is constructed this way:\n\n  (server_id & 255) << 56\n+ (server_startup_time_in_seconds << 24)\n+ incremented_variable++;\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT UUID_SHORT();\n        -> 92395783831158784\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (413,4,'GEOMFROMTEXT','GeomFromText(wkt[,srid]), GeometryFromText(wkt[,srid])\n\nConstructs a geometry value of any type using its WKT representation\nand SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (414,38,'RIGHT','Syntax:\nRIGHT(str,len)\n\nReturns the rightmost len characters from the string str, or NULL if\nany argument is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT RIGHT(\'foobarbar\', 4);\n        -> \'rbar\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (415,32,'DATEDIFF','Syntax:\nDATEDIFF(expr1,expr2)\n\nDATEDIFF() returns expr1 - expr2 expressed as a value in days from one\ndate to the other. expr1 and expr2 are date or date-and-time\nexpressions. Only the date parts of the values are used in the\ncalculation.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATEDIFF(\'2007-12-31 23:59:59\',\'2007-12-30\');\n        -> 1\nmysql> SELECT DATEDIFF(\'2010-11-30 23:59:59\',\'2010-12-31\');\n        -> -31\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (416,40,'DROP TABLESPACE','Syntax:\nDROP TABLESPACE tablespace_name\n    ENGINE [=] engine_name\n\nThis statement drops a tablespace that was previously created using\nCREATE TABLESPACE (see [HELP CREATE TABLESPACE]).\n\n*Important*: The tablespace to be dropped must not contain any data\nfiles; in other words, before you can drop a tablespace, you must first\ndrop each of its data files using ALTER TABLESPACE ... DROP DATAFILE\n(see [HELP ALTER TABLESPACE]).\n\nThe ENGINE clause (required) specifies the storage engine used by the\ntablespace. Currently, the only accepted values for engine_name are NDB\nand NDBCLUSTER.\n\nDROP TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-tablespace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (417,40,'DROP PROCEDURE','Syntax:\nDROP {PROCEDURE | FUNCTION} [IF EXISTS] sp_name\n\nThis statement is used to drop a stored procedure or function. That is,\nthe specified routine is removed from the server. You must have the\nALTER ROUTINE privilege for the routine. (If the\nautomatic_sp_privileges system variable is enabled, that privilege and\nEXECUTE are granted automatically to the routine creator when the\nroutine is created and dropped from the creator when the routine is\ndropped. See\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-routines-privileges.html.\n)\n\nThe IF EXISTS clause is a MySQL extension. It prevents an error from\noccurring if the procedure or function does not exist. A warning is\nproduced that can be viewed with SHOW WARNINGS.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/drop-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/drop-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (418,21,'CHECK TABLE','Syntax:\nCHECK TABLE tbl_name [, tbl_name] ... [option] ...\n\noption = {\n    FOR UPGRADE\n  | QUICK\n  | FAST\n  | MEDIUM\n  | EXTENDED\n  | CHANGED\n}\n\nCHECK TABLE checks a table or tables for errors. CHECK TABLE works for\nInnoDB, MyISAM, ARCHIVE, and CSV tables. For MyISAM tables, the key\nstatistics are updated as well.\n\nTo check a table, you must have some privilege for it.\n\nCHECK TABLE can also check views for problems, such as tables that are\nreferenced in the view definition that no longer exist.\n\nCHECK TABLE is supported for partitioned tables, and you can use ALTER\nTABLE ... CHECK PARTITION to check one or more partitions; for more\ninformation, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/check-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/check-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (419,38,'BIN','Syntax:\nBIN(N)\n\nReturns a string representation of the binary value of N, where N is a\nlonglong (BIGINT) number. This is equivalent to CONV(N,10,2). Returns\nNULL if N is NULL.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT BIN(12);\n        -> \'1100\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (420,5,'INSTALL PLUGIN','Syntax:\nINSTALL PLUGIN plugin_name SONAME \'shared_library_name\'\n\nThis statement installs a server plugin. It requires the INSERT\nprivilege for the mysql.plugin table.\n\nplugin_name is the name of the plugin as defined in the plugin\ndescriptor structure contained in the library file (see\nhttp://dev.mysql.com/doc/refman/5.5/en/plugin-data-structures.html).\nPlugin names are not case sensitive. For maximal compatibility, plugin\nnames should be limited to ASCII letters, digits, and underscore\nbecause they are used in C source files, shell command lines, M4 and\nBourne shell scripts, and SQL environments.\n\nshared_library_name is the name of the shared library that contains the\nplugin code. The name includes the file name extension (for example,\nlibmyplugin.so, libmyplugin.dll, or libmyplugin.dylib).\n\nThe shared library must be located in the plugin directory (the\ndirectory named by the plugin_dir system variable). The library must be\nin the plugin directory itself, not in a subdirectory. By default,\nplugin_dir is the plugin directory under the directory named by the\npkglibdir configuration variable, but it can be changed by setting the\nvalue of plugin_dir at server startup. For example, set its value in a\nmy.cnf file:\n\n[mysqld]\nplugin_dir=/path/to/plugin/directory\n\nIf the value of plugin_dir is a relative path name, it is taken to be\nrelative to the MySQL base directory (the value of the basedir system\nvariable).\n\nINSTALL PLUGIN loads and initializes the plugin code to make the plugin\navailable for use. A plugin is initialized by executing its\ninitialization function, which handles any setup that the plugin must\nperform before it can be used. When the server shuts down, it executes\nthe deinitialization function for each plugin that is loaded so that\nthe plugin has a chance to perform any final cleanup.\n\nINSTALL PLUGIN also registers the plugin by adding a line that\nindicates the plugin name and library file name to the mysql.plugin\ntable. At server startup, the server loads and initializes any plugin\nthat is listed in the mysql.plugin table. This means that a plugin is\ninstalled with INSTALL PLUGIN only once, not every time the server\nstarts. Plugin loading at startup does not occur if the server is\nstarted with the --skip-grant-tables option.\n\nA plugin library can contain multiple plugins. For each of them to be\ninstalled, use a separate INSTALL PLUGIN statement. Each statement\nnames a different plugin, but all of them specify the same library\nname.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/install-plugin.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/install-plugin.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (421,24,'DECLARE CURSOR','Syntax:\nDECLARE cursor_name CURSOR FOR select_statement\n\nThis statement declares a cursor and associates it with a SELECT\nstatement that retrieves the rows to be traversed by the cursor. To\nfetch the rows later, use a FETCH statement. The number of columns\nretrieved by the SELECT statement must match the number of output\nvariables specified in the FETCH statement.\n\nThe SELECT statement cannot have an INTO clause.\n\nCursor declarations must appear before handler declarations and after\nvariable and condition declarations.\n\nA stored program may contain multiple cursor declarations, but each\ncursor declared in a given block must have a unique name. For an\nexample, see http://dev.mysql.com/doc/refman/5.5/en/cursors.html.\n\nFor information available through SHOW statements, it is possible in\nmany cases to obtain equivalent information by using a cursor with an\nINFORMATION_SCHEMA table.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/declare-cursor.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/declare-cursor.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (422,28,'LOAD DATA','Syntax:\nLOAD DATA [LOW_PRIORITY | CONCURRENT] [LOCAL] INFILE \'file_name\'\n    [REPLACE | IGNORE]\n    INTO TABLE tbl_name\n    [CHARACTER SET charset_name]\n    [{FIELDS | COLUMNS}\n        [TERMINATED BY \'string\']\n        [[OPTIONALLY] ENCLOSED BY \'char\']\n        [ESCAPED BY \'char\']\n    ]\n    [LINES\n        [STARTING BY \'string\']\n        [TERMINATED BY \'string\']\n    ]\n    [IGNORE number {LINES | ROWS}]\n    [(col_name_or_user_var,...)]\n    [SET col_name = expr,...]\n\nThe LOAD DATA INFILE statement reads rows from a text file into a table\nat a very high speed. LOAD DATA INFILE is the complement of SELECT ...\nINTO OUTFILE. (See\nhttp://dev.mysql.com/doc/refman/5.5/en/select-into.html.) To write data\nfrom a table to a file, use SELECT ... INTO OUTFILE. To read the file\nback into a table, use LOAD DATA INFILE. The syntax of the FIELDS and\nLINES clauses is the same for both statements. Both clauses are\noptional, but FIELDS must precede LINES if both are specified.\n\nYou can also load data files by using the mysqlimport utility; it\noperates by sending a LOAD DATA INFILE statement to the server. The\n--local option causes mysqlimport to read data files from the client\nhost. You can specify the --compress option to get better performance\nover slow networks if the client and server support the compressed\nprotocol. See http://dev.mysql.com/doc/refman/5.5/en/mysqlimport.html.\n\nFor more information about the efficiency of INSERT versus LOAD DATA\nINFILE and speeding up LOAD DATA INFILE, see\nhttp://dev.mysql.com/doc/refman/5.5/en/insert-speed.html.\n\nThe file name must be given as a literal string. On Windows, specify\nbackslashes in path names as forward slashes or doubled backslashes.\nThe character_set_filesystem system variable controls the\ninterpretation of the file name.\n\nThe server uses the character set indicated by the\ncharacter_set_database system variable to interpret the information in\nthe file. SET NAMES and the setting of character_set_client do not\naffect interpretation of input. If the contents of the input file use a\ncharacter set that differs from the default, it is usually preferable\nto specify the character set of the file by using the CHARACTER SET\nclause. A character set of binary specifies "no conversion."\n\nLOAD DATA INFILE interprets all fields in the file as having the same\ncharacter set, regardless of the data types of the columns into which\nfield values are loaded. For proper interpretation of file contents,\nyou must ensure that it was written with the correct character set. For\nexample, if you write a data file with mysqldump -T or by issuing a\nSELECT ... INTO OUTFILE statement in mysql, be sure to use a\n--default-character-set option so that output is written in the\ncharacter set to be used when the file is loaded with LOAD DATA INFILE.\n\n*Note*: It is not possible to load data files that use the ucs2, utf16,\nor utf32 character set.\n\nIf you use LOW_PRIORITY, execution of the LOAD DATA statement is\ndelayed until no other clients are reading from the table. This affects\nonly storage engines that use only table-level locking (such as MyISAM,\nMEMORY, and MERGE).\n\nIf you specify CONCURRENT with a MyISAM table that satisfies the\ncondition for concurrent inserts (that is, it contains no free blocks\nin the middle), other threads can retrieve data from the table while\nLOAD DATA is executing. This option affects the performance of LOAD\nDATA a bit, even if no other thread is using the table at the same\ntime.\n\nWith row-based replication, CONCURRENT is replicated regardless of\nMySQL version. With statement-based replication CONCURRENT is not\nreplicated prior to MySQL 5.5.1 (see Bug #34628). For more information,\nsee\nhttp://dev.mysql.com/doc/refman/5.5/en/replication-features-load-data.h\ntml.\n\nThe LOCAL keyword affects expected location of the file and error\nhandling, as described later. LOCAL works only if your server and your\nclient both have been configured to permit it. For example, if mysqld\nwas started with --local-infile=0, LOCAL does not work. See\nhttp://dev.mysql.com/doc/refman/5.5/en/load-data-local.html.\n\nThe LOCAL keyword affects where the file is expected to be found:\n\no If LOCAL is specified, the file is read by the client program on the\n  client host and sent to the server. The file can be given as a full\n  path name to specify its exact location. If given as a relative path\n  name, the name is interpreted relative to the directory in which the\n  client program was started.\n\n  When using LOCAL with LOAD DATA, a copy of the file is created in the\n  server\'s temporary directory. This is not the directory determined by\n  the value of tmpdir or slave_load_tmpdir, but rather the operating\n  system\'s temporary directory, and is not configurable in the MySQL\n  Server. (Typically the system temporary directory is /tmp on Linux\n  systems and C:\\WINDOWS\\TEMP on Windows.) Lack of sufficient space for\n  the copy in this directory can cause the LOAD DATA LOCAL statement to\n  fail.\n\no If LOCAL is not specified, the file must be located on the server\n  host and is read directly by the server. The server uses the\n  following rules to locate the file:\n\n  o If the file name is an absolute path name, the server uses it as\n    given.\n\n  o If the file name is a relative path name with one or more leading\n    components, the server searches for the file relative to the\n    server\'s data directory.\n\n  o If a file name with no leading components is given, the server\n    looks for the file in the database directory of the default\n    database.\n\nIn the non-LOCAL case, these rules mean that a file named as\n./myfile.txt is read from the server\'s data directory, whereas the file\nnamed as myfile.txt is read from the database directory of the default\ndatabase. For example, if db1 is the default database, the following\nLOAD DATA statement reads the file data.txt from the database directory\nfor db1, even though the statement explicitly loads the file into a\ntable in the db2 database:\n\nLOAD DATA INFILE \'data.txt\' INTO TABLE db2.my_table;\n\nFor security reasons, when reading text files located on the server,\nthe files must either reside in the database directory or be readable\nby the user account used to run the server. Also, to use LOAD DATA\nINFILE on server files, you must have the FILE privilege. See\nhttp://dev.mysql.com/doc/refman/5.5/en/privileges-provided.html. For\nnon-LOCAL load operations, if the secure_file_priv system variable is\nset to a nonempty directory name, the file to be loaded must be located\nin that directory.\n\nUsing LOCAL is a bit slower than letting the server access the files\ndirectly, because the contents of the file must be sent over the\nconnection by the client to the server. On the other hand, you do not\nneed the FILE privilege to load local files.\n\nLOCAL also affects error handling:\n\no With LOAD DATA INFILE, data-interpretation and duplicate-key errors\n  terminate the operation.\n\no With LOAD DATA LOCAL INFILE, data-interpretation and duplicate-key\n  errors become warnings and the operation continues because the server\n  has no way to stop transmission of the file in the middle of the\n  operation. For duplicate-key errors, this is the same as if IGNORE is\n  specified. IGNORE is explained further later in this section.\n\nThe REPLACE and IGNORE keywords control handling of input rows that\nduplicate existing rows on unique key values:\n\no If you specify REPLACE, input rows replace existing rows. In other\n  words, rows that have the same value for a primary key or unique\n  index as an existing row. See [HELP REPLACE].\n\no If you specify IGNORE, rows that duplicate an existing row on a\n  unique key value are discarded.\n\no If you do not specify either option, the behavior depends on whether\n  the LOCAL keyword is specified. Without LOCAL, an error occurs when a\n  duplicate key value is found, and the rest of the text file is\n  ignored. With LOCAL, the default behavior is the same as if IGNORE is\n  specified; this is because the server has no way to stop transmission\n  of the file in the middle of the operation.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/load-data.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/load-data.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (423,25,'MULTILINESTRING','MultiLineString(ls1,ls2,...)\n\nConstructs a MultiLineString value using LineString or WKB LineString\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-mysql-specific-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (424,32,'LOCALTIME','Syntax:\nLOCALTIME, LOCALTIME()\n\nLOCALTIME and LOCALTIME() are synonyms for NOW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (425,27,'SHOW RELAYLOG EVENTS','Syntax:\nSHOW RELAYLOG EVENTS\n   [IN \'log_name\'] [FROM pos] [LIMIT [offset,] row_count]\n\nShows the events in the relay log of a replication slave. If you do not\nspecify \'log_name\', the first relay log is displayed. This statement\nhas no effect on the master.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-relaylog-events.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-relaylog-events.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (426,4,'MPOINTFROMTEXT','MPointFromText(wkt[,srid]), MultiPointFromText(wkt[,srid])\n\nConstructs a MultiPoint value using its WKT representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkt-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (427,23,'BLOB','BLOB[(M)]\n\nA BLOB column with a maximum length of 65,535 (216 - 1) bytes. Each\nBLOB value is stored using a 2-byte length prefix that indicates the\nnumber of bytes in the value.\n\nAn optional length M can be given for this type. If this is done, MySQL\ncreates the column as the smallest BLOB type large enough to hold\nvalues M bytes long.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (428,12,'SHA1','Syntax:\nSHA1(str), SHA(str)\n\nCalculates an SHA-1 160-bit checksum for the string, as described in\nRFC 3174 (Secure Hash Algorithm). The value is returned as a string of\n40 hex digits, or NULL if the argument was NULL. One of the possible\nuses for this function is as a hash key. See the notes at the beginning\nof this section about storing hash values efficiently. You can also use\nSHA1() as a cryptographic function for storing passwords. SHA() is\nsynonymous with SHA1().\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring; see the notes at the beginning of this section about using the\nvalue as a nonbinary string.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SELECT SHA1(\'abc\');\n        -> \'a9993e364706816aba3e25717850c26c9cd0d89d\'\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (429,38,'SUBSTR','Syntax:\nSUBSTR(str,pos), SUBSTR(str FROM pos), SUBSTR(str,pos,len), SUBSTR(str\nFROM pos FOR len)\n\nSUBSTR() is a synonym for SUBSTRING().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (430,12,'PASSWORD','Syntax:\nPASSWORD(str)\n\nReturns a hashed password string calculated from the cleartext password\nstr. The return value is a nonbinary string in the connection character\nset (a binary string before MySQL 5.5.3), or NULL if the argument is\nNULL. This function is the SQL interface to the algorithm used by the\nserver to encrypt MySQL passwords for storage in the mysql.user grant\ntable.\n\nThe old_passwords system variable controls the password hashing method\nused by the PASSWORD() function. It also influences password hashing\nperformed by CREATE USER and GRANT statements that specify a password\nusing an IDENTIFIED BY clause.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','mysql> SET old_passwords = 0;\nmysql> SELECT PASSWORD(\'mypass\'), OLD_PASSWORD(\'mypass\');\n+-------------------------------------------+------------------------+\n| PASSWORD(\'mypass\')                        | OLD_PASSWORD(\'mypass\') |\n+-------------------------------------------+------------------------+\n| *6C8989366EAF75BB670AD8EA7A7FC1176A95CEF4 | 6f8c114b58f2ce9e       |\n+-------------------------------------------+------------------------+\n\nmysql> SET old_passwords = 1;\nmysql> SELECT PASSWORD(\'mypass\'), OLD_PASSWORD(\'mypass\');\n+--------------------+------------------------+\n| PASSWORD(\'mypass\') | OLD_PASSWORD(\'mypass\') |\n+--------------------+------------------------+\n| 6f8c114b58f2ce9e   | 6f8c114b58f2ce9e       |\n+--------------------+------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (431,23,'CHAR','[NATIONAL] CHAR[(M)] [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nA fixed-length string that is always right-padded with spaces to the\nspecified length when stored. M represents the column length in\ncharacters. The range of M is 0 to 255. If M is omitted, the length is\n1.\n\n*Note*: Trailing spaces are removed when CHAR values are retrieved\nunless the PAD_CHAR_TO_FULL_LENGTH SQL mode is enabled.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (432,32,'UTC_DATE','Syntax:\nUTC_DATE, UTC_DATE()\n\nReturns the current UTC date as a value in \'YYYY-MM-DD\' or YYYYMMDD\nformat, depending on whether the function is used in a string or\nnumeric context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_DATE(), UTC_DATE() + 0;\n        -> \'2003-08-14\', 20030814\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (433,37,'DIMENSION','Dimension(g)\n\nReturns the inherent dimension of the geometry value g. The result can\nbe -1, 0, 1, or 2. The meaning of these values is given in\nhttp://dev.mysql.com/doc/refman/5.5/en/gis-class-geometry.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html\n\n','mysql> SELECT Dimension(GeomFromText(\'LineString(1 1,2 2)\'));\n+------------------------------------------------+\n| Dimension(GeomFromText(\'LineString(1 1,2 2)\')) |\n+------------------------------------------------+\n|                                              1 |\n+------------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (434,16,'COUNT DISTINCT','Syntax:\nCOUNT(DISTINCT expr,[expr...])\n\nReturns a count of the number of rows with different non-NULL expr\nvalues.\n\nCOUNT(DISTINCT) returns 0 if there were no matching rows.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html\n\n','mysql> SELECT COUNT(DISTINCT results) FROM student;\n','http://dev.mysql.com/doc/refman/5.5/en/group-by-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (435,23,'BIT','BIT[(M)]\n\nA bit-field type. M indicates the number of bits per value, from 1 to\n64. The default is 1 if M is omitted.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (436,8,'XA','Syntax:\nXA {START|BEGIN} xid [JOIN|RESUME]\n\nXA END xid [SUSPEND [FOR MIGRATE]]\n\nXA PREPARE xid\n\nXA COMMIT xid [ONE PHASE]\n\nXA ROLLBACK xid\n\nXA RECOVER\n\nFor XA START, the JOIN and RESUME clauses are not supported.\n\nFor XA END the SUSPEND [FOR MIGRATE] clause is not supported.\n\nEach XA statement begins with the XA keyword, and most of them require\nan xid value. An xid is an XA transaction identifier. It indicates\nwhich transaction the statement applies to. xid values are supplied by\nthe client, or generated by the MySQL server. An xid value has from one\nto three parts:\n\nxid: gtrid [, bqual [, formatID ]]\n\ngtrid is a global transaction identifier, bqual is a branch qualifier,\nand formatID is a number that identifies the format used by the gtrid\nand bqual values. As indicated by the syntax, bqual and formatID are\noptional. The default bqual value is \'\' if not given. The default\nformatID value is 1 if not given.\n\ngtrid and bqual must be string literals, each up to 64 bytes (not\ncharacters) long. gtrid and bqual can be specified in several ways. You\ncan use a quoted string (\'ab\'), hex string (0x6162, X\'ab\'), or bit\nvalue (b\'nnnn\').\n\nformatID is an unsigned integer.\n\nThe gtrid and bqual values are interpreted in bytes by the MySQL\nserver\'s underlying XA support routines. However, while an SQL\nstatement containing an XA statement is being parsed, the server works\nwith some specific character set. To be safe, write gtrid and bqual as\nhex strings.\n\nxid values typically are generated by the Transaction Manager. Values\ngenerated by one TM must be different from values generated by other\nTMs. A given TM must be able to recognize its own xid values in a list\nof values returned by the XA RECOVER statement.\n\nFor XA START xid starts an XA transaction with the given xid value.\nEach XA transaction must have a unique xid value, so the value must not\ncurrently be used by another XA transaction. Uniqueness is assessed\nusing the gtrid and bqual values. All following XA statements for the\nXA transaction must be specified using the same xid value as that given\nin the XA START statement. If you use any of those statements but\nspecify an xid value that does not correspond to some existing XA\ntransaction, an error occurs.\n\nOne or more XA transactions can be part of the same global transaction.\nAll XA transactions within a given global transaction must use the same\ngtrid value in the xid value. For this reason, gtrid values must be\nglobally unique so that there is no ambiguity about which global\ntransaction a given XA transaction is part of. The bqual part of the\nxid value must be different for each XA transaction within a global\ntransaction. (The requirement that bqual values be different is a\nlimitation of the current MySQL XA implementation. It is not part of\nthe XA specification.)\n\nThe XA RECOVER statement returns information for those XA transactions\non the MySQL server that are in the PREPARED state. (See\nhttp://dev.mysql.com/doc/refman/5.5/en/xa-states.html.) The output\nincludes a row for each such XA transaction on the server, regardless\nof which client started it.\n\nXA RECOVER output rows look like this (for an example xid value\nconsisting of the parts \'abc\', \'def\', and 7):\n\nmysql> XA RECOVER;\n+----------+--------------+--------------+--------+\n| formatID | gtrid_length | bqual_length | data   |\n+----------+--------------+--------------+--------+\n|        7 |            3 |            3 | abcdef |\n+----------+--------------+--------------+--------+\n\nThe output columns have the following meanings:\n\no formatID is the formatID part of the transaction xid\n\no gtrid_length is the length in bytes of the gtrid part of the xid\n\no bqual_length is the length in bytes of the bqual part of the xid\n\no data is the concatenation of the gtrid and bqual parts of the xid\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/xa-statements.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/xa-statements.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (437,31,'EQUALS','Equals(g1,g2)\n\nReturns 1 or 0 to indicate whether g1 is spatially equal to g2.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/spatial-relation-functions-mbr.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (438,27,'SHOW CREATE VIEW','Syntax:\nSHOW CREATE VIEW view_name\n\nThis statement shows the CREATE VIEW statement that creates the named\nview.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-create-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-create-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (439,2,'CENTROID','Centroid(mpoly)\n\nReturns the mathematical centroid for the MultiPolygon value mpoly as a\nPoint. The result is not guaranteed to be on the MultiPolygon.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-multipolygon-property-functions.html\n\n','mysql> SET @poly =\n    -> GeomFromText(\'POLYGON((0 0,10 0,10 10,0 10,0 0),(5 5,7 5,7 7,5 7,5 5))\');\nmysql> SELECT GeometryType(@poly),AsText(Centroid(@poly));\n+---------------------+--------------------------------------------+\n| GeometryType(@poly) | AsText(Centroid(@poly))                    |\n+---------------------+--------------------------------------------+\n| POLYGON             | POINT(4.958333333333333 4.958333333333333) |\n+---------------------+--------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-multipolygon-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (440,20,'INTERVAL','Syntax:\nINTERVAL(N,N1,N2,N3,...)\n\nReturns 0 if N < N1, 1 if N < N2 and so on or -1 if N is NULL. All\narguments are treated as integers. It is required that N1 < N2 < N3 <\n... < Nn for this function to work correctly. This is because a binary\nsearch is used (very fast).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT INTERVAL(23, 1, 15, 17, 30, 44, 200);\n        -> 3\nmysql> SELECT INTERVAL(10, 1, 10, 100, 1000);\n        -> 2\nmysql> SELECT INTERVAL(22, 23, 30, 44, 200);\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (441,32,'FROM_DAYS','Syntax:\nFROM_DAYS(N)\n\nGiven a day number N, returns a DATE value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT FROM_DAYS(730669);\n        -> \'2007-07-03\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (442,40,'ALTER PROCEDURE','Syntax:\nALTER PROCEDURE proc_name [characteristic ...]\n\ncharacteristic:\n    COMMENT \'string\'\n  | LANGUAGE SQL\n  | { CONTAINS SQL | NO SQL | READS SQL DATA | MODIFIES SQL DATA }\n  | SQL SECURITY { DEFINER | INVOKER }\n\nThis statement can be used to change the characteristics of a stored\nprocedure. More than one change may be specified in an ALTER PROCEDURE\nstatement. However, you cannot change the parameters or body of a\nstored procedure using this statement; to make such changes, you must\ndrop and re-create the procedure using DROP PROCEDURE and CREATE\nPROCEDURE.\n\nYou must have the ALTER ROUTINE privilege for the procedure. By\ndefault, that privilege is granted automatically to the procedure\ncreator. This behavior can be changed by disabling the\nautomatic_sp_privileges system variable. See\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-routines-privileges.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-procedure.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-procedure.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (443,19,'BIT_COUNT','Syntax:\nBIT_COUNT(N)\n\nReturns the number of bits that are set in the argument N.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html\n\n','mysql> SELECT BIT_COUNT(29), BIT_COUNT(b\'101010\');\n        -> 4, 3\n','http://dev.mysql.com/doc/refman/5.5/en/bit-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (444,38,'OCTET_LENGTH','Syntax:\nOCTET_LENGTH(str)\n\nOCTET_LENGTH() is a synonym for LENGTH().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (445,32,'UTC_TIMESTAMP','Syntax:\nUTC_TIMESTAMP, UTC_TIMESTAMP()\n\nReturns the current UTC date and time as a value in \'YYYY-MM-DD\nHH:MM:SS\' or YYYYMMDDHHMMSS.uuuuuu format, depending on whether the\nfunction is used in a string or numeric context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT UTC_TIMESTAMP(), UTC_TIMESTAMP() + 0;\n        -> \'2003-08-14 18:08:04\', 20030814180804.000000\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (446,12,'AES_ENCRYPT','Syntax:\nAES_ENCRYPT(str,key_str)\n\nAES_ENCRYPT() and AES_DECRYPT() implement encryption and decryption of\ndata using the official AES (Advanced Encryption Standard) algorithm,\npreviously known as "Rijndael." The AES standard permits various key\nlengths. These functions implement AES with a 128-bit key length, but\nyou can extend them to 256 bits by modifying the source. The key length\nis a trade off between performance and security.\n\nAES_ENCRYPT() encrypts the string str using the key string key_str and\nreturns a binary string containing the encrypted output. AES_DECRYPT()\ndecrypts the encrypted string crypt_str using the key string key_str\nand returns the original plaintext string. If either function argument\nis NULL, the function returns NULL.\n\nThe str and crypt_str arguments can be any length, and padding is\nautomatically added to str so it is a multiple of a block as required\nby block-based algorithms such as AES. This padding is automatically\nremoved by the AES_DECRYPT() function. The length of crypt_str can be\ncalculated using this formula:\n\n16 * (trunc(string_length / 16) + 1)\n\nFor a key length of 128 bits, the most secure way to pass a key to the\nkey_str argument is to create a truly random 128-bit value and pass it\nas a binary value. For example:\n\nINSERT INTO t\nVALUES (1,AES_ENCRYPT(\'text\',UNHEX(\'F3229A0B371ED2D9441B830D21A390C3\')));\n\nA passphrase can be used to generate an AES key by hashing the\npassphrase. For example:\n\nINSERT INTO t VALUES (1,AES_ENCRYPT(\'text\', SHA2(\'My secret passphrase\',512)));\n\nDo not pass a password or passphrase directly to crypt_str, hash it\nfirst. Previous versions of this documentation suggested the former\napproach, but it is no longer recommended as the examples shown here\nare more secure.\n\nIf AES_DECRYPT() detects invalid data or incorrect padding, it returns\nNULL. However, it is possible for AES_DECRYPT() to return a non-NULL\nvalue (possibly garbage) if the input data or the key is invalid.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (447,3,'+','Syntax:\n+\n\nAddition:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html\n\n','mysql> SELECT 3+5;\n        -> 8\n','http://dev.mysql.com/doc/refman/5.5/en/arithmetic-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (448,14,'INET_NTOA','Syntax:\nINET_NTOA(expr)\n\nGiven a numeric IPv4 network address in network byte order, returns the\ndotted-quad representation of the address as a string. INET_NTOA()\nreturns NULL if it does not understand its argument.\n\nAs of MySQL 5.5.3, the return value is a nonbinary string in the\nconnection character set. Before 5.5.3, the return value is a binary\nstring.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html\n\n','mysql> SELECT INET_NTOA(167773449);\n        -> \'10.0.5.9\'\n','http://dev.mysql.com/doc/refman/5.5/en/miscellaneous-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (449,3,'ACOS','Syntax:\nACOS(X)\n\nReturns the arc cosine of X, that is, the value whose cosine is X.\nReturns NULL if X is not in the range -1 to 1.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ACOS(1);\n        -> 0\nmysql> SELECT ACOS(1.0001);\n        -> NULL\nmysql> SELECT ACOS(0);\n        -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (450,8,'ISOLATION','Syntax:\nSET [GLOBAL | SESSION] TRANSACTION ISOLATION LEVEL\n  {\n       REPEATABLE READ\n     | READ COMMITTED\n     | READ UNCOMMITTED\n     | SERIALIZABLE\n   }\n\nThis statement sets the transaction isolation level, used for\noperations on InnoDB tables.\n\nScope of the Isolation Level\n\nYou can set the isolation level globally, for the current session, or\nfor the next transaction:\n\no With the GLOBAL keyword, the statement sets the default transaction\n  level globally for all subsequent sessions. Existing sessions are\n  unaffected.\n\no With the SESSION keyword, the statement sets the default transaction\n  level for all subsequent transactions performed within the current\n  session.\n\no Without any SESSION or GLOBAL keyword, the statement sets the\n  isolation level for the next (not started) transaction performed\n  within the current session.\n\nA change to the global default isolation level requires the SUPER\nprivilege. Any session is free to change its session isolation level\n(even in the middle of a transaction), or the isolation level for its\nnext transaction.\n\nSET TRANSACTION ISOLATION LEVEL without GLOBAL or SESSION is not\npermitted while there is an active transaction:\n\nmysql> START TRANSACTION;\nQuery OK, 0 rows affected (0.02 sec)\n\nmysql> SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;\nERROR 1568 (25001): Transaction isolation level can\'t be changed\nwhile a transaction is in progress\n\nTo set the global default isolation level at server startup, use the\n--transaction-isolation=level option to mysqld on the command line or\nin an option file. Values of level for this option use dashes rather\nthan spaces, so the permissible values are READ-UNCOMMITTED,\nREAD-COMMITTED, REPEATABLE-READ, or SERIALIZABLE. For example, to set\nthe default isolation level to REPEATABLE READ, use these lines in the\n[mysqld] section of an option file:\n\n[mysqld]\ntransaction-isolation = REPEATABLE-READ\n\nIt is possible to check or set the global and session transaction\nisolation levels at runtime by using the tx_isolation system variable:\n\nSELECT @@GLOBAL.tx_isolation, @@tx_isolation;\nSET GLOBAL tx_isolation=\'REPEATABLE-READ\';\nSET SESSION tx_isolation=\'SERIALIZABLE\';\n\nDetails and Usage of Isolation Levels\n\nInnoDB supports each of the transaction isolation levels described here\nusing different locking strategies. You can enforce a high degree of\nconsistency with the default REPEATABLE READ level, for operations on\ncrucial data where ACID compliance is important. Or you can relax the\nconsistency rules with READ COMMITTED or even READ UNCOMMITTED, in\nsituations such as bulk reporting where precise consistency and\nrepeatable results are less important than minimizing the amount of\noverhead for locking. SERIALIZABLE enforces even stricter rules than\nREPEATABLE READ, and is used mainly in specialized situations, such as\nwith XA transactions and for troubleshooting issues with concurrency\nand deadlocks.\n\nFor full information about how these isolation levels work with InnoDB\ntransactions, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-transaction-model.html.\nIn particular, for additional information about InnoDB record-level\nlocks and how it uses them to execute various types of statements, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-record-level-locks.html\nand http://dev.mysql.com/doc/refman/5.5/en/innodb-locks-set.html.\n\nThe following list describes how MySQL supports the different\ntransaction levels. The list goes from the most commonly used level to\nthe least used.\n\no REPEATABLE READ\n\n  This is the default isolation level for InnoDB. For consistent reads,\n  there is an important difference from the READ COMMITTED isolation\n  level: All consistent reads within the same transaction read the\n  snapshot established by the first read. This convention means that if\n  you issue several plain (nonlocking) SELECT statements within the\n  same transaction, these SELECT statements are consistent also with\n  respect to each other. See\n  http://dev.mysql.com/doc/refman/5.5/en/innodb-consistent-read.html.\n\n  For locking reads (SELECT with FOR UPDATE or LOCK IN SHARE MODE),\n  UPDATE, and DELETE statements, locking depends on whether the\n  statement uses a unique index with a unique search condition, or a\n  range-type search condition. For a unique index with a unique search\n  condition, InnoDB locks only the index record found, not the gap\n  before it. For other search conditions, InnoDB locks the index range\n  scanned, using gap locks or next-key (gap plus index-record) locks to\n  block insertions by other sessions into the gaps covered by the\n  range.\n\no READ COMMITTED\n\n  A somewhat Oracle-like isolation level with respect to consistent\n  (nonlocking) reads: Each consistent read, even within the same\n  transaction, sets and reads its own fresh snapshot. See\n  http://dev.mysql.com/doc/refman/5.5/en/innodb-consistent-read.html.\n\n  For locking reads (SELECT with FOR UPDATE or LOCK IN SHARE MODE),\n  UPDATE statements, and DELETE statements, InnoDB locks only index\n  records, not the gaps before them, and thus permits the free\n  insertion of new records next to locked records.\n\n  *Note*: In MySQL 5.5, when READ COMMITTED isolation level is used or\n  the innodb_locks_unsafe_for_binlog system variable is enabled, there\n  is no InnoDB gap locking except for foreign-key constraint checking\n  and duplicate-key checking. Also, record locks for nonmatching rows\n  are released after MySQL has evaluated the WHERE condition. If you\n  use READ COMMITTED or enable innodb_locks_unsafe_for_binlog, you must\n  use row-based binary logging.\n\no READ UNCOMMITTED\n\n  SELECT statements are performed in a nonlocking fashion, but a\n  possible earlier version of a row might be used. Thus, using this\n  isolation level, such reads are not consistent. This is also called a\n  "dirty read." Otherwise, this isolation level works like READ\n  COMMITTED.\n\no SERIALIZABLE\n\n  This level is like REPEATABLE READ, but InnoDB implicitly converts\n  all plain SELECT statements to SELECT ... LOCK IN SHARE MODE if\n  autocommit is disabled. If autocommit is enabled, the SELECT is its\n  own transaction. It therefore is known to be read only and can be\n  serialized if performed as a consistent (nonlocking) read and need\n  not block for other transactions. (To force a plain SELECT to block\n  if other transactions have modified the selected rows, disable\n  autocommit.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-transaction.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-transaction.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (451,3,'CEILING','Syntax:\nCEILING(X)\n\nReturns the smallest integer value not less than X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT CEILING(1.23);\n        -> 2\nmysql> SELECT CEILING(-1.23);\n        -> -1\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (452,3,'SIN','Syntax:\nSIN(X)\n\nReturns the sine of X, where X is given in radians.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT SIN(PI());\n        -> 1.2246063538224e-16\nmysql> SELECT ROUND(SIN(PI()));\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (453,32,'DAYOFWEEK','Syntax:\nDAYOFWEEK(date)\n\nReturns the weekday index for date (1 = Sunday, 2 = Monday, ..., 7 =\nSaturday). These index values correspond to the ODBC standard.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYOFWEEK(\'2007-02-03\');\n        -> 7\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (454,27,'SHOW PROCESSLIST','Syntax:\nSHOW [FULL] PROCESSLIST\n\nSHOW PROCESSLIST shows you which threads are running. You can also get\nthis information from the INFORMATION_SCHEMA PROCESSLIST table or the\nmysqladmin processlist command. If you have the PROCESS privilege, you\ncan see all threads. Otherwise, you can see only your own threads (that\nis, threads associated with the MySQL account that you are using). If\nyou do not use the FULL keyword, only the first 100 characters of each\nstatement are shown in the Info field.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-processlist.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-processlist.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (455,33,'LINEFROMWKB','LineFromWKB(wkb[,srid]), LineStringFromWKB(wkb[,srid])\n\nConstructs a LineString value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (456,37,'GEOMETRYTYPE','GeometryType(g)\n\nReturns a binary string indicating the name of the geometry type of\nwhich the geometry instance g is a member. The name corresponds to one\nof the instantiable Geometry subclasses.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html\n\n','mysql> SELECT GeometryType(GeomFromText(\'POINT(1 1)\'));\n+------------------------------------------+\n| GeometryType(GeomFromText(\'POINT(1 1)\')) |\n+------------------------------------------+\n| POINT                                    |\n+------------------------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-general-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (457,40,'CREATE VIEW','Syntax:\nCREATE\n    [OR REPLACE]\n    [ALGORITHM = {UNDEFINED | MERGE | TEMPTABLE}]\n    [DEFINER = { user | CURRENT_USER }]\n    [SQL SECURITY { DEFINER | INVOKER }]\n    VIEW view_name [(column_list)]\n    AS select_statement\n    [WITH [CASCADED | LOCAL] CHECK OPTION]\n\nThe CREATE VIEW statement creates a new view, or replaces an existing\none if the OR REPLACE clause is given. If the view does not exist,\nCREATE OR REPLACE VIEW is the same as CREATE VIEW. If the view does\nexist, CREATE OR REPLACE VIEW is the same as ALTER VIEW.\n\nThe select_statement is a SELECT statement that provides the definition\nof the view. (When you select from the view, you select in effect using\nthe SELECT statement.) select_statement can select from base tables or\nother views.\n\nThe view definition is "frozen" at creation time, so changes to the\nunderlying tables afterward do not affect the view definition. For\nexample, if a view is defined as SELECT * on a table, new columns added\nto the table later do not become part of the view.\n\nThe ALGORITHM clause affects how MySQL processes the view. The DEFINER\nand SQL SECURITY clauses specify the security context to be used when\nchecking access privileges at view invocation time. The WITH CHECK\nOPTION clause can be given to constrain inserts or updates to rows in\ntables referenced by the view. These clauses are described later in\nthis section.\n\nThe CREATE VIEW statement requires the CREATE VIEW privilege for the\nview, and some privilege for each column selected by the SELECT\nstatement. For columns used elsewhere in the SELECT statement you must\nhave the SELECT privilege. If the OR REPLACE clause is present, you\nmust also have the DROP privilege for the view. CREATE VIEW might also\nrequire the SUPER privilege, depending on the DEFINER value, as\ndescribed later in this section.\n\nWhen a view is referenced, privilege checking occurs as described later\nin this section.\n\nA view belongs to a database. By default, a new view is created in the\ndefault database. To create the view explicitly in a given database,\nspecify the name as db_name.view_name when you create it:\n\nmysql> CREATE VIEW test.v AS SELECT * FROM t;\n\nWithin a database, base tables and views share the same namespace, so a\nbase table and a view cannot have the same name.\n\nColumns retrieved by the SELECT statement can be simple references to\ntable columns. They can also be expressions that use functions,\nconstant values, operators, and so forth.\n\nViews must have unique column names with no duplicates, just like base\ntables. By default, the names of the columns retrieved by the SELECT\nstatement are used for the view column names. To define explicit names\nfor the view columns, the optional column_list clause can be given as a\nlist of comma-separated identifiers. The number of names in column_list\nmust be the same as the number of columns retrieved by the SELECT\nstatement.\n\nUnqualified table or view names in the SELECT statement are interpreted\nwith respect to the default database. A view can refer to tables or\nviews in other databases by qualifying the table or view name with the\nproper database name.\n\nA view can be created from many kinds of SELECT statements. It can\nrefer to base tables or other views. It can use joins, UNION, and\nsubqueries. The SELECT need not even refer to any tables. The following\nexample defines a view that selects two columns from another table, as\nwell as an expression calculated from those columns:\n\nmysql> CREATE TABLE t (qty INT, price INT);\nmysql> INSERT INTO t VALUES(3, 50);\nmysql> CREATE VIEW v AS SELECT qty, price, qty*price AS value FROM t;\nmysql> SELECT * FROM v;\n+------+-------+-------+\n| qty  | price | value |\n+------+-------+-------+\n|    3 |    50 |   150 |\n+------+-------+-------+\n\nA view definition is subject to the following restrictions:\n\no The SELECT statement cannot contain a subquery in the FROM clause.\n\no The SELECT statement cannot refer to system or user variables.\n\no Within a stored program, the definition cannot refer to program\n  parameters or local variables.\n\no The SELECT statement cannot refer to prepared statement parameters.\n\no Any table or view referred to in the definition must exist. However,\n  after a view has been created, it is possible to drop a table or view\n  that the definition refers to. In this case, use of the view results\n  in an error. To check a view definition for problems of this kind,\n  use the CHECK TABLE statement.\n\no The definition cannot refer to a TEMPORARY table, and you cannot\n  create a TEMPORARY view.\n\no Any tables named in the view definition must exist at definition\n  time.\n\no You cannot associate a trigger with a view.\n\no Aliases for column names in the SELECT statement are checked against\n  the maximum column length of 64 characters (not the maximum alias\n  length of 256 characters).\n\nORDER BY is permitted in a view definition, but it is ignored if you\nselect from a view using a statement that has its own ORDER BY.\n\nFor other options or clauses in the definition, they are added to the\noptions or clauses of the statement that references the view, but the\neffect is undefined. For example, if a view definition includes a LIMIT\nclause, and you select from the view using a statement that has its own\nLIMIT clause, it is undefined which limit applies. This same principle\napplies to options such as ALL, DISTINCT, or SQL_SMALL_RESULT that\nfollow the SELECT keyword, and to clauses such as INTO, FOR UPDATE,\nLOCK IN SHARE MODE, and PROCEDURE.\n\nIf you create a view and then change the query processing environment\nby changing system variables, that may affect the results that you get\nfrom the view:\n\nmysql> CREATE VIEW v (mycol) AS SELECT \'abc\';\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SET sql_mode = \'\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| mycol |\n+-------+\n1 row in set (0.01 sec)\n\nmysql> SET sql_mode = \'ANSI_QUOTES\';\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SELECT "mycol" FROM v;\n+-------+\n| mycol |\n+-------+\n| abc   |\n+-------+\n1 row in set (0.00 sec)\n\nThe DEFINER and SQL SECURITY clauses determine which MySQL account to\nuse when checking access privileges for the view when a statement is\nexecuted that references the view. The valid SQL SECURITY\ncharacteristic values are DEFINER and INVOKER. These indicate that the\nrequired privileges must be held by the user who defined or invoked the\nview, respectively. The default SQL SECURITY value is DEFINER.\n\nIf a user value is given for the DEFINER clause, it should be a MySQL\naccount specified as \'user_name\'@\'host_name\' (the same format used in\nthe GRANT statement), CURRENT_USER, or CURRENT_USER(). The default\nDEFINER value is the user who executes the CREATE VIEW statement. This\nis the same as specifying DEFINER = CURRENT_USER explicitly.\n\nIf you specify the DEFINER clause, these rules determine the valid\nDEFINER user values:\n\no If you do not have the SUPER privilege, the only valid user value is\n  your own account, either specified literally or by using\n  CURRENT_USER. You cannot set the definer to some other account.\n\no If you have the SUPER privilege, you can specify any syntactically\n  valid account name. If the account does not actually exist, a warning\n  is generated.\n\no Although it is possible to create a view with a nonexistent DEFINER\n  account, an error occurs when the view is referenced if the SQL\n  SECURITY value is DEFINER but the definer account does not exist.\n\nFor more information about view security, see\nhttp://dev.mysql.com/doc/refman/5.5/en/stored-programs-security.html.\n\nWithin a view definition, CURRENT_USER returns the view\'s DEFINER value\nby default. For views defined with the SQL SECURITY INVOKER\ncharacteristic, CURRENT_USER returns the account for the view\'s\ninvoker. For information about user auditing within views, see\nhttp://dev.mysql.com/doc/refman/5.5/en/account-activity-auditing.html.\n\nWithin a stored routine that is defined with the SQL SECURITY DEFINER\ncharacteristic, CURRENT_USER returns the routine\'s DEFINER value. This\nalso affects a view defined within such a routine, if the view\ndefinition contains a DEFINER value of CURRENT_USER.\n\nView privileges are checked like this:\n\no At view definition time, the view creator must have the privileges\n  needed to use the top-level objects accessed by the view. For\n  example, if the view definition refers to table columns, the creator\n  must have some privilege for each column in the select list of the\n  definition, and the SELECT privilege for each column used elsewhere\n  in the definition. If the definition refers to a stored function,\n  only the privileges needed to invoke the function can be checked. The\n  privileges required at function invocation time can be checked only\n  as it executes: For different invocations, different execution paths\n  within the function might be taken.\n\no The user who references a view must have appropriate privileges to\n  access it (SELECT to select from it, INSERT to insert into it, and so\n  forth.)\n\no When a view has been referenced, privileges for objects accessed by\n  the view are checked against the privileges held by the view DEFINER\n  account or invoker, depending on whether the SQL SECURITY\n  characteristic is DEFINER or INVOKER, respectively.\n\no If reference to a view causes execution of a stored function,\n  privilege checking for statements executed within the function depend\n  on whether the function SQL SECURITY characteristic is DEFINER or\n  INVOKER. If the security characteristic is DEFINER, the function runs\n  with the privileges of the DEFINER account. If the characteristic is\n  INVOKER, the function runs with the privileges determined by the\n  view\'s SQL SECURITY characteristic.\n\nExample: A view might depend on a stored function, and that function\nmight invoke other stored routines. For example, the following view\ninvokes a stored function f():\n\nCREATE VIEW v AS SELECT * FROM t WHERE t.id = f(t.name);\n\nSuppose that f() contains a statement such as this:\n\nIF name IS NULL then\n  CALL p1();\nELSE\n  CALL p2();\nEND IF;\n\nThe privileges required for executing statements within f() need to be\nchecked when f() executes. This might mean that privileges are needed\nfor p1() or p2(), depending on the execution path within f(). Those\nprivileges must be checked at runtime, and the user who must possess\nthe privileges is determined by the SQL SECURITY values of the view v\nand the function f().\n\nThe DEFINER and SQL SECURITY clauses for views are extensions to\nstandard SQL. In standard SQL, views are handled using the rules for\nSQL SECURITY DEFINER. The standard says that the definer of the view,\nwhich is the same as the owner of the view\'s schema, gets applicable\nprivileges on the view (for example, SELECT) and may grant them. MySQL\nhas no concept of a schema "owner", so MySQL adds a clause to identify\nthe definer. The DEFINER clause is an extension where the intent is to\nhave what the standard has; that is, a permanent record of who defined\nthe view. This is why the default DEFINER value is the account of the\nview creator.\n\nThe optional ALGORITHM clause is a MySQL extension to standard SQL. It\naffects how MySQL processes the view. ALGORITHM takes three values:\nMERGE, TEMPTABLE, or UNDEFINED. The default algorithm is UNDEFINED if\nno ALGORITHM clause is present. For more information, see\nhttp://dev.mysql.com/doc/refman/5.5/en/view-algorithms.html.\n\nSome views are updatable. That is, you can use them in statements such\nas UPDATE, DELETE, or INSERT to update the contents of the underlying\ntable. For a view to be updatable, there must be a one-to-one\nrelationship between the rows in the view and the rows in the\nunderlying table. There are also certain other constructs that make a\nview nonupdatable.\n\nThe WITH CHECK OPTION clause can be given for an updatable view to\nprevent inserts or updates to rows except those for which the WHERE\nclause in the select_statement is true.\n\nIn a WITH CHECK OPTION clause for an updatable view, the LOCAL and\nCASCADED keywords determine the scope of check testing when the view is\ndefined in terms of another view. The LOCAL keyword restricts the CHECK\nOPTION only to the view being defined. CASCADED causes the checks for\nunderlying views to be evaluated as well. When neither keyword is\ngiven, the default is CASCADED.\n\nFor more information about updatable views and the WITH CHECK OPTION\nclause, see\nhttp://dev.mysql.com/doc/refman/5.5/en/view-updatability.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-view.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-view.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (458,38,'TRIM','Syntax:\nTRIM([{BOTH | LEADING | TRAILING} [remstr] FROM] str), TRIM([remstr\nFROM] str)\n\nReturns the string str with all remstr prefixes or suffixes removed. If\nnone of the specifiers BOTH, LEADING, or TRAILING is given, BOTH is\nassumed. remstr is optional and, if not specified, spaces are removed.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT TRIM(\'  bar   \');\n        -> \'bar\'\nmysql> SELECT TRIM(LEADING \'x\' FROM \'xxxbarxxx\');\n        -> \'barxxx\'\nmysql> SELECT TRIM(BOTH \'x\' FROM \'xxxbarxxx\');\n        -> \'bar\'\nmysql> SELECT TRIM(TRAILING \'xyz\' FROM \'barxxyz\');\n        -> \'barx\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (459,20,'IS','Syntax:\nIS boolean_value\n\nTests a value against a boolean value, where boolean_value can be TRUE,\nFALSE, or UNKNOWN.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 1 IS TRUE, 0 IS FALSE, NULL IS UNKNOWN;\n        -> 1, 1, 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (460,32,'GET_FORMAT','Syntax:\nGET_FORMAT({DATE|TIME|DATETIME}, {\'EUR\'|\'USA\'|\'JIS\'|\'ISO\'|\'INTERNAL\'})\n\nReturns a format string. This function is useful in combination with\nthe DATE_FORMAT() and the STR_TO_DATE() functions.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DATE_FORMAT(\'2003-10-03\',GET_FORMAT(DATE,\'EUR\'));\n        -> \'03.10.2003\'\nmysql> SELECT STR_TO_DATE(\'10.31.2003\',GET_FORMAT(DATE,\'USA\'));\n        -> \'2003-10-31\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (461,23,'TINYBLOB','TINYBLOB\n\nA BLOB column with a maximum length of 255 (28 - 1) bytes. Each\nTINYBLOB value is stored using a 1-byte length prefix that indicates\nthe number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (462,24,'SIGNAL','Syntax:\nSIGNAL condition_value\n    [SET signal_information_item\n    [, signal_information_item] ...]\n\ncondition_value:\n    SQLSTATE [VALUE] sqlstate_value\n  | condition_name\n\nsignal_information_item:\n    condition_information_item_name = simple_value_specification\n\ncondition_information_item_name:\n    CLASS_ORIGIN\n  | SUBCLASS_ORIGIN\n  | MESSAGE_TEXT\n  | MYSQL_ERRNO\n  | CONSTRAINT_CATALOG\n  | CONSTRAINT_SCHEMA\n  | CONSTRAINT_NAME\n  | CATALOG_NAME\n  | SCHEMA_NAME\n  | TABLE_NAME\n  | COLUMN_NAME\n  | CURSOR_NAME\n\ncondition_name, simple_value_specification:\n    (see following discussion)\n\nSIGNAL is the way to "return" an error. SIGNAL provides error\ninformation to a handler, to an outer portion of the application, or to\nthe client. Also, it provides control over the error\'s characteristics\n(error number, SQLSTATE value, message). Without SIGNAL, it is\nnecessary to resort to workarounds such as deliberately referring to a\nnonexistent table to cause a routine to return an error.\n\nNo special privileges are required to execute the SIGNAL statement.\n\nThe condition_value in a SIGNAL statement indicates the error value to\nbe returned. It can be an SQLSTATE value (a 5-character string literal)\nor a condition_name that refers to a named condition previously defined\nwith DECLARE ... CONDITION (see [HELP DECLARE CONDITION]).\n\nAn SQLSTATE value can indicate errors, warnings, or "not found." The\nfirst two characters of the value indicate its error class, as\ndiscussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/signal.html#signal-condition-inf\normation-items. Some signal values cause statement termination; see\nhttp://dev.mysql.com/doc/refman/5.5/en/signal.html#signal-effects.\n\nThe SQLSTATE value for a SIGNAL statement should not start with \'00\'\nbecause such values indicate success and are not valid for signaling an\nerror. This is true whether the SQLSTATE value is specified directly in\nthe SIGNAL statement or in a named condition referred to in the\nstatement. If the value is invalid, a Bad SQLSTATE error occurs.\n\nTo signal a generic SQLSTATE value, use \'45000\', which means "unhandled\nuser-defined exception."\n\nThe SIGNAL statement optionally includes a SET clause that contains\nmultiple signal items, in a comma-separated list of\ncondition_information_item_name = simple_value_specification\nassignments.\n\nEach condition_information_item_name may be specified only once in the\nSET clause. Otherwise, a Duplicate condition information item error\noccurs.\n\nValid simple_value_specification designators can be specified using\nstored procedure or function parameters, stored program local variables\ndeclared with DECLARE, user-defined variables, system variables, or\nliterals. A character literal may include a _charset introducer.\n\nFor information about permissible condition_information_item_name\nvalues, see\nhttp://dev.mysql.com/doc/refman/5.5/en/signal.html#signal-condition-inf\normation-items.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/signal.html\n\n','CREATE PROCEDURE p (pval INT)\nBEGIN\n  DECLARE specialty CONDITION FOR SQLSTATE \'45000\';\n  IF pval = 0 THEN\n    SIGNAL SQLSTATE \'01000\';\n  ELSEIF pval = 1 THEN\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSEIF pval = 2 THEN\n    SIGNAL specialty\n      SET MESSAGE_TEXT = \'An error occurred\';\n  ELSE\n    SIGNAL SQLSTATE \'01000\'\n      SET MESSAGE_TEXT = \'A warning occurred\', MYSQL_ERRNO = 1000;\n    SIGNAL SQLSTATE \'45000\'\n      SET MESSAGE_TEXT = \'An error occurred\', MYSQL_ERRNO = 1001;\n  END IF;\nEND;\n','http://dev.mysql.com/doc/refman/5.5/en/signal.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (463,8,'SAVEPOINT','Syntax:\nSAVEPOINT identifier\nROLLBACK [WORK] TO [SAVEPOINT] identifier\nRELEASE SAVEPOINT identifier\n\nInnoDB supports the SQL statements SAVEPOINT, ROLLBACK TO SAVEPOINT,\nRELEASE SAVEPOINT and the optional WORK keyword for ROLLBACK.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/savepoint.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/savepoint.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (464,17,'USER','Syntax:\nUSER()\n\nReturns the current MySQL user name and host name as a string in the\nutf8 character set.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT USER();\n        -> \'davida@localhost\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (465,24,'LABELS','Syntax:\n[begin_label:] BEGIN\n    [statement_list]\nEND [end_label]\n\n[begin_label:] LOOP\n    statement_list\nEND LOOP [end_label]\n\n[begin_label:] REPEAT\n    statement_list\nUNTIL search_condition\nEND REPEAT [end_label]\n\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nLabels are permitted for BEGIN ... END blocks and for the LOOP, REPEAT,\nand WHILE statements. Label use for those statements follows these\nrules:\n\no begin_label must be followed by a colon.\n\no begin_label can be given without end_label. If end_label is present,\n  it must be the same as begin_label.\n\no end_label cannot be given without begin_label.\n\no Labels at the same nesting level must be distinct.\n\no Labels can be up to 16 characters long.\n\nTo refer to a label within the labeled construct, use an ITERATE or\nLEAVE statement. The following example uses those statements to\ncontinue iterating or terminate the loop:\n\nCREATE PROCEDURE doiterate(p1 INT)\nBEGIN\n  label1: LOOP\n    SET p1 = p1 + 1;\n    IF p1 < 10 THEN ITERATE label1; END IF;\n    LEAVE label1;\n  END LOOP label1;\nEND;\n\nThe scope of a block label does not include the code for handlers\ndeclared within the block. For details, see [HELP DECLARE HANDLER].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/statement-labels.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/statement-labels.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (466,40,'ALTER TABLE','Syntax:\nALTER [ONLINE | OFFLINE] [IGNORE] TABLE tbl_name\n    [alter_specification [, alter_specification] ...]\n    [partition_options]\n\nalter_specification:\n    table_options\n  | ADD [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name ]\n  | ADD [COLUMN] (col_name column_definition,...)\n  | ADD {INDEX|KEY} [index_name]\n        [index_type] (index_col_name,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]] PRIMARY KEY\n        [index_type] (index_col_name,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]]\n        UNIQUE [INDEX|KEY] [index_name]\n        [index_type] (index_col_name,...) [index_option] ...\n  | ADD FULLTEXT [INDEX|KEY] [index_name]\n        (index_col_name,...) [index_option] ...\n  | ADD SPATIAL [INDEX|KEY] [index_name]\n        (index_col_name,...) [index_option] ...\n  | ADD [CONSTRAINT [symbol]]\n        FOREIGN KEY [index_name] (index_col_name,...)\n        reference_definition\n  | ALTER [COLUMN] col_name {SET DEFAULT literal | DROP DEFAULT}\n  | CHANGE [COLUMN] old_col_name new_col_name column_definition\n        [FIRST|AFTER col_name]\n  | MODIFY [COLUMN] col_name column_definition\n        [FIRST | AFTER col_name]\n  | DROP [COLUMN] col_name\n  | DROP PRIMARY KEY\n  | DROP {INDEX|KEY} index_name\n  | DROP FOREIGN KEY fk_symbol\n  | DISABLE KEYS\n  | ENABLE KEYS\n  | RENAME [TO|AS] new_tbl_name\n  | ORDER BY col_name [, col_name] ...\n  | CONVERT TO CHARACTER SET charset_name [COLLATE collation_name]\n  | [DEFAULT] CHARACTER SET [=] charset_name [COLLATE [=] collation_name]\n  | DISCARD TABLESPACE\n  | IMPORT TABLESPACE\n  | FORCE\n  | ADD PARTITION (partition_definition)\n  | DROP PARTITION partition_names\n  | TRUNCATE PARTITION {partition_names | ALL}\n  | COALESCE PARTITION number\n  | REORGANIZE PARTITION [partition_names INTO (partition_definitions)]\n  | ANALYZE PARTITION {partition_names | ALL}\n  | CHECK PARTITION {partition_names | ALL}\n  | OPTIMIZE PARTITION {partition_names | ALL}\n  | REBUILD PARTITION {partition_names | ALL}\n  | REPAIR PARTITION {partition_names | ALL}\n  | PARTITION BY partitioning_expression\n  | REMOVE PARTITIONING\n\nindex_col_name:\n    col_name [(length)] [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option:\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n\ntable_options:\n    table_option [[,] table_option] ...  (see CREATE TABLE options)\n\npartition_options:\n    (see CREATE TABLE options)\n\nALTER TABLE changes the structure of a table. For example, you can add\nor delete columns, create or destroy indexes, change the type of\nexisting columns, or rename columns or the table itself. You can also\nchange characteristics such as the storage engine used for the table or\nthe table comment.\n\nFollowing the table name, specify the alterations to be made. If none\nare given, ALTER TABLE does nothing.\n\nThe syntax for many of the permissible alterations is similar to\nclauses of the CREATE TABLE statement. See [HELP CREATE TABLE], for\nmore information.\n\ntable_options signifies table options of the kind that can be used in\nthe CREATE TABLE statement, such as ENGINE, AUTO_INCREMENT,\nAVG_ROW_LENGTH, MAX_ROWS, or ROW_FORMAT. For a list of all table\noptions and a description of each, see [HELP CREATE TABLE]. However,\nALTER TABLE ignores the DATA DIRECTORY and INDEX DIRECTORY table\noptions.\n\npartition_options signifies options that can be used with partitioned\ntables for repartitioning, for adding, dropping, merging, and splitting\npartitions, and for performing partitioning maintenance. It is possible\nfor an ALTER TABLE statement to contain a PARTITION BY or REMOVE\nPARTITIONING clause in an addition to other alter specifications, but\nthe PARTITION BY or REMOVE PARTITIONING clause must be specified last\nafter any other specifications. The ADD PARTITION, DROP PARTITION,\nCOALESCE PARTITION, REORGANIZE PARTITION, ANALYZE PARTITION, CHECK\nPARTITION, and REPAIR PARTITION options cannot be combined with other\nalter specifications in a single ALTER TABLE, since the options just\nlisted act on individual partitions. For a list of partition options\nand a description of each, see [HELP CREATE TABLE]. For additional\ninformation, see\nhttp://dev.mysql.com/doc/refman/5.5/en/alter-table-partition-operations\n.html.\n\nSome operations may result in warnings if attempted on a table for\nwhich the storage engine does not support the operation. These warnings\ncan be displayed with SHOW WARNINGS. See [HELP SHOW WARNINGS].\n\nFor information on troubleshooting ALTER TABLE, see\nhttp://dev.mysql.com/doc/refman/5.5/en/alter-table-problems.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (467,33,'MPOINTFROMWKB','MPointFromWKB(wkb[,srid]), MultiPointFromWKB(wkb[,srid])\n\nConstructs a MultiPoint value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (468,23,'CHAR BYTE','The CHAR BYTE data type is an alias for the BINARY data type. This is a\ncompatibility feature.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (469,21,'REPAIR TABLE','Syntax:\nREPAIR [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n    tbl_name [, tbl_name] ...\n    [QUICK] [EXTENDED] [USE_FRM]\n\nREPAIR TABLE repairs a possibly corrupted table. By default, it has the\nsame effect as myisamchk --recover tbl_name. REPAIR TABLE works for\nMyISAM, ARCHIVE, and CSV tables. See\nhttp://dev.mysql.com/doc/refman/5.5/en/myisam-storage-engine.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/archive-storage-engine.html, and\nhttp://dev.mysql.com/doc/refman/5.5/en/csv-storage-engine.html\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nREPAIR TABLE is supported for partitioned tables. However, the USE_FRM\noption cannot be used with this statement on a partitioned table.\n\nYou can use ALTER TABLE ... REPAIR PARTITION to repair one or more\npartitions; for more information, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/repair-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/repair-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (470,18,'MERGE','The MERGE storage engine, also known as the MRG_MyISAM engine, is a\ncollection of identical MyISAM tables that can be used as one.\n"Identical" means that all tables have identical column and index\ninformation. You cannot merge MyISAM tables in which the columns are\nlisted in a different order, do not have exactly the same columns, or\nhave the indexes in different order. However, any or all of the MyISAM\ntables can be compressed with myisampack. See\nhttp://dev.mysql.com/doc/refman/5.5/en/myisampack.html. Differences in\ntable options such as AVG_ROW_LENGTH, MAX_ROWS, or PACK_KEYS do not\nmatter.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/merge-storage-engine.html\n\n','mysql> CREATE TABLE t1 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> CREATE TABLE t2 (\n    ->    a INT NOT NULL AUTO_INCREMENT PRIMARY KEY,\n    ->    message CHAR(20)) ENGINE=MyISAM;\nmysql> INSERT INTO t1 (message) VALUES (\'Testing\'),(\'table\'),(\'t1\');\nmysql> INSERT INTO t2 (message) VALUES (\'Testing\'),(\'table\'),(\'t2\');\nmysql> CREATE TABLE total (\n    ->    a INT NOT NULL AUTO_INCREMENT,\n    ->    message CHAR(20), INDEX(a))\n    ->    ENGINE=MERGE UNION=(t1,t2) INSERT_METHOD=LAST;\n','http://dev.mysql.com/doc/refman/5.5/en/merge-storage-engine.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (471,40,'CREATE TABLE','Syntax:\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    (create_definition,...)\n    [table_options]\n    [partition_options]\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    [(create_definition,...)]\n    [table_options]\n    [partition_options]\n    select_statement\n\nCREATE [TEMPORARY] TABLE [IF NOT EXISTS] tbl_name\n    { LIKE old_tbl_name | (LIKE old_tbl_name) }\n\ncreate_definition:\n    col_name column_definition\n  | [CONSTRAINT [symbol]] PRIMARY KEY [index_type] (index_col_name,...)\n      [index_option] ...\n  | {INDEX|KEY} [index_name] [index_type] (index_col_name,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] UNIQUE [INDEX|KEY]\n      [index_name] [index_type] (index_col_name,...)\n      [index_option] ...\n  | {FULLTEXT|SPATIAL} [INDEX|KEY] [index_name] (index_col_name,...)\n      [index_option] ...\n  | [CONSTRAINT [symbol]] FOREIGN KEY\n      [index_name] (index_col_name,...) reference_definition\n  | CHECK (expr)\n\ncolumn_definition:\n    data_type [NOT NULL | NULL] [DEFAULT default_value]\n      [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]\n      [COMMENT \'string\']\n      [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]\n      [STORAGE {DISK|MEMORY|DEFAULT}]\n      [reference_definition]\n\ndata_type:\n    BIT[(length)]\n  | TINYINT[(length)] [UNSIGNED] [ZEROFILL]\n  | SMALLINT[(length)] [UNSIGNED] [ZEROFILL]\n  | MEDIUMINT[(length)] [UNSIGNED] [ZEROFILL]\n  | INT[(length)] [UNSIGNED] [ZEROFILL]\n  | INTEGER[(length)] [UNSIGNED] [ZEROFILL]\n  | BIGINT[(length)] [UNSIGNED] [ZEROFILL]\n  | REAL[(length,decimals)] [UNSIGNED] [ZEROFILL]\n  | DOUBLE[(length,decimals)] [UNSIGNED] [ZEROFILL]\n  | FLOAT[(length,decimals)] [UNSIGNED] [ZEROFILL]\n  | DECIMAL[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n  | NUMERIC[(length[,decimals])] [UNSIGNED] [ZEROFILL]\n  | DATE\n  | TIME\n  | TIMESTAMP\n  | DATETIME\n  | YEAR\n  | CHAR[(length)]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | VARCHAR(length)\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | BINARY[(length)]\n  | VARBINARY(length)\n  | TINYBLOB\n  | BLOB\n  | MEDIUMBLOB\n  | LONGBLOB\n  | TINYTEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | TEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | MEDIUMTEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | LONGTEXT [BINARY]\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | ENUM(value1,value2,value3,...)\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | SET(value1,value2,value3,...)\n      [CHARACTER SET charset_name] [COLLATE collation_name]\n  | spatial_type\n\nindex_col_name:\n    col_name [(length)] [ASC | DESC]\n\nindex_type:\n    USING {BTREE | HASH}\n\nindex_option:\n    KEY_BLOCK_SIZE [=] value\n  | index_type\n  | WITH PARSER parser_name\n  | COMMENT \'string\'\n\nreference_definition:\n    REFERENCES tbl_name (index_col_name,...)\n      [MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]\n      [ON DELETE reference_option]\n      [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION\n\ntable_options:\n    table_option [[,] table_option] ...\n\ntable_option:\n    ENGINE [=] engine_name\n  | AUTO_INCREMENT [=] value\n  | AVG_ROW_LENGTH [=] value\n  | [DEFAULT] CHARACTER SET [=] charset_name\n  | CHECKSUM [=] {0 | 1}\n  | [DEFAULT] COLLATE [=] collation_name\n  | COMMENT [=] \'string\'\n  | CONNECTION [=] \'connect_string\'\n  | DATA DIRECTORY [=] \'absolute path to directory\'\n  | DELAY_KEY_WRITE [=] {0 | 1}\n  | INDEX DIRECTORY [=] \'absolute path to directory\'\n  | INSERT_METHOD [=] { NO | FIRST | LAST }\n  | KEY_BLOCK_SIZE [=] value\n  | MAX_ROWS [=] value\n  | MIN_ROWS [=] value\n  | PACK_KEYS [=] {0 | 1 | DEFAULT}\n  | PASSWORD [=] \'string\'\n  | ROW_FORMAT [=] {DEFAULT|DYNAMIC|FIXED|COMPRESSED|REDUNDANT|COMPACT}\n  | TABLESPACE tablespace_name [STORAGE {DISK|MEMORY|DEFAULT}]\n  | UNION [=] (tbl_name[,tbl_name]...)\n\npartition_options:\n    PARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1|2}] (column_list)\n        | RANGE{(expr) | COLUMNS(column_list)}\n        | LIST{(expr) | COLUMNS(column_list)} }\n    [PARTITIONS num]\n    [SUBPARTITION BY\n        { [LINEAR] HASH(expr)\n        | [LINEAR] KEY [ALGORITHM={1|2}] (column_list) }\n      [SUBPARTITIONS num]\n    ]\n    [(partition_definition [, partition_definition] ...)]\n\npartition_definition:\n    PARTITION partition_name\n        [VALUES \n            {LESS THAN {(expr | value_list) | MAXVALUE} \n            | \n            IN (value_list)}]\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'comment_text\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n        [NODEGROUP [=] node_group_id]\n        [(subpartition_definition [, subpartition_definition] ...)]\n\nsubpartition_definition:\n    SUBPARTITION logical_name\n        [[STORAGE] ENGINE [=] engine_name]\n        [COMMENT [=] \'comment_text\' ]\n        [DATA DIRECTORY [=] \'data_dir\']\n        [INDEX DIRECTORY [=] \'index_dir\']\n        [MAX_ROWS [=] max_number_of_rows]\n        [MIN_ROWS [=] min_number_of_rows]\n        [TABLESPACE [=] tablespace_name]\n        [NODEGROUP [=] node_group_id]\n\nselect_statement:\n    [IGNORE | REPLACE] [AS] SELECT ...   (Some valid select statement)\n\nCREATE TABLE creates a table with the given name. You must have the\nCREATE privilege for the table.\n\nRules for permissible table names are given in\nhttp://dev.mysql.com/doc/refman/5.5/en/identifiers.html. By default,\nthe table is created in the default database, using the InnoDB storage\nengine. An error occurs if the table exists, if there is no default\ndatabase, or if the database does not exist.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/create-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (472,20,'>','Syntax:\n>\n\nGreater than:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT 2 > 2;\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (473,21,'ANALYZE TABLE','Syntax:\nANALYZE [NO_WRITE_TO_BINLOG | LOCAL] TABLE\n    tbl_name [, tbl_name] ...\n\nANALYZE TABLE analyzes and stores the key distribution for a table.\nDuring the analysis, the table is locked with a read lock for InnoDB\nand MyISAM. This statement works with InnoDB, NDB, and MyISAM tables.\nFor MyISAM tables, this statement is equivalent to using myisamchk\n--analyze.\n\nFor more information on how the analysis works within InnoDB, see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-statistics-estimation.htm\nl. Also see\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-analyze-table-complexity.\nhtml and\nhttp://dev.mysql.com/doc/refman/5.5/en/innodb-restrictions.html.\n\nMySQL uses the stored key distribution to decide the order in which\ntables should be joined when you perform a join on something other than\na constant. In addition, key distributions can be used when deciding\nwhich indexes to use for a specific table within a query.\n\nThis statement requires SELECT and INSERT privileges for the table.\n\nANALYZE TABLE is supported for partitioned tables, and you can use\nALTER TABLE ... ANALYZE PARTITION to analyze one or more partitions;\nfor more information, see [HELP ALTER TABLE], and\nhttp://dev.mysql.com/doc/refman/5.5/en/partitioning-maintenance.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/analyze-table.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/analyze-table.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (474,32,'MICROSECOND','Syntax:\nMICROSECOND(expr)\n\nReturns the microseconds from the time or datetime expression expr as a\nnumber in the range from 0 to 999999.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MICROSECOND(\'12:00:00.123456\');\n        -> 123456\nmysql> SELECT MICROSECOND(\'2009-12-31 23:59:59.000010\');\n        -> 10\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (475,40,'CONSTRAINT','MySQL supports foreign keys, which let you cross-reference related data\nacross tables, and foreign key constraints, which help keep this\nspread-out data consistent. The essential syntax for a foreign key\nconstraint definition in a CREATE TABLE or ALTER TABLE statement looks\nlike this:\n\n[CONSTRAINT [symbol]] FOREIGN KEY\n    [index_name] (index_col_name, ...)\n    REFERENCES tbl_name (index_col_name,...)\n    [ON DELETE reference_option]\n    [ON UPDATE reference_option]\n\nreference_option:\n    RESTRICT | CASCADE | SET NULL | NO ACTION\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-table-foreign-keys.html\n\n','CREATE TABLE product (\n    category INT NOT NULL, id INT NOT NULL,\n    price DECIMAL,\n    PRIMARY KEY(category, id)\n)   ENGINE=INNODB;\n\nCREATE TABLE customer (\n    id INT NOT NULL,\n    PRIMARY KEY (id)\n)   ENGINE=INNODB;\n\nCREATE TABLE product_order (\n    no INT NOT NULL AUTO_INCREMENT,\n    product_category INT NOT NULL,\n    product_id INT NOT NULL,\n    customer_id INT NOT NULL,\n\n    PRIMARY KEY(no),\n    INDEX (product_category, product_id),\n    INDEX (customer_id),\n\n    FOREIGN KEY (product_category, product_id)\n      REFERENCES product(category, id)\n      ON UPDATE CASCADE ON DELETE RESTRICT,\n\n    FOREIGN KEY (customer_id)\n      REFERENCES customer(id)\n)   ENGINE=INNODB;\n','http://dev.mysql.com/doc/refman/5.5/en/create-table-foreign-keys.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (476,40,'CREATE SERVER','Syntax:\nCREATE SERVER server_name\n    FOREIGN DATA WRAPPER wrapper_name\n    OPTIONS (option [, option] ...)\n\noption:\n  { HOST character-literal\n  | DATABASE character-literal\n  | USER character-literal\n  | PASSWORD character-literal\n  | SOCKET character-literal\n  | OWNER character-literal\n  | PORT numeric-literal }\n\nThis statement creates the definition of a server for use with the\nFEDERATED storage engine. The CREATE SERVER statement creates a new row\nin the servers table in the mysql database. This statement requires the\nSUPER privilege.\n\nThe server_name should be a unique reference to the server. Server\ndefinitions are global within the scope of the server, it is not\npossible to qualify the server definition to a specific database.\nserver_name has a maximum length of 64 characters (names longer than 64\ncharacters are silently truncated), and is case insensitive. You may\nspecify the name as a quoted string.\n\nThe wrapper_name should be mysql, and may be quoted with single\nquotation marks. Other values for wrapper_name are not currently\nsupported.\n\nFor each option you must specify either a character literal or numeric\nliteral. Character literals are UTF-8, support a maximum length of 64\ncharacters and default to a blank (empty) string. String literals are\nsilently truncated to 64 characters. Numeric literals must be a number\nbetween 0 and 9999, default value is 0.\n\n*Note*: The OWNER option is currently not applied, and has no effect on\nthe ownership or operation of the server connection that is created.\n\nThe CREATE SERVER statement creates an entry in the mysql.servers table\nthat can later be used with the CREATE TABLE statement when creating a\nFEDERATED table. The options that you specify will be used to populate\nthe columns in the mysql.servers table. The table columns are\nServer_name, Host, Db, Username, Password, Port and Socket.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/create-server.html\n\n','CREATE SERVER s\nFOREIGN DATA WRAPPER mysql\nOPTIONS (USER \'Remote\', HOST \'192.168.1.106\', DATABASE \'test\');\n','http://dev.mysql.com/doc/refman/5.5/en/create-server.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (477,38,'FIELD','Syntax:\nFIELD(str,str1,str2,str3,...)\n\nReturns the index (position) of str in the str1, str2, str3, ... list.\nReturns 0 if str is not found.\n\nIf all arguments to FIELD() are strings, all arguments are compared as\nstrings. If all arguments are numbers, they are compared as numbers.\nOtherwise, the arguments are compared as double.\n\nIf str is NULL, the return value is 0 because NULL fails equality\ncomparison with any value. FIELD() is the complement of ELT().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT FIELD(\'ej\', \'Hej\', \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> 2\nmysql> SELECT FIELD(\'fo\', \'Hej\', \'ej\', \'Heja\', \'hej\', \'foo\');\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (478,32,'MAKETIME','Syntax:\nMAKETIME(hour,minute,second)\n\nReturns a time value calculated from the hour, minute, and second\narguments.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT MAKETIME(12,15,30);\n        -> \'12:15:30\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (479,32,'CURDATE','Syntax:\nCURDATE()\n\nReturns the current date as a value in \'YYYY-MM-DD\' or YYYYMMDD format,\ndepending on whether the function is used in a string or numeric\ncontext.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT CURDATE();\n        -> \'2008-06-13\'\nmysql> SELECT CURDATE() + 0;\n        -> 20080613\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (480,10,'SET PASSWORD','Syntax:\nSET PASSWORD [FOR user] =\n    {\n        PASSWORD(\'cleartext password\')\n      | OLD_PASSWORD(\'cleartext password\')\n      | \'encrypted password\'\n    }\n\nThe SET PASSWORD statement assigns a password to a MySQL user account:\n\no With no FOR user clause, this statement sets the password for the\n  current user:\n\nSET PASSWORD = PASSWORD(\'cleartext password\');\n\n  Any client who connects to the server using a nonanonymous account\n  can change the password for that account. To see which account the\n  server authenticated you for, invoke the CURRENT_USER() function:\n\nSELECT CURRENT_USER();\n\no With a FOR user clause, this statement sets the password for the\n  named account, which must exist:\n\nSET PASSWORD FOR \'jeffrey\'@\'localhost\' = PASSWORD(\'cleartext password\');\n\n  In this case, you must have the UPDATE privilege for the mysql\n  database.\n\nWhen the read_only system variable is enabled, SET PASSWORD requires\nthe SUPER privilege, in addition to any other required privileges.\n\nIf a FOR user clause is given, the account name uses the format\ndescribed in http://dev.mysql.com/doc/refman/5.5/en/account-names.html.\nThe user value should be given as \'user_name\'@\'host_name\', where\n\'user_name\' and \'host_name\' are exactly as listed in the User and Host\ncolumns of the account\'s mysql.user table row. (If you specify only a\nuser name, a host name of \'%\' is used.) For example, to set the\npassword for an account with User and Host column values of \'bob\' and\n\'%.example.org\', write the statement like this:\n\nSET PASSWORD FOR \'bob\'@\'%.example.org\' = PASSWORD(\'cleartext password\');\n\nThe password can be specified in these ways:\n\no Using the PASSWORD() function\n\n  The function argument is the cleartext (unencrypted) password.\n  PASSWORD() hashes the password and returns the encrypted password\n  string.\n\n  The old_passwords system variable value determines the hashing method\n  used by PASSWORD(). It should be set to a value compatible with the\n  hash format required by the account authentication plugin. For\n  example, if the account uses the mysql_native_password authentication\n  plugin, old_passwords should be 0 for PASSWORD() to produce a hash\n  value in the correct format. For mysql_old_password, old_passwords\n  should be 1.\n\no Using the OLD_PASSWORD() function:\n\n  The function argument is the cleartext (unencrypted) password.\n  OLD_PASSWORD() hashes the password using pre-4.1 hashing and returns\n  the encrypted password string. This hashing method is appropriate\n  only for accounts that use the mysql_old_password authentication\n  plugin.\n\no Using an already encrypted password string\n\n  The password is specified as a string literal. It must represent the\n  already encrypted password value, in the hash format required by the\n  authentication method used for the account.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-password.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-password.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (481,40,'ALTER TABLESPACE','Syntax:\nALTER TABLESPACE tablespace_name\n    {ADD|DROP} DATAFILE \'file_name\'\n    [INITIAL_SIZE [=] size]\n    [WAIT]\n    ENGINE [=] engine_name\n\nThis statement can be used either to add a new data file, or to drop a\ndata file from a tablespace.\n\nThe ADD DATAFILE variant enables you to specify an initial size using\nan INITIAL_SIZE clause, where size is measured in bytes; the default\nvalue is 134217728 (128 MB). Prior to MySQL Cluster NDB 7.2.14, this\nvalue was required to be specified using digits (Bug #13116514, Bug\n#16104705, Bug #62858); in MySQL Cluster NDB 7.2.14 and later, you may\noptionally follow size with a one-letter abbreviation for an order of\nmagnitude, similar to those used in my.cnf. Generally, this is one of\nthe letters M (megabytes) or G (gigabytes).\n\n*Note*: All MySQL Cluster Disk Data objects share the same namespace.\nThis means that each Disk Data object must be uniquely named (and not\nmerely each Disk Data object of a given type). For example, you cannot\nhave a tablespace and an data file with the same name, or an undo log\nfile and a tablespace with the same name.\n\nOn 32-bit systems, the maximum supported value for INITIAL_SIZE is\n4294967296 (4 GB). (Bug #29186)\n\nINITIAL_SIZE is rounded, explicitly, as for CREATE TABLESPACE.\n\nOnce a data file has been created, its size cannot be changed; however,\nyou can add more data files to the tablespace using additional ALTER\nTABLESPACE ... ADD DATAFILE statements.\n\nUsing DROP DATAFILE with ALTER TABLESPACE drops the data file\n\'file_name\' from the tablespace. You cannot drop a data file from a\ntablespace which is in use by any table; in other words, the data file\nmust be empty (no extents used). See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data-objects.\nhtml. In addition, any data file to be dropped must previously have\nbeen added to the tablespace with CREATE TABLESPACE or ALTER\nTABLESPACE.\n\nBoth ALTER TABLESPACE ... ADD DATAFILE and ALTER TABLESPACE ... DROP\nDATAFILE require an ENGINE clause which specifies the storage engine\nused by the tablespace. Currently, the only accepted values for\nengine_name are NDB and NDBCLUSTER.\n\nWAIT is parsed but otherwise ignored, and so has no effect in MySQL\n5.5. It is intended for future expansion.\n\nWhen ALTER TABLESPACE ... ADD DATAFILE is used with ENGINE = NDB, a\ndata file is created on each Cluster data node. You can verify that the\ndata files were created and obtain information about them by querying\nthe INFORMATION_SCHEMA.FILES table. For example, the following query\nshows all data files belonging to the tablespace named newts:\n\nmysql> SELECT LOGFILE_GROUP_NAME, FILE_NAME, EXTRA\n    -> FROM INFORMATION_SCHEMA.FILES\n    -> WHERE TABLESPACE_NAME = \'newts\' AND FILE_TYPE = \'DATAFILE\';\n+--------------------+--------------+----------------+\n| LOGFILE_GROUP_NAME | FILE_NAME    | EXTRA          |\n+--------------------+--------------+----------------+\n| lg_3               | newdata.dat  | CLUSTER_NODE=3 |\n| lg_3               | newdata.dat  | CLUSTER_NODE=4 |\n| lg_3               | newdata2.dat | CLUSTER_NODE=3 |\n| lg_3               | newdata2.dat | CLUSTER_NODE=4 |\n+--------------------+--------------+----------------+\n2 rows in set (0.03 sec)\n\nSee http://dev.mysql.com/doc/refman/5.5/en/files-table.html.\n\nALTER TABLESPACE is useful only with Disk Data storage for MySQL\nCluster. See\nhttp://dev.mysql.com/doc/refman/5.5/en/mysql-cluster-disk-data.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/alter-tablespace.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/alter-tablespace.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (482,17,'DATABASE','Syntax:\nDATABASE()\n\nReturns the default (current) database name as a string in the utf8\ncharacter set. If there is no default database, DATABASE() returns\nNULL. Within a stored routine, the default database is the database\nthat the routine is associated with, which is not necessarily the same\nas the database that is the default in the calling context.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT DATABASE();\n        -> \'test\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (483,6,'IF FUNCTION','Syntax:\nIF(expr1,expr2,expr3)\n\nIf expr1 is TRUE (expr1 <> 0 and expr1 <> NULL) then IF() returns\nexpr2; otherwise it returns expr3. IF() returns a numeric or string\nvalue, depending on the context in which it is used.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html\n\n','mysql> SELECT IF(1>2,2,3);\n        -> 3\nmysql> SELECT IF(1<2,\'yes\',\'no\');\n        -> \'yes\'\nmysql> SELECT IF(STRCMP(\'test\',\'test1\'),\'no\',\'yes\');\n        -> \'no\'\n','http://dev.mysql.com/doc/refman/5.5/en/control-flow-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (484,23,'ENUM','ENUM(\'value1\',\'value2\',...) [CHARACTER SET charset_name] [COLLATE\ncollation_name]\n\nAn enumeration. A string object that can have only one value, chosen\nfrom the list of values \'value1\', \'value2\', ..., NULL or the special \'\'\nerror value. ENUM values are represented internally as integers.\n\nAn ENUM column can have a maximum of 65,535 distinct elements. (The\npractical limit is less than 3000.) A table can have no more than 255\nunique element list definitions among its ENUM and SET columns\nconsidered as a group. For more information on these limits, see\nhttp://dev.mysql.com/doc/refman/5.5/en/limits-frm-file.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (485,33,'POINTFROMWKB','PointFromWKB(wkb[,srid])\n\nConstructs a Point value using its WKB representation and SRID.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/gis-wkb-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (486,3,'POWER','Syntax:\nPOWER(X,Y)\n\nThis is a synonym for POW().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (487,3,'ATAN','Syntax:\nATAN(X)\n\nReturns the arc tangent of X, that is, the value whose tangent is X.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT ATAN(2);\n        -> 1.1071487177941\nmysql> SELECT ATAN(-2);\n        -> -1.1071487177941\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (488,38,'STRCMP','Syntax:\nSTRCMP(expr1,expr2)\n\nSTRCMP() returns 0 if the strings are the same, -1 if the first\nargument is smaller than the second according to the current sort\norder, and 1 otherwise.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html\n\n','mysql> SELECT STRCMP(\'text\', \'text2\');\n        -> -1\nmysql> SELECT STRCMP(\'text2\', \'text\');\n        -> 1\nmysql> SELECT STRCMP(\'text\', \'text\');\n        -> 0\n','http://dev.mysql.com/doc/refman/5.5/en/string-comparison-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (489,28,'INSERT DELAYED','Syntax:\nINSERT DELAYED ...\n\nThe DELAYED option for the INSERT statement is a MySQL extension to\nstandard SQL that is very useful if you have clients that cannot or\nneed not wait for the INSERT to complete. This is a common situation\nwhen you use MySQL for logging and you also periodically run SELECT and\nUPDATE statements that take a long time to complete.\n\nWhen a client uses INSERT DELAYED, it gets an okay from the server at\nonce, and the row is queued to be inserted when the table is not in use\nby any other thread.\n\nAnother major benefit of using INSERT DELAYED is that inserts from many\nclients are bundled together and written in one block. This is much\nfaster than performing many separate inserts.\n\nNote that INSERT DELAYED is slower than a normal INSERT if the table is\nnot otherwise in use. There is also the additional overhead for the\nserver to handle a separate thread for each table for which there are\ndelayed rows. This means that you should use INSERT DELAYED only when\nyou are really sure that you need it.\n\nThe queued rows are held only in memory until they are inserted into\nthe table. This means that if you terminate mysqld forcibly (for\nexample, with kill -9) or if mysqld dies unexpectedly, any queued rows\nthat have not been written to disk are lost.\n\nThere are some constraints on the use of DELAYED:\n\no INSERT DELAYED works only with MyISAM, MEMORY, ARCHIVE, and BLACKHOLE\n  tables. For engines that do not support DELAYED, an error occurs.\n\no An error occurs for INSERT DELAYED if used with a table that has been\n  locked with LOCK TABLES because the insert must be handled by a\n  separate thread, not by the session that holds the lock.\n\no For MyISAM tables, if there are no free blocks in the middle of the\n  data file, concurrent SELECT and INSERT statements are supported.\n  Under these circumstances, you very seldom need to use INSERT DELAYED\n  with MyISAM.\n\no INSERT DELAYED should be used only for INSERT statements that specify\n  value lists. The server ignores DELAYED for INSERT ... SELECT or\n  INSERT ... ON DUPLICATE KEY UPDATE statements.\n\no Because the INSERT DELAYED statement returns immediately, before the\n  rows are inserted, you cannot use LAST_INSERT_ID() to get the\n  AUTO_INCREMENT value that the statement might generate.\n\no DELAYED rows are not visible to SELECT statements until they actually\n  have been inserted.\n\no Prior to MySQL 5.5.7, INSERT DELAYED was treated as a normal INSERT\n  if the statement inserted multiple rows, binary logging was enabled,\n  and the global logging format was statement-based (that is, whenever\n  binlog_format was set to STATEMENT). Beginning with MySQL 5.5.7,\n  INSERT DELAYED is always handled as a simple INSERT (that is, without\n  the DELAYED option) whenever the value of binlog_format is STATEMENT\n  or MIXED. (In the latter case, the statement no longer triggers a\n  switch to row-based logging, and so is logged using the\n  statement-based format.)\n\n  This does not apply when using row-based binary logging mode\n  (binlog_format set to ROW), in which INSERT DELAYED statements are\n  always executed using the DELAYED option as specified, and logged as\n  row-update events.\n\no DELAYED is ignored on slave replication servers, so that INSERT\n  DELAYED is treated as a normal INSERT on slaves. This is because\n  DELAYED could cause the slave to have different data than the master.\n\no Pending INSERT DELAYED statements are lost if a table is write locked\n  and ALTER TABLE is used to modify the table structure.\n\no INSERT DELAYED is not supported for views.\n\no INSERT DELAYED is not supported for partitioned tables.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/insert-delayed.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/insert-delayed.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (490,27,'SHOW PROFILE','Syntax:\nSHOW PROFILE [type [, type] ... ]\n    [FOR QUERY n]\n    [LIMIT row_count [OFFSET offset]]\n\ntype:\n    ALL\n  | BLOCK IO\n  | CONTEXT SWITCHES\n  | CPU\n  | IPC\n  | MEMORY\n  | PAGE FAULTS\n  | SOURCE\n  | SWAPS\n\nThe SHOW PROFILE and SHOW PROFILES statements display profiling\ninformation that indicates resource usage for statements executed\nduring the course of the current session.\n\nProfiling is controlled by the profiling session variable, which has a\ndefault value of 0 (OFF). Profiling is enabled by setting profiling to\n1 or ON:\n\nmysql> SET profiling = 1;\n\nSHOW PROFILES displays a list of the most recent statements sent to the\nserver. The size of the list is controlled by the\nprofiling_history_size session variable, which has a default value of\n15. The maximum value is 100. Setting the value to 0 has the practical\neffect of disabling profiling.\n\nAll statements are profiled except SHOW PROFILE and SHOW PROFILES, so\nyou will find neither of those statements in the profile list.\nMalformed statements are profiled. For example, SHOW PROFILING is an\nillegal statement, and a syntax error occurs if you try to execute it,\nbut it will show up in the profiling list.\n\nSHOW PROFILE displays detailed information about a single statement.\nWithout the FOR QUERY n clause, the output pertains to the most\nrecently executed statement. If FOR QUERY n is included, SHOW PROFILE\ndisplays information for statement n. The values of n correspond to the\nQuery_ID values displayed by SHOW PROFILES.\n\nThe LIMIT row_count clause may be given to limit the output to\nrow_count rows. If LIMIT is given, OFFSET offset may be added to begin\nthe output offset rows into the full set of rows.\n\nBy default, SHOW PROFILE displays Status and Duration columns. The\nStatus values are like the State values displayed by SHOW PROCESSLIST,\nalthough there might be some minor differences in interpretion for the\ntwo statements for some status values (see\nhttp://dev.mysql.com/doc/refman/5.5/en/thread-information.html).\n\nOptional type values may be specified to display specific additional\ntypes of information:\n\no ALL displays all information\n\no BLOCK IO displays counts for block input and output operations\n\no CONTEXT SWITCHES displays counts for voluntary and involuntary\n  context switches\n\no CPU displays user and system CPU usage times\n\no IPC displays counts for messages sent and received\n\no MEMORY is not currently implemented\n\no PAGE FAULTS displays counts for major and minor page faults\n\no SOURCE displays the names of functions from the source code, together\n  with the name and line number of the file in which the function\n  occurs\n\no SWAPS displays swap counts\n\nProfiling is enabled per session. When a session ends, its profiling\ninformation is lost.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-profile.html\n\n','mysql> SELECT @@profiling;\n+-------------+\n| @@profiling |\n+-------------+\n|           0 |\n+-------------+\n1 row in set (0.00 sec)\n\nmysql> SET profiling = 1;\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> DROP TABLE IF EXISTS t1;\nQuery OK, 0 rows affected, 1 warning (0.00 sec)\n\nmysql> CREATE TABLE T1 (id INT);\nQuery OK, 0 rows affected (0.01 sec)\n\nmysql> SHOW PROFILES;\n+----------+----------+--------------------------+\n| Query_ID | Duration | Query                    |\n+----------+----------+--------------------------+\n|        0 | 0.000088 | SET PROFILING = 1        |\n|        1 | 0.000136 | DROP TABLE IF EXISTS t1  |\n|        2 | 0.011947 | CREATE TABLE t1 (id INT) |\n+----------+----------+--------------------------+\n3 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE;\n+----------------------+----------+\n| Status               | Duration |\n+----------------------+----------+\n| checking permissions | 0.000040 |\n| creating table       | 0.000056 |\n| After create         | 0.011363 |\n| query end            | 0.000375 |\n| freeing items        | 0.000089 |\n| logging slow query   | 0.000019 |\n| cleaning up          | 0.000005 |\n+----------------------+----------+\n7 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE FOR QUERY 1;\n+--------------------+----------+\n| Status             | Duration |\n+--------------------+----------+\n| query end          | 0.000107 |\n| freeing items      | 0.000008 |\n| logging slow query | 0.000015 |\n| cleaning up        | 0.000006 |\n+--------------------+----------+\n4 rows in set (0.00 sec)\n\nmysql> SHOW PROFILE CPU FOR QUERY 2;\n+----------------------+----------+----------+------------+\n| Status               | Duration | CPU_user | CPU_system |\n+----------------------+----------+----------+------------+\n| checking permissions | 0.000040 | 0.000038 |   0.000002 |\n| creating table       | 0.000056 | 0.000028 |   0.000028 |\n| After create         | 0.011363 | 0.000217 |   0.001571 |\n| query end            | 0.000375 | 0.000013 |   0.000028 |\n| freeing items        | 0.000089 | 0.000010 |   0.000014 |\n| logging slow query   | 0.000019 | 0.000009 |   0.000010 |\n| cleaning up          | 0.000005 | 0.000003 |   0.000002 |\n+----------------------+----------+----------+------------+\n7 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/show-profile.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (491,27,'SHOW PROCEDURE CODE','Syntax:\nSHOW PROCEDURE CODE proc_name\n\nThis statement is a MySQL extension that is available only for servers\nthat have been built with debugging support. It displays a\nrepresentation of the internal implementation of the named stored\nprocedure. A similar statement, SHOW FUNCTION CODE, displays\ninformation about stored functions (see [HELP SHOW FUNCTION CODE]).\n\nTo use either statement, you must be the owner of the routine or have\nSELECT access to the mysql.proc table.\n\nIf the named routine is available, each statement produces a result\nset. Each row in the result set corresponds to one "instruction" in the\nroutine. The first column is Pos, which is an ordinal number beginning\nwith 0. The second column is Instruction, which contains an SQL\nstatement (usually changed from the original source), or a directive\nwhich has meaning only to the stored-routine handler.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-procedure-code.html\n\n','mysql> DELIMITER //\nmysql> CREATE PROCEDURE p1 ()\n    -> BEGIN\n    ->   DECLARE fanta INT DEFAULT 55;\n    ->   DROP TABLE t2;\n    ->   LOOP\n    ->     INSERT INTO t3 VALUES (fanta);\n    ->     END LOOP;\n    ->   END//\nQuery OK, 0 rows affected (0.00 sec)\n\nmysql> SHOW PROCEDURE CODE p1//\n+-----+----------------------------------------+\n| Pos | Instruction                            |\n+-----+----------------------------------------+\n|   0 | set fanta@0 55                         |\n|   1 | stmt 9 "DROP TABLE t2"                 |\n|   2 | stmt 5 "INSERT INTO t3 VALUES (fanta)" |\n|   3 | jump 2                                 |\n+-----+----------------------------------------+\n4 rows in set (0.00 sec)\n','http://dev.mysql.com/doc/refman/5.5/en/show-procedure-code.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (492,23,'MEDIUMTEXT','MEDIUMTEXT [CHARACTER SET charset_name] [COLLATE collation_name]\n\nA TEXT column with a maximum length of 16,777,215 (224 - 1) characters.\nThe effective maximum length is less if the value contains multibyte\ncharacters. Each MEDIUMTEXT value is stored using a 3-byte length\nprefix that indicates the number of bytes in the value.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/string-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (493,3,'LN','Syntax:\nLN(X)\n\nReturns the natural logarithm of X; that is, the base-e logarithm of X.\nIf X is less than or equal to 0, then NULL is returned.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LN(2);\n        -> 0.69314718055995\nmysql> SELECT LN(-2);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (494,24,'RETURN','Syntax:\nRETURN expr\n\nThe RETURN statement terminates execution of a stored function and\nreturns the value expr to the function caller. There must be at least\none RETURN statement in a stored function. There may be more than one\nif the function has multiple exit points.\n\nThis statement is not used in stored procedures, triggers, or events.\nThe LEAVE statement can be used to exit a stored program of those\ntypes.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/return.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/return.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (495,27,'SHOW COLLATION','Syntax:\nSHOW COLLATION\n    [LIKE \'pattern\' | WHERE expr]\n\nThis statement lists collations supported by the server. By default,\nthe output from SHOW COLLATION includes all available collations. The\nLIKE clause, if present, indicates which collation names to match. The\nWHERE clause can be given to select rows using more general conditions,\nas discussed in\nhttp://dev.mysql.com/doc/refman/5.5/en/extended-show.html. For example:\n\nmysql> SHOW COLLATION LIKE \'latin1%\';\n+-------------------+---------+----+---------+----------+---------+\n| Collation         | Charset | Id | Default | Compiled | Sortlen |\n+-------------------+---------+----+---------+----------+---------+\n| latin1_german1_ci | latin1  |  5 |         |          |       0 |\n| latin1_swedish_ci | latin1  |  8 | Yes     | Yes      |       0 |\n| latin1_danish_ci  | latin1  | 15 |         |          |       0 |\n| latin1_german2_ci | latin1  | 31 |         | Yes      |       2 |\n| latin1_bin        | latin1  | 47 |         | Yes      |       0 |\n| latin1_general_ci | latin1  | 48 |         |          |       0 |\n| latin1_general_cs | latin1  | 49 |         |          |       0 |\n| latin1_spanish_ci | latin1  | 94 |         |          |       0 |\n+-------------------+---------+----+---------+----------+---------+\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/show-collation.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/show-collation.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (496,3,'LOG','Syntax:\nLOG(X), LOG(B,X)\n\nIf called with one parameter, this function returns the natural\nlogarithm of X. If X is less than or equal to 0, then NULL is returned.\n\nThe inverse of this function (when called with a single argument) is\nthe EXP() function.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT LOG(2);\n        -> 0.69314718055995\nmysql> SELECT LOG(-2);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (497,8,'SET SQL_LOG_BIN','Syntax:\nSET sql_log_bin = {0|1}\n\nThe sql_log_bin variable controls whether logging to the binary log is\ndone. The default value is 1 (do logging). To change logging for the\ncurrent session, change the session value of this variable. The session\nuser must have the SUPER privilege to set this variable. Set this\nvariable to 0 for a session to temporarily disable binary logging while\nmaking changes to the master which you do not want to replicate to the\nslave.\n\nAs of MySQL 5.5, sql_log_bin can be set as a global or session\nvariable. Setting sql_log_bin globally is only detected when a new\nsession is started. Any sessions previously running are not impacted\nwhen setting sql_log_bin globally.\n\n*Warning*: Incorrect use of sql_log_bin with a global scope means any\nchanges made in an already running session are still being recorded to\nthe binary log and therefore replicated. Exercise extreme caution using\nsql_log_bin with a global scope as the above situation could cause\nunexpected results including replication failure.\n\nBeginning with MySQL 5.5.5, it is no longer possible to set\n@@session.sql_log_bin within a transaction or subquery. (Bug #53437)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/set-sql-log-bin.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/set-sql-log-bin.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (498,20,'!=','Syntax:\n<>, !=\n\nNot equal:\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT \'.01\' <> \'0.01\';\n        -> 1\nmysql> SELECT .01 <> \'0.01\';\n        -> 0\nmysql> SELECT \'zapp\' <> \'zappp\';\n        -> 1\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (499,24,'WHILE','Syntax:\n[begin_label:] WHILE search_condition DO\n    statement_list\nEND WHILE [end_label]\n\nThe statement list within a WHILE statement is repeated as long as the\nsearch_condition expression is true. statement_list consists of one or\nmore SQL statements, each terminated by a semicolon (;) statement\ndelimiter.\n\nA WHILE statement can be labeled. For the rules regarding label use,\nsee [HELP labels].\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/while.html\n\n','CREATE PROCEDURE dowhile()\nBEGIN\n  DECLARE v1 INT DEFAULT 5;\n\n  WHILE v1 > 0 DO\n    ...\n    SET v1 = v1 - 1;\n  END WHILE;\nEND;\n','http://dev.mysql.com/doc/refman/5.5/en/while.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (500,12,'AES_DECRYPT','Syntax:\nAES_DECRYPT(crypt_str,key_str)\n\nThis function decrypts data using the official AES (Advanced Encryption\nStandard) algorithm. For more information, see the description of\nAES_ENCRYPT().\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/encryption-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (501,32,'DAYNAME','Syntax:\nDAYNAME(date)\n\nReturns the name of the weekday for date. The language used for the\nname is controlled by the value of the lc_time_names system variable\n(http://dev.mysql.com/doc/refman/5.5/en/locale-support.html).\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html\n\n','mysql> SELECT DAYNAME(\'2007-02-03\');\n        -> \'Saturday\'\n','http://dev.mysql.com/doc/refman/5.5/en/date-and-time-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (502,17,'COERCIBILITY','Syntax:\nCOERCIBILITY(str)\n\nReturns the collation coercibility value of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT COERCIBILITY(\'abc\' COLLATE latin1_swedish_ci);\n        -> 0\nmysql> SELECT COERCIBILITY(USER());\n        -> 3\nmysql> SELECT COERCIBILITY(\'abc\');\n        -> 4\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (503,23,'INT','INT[(M)] [UNSIGNED] [ZEROFILL]\n\nA normal-size integer. The signed range is -2147483648 to 2147483647.\nThe unsigned range is 0 to 4294967295.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html\n\n','','http://dev.mysql.com/doc/refman/5.5/en/numeric-type-overview.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (504,13,'GLENGTH','GLength(ls)\n\nReturns a double-precision number indicating the length of the\nLineString value ls in its associated spatial reference.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html\n\n','mysql> SET @ls = \'LineString(1 1,2 2,3 3)\';\nmysql> SELECT GLength(GeomFromText(@ls));\n+----------------------------+\n| GLength(GeomFromText(@ls)) |\n+----------------------------+\n|            2.8284271247462 |\n+----------------------------+\n','http://dev.mysql.com/doc/refman/5.5/en/gis-linestring-property-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (505,17,'COLLATION','Syntax:\nCOLLATION(str)\n\nReturns the collation of the string argument.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT COLLATION(\'abc\');\n        -> \'latin1_swedish_ci\'\nmysql> SELECT COLLATION(_utf8\'abc\');\n        -> \'utf8_general_ci\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (506,3,'RADIANS','Syntax:\nRADIANS(X)\n\nReturns the argument X, converted from degrees to radians. (Note that\nπ radians equals 180 degrees.)\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html\n\n','mysql> SELECT RADIANS(90);\n        -> 1.5707963267949\n','http://dev.mysql.com/doc/refman/5.5/en/mathematical-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (507,20,'COALESCE','Syntax:\nCOALESCE(value,...)\n\nReturns the first non-NULL value in the list, or NULL if there are no\nnon-NULL values.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html\n\n','mysql> SELECT COALESCE(NULL,1);\n        -> 1\nmysql> SELECT COALESCE(NULL,NULL,NULL);\n        -> NULL\n','http://dev.mysql.com/doc/refman/5.5/en/comparison-operators.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (508,17,'VERSION','Syntax:\nVERSION()\n\nReturns a string that indicates the MySQL server version. The string\nuses the utf8 character set. The value might have a suffix in addition\nto the version number. See the description of the version system\nvariable in\nhttp://dev.mysql.com/doc/refman/5.5/en/server-system-variables.html.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/information-functions.html\n\n','mysql> SELECT VERSION();\n        -> \'5.5.44-standard\'\n','http://dev.mysql.com/doc/refman/5.5/en/information-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (509,38,'MAKE_SET','Syntax:\nMAKE_SET(bits,str1,str2,...)\n\nReturns a set value (a string containing substrings separated by ","\ncharacters) consisting of the strings that have the corresponding bit\nin bits set. str1 corresponds to bit 0, str2 to bit 1, and so on. NULL\nvalues in str1, str2, ... are not appended to the result.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT MAKE_SET(1,\'a\',\'b\',\'c\');\n        -> \'a\'\nmysql> SELECT MAKE_SET(1 | 4,\'hello\',\'nice\',\'world\');\n        -> \'hello,world\'\nmysql> SELECT MAKE_SET(1 | 4,\'hello\',\'nice\',NULL,\'world\');\n        -> \'hello\'\nmysql> SELECT MAKE_SET(0,\'a\',\'b\',\'c\');\n        -> \'\'\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
+INSERT INTO help_topic (help_topic_id,help_category_id,name,description,example,url) VALUES (510,38,'FIND_IN_SET','Syntax:\nFIND_IN_SET(str,strlist)\n\nReturns a value in the range of 1 to N if the string str is in the\nstring list strlist consisting of N substrings. A string list is a\nstring composed of substrings separated by "," characters. If the first\nargument is a constant string and the second is a column of type SET,\nthe FIND_IN_SET() function is optimized to use bit arithmetic. Returns\n0 if str is not in strlist or if strlist is the empty string. Returns\nNULL if either argument is NULL. This function does not work properly\nif the first argument contains a comma (",") character.\n\nURL: http://dev.mysql.com/doc/refman/5.5/en/string-functions.html\n\n','mysql> SELECT FIND_IN_SET(\'b\',\'a,b,c,d\');\n        -> 2\n','http://dev.mysql.com/doc/refman/5.5/en/string-functions.html');
 
-insert into help_relation (help_topic_id,help_keyword_id) values (1,0);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,0);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,1);
-insert into help_relation (help_topic_id,help_keyword_id) values (235,2);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,3);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,4);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,4);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,4);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,5);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,6);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,6);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,7);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,8);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,9);
-insert into help_relation (help_topic_id,help_keyword_id) values (432,10);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,11);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,12);
-insert into help_relation (help_topic_id,help_keyword_id) values (21,12);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,12);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,12);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,12);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,13);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,13);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,14);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,15);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,16);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,16);
-insert into help_relation (help_topic_id,help_keyword_id) values (18,17);
-insert into help_relation (help_topic_id,help_keyword_id) values (136,17);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,17);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,17);
-insert into help_relation (help_topic_id,help_keyword_id) values (503,18);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,18);
-insert into help_relation (help_topic_id,help_keyword_id) values (382,19);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,20);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,20);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,20);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,20);
-insert into help_relation (help_topic_id,help_keyword_id) values (246,20);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,21);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,22);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (35,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (240,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (303,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (9,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (417,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (418,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (31,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (89,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (266,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (188,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (407,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (233,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (333,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,23);
-insert into help_relation (help_topic_id,help_keyword_id) values (110,24);
-insert into help_relation (help_topic_id,help_keyword_id) values (426,25);
-insert into help_relation (help_topic_id,help_keyword_id) values (124,25);
-insert into help_relation (help_topic_id,help_keyword_id) values (172,25);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,26);
-insert into help_relation (help_topic_id,help_keyword_id) values (84,27);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,28);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,29);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,30);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,31);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,31);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,32);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,33);
-insert into help_relation (help_topic_id,help_keyword_id) values (36,34);
-insert into help_relation (help_topic_id,help_keyword_id) values (240,34);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,34);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,35);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,35);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,36);
-insert into help_relation (help_topic_id,help_keyword_id) values (419,37);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,37);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,37);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,38);
-insert into help_relation (help_topic_id,help_keyword_id) values (21,38);
-insert into help_relation (help_topic_id,help_keyword_id) values (297,38);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,38);
-insert into help_relation (help_topic_id,help_keyword_id) values (454,38);
-insert into help_relation (help_topic_id,help_keyword_id) values (503,39);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (79,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (363,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,40);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,41);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,41);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,42);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,43);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,43);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,44);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,44);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,44);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,44);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,45);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,46);
-insert into help_relation (help_topic_id,help_keyword_id) values (317,47);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,47);
-insert into help_relation (help_topic_id,help_keyword_id) values (363,48);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,49);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,49);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,50);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,51);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,51);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,51);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,52);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,52);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,52);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,52);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,53);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,53);
-insert into help_relation (help_topic_id,help_keyword_id) values (178,54);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,54);
-insert into help_relation (help_topic_id,help_keyword_id) values (53,55);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,55);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,56);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,57);
-insert into help_relation (help_topic_id,help_keyword_id) values (57,57);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,57);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,58);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,58);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,59);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,59);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,59);
-insert into help_relation (help_topic_id,help_keyword_id) values (195,60);
-insert into help_relation (help_topic_id,help_keyword_id) values (252,60);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,60);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,61);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,61);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,62);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,62);
-insert into help_relation (help_topic_id,help_keyword_id) values (303,62);
-insert into help_relation (help_topic_id,help_keyword_id) values (360,62);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,63);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,64);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,65);
-insert into help_relation (help_topic_id,help_keyword_id) values (68,66);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,67);
-insert into help_relation (help_topic_id,help_keyword_id) values (419,67);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,67);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,68);
-insert into help_relation (help_topic_id,help_keyword_id) values (89,69);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,69);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,69);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,70);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,71);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,72);
-insert into help_relation (help_topic_id,help_keyword_id) values (93,73);
-insert into help_relation (help_topic_id,help_keyword_id) values (485,73);
-insert into help_relation (help_topic_id,help_keyword_id) values (387,74);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,75);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,76);
-insert into help_relation (help_topic_id,help_keyword_id) values (40,77);
-insert into help_relation (help_topic_id,help_keyword_id) values (272,77);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,77);
-insert into help_relation (help_topic_id,help_keyword_id) values (272,78);
-insert into help_relation (help_topic_id,help_keyword_id) values (463,78);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,78);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,79);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,79);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,80);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,80);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,81);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,82);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,82);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,82);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,82);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,83);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,83);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,84);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,84);
-insert into help_relation (help_topic_id,help_keyword_id) values (307,85);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,85);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,85);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,85);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,86);
-insert into help_relation (help_topic_id,help_keyword_id) values (260,87);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,88);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,89);
-insert into help_relation (help_topic_id,help_keyword_id) values (131,90);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,91);
-insert into help_relation (help_topic_id,help_keyword_id) values (463,91);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,91);
-insert into help_relation (help_topic_id,help_keyword_id) values (17,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (418,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (442,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (331,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (191,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (305,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (491,92);
-insert into help_relation (help_topic_id,help_keyword_id) values (190,93);
-insert into help_relation (help_topic_id,help_keyword_id) values (101,93);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,94);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,94);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,95);
-insert into help_relation (help_topic_id,help_keyword_id) values (403,96);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,96);
-insert into help_relation (help_topic_id,help_keyword_id) values (71,97);
-insert into help_relation (help_topic_id,help_keyword_id) values (435,97);
-insert into help_relation (help_topic_id,help_keyword_id) values (332,97);
-insert into help_relation (help_topic_id,help_keyword_id) values (288,98);
-insert into help_relation (help_topic_id,help_keyword_id) values (87,99);
-insert into help_relation (help_topic_id,help_keyword_id) values (59,99);
-insert into help_relation (help_topic_id,help_keyword_id) values (29,99);
-insert into help_relation (help_topic_id,help_keyword_id) values (197,100);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,100);
-insert into help_relation (help_topic_id,help_keyword_id) values (489,100);
-insert into help_relation (help_topic_id,help_keyword_id) values (304,100);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,101);
-insert into help_relation (help_topic_id,help_keyword_id) values (285,101);
-insert into help_relation (help_topic_id,help_keyword_id) values (316,102);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,102);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,103);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,104);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (31,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (303,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (188,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (9,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,105);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,106);
-insert into help_relation (help_topic_id,help_keyword_id) values (367,106);
-insert into help_relation (help_topic_id,help_keyword_id) values (111,107);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,108);
-insert into help_relation (help_topic_id,help_keyword_id) values (463,108);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,108);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,109);
-insert into help_relation (help_topic_id,help_keyword_id) values (24,109);
-insert into help_relation (help_topic_id,help_keyword_id) values (115,110);
-insert into help_relation (help_topic_id,help_keyword_id) values (176,110);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (202,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (246,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,111);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,112);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,113);
-insert into help_relation (help_topic_id,help_keyword_id) values (329,113);
-insert into help_relation (help_topic_id,help_keyword_id) values (117,113);
-insert into help_relation (help_topic_id,help_keyword_id) values (473,113);
-insert into help_relation (help_topic_id,help_keyword_id) values (117,114);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,114);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,115);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,115);
-insert into help_relation (help_topic_id,help_keyword_id) values (39,116);
-insert into help_relation (help_topic_id,help_keyword_id) values (121,116);
-insert into help_relation (help_topic_id,help_keyword_id) values (267,116);
-insert into help_relation (help_topic_id,help_keyword_id) values (153,116);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,117);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,117);
-insert into help_relation (help_topic_id,help_keyword_id) values (421,118);
-insert into help_relation (help_topic_id,help_keyword_id) values (126,119);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,120);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,120);
-insert into help_relation (help_topic_id,help_keyword_id) values (127,120);
-insert into help_relation (help_topic_id,help_keyword_id) values (499,120);
-insert into help_relation (help_topic_id,help_keyword_id) values (223,121);
-insert into help_relation (help_topic_id,help_keyword_id) values (335,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (131,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (497,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (184,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (480,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,122);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,123);
-insert into help_relation (help_topic_id,help_keyword_id) values (265,124);
-insert into help_relation (help_topic_id,help_keyword_id) values (134,124);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,124);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,124);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (338,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (367,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (225,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (60,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (331,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (139,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (217,125);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,126);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,126);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,126);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,127);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,127);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,127);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,127);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,127);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,128);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,129);
-insert into help_relation (help_topic_id,help_keyword_id) values (426,130);
-insert into help_relation (help_topic_id,help_keyword_id) values (54,131);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,132);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,133);
-insert into help_relation (help_topic_id,help_keyword_id) values (317,134);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,135);
-insert into help_relation (help_topic_id,help_keyword_id) values (458,136);
-insert into help_relation (help_topic_id,help_keyword_id) values (258,137);
-insert into help_relation (help_topic_id,help_keyword_id) values (288,138);
-insert into help_relation (help_topic_id,help_keyword_id) values (252,139);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,139);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,140);
-insert into help_relation (help_topic_id,help_keyword_id) values (87,141);
-insert into help_relation (help_topic_id,help_keyword_id) values (59,141);
-insert into help_relation (help_topic_id,help_keyword_id) values (240,142);
-insert into help_relation (help_topic_id,help_keyword_id) values (54,143);
-insert into help_relation (help_topic_id,help_keyword_id) values (327,143);
-insert into help_relation (help_topic_id,help_keyword_id) values (87,144);
-insert into help_relation (help_topic_id,help_keyword_id) values (59,144);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,145);
-insert into help_relation (help_topic_id,help_keyword_id) values (316,146);
-insert into help_relation (help_topic_id,help_keyword_id) values (426,147);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,147);
-insert into help_relation (help_topic_id,help_keyword_id) values (458,147);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,147);
-insert into help_relation (help_topic_id,help_keyword_id) values (124,147);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,147);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,148);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,148);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,148);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,148);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,149);
-insert into help_relation (help_topic_id,help_keyword_id) values (29,150);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,151);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,152);
-insert into help_relation (help_topic_id,help_keyword_id) values (211,153);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,154);
-insert into help_relation (help_topic_id,help_keyword_id) values (316,154);
-insert into help_relation (help_topic_id,help_keyword_id) values (182,154);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,154);
-insert into help_relation (help_topic_id,help_keyword_id) values (422,154);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,155);
-insert into help_relation (help_topic_id,help_keyword_id) values (332,155);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,156);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,157);
-insert into help_relation (help_topic_id,help_keyword_id) values (182,158);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,159);
-insert into help_relation (help_topic_id,help_keyword_id) values (70,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (338,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (35,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (305,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (418,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (395,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (213,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (407,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (236,160);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,161);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,162);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,162);
-insert into help_relation (help_topic_id,help_keyword_id) values (255,163);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,164);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,165);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,165);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,166);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,166);
-insert into help_relation (help_topic_id,help_keyword_id) values (62,166);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,166);
-insert into help_relation (help_topic_id,help_keyword_id) values (178,167);
-insert into help_relation (help_topic_id,help_keyword_id) values (170,168);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,169);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,169);
-insert into help_relation (help_topic_id,help_keyword_id) values (417,169);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,169);
-insert into help_relation (help_topic_id,help_keyword_id) values (457,170);
-insert into help_relation (help_topic_id,help_keyword_id) values (31,170);
-insert into help_relation (help_topic_id,help_keyword_id) values (161,170);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,171);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,172);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,172);
-insert into help_relation (help_topic_id,help_keyword_id) values (192,173);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,174);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,174);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,174);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,174);
-insert into help_relation (help_topic_id,help_keyword_id) values (363,174);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,175);
-insert into help_relation (help_topic_id,help_keyword_id) values (88,175);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,175);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,176);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,176);
-insert into help_relation (help_topic_id,help_keyword_id) values (255,177);
-insert into help_relation (help_topic_id,help_keyword_id) values (252,178);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,178);
-insert into help_relation (help_topic_id,help_keyword_id) values (317,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (503,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (211,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (24,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (170,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (130,179);
-insert into help_relation (help_topic_id,help_keyword_id) values (158,180);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,180);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,180);
-insert into help_relation (help_topic_id,help_keyword_id) values (413,181);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,182);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,183);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,183);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,183);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,183);
-insert into help_relation (help_topic_id,help_keyword_id) values (307,184);
-insert into help_relation (help_topic_id,help_keyword_id) values (103,184);
-insert into help_relation (help_topic_id,help_keyword_id) values (153,184);
-insert into help_relation (help_topic_id,help_keyword_id) values (147,185);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,185);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,186);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,186);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,187);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,187);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,188);
-insert into help_relation (help_topic_id,help_keyword_id) values (162,188);
-insert into help_relation (help_topic_id,help_keyword_id) values (458,189);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,190);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,190);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,191);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,191);
-insert into help_relation (help_topic_id,help_keyword_id) values (316,192);
-insert into help_relation (help_topic_id,help_keyword_id) values (182,192);
-insert into help_relation (help_topic_id,help_keyword_id) values (422,192);
-insert into help_relation (help_topic_id,help_keyword_id) values (202,192);
-insert into help_relation (help_topic_id,help_keyword_id) values (307,193);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,193);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,194);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,195);
-insert into help_relation (help_topic_id,help_keyword_id) values (379,195);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,196);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,197);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,197);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,197);
-insert into help_relation (help_topic_id,help_keyword_id) values (397,198);
-insert into help_relation (help_topic_id,help_keyword_id) values (468,199);
-insert into help_relation (help_topic_id,help_keyword_id) values (131,200);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,200);
-insert into help_relation (help_topic_id,help_keyword_id) values (184,200);
-insert into help_relation (help_topic_id,help_keyword_id) values (351,200);
-insert into help_relation (help_topic_id,help_keyword_id) values (139,200);
-insert into help_relation (help_topic_id,help_keyword_id) values (455,201);
-insert into help_relation (help_topic_id,help_keyword_id) values (87,202);
-insert into help_relation (help_topic_id,help_keyword_id) values (59,202);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,203);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,204);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,204);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,204);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,205);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,206);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,207);
-insert into help_relation (help_topic_id,help_keyword_id) values (252,208);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,209);
-insert into help_relation (help_topic_id,help_keyword_id) values (194,209);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,210);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,211);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,211);
-insert into help_relation (help_topic_id,help_keyword_id) values (223,212);
-insert into help_relation (help_topic_id,help_keyword_id) values (258,213);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,214);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,214);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,214);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,214);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,214);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,215);
-insert into help_relation (help_topic_id,help_keyword_id) values (263,216);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,217);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,217);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,218);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,218);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,218);
-insert into help_relation (help_topic_id,help_keyword_id) values (294,219);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,220);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,221);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,222);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,223);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,224);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,224);
-insert into help_relation (help_topic_id,help_keyword_id) values (312,224);
-insert into help_relation (help_topic_id,help_keyword_id) values (188,224);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,224);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,225);
-insert into help_relation (help_topic_id,help_keyword_id) values (280,226);
-insert into help_relation (help_topic_id,help_keyword_id) values (282,227);
-insert into help_relation (help_topic_id,help_keyword_id) values (467,228);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (307,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (89,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (103,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (62,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (311,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,229);
-insert into help_relation (help_topic_id,help_keyword_id) values (427,230);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,231);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,231);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,232);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,233);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,234);
-insert into help_relation (help_topic_id,help_keyword_id) values (258,234);
-insert into help_relation (help_topic_id,help_keyword_id) values (275,235);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,236);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,237);
-insert into help_relation (help_topic_id,help_keyword_id) values (7,237);
-insert into help_relation (help_topic_id,help_keyword_id) values (260,238);
-insert into help_relation (help_topic_id,help_keyword_id) values (432,238);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,239);
-insert into help_relation (help_topic_id,help_keyword_id) values (49,239);
-insert into help_relation (help_topic_id,help_keyword_id) values (228,239);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,239);
-insert into help_relation (help_topic_id,help_keyword_id) values (233,239);
-insert into help_relation (help_topic_id,help_keyword_id) values (429,240);
-insert into help_relation (help_topic_id,help_keyword_id) values (89,241);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,241);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,241);
-insert into help_relation (help_topic_id,help_keyword_id) values (316,242);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,243);
-insert into help_relation (help_topic_id,help_keyword_id) values (317,244);
-insert into help_relation (help_topic_id,help_keyword_id) values (503,244);
-insert into help_relation (help_topic_id,help_keyword_id) values (211,244);
-insert into help_relation (help_topic_id,help_keyword_id) values (24,244);
-insert into help_relation (help_topic_id,help_keyword_id) values (170,244);
-insert into help_relation (help_topic_id,help_keyword_id) values (130,244);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,245);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,246);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,247);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,248);
-insert into help_relation (help_topic_id,help_keyword_id) values (387,249);
-insert into help_relation (help_topic_id,help_keyword_id) values (335,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (432,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (260,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,250);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,251);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,252);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,252);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (112,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (117,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (324,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (473,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (281,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (419,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (403,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (62,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (217,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,253);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (367,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (417,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,254);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,255);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,256);
-insert into help_relation (help_topic_id,help_keyword_id) values (31,256);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,256);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,256);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,257);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,258);
-insert into help_relation (help_topic_id,help_keyword_id) values (308,259);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,260);
-insert into help_relation (help_topic_id,help_keyword_id) values (313,261);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,262);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,263);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,264);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,265);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,266);
-insert into help_relation (help_topic_id,help_keyword_id) values (258,266);
-insert into help_relation (help_topic_id,help_keyword_id) values (363,266);
-insert into help_relation (help_topic_id,help_keyword_id) values (318,267);
-insert into help_relation (help_topic_id,help_keyword_id) values (377,267);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,267);
-insert into help_relation (help_topic_id,help_keyword_id) values (211,268);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,269);
-insert into help_relation (help_topic_id,help_keyword_id) values (70,270);
-insert into help_relation (help_topic_id,help_keyword_id) values (491,270);
-insert into help_relation (help_topic_id,help_keyword_id) values (422,271);
-insert into help_relation (help_topic_id,help_keyword_id) values (249,272);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,273);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,274);
-insert into help_relation (help_topic_id,help_keyword_id) values (49,274);
-insert into help_relation (help_topic_id,help_keyword_id) values (228,274);
-insert into help_relation (help_topic_id,help_keyword_id) values (233,274);
-insert into help_relation (help_topic_id,help_keyword_id) values (329,275);
-insert into help_relation (help_topic_id,help_keyword_id) values (153,275);
-insert into help_relation (help_topic_id,help_keyword_id) values (457,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (99,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (305,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (281,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (312,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (213,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (79,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (17,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (49,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (22,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (395,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (62,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (360,276);
-insert into help_relation (help_topic_id,help_keyword_id) values (258,277);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,278);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,279);
-insert into help_relation (help_topic_id,help_keyword_id) values (237,280);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,281);
-insert into help_relation (help_topic_id,help_keyword_id) values (454,281);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,282);
-insert into help_relation (help_topic_id,help_keyword_id) values (40,283);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,283);
-insert into help_relation (help_topic_id,help_keyword_id) values (272,283);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,284);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,285);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,286);
-insert into help_relation (help_topic_id,help_keyword_id) values (380,287);
-insert into help_relation (help_topic_id,help_keyword_id) values (149,288);
-insert into help_relation (help_topic_id,help_keyword_id) values (109,289);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,290);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,290);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,291);
-insert into help_relation (help_topic_id,help_keyword_id) values (419,292);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,293);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,293);
-insert into help_relation (help_topic_id,help_keyword_id) values (341,294);
-insert into help_relation (help_topic_id,help_keyword_id) values (346,295);
-insert into help_relation (help_topic_id,help_keyword_id) values (260,296);
-insert into help_relation (help_topic_id,help_keyword_id) values (272,297);
-insert into help_relation (help_topic_id,help_keyword_id) values (324,298);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,298);
-insert into help_relation (help_topic_id,help_keyword_id) values (195,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (70,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (335,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (71,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (338,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (7,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (136,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (281,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (10,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (285,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (139,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (217,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (17,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (21,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (351,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (84,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (225,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (25,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (147,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (297,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (360,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (426,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (34,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (367,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (162,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (491,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (490,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (40,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (312,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (495,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (311,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (172,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (60,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (395,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (331,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (332,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (124,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (194,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (454,299);
-insert into help_relation (help_topic_id,help_keyword_id) values (39,300);
-insert into help_relation (help_topic_id,help_keyword_id) values (308,300);
-insert into help_relation (help_topic_id,help_keyword_id) values (252,300);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,300);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,300);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,301);
-insert into help_relation (help_topic_id,help_keyword_id) values (329,302);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,303);
-insert into help_relation (help_topic_id,help_keyword_id) values (124,304);
-insert into help_relation (help_topic_id,help_keyword_id) values (352,304);
-insert into help_relation (help_topic_id,help_keyword_id) values (59,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (87,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (330,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (29,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (346,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (235,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (499,305);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,306);
-insert into help_relation (help_topic_id,help_keyword_id) values (149,307);
-insert into help_relation (help_topic_id,help_keyword_id) values (319,307);
-insert into help_relation (help_topic_id,help_keyword_id) values (317,308);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,309);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,310);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,311);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,311);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,311);
-insert into help_relation (help_topic_id,help_keyword_id) values (304,311);
-insert into help_relation (help_topic_id,help_keyword_id) values (258,311);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,312);
-insert into help_relation (help_topic_id,help_keyword_id) values (162,312);
-insert into help_relation (help_topic_id,help_keyword_id) values (143,313);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,314);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,314);
-insert into help_relation (help_topic_id,help_keyword_id) values (79,314);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,315);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,316);
-insert into help_relation (help_topic_id,help_keyword_id) values (184,317);
-insert into help_relation (help_topic_id,help_keyword_id) values (458,318);
-insert into help_relation (help_topic_id,help_keyword_id) values (113,319);
-insert into help_relation (help_topic_id,help_keyword_id) values (24,319);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,320);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,321);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,322);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,322);
-insert into help_relation (help_topic_id,help_keyword_id) values (392,323);
-insert into help_relation (help_topic_id,help_keyword_id) values (120,323);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,324);
-insert into help_relation (help_topic_id,help_keyword_id) values (25,325);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,325);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,326);
-insert into help_relation (help_topic_id,help_keyword_id) values (375,327);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,327);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,328);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,329);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,329);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,330);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,331);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,332);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,333);
-insert into help_relation (help_topic_id,help_keyword_id) values (380,333);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,334);
-insert into help_relation (help_topic_id,help_keyword_id) values (294,334);
-insert into help_relation (help_topic_id,help_keyword_id) values (421,334);
-insert into help_relation (help_topic_id,help_keyword_id) values (385,335);
-insert into help_relation (help_topic_id,help_keyword_id) values (426,336);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,336);
-insert into help_relation (help_topic_id,help_keyword_id) values (124,336);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,336);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,337);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,338);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,339);
-insert into help_relation (help_topic_id,help_keyword_id) values (88,340);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,340);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,341);
-insert into help_relation (help_topic_id,help_keyword_id) values (399,342);
-insert into help_relation (help_topic_id,help_keyword_id) values (90,343);
-insert into help_relation (help_topic_id,help_keyword_id) values (178,343);
-insert into help_relation (help_topic_id,help_keyword_id) values (153,343);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,344);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,345);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,345);
-insert into help_relation (help_topic_id,help_keyword_id) values (54,346);
-insert into help_relation (help_topic_id,help_keyword_id) values (327,346);
-insert into help_relation (help_topic_id,help_keyword_id) values (375,347);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,347);
-insert into help_relation (help_topic_id,help_keyword_id) values (9,347);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,348);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,349);
-insert into help_relation (help_topic_id,help_keyword_id) values (125,350);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,351);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,351);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,352);
-insert into help_relation (help_topic_id,help_keyword_id) values (409,353);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,354);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,355);
-insert into help_relation (help_topic_id,help_keyword_id) values (146,356);
-insert into help_relation (help_topic_id,help_keyword_id) values (24,357);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,358);
-insert into help_relation (help_topic_id,help_keyword_id) values (112,358);
-insert into help_relation (help_topic_id,help_keyword_id) values (224,358);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,358);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,359);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,359);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,359);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,360);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (442,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (161,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (375,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (228,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (62,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (236,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,361);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,362);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,363);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,364);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,364);
-insert into help_relation (help_topic_id,help_keyword_id) values (1,365);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,366);
-insert into help_relation (help_topic_id,help_keyword_id) values (351,366);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,367);
-insert into help_relation (help_topic_id,help_keyword_id) values (429,368);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,369);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,370);
-insert into help_relation (help_topic_id,help_keyword_id) values (480,370);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,370);
-insert into help_relation (help_topic_id,help_keyword_id) values (79,370);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,371);
-insert into help_relation (help_topic_id,help_keyword_id) values (468,372);
-insert into help_relation (help_topic_id,help_keyword_id) values (232,372);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,373);
-insert into help_relation (help_topic_id,help_keyword_id) values (71,374);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,374);
-insert into help_relation (help_topic_id,help_keyword_id) values (497,375);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,376);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,377);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,378);
-insert into help_relation (help_topic_id,help_keyword_id) values (419,379);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,379);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,380);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,381);
-insert into help_relation (help_topic_id,help_keyword_id) values (330,381);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,381);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,382);
-insert into help_relation (help_topic_id,help_keyword_id) values (490,383);
-insert into help_relation (help_topic_id,help_keyword_id) values (419,384);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,385);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,385);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,386);
-insert into help_relation (help_topic_id,help_keyword_id) values (378,387);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,388);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,389);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,389);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,389);
-insert into help_relation (help_topic_id,help_keyword_id) values (446,390);
-insert into help_relation (help_topic_id,help_keyword_id) values (285,391);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,392);
-insert into help_relation (help_topic_id,help_keyword_id) values (451,393);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,394);
-insert into help_relation (help_topic_id,help_keyword_id) values (130,395);
-insert into help_relation (help_topic_id,help_keyword_id) values (10,396);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,396);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,397);
-insert into help_relation (help_topic_id,help_keyword_id) values (31,397);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,397);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,398);
-insert into help_relation (help_topic_id,help_keyword_id) values (58,399);
-insert into help_relation (help_topic_id,help_keyword_id) values (86,400);
-insert into help_relation (help_topic_id,help_keyword_id) values (208,400);
-insert into help_relation (help_topic_id,help_keyword_id) values (459,400);
-insert into help_relation (help_topic_id,help_keyword_id) values (370,400);
-insert into help_relation (help_topic_id,help_keyword_id) values (86,401);
-insert into help_relation (help_topic_id,help_keyword_id) values (208,401);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,401);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,401);
-insert into help_relation (help_topic_id,help_keyword_id) values (315,401);
-insert into help_relation (help_topic_id,help_keyword_id) values (191,402);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,403);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,403);
-insert into help_relation (help_topic_id,help_keyword_id) values (329,404);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,405);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,406);
-insert into help_relation (help_topic_id,help_keyword_id) values (148,407);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,407);
-insert into help_relation (help_topic_id,help_keyword_id) values (327,407);
-insert into help_relation (help_topic_id,help_keyword_id) values (34,408);
-insert into help_relation (help_topic_id,help_keyword_id) values (463,409);
-insert into help_relation (help_topic_id,help_keyword_id) values (482,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (303,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (9,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (279,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (29,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (31,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (188,410);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,411);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,412);
-insert into help_relation (help_topic_id,help_keyword_id) values (272,413);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,414);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,415);
-insert into help_relation (help_topic_id,help_keyword_id) values (224,415);
-insert into help_relation (help_topic_id,help_keyword_id) values (333,415);
-insert into help_relation (help_topic_id,help_keyword_id) values (79,415);
-insert into help_relation (help_topic_id,help_keyword_id) values (316,416);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,417);
-insert into help_relation (help_topic_id,help_keyword_id) values (311,417);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,417);
-insert into help_relation (help_topic_id,help_keyword_id) values (426,418);
-insert into help_relation (help_topic_id,help_keyword_id) values (50,418);
-insert into help_relation (help_topic_id,help_keyword_id) values (124,418);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,418);
-insert into help_relation (help_topic_id,help_keyword_id) values (85,418);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,418);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,419);
-insert into help_relation (help_topic_id,help_keyword_id) values (62,419);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,419);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,419);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,419);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,420);
-insert into help_relation (help_topic_id,help_keyword_id) values (235,421);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,422);
-insert into help_relation (help_topic_id,help_keyword_id) values (3,423);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,423);
-insert into help_relation (help_topic_id,help_keyword_id) values (489,423);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,424);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,424);
-insert into help_relation (help_topic_id,help_keyword_id) values (473,425);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,425);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,426);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,426);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,427);
-insert into help_relation (help_topic_id,help_keyword_id) values (246,427);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,428);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,428);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,429);
-insert into help_relation (help_topic_id,help_keyword_id) values (437,429);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,430);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,430);
-insert into help_relation (help_topic_id,help_keyword_id) values (131,431);
-insert into help_relation (help_topic_id,help_keyword_id) values (450,431);
-insert into help_relation (help_topic_id,help_keyword_id) values (351,431);
-insert into help_relation (help_topic_id,help_keyword_id) values (139,431);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,432);
-insert into help_relation (help_topic_id,help_keyword_id) values (476,432);
-insert into help_relation (help_topic_id,help_keyword_id) values (157,432);
-insert into help_relation (help_topic_id,help_keyword_id) values (312,432);
-insert into help_relation (help_topic_id,help_keyword_id) values (188,432);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,432);
-insert into help_relation (help_topic_id,help_keyword_id) values (86,433);
-insert into help_relation (help_topic_id,help_keyword_id) values (475,433);
-insert into help_relation (help_topic_id,help_keyword_id) values (370,433);
-insert into help_relation (help_topic_id,help_keyword_id) values (486,434);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,435);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,436);
-insert into help_relation (help_topic_id,help_keyword_id) values (147,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (39,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (225,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (54,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (327,437);
-insert into help_relation (help_topic_id,help_keyword_id) values (260,438);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,439);
-insert into help_relation (help_topic_id,help_keyword_id) values (363,439);
-insert into help_relation (help_topic_id,help_keyword_id) values (494,440);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,441);
-insert into help_relation (help_topic_id,help_keyword_id) values (408,442);
-insert into help_relation (help_topic_id,help_keyword_id) values (91,442);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,442);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,443);
-insert into help_relation (help_topic_id,help_keyword_id) values (214,443);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,444);
-insert into help_relation (help_topic_id,help_keyword_id) values (499,445);
-insert into help_relation (help_topic_id,help_keyword_id) values (469,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (329,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (132,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (117,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (423,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (473,446);
-insert into help_relation (help_topic_id,help_keyword_id) values (0,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (98,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (386,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (291,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (435,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (308,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (363,447);
-insert into help_relation (help_topic_id,help_keyword_id) values (500,448);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,449);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,450);
-insert into help_relation (help_topic_id,help_keyword_id) values (136,451);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,451);
-insert into help_relation (help_topic_id,help_keyword_id) values (297,451);
-insert into help_relation (help_topic_id,help_keyword_id) values (37,451);
-insert into help_relation (help_topic_id,help_keyword_id) values (498,452);
-insert into help_relation (help_topic_id,help_keyword_id) values (28,453);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,454);
-insert into help_relation (help_topic_id,help_keyword_id) values (22,454);
-insert into help_relation (help_topic_id,help_keyword_id) values (266,454);
-insert into help_relation (help_topic_id,help_keyword_id) values (349,455);
-insert into help_relation (help_topic_id,help_keyword_id) values (495,455);
-insert into help_relation (help_topic_id,help_keyword_id) values (201,456);
-insert into help_relation (help_topic_id,help_keyword_id) values (358,457);
-insert into help_relation (help_topic_id,help_keyword_id) values (106,457);
-insert into help_relation (help_topic_id,help_keyword_id) values (212,458);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,459);
-insert into help_relation (help_topic_id,help_keyword_id) values (108,459);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,459);
-insert into help_relation (help_topic_id,help_keyword_id) values (466,460);
-insert into help_relation (help_topic_id,help_keyword_id) values (196,461);
-insert into help_relation (help_topic_id,help_keyword_id) values (481,461);
-insert into help_relation (help_topic_id,help_keyword_id) values (462,462);
-insert into help_relation (help_topic_id,help_keyword_id) values (376,462);
-insert into help_relation (help_topic_id,help_keyword_id) values (40,463);
-insert into help_relation (help_topic_id,help_keyword_id) values (60,463);
-insert into help_relation (help_topic_id,help_keyword_id) values (272,463);
-insert into help_relation (help_topic_id,help_keyword_id) values (187,463);
-insert into help_relation (help_topic_id,help_keyword_id) values (267,463);
-insert into help_relation (help_topic_id,help_keyword_id) values (211,464);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,464);
-insert into help_relation (help_topic_id,help_keyword_id) values (203,465);
-insert into help_relation (help_topic_id,help_keyword_id) values (471,466);
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (0,'JOIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (1,'HOST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (2,'REPEAT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (3,'SERIALIZABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (4,'REPLACE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (5,'AT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (6,'SCHEDULE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (7,'RETURNS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (8,'STARTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (9,'MASTER_SSL_CA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (10,'NCHAR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (11,'ONLY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (12,'COLUMNS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (13,'COMPLETION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (14,'WORK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (15,'DATETIME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (16,'MODE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (17,'OPEN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (18,'INTEGER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (19,'ESCAPE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (20,'VALUE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (21,'MASTER_SSL_VERIFY_SERVER_CERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (22,'SQL_BIG_RESULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (23,'DROP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (24,'GEOMETRYCOLLECTIONFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (25,'EVENTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (26,'MONTH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (27,'PROFILES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (28,'DUPLICATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (29,'REPLICATION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (30,'UNLOCK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (31,'INNODB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (32,'YEAR_MONTH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (33,'SUBJECT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (34,'PREPARE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (35,'LOCK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (36,'NDB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (37,'CHECK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (38,'FULL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (39,'INT4');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (40,'BY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (41,'NO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (42,'MINUTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (43,'PARTITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (44,'DATA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (45,'DAY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (46,'SHARE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (47,'REAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (48,'SEPARATOR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (49,'MESSAGE_TEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (50,'MASTER_HEARTBEAT_PERIOD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (51,'DELETE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (52,'ON');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (53,'COLUMN_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (54,'CONNECTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (55,'CLOSE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (56,'X509');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (57,'USE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (58,'SUBCLASS_ORIGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (59,'WHERE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (60,'PRIVILEGES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (61,'SPATIAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (62,'EVENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (63,'SUPER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (64,'SQL_BUFFER_RESULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (65,'IGNORE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (66,'SHA2');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (67,'QUICK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (68,'SIGNED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (69,'OFFLINE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (70,'SECURITY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (71,'AUTOEXTEND_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (72,'NDBCLUSTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (73,'POLYGONFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (74,'FALSE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (75,'LEVEL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (76,'FORCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (77,'BINARY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (78,'TO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (79,'CHANGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (80,'CURRENT_USER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (81,'HOUR_MINUTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (82,'UPDATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (83,'PRESERVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (84,'TABLE_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (85,'INTO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (86,'FEDERATED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (87,'VARYING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (88,'MAX_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (89,'HOUR_SECOND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (90,'VARIABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (91,'ROLLBACK');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (92,'PROCEDURE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (93,'TIMESTAMP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (94,'IMPORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (95,'AGAINST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (96,'CHECKSUM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (97,'COUNT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (98,'INSERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (99,'LONGBINARY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (100,'THEN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (101,'ENGINES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (102,'HANDLER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (103,'PORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (104,'DAY_SECOND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (105,'EXISTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (106,'MUTEX');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (107,'HELP_DATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (108,'RELEASE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (109,'BOOLEAN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (110,'MOD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (111,'DEFAULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (112,'TYPE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (113,'NO_WRITE_TO_BINLOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (114,'OPTIMIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (115,'SQLSTATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (116,'RESET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (117,'CLASS_ORIGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (118,'INSTALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (119,'ITERATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (120,'DO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (121,'BIGINT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (122,'SET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (123,'ISSUER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (124,'DATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (125,'STATUS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (126,'FULLTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (127,'COMMENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (128,'MASTER_CONNECT_RETRY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (129,'INNER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (130,'RELAYLOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (131,'STOP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (132,'MASTER_LOG_FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (133,'MRG_MYISAM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (134,'PRECISION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (135,'REQUIRE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (136,'TRAILING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (137,'PARTITIONS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (138,'LONG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (139,'OPTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (140,'REORGANIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (141,'ELSE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (142,'DEALLOCATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (143,'IO_THREAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (144,'CASE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (145,'CIPHER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (146,'CONTINUE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (147,'FROM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (148,'READ');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (149,'LEFT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (150,'ELSEIF');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (151,'MINUTE_SECOND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (152,'COMPACT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (153,'DEC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (154,'FOR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (155,'WARNINGS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (156,'MIN_ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (157,'STRING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (158,'CONDITION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (159,'ENCLOSED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (160,'FUNCTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (161,'AGGREGATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (162,'FIELDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (163,'INT3');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (164,'ARCHIVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (165,'AVG_ROW_LENGTH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (166,'ADD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (167,'KILL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (168,'FLOAT4');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (169,'TABLESPACE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (170,'VIEW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (171,'REPEATABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (172,'INFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (173,'HELP_VERSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (174,'ORDER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (175,'USING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (176,'CONSTRAINT_CATALOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (177,'MIDDLEINT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (178,'GRANT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (179,'UNSIGNED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (180,'DECIMAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (181,'GEOMETRYFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (182,'INDEXES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (183,'FOREIGN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (184,'CACHE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (185,'HOSTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (186,'MYSQL_ERRNO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (187,'COMMIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (188,'SCHEMAS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (189,'LEADING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (190,'SNAPSHOT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (191,'CONSTRAINT_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (192,'DECLARE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (193,'LOAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (194,'SQL_CACHE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (195,'CONVERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (196,'DYNAMIC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (197,'COLLATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (198,'POLYGONFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (199,'BYTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (200,'ENVELOPE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (201,'GLOBAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (202,'LINESTRINGFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (203,'WHEN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (204,'HAVING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (205,'AS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (206,'STARTING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (207,'RELOAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (208,'AUTOCOMMIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (209,'REVOKE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (210,'GRANTS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (211,'OUTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (212,'CURSOR_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (213,'FLOOR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (214,'EXPLAIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (215,'WITH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (216,'AFTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (217,'STD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (218,'CSV');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (219,'DISABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (220,'UNINSTALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (221,'OUTFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (222,'LOW_PRIORITY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (223,'FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (224,'NODEGROUP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (225,'SCHEMA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (226,'SONAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (227,'POW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (228,'DUAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (229,'INDEX');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (230,'MULTIPOINTFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (231,'MULTIPOINTFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (232,'DEFINER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (233,'MASTER_BIND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (234,'REMOVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (235,'EXTENDED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (236,'MULTILINESTRINGFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (237,'CROSS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (238,'CONTRIBUTORS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (239,'NATIONAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (240,'GROUP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (241,'SHA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (242,'ONLINE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (243,'UNDO');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (244,'IGNORE_SERVER_IDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (245,'ZEROFILL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (246,'CLIENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (247,'MASTER_PASSWORD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (248,'OWNER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (249,'RELAY_LOG_FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (250,'TRUE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (251,'CHARACTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (252,'MASTER_USER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (253,'SCHEMA_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (254,'TABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (255,'ENGINE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (256,'INSERT_METHOD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (257,'CASCADE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (258,'RELAY_LOG_POS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (259,'SQL_CALC_FOUND_ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (260,'UNION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (261,'MYISAM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (262,'LEAVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (263,'MODIFY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (264,'MATCH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (265,'MASTER_LOG_POS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (266,'DISTINCTROW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (267,'DESC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (268,'TIME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (269,'NUMERIC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (270,'EXPANSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (271,'CODE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (272,'CURSOR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (273,'GEOMETRYCOLLECTIONFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (274,'AREA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (275,'CHAIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (276,'LOGFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (277,'FLUSH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (278,'CREATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (279,'DESCRIBE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (280,'EXTENT_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (281,'MAX_UPDATES_PER_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (282,'INT2');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (283,'PROCESSLIST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (284,'ENDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (285,'LOGS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (286,'RECOVER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (287,'DISCARD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (288,'HEAP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (289,'SOUNDS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (290,'BETWEEN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (291,'MULTILINESTRINGFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (292,'REPAIR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (293,'PACK_KEYS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (294,'FAST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (295,'VALUES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (296,'CALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (297,'LOOP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (298,'VARCHARACTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (299,'BEFORE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (300,'TRUNCATE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (301,'SHOW');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (302,'ALL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (303,'REDUNDANT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (304,'USER_RESOURCES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (305,'PARTIAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (306,'BINLOG');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (307,'END');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (308,'SECOND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (309,'AND');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (310,'FLOAT8');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (311,'PREV');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (312,'HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (313,'SELECT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (314,'DATABASES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (315,'OR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (316,'IDENTIFIED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (317,'WRAPPER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (318,'MASTER_SSL_CIPHER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (319,'SQL_SLAVE_SKIP_COUNTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (320,'BOOL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (321,'BOTH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (322,'YEAR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (323,'MASTER_PORT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (324,'CONCURRENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (325,'HELP');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (326,'UNIQUE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (327,'TRIGGERS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (328,'PROCESS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (329,'OPTIONS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (330,'RESIGNAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (331,'CONSISTENT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (332,'MASTER_SSL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (333,'DATE_ADD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (334,'MAX_CONNECTIONS_PER_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (335,'LIKE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (336,'PLUGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (337,'FETCH');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (338,'IN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (339,'COLUMN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (340,'DUMPFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (341,'USAGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (342,'EXECUTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (343,'MEMORY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (344,'CEIL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (345,'QUERY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (346,'MASTER_HOST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (347,'LINES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (348,'SQL_THREAD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (349,'SERVER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (350,'MAX_QUERIES_PER_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (351,'MASTER_SSL_CERT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (352,'MULTIPOLYGONFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (353,'TRANSACTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (354,'DAY_MINUTE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (355,'DATE_SUB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (356,'STDDEV');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (357,'REBUILD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (358,'GEOMETRYFROMWKB');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (359,'INT1');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (360,'RENAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (361,'PARSER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (362,'RIGHT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (363,'ALTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (364,'MAX_ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (365,'SOCKET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (366,'STRAIGHT_JOIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (367,'NATURAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (368,'VARIABLES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (369,'ESCAPED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (370,'SHA1');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (371,'KEY_BLOCK_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (372,'PASSWORD');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (373,'OFFSET');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (374,'CHAR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (375,'NEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (376,'ERRORS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (377,'SQL_LOG_BIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (378,'TEMPORARY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (379,'COMMITTED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (380,'SQL_SMALL_RESULT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (381,'UPGRADE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (382,'XA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (383,'BEGIN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (384,'DELAY_KEY_WRITE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (385,'PROFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (386,'MEDIUM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (387,'INTERVAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (388,'CENTROID');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (389,'SSL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (390,'DAY_HOUR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (391,'NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (392,'REFERENCES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (393,'AES_ENCRYPT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (394,'STORAGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (395,'ISOLATION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (396,'CEILING');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (397,'EVERY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (398,'INT8');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (399,'AUTHORS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (400,'RESTRICT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (401,'UNCOMMITTED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (402,'LINESTRINGFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (403,'IS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (404,'NOT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (405,'ANALYSE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (406,'DATAFILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (407,'DES_KEY_FILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (408,'SIGNAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (409,'COMPRESSED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (410,'START');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (411,'PLUGINS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (412,'SAVEPOINT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (413,'IF');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (414,'ROWS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (415,'PRIMARY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (416,'PURGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (417,'LAST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (418,'USER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (419,'EXIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (420,'KEYS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (421,'LIMIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (422,'KEY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (423,'MERGE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (424,'UNTIL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (425,'SQL_NO_CACHE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (426,'DELAYED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (427,'CONSTRAINT_SCHEMA');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (428,'ANALYZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (429,'CONSTRAINT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (430,'SERIAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (431,'ACTION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (432,'WRITE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (433,'INITIAL_SIZE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (434,'SESSION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (435,'DATABASE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (436,'NULL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (437,'POWER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (438,'USE_FRM');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (439,'TERMINATED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (440,'SLAVE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (441,'NVARCHAR');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (442,'ASC');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (443,'RETURN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (444,'OPTIONALLY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (445,'ENABLE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (446,'DIRECTORY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (447,'MAX_USER_CONNECTIONS');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (448,'WHILE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (449,'LOCAL');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (450,'AES_DECRYPT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (451,'DISTINCT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (452,'MASTER_SSL_KEY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (453,'NONE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (454,'TABLES');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (455,'<>');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (456,'RLIKE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (457,'TRIGGER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (458,'COLLATION');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (459,'SHUTDOWN');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (460,'HIGH_PRIORITY');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (461,'BTREE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (462,'FIRST');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (463,'COALESCE');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (464,'WAIT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (465,'CATALOG_NAME');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (466,'MASTER');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (467,'FIXED');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (468,'MULTIPOLYGONFROMTEXT');
+INSERT INTO help_keyword (help_keyword_id,name) VALUES (469,'ROW_FORMAT');
+
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,0);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,0);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,1);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (234,2);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,3);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,4);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,4);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,4);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,5);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,6);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,6);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,7);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,8);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,9);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (431,10);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,11);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,12);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (21,12);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,12);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,12);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,12);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,13);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,13);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,14);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,15);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,16);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,16);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (18,17);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (135,17);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,17);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,17);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,18);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,18);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (381,19);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,20);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,20);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,20);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,20);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (245,20);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,21);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,22);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (239,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (302,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (9,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (406,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (416,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (417,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (88,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (265,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (187,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (232,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (332,23);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (109,24);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,25);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,25);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (171,25);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,26);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (83,27);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,28);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,29);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,30);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,31);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,31);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,32);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,33);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (36,34);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (239,34);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,34);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,35);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,35);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,36);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (418,37);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,37);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,37);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,38);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (21,38);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (296,38);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,38);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (454,38);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,39);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (78,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (361,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,40);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,41);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,41);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,42);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,43);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,43);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,44);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,44);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,44);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,44);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,45);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,46);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (316,47);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,47);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (361,48);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,49);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,49);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,50);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,51);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,52);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,53);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,53);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (177,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,54);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (53,55);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,55);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,56);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,57);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (57,57);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,57);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,58);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,58);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,59);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,59);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,59);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (194,60);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (251,60);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,60);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,61);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,61);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,62);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,62);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (302,62);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (359,62);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,63);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,64);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,65);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (68,66);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (418,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,67);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,68);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (88,69);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,69);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,69);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,70);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,71);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,72);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (92,73);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (485,73);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (386,74);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,75);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,76);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (40,77);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,77);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,77);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (463,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,78);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,79);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,79);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,80);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,80);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,81);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,82);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,82);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,82);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,82);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,83);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,83);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,84);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,84);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (306,85);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,85);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,85);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,85);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,86);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (260,87);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,88);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,89);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (130,90);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,91);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (463,91);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,91);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (17,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (442,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (304,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (491,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (417,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (330,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (190,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,92);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (189,93);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (100,93);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,94);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,94);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,95);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (402,96);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,96);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (71,97);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (434,97);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (331,97);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (196,98);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,98);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (489,98);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (303,98);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (287,99);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (86,100);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (59,100);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (29,100);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,101);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (284,101);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (315,102);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,102);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,103);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,104);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (302,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (187,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (9,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,105);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,106);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (366,106);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (110,107);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,108);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (463,108);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,108);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,109);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (24,109);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (114,110);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (175,110);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (201,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (245,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,111);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,112);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,113);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (328,113);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (116,113);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (473,113);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (116,114);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,114);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,115);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,115);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (39,116);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (120,116);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (266,116);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (152,116);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,117);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,117);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (420,118);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (125,119);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,120);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,120);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (126,120);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (499,120);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (222,121);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (334,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (130,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (497,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (183,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (480,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,122);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,123);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (264,124);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (133,124);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,124);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,124);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (337,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (366,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (224,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (60,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (330,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (138,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (216,125);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,126);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,126);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,126);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,127);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,127);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,127);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,127);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,127);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,128);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,129);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,130);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (54,131);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,132);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,133);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (316,134);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,135);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (458,136);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (257,137);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (287,138);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (251,139);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,139);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,140);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (86,141);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (59,141);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (239,142);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (54,143);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (326,143);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (86,144);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (59,144);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,145);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (315,146);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,147);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,147);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (458,147);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,147);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,147);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,147);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,148);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,148);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,148);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,148);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,149);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (29,150);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,151);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,152);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (210,153);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,154);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (315,154);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (181,154);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,154);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (421,154);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,155);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (331,155);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,156);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,157);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (181,158);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,159);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (70,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (337,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (35,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (304,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (417,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (394,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (212,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (406,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (235,160);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,161);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,162);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,162);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (254,163);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,164);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,165);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,165);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,166);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,166);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,166);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,166);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (177,167);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (169,168);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (416,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,169);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (457,170);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,170);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (160,170);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,171);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,172);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,172);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (191,173);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,174);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,174);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,174);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,174);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (361,174);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,175);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (87,175);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,175);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,176);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,176);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (254,177);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (251,178);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,178);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (316,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (210,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (24,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (169,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (129,179);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (157,180);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,180);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,180);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (413,181);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,182);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,183);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,183);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,183);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,183);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (306,184);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (102,184);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (152,184);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (146,185);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,185);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,186);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,186);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,187);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,187);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,188);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (161,188);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (458,189);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,190);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,190);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,191);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,191);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (315,192);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (181,192);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (421,192);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (201,192);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (306,193);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,193);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,194);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,195);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (378,195);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,196);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,197);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,197);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,197);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (396,198);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (468,199);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (241,200);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (130,201);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,201);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (183,201);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (350,201);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (138,201);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (455,202);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (86,203);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (59,203);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,204);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,205);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,205);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,205);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,206);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,207);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,208);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (251,209);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,210);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (193,210);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,211);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,212);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,212);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (222,213);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (257,214);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,215);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,215);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,215);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,215);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,215);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,216);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (262,217);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,218);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,218);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,219);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,219);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,219);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (293,220);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,221);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,222);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,223);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,224);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,225);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,225);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (311,225);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (187,225);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,225);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,226);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (279,227);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (281,228);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (306,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (88,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (102,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (310,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,229);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (467,230);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (426,231);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,232);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,232);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,233);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,234);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,235);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (257,235);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (274,236);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,237);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,238);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (7,238);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (260,239);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (431,239);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,240);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (49,240);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (227,240);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,240);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (232,240);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (428,241);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (88,242);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,242);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,242);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (315,243);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,244);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (316,245);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (503,245);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (210,245);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (24,245);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (169,245);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (129,245);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,246);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,247);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,248);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,249);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (386,250);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (334,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (431,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (260,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,251);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,252);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,253);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,253);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (111,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (116,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (323,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (473,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (280,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (402,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (418,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (216,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,254);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (366,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (416,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,255);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,256);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,257);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,258);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,259);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (307,260);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,261);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (312,262);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,263);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,264);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,265);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,266);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,267);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (257,267);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (361,267);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (317,268);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (376,268);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,268);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (210,269);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,270);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (70,271);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (491,271);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (421,272);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (248,273);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (327,274);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,275);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,276);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (49,276);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (227,276);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (232,276);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (328,277);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (152,277);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (457,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (98,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (304,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (280,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (311,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (212,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (78,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (17,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (49,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (22,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (394,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (359,278);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (257,279);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,280);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,281);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (236,282);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,283);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (454,283);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,284);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (40,285);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,285);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,285);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,286);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,287);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,288);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (379,289);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (148,290);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (108,291);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,292);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,292);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,293);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (418,294);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,295);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (340,296);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (345,297);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (260,298);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,299);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (323,300);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,300);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (194,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (70,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (334,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (71,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (337,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (7,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (135,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (280,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (10,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (284,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (138,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (216,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (17,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (21,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (350,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (83,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (224,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (25,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (146,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (296,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (359,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (34,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (366,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (161,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (491,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (490,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (40,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (495,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (311,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (310,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (171,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (60,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (394,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (330,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (331,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (193,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (454,301);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (39,302);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (307,302);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (251,302);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,302);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,302);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,303);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (328,304);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,305);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,306);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (351,306);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (59,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (86,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (329,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (29,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (345,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (234,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (499,307);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,308);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (148,309);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (318,309);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (316,310);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,311);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,312);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,313);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,313);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,313);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (303,313);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (257,313);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,314);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (161,314);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (142,315);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,316);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,316);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (78,316);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,317);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,318);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (183,319);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (112,320);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (24,320);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (458,321);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,322);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,323);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,324);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,324);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (391,325);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (119,325);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,326);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (25,327);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,327);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,328);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (374,329);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,329);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,330);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,331);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,331);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,332);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,333);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,334);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,335);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (379,335);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,336);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (293,336);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (420,336);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (384,337);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,338);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,338);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,338);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,338);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,339);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,340);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,341);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (87,342);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,342);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,343);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (398,344);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (89,345);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (177,345);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (152,345);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,346);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,347);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,347);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (54,348);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (326,348);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (374,349);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,349);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (9,349);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,350);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,351);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (124,352);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,353);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,353);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,354);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,355);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (408,356);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,357);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (145,358);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (24,359);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,360);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (111,360);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (223,360);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,360);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,361);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,361);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,361);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,362);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (442,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (160,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (374,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (227,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (235,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,363);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,364);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,365);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,366);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,366);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (1,367);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,368);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (350,368);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,369);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (428,370);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,371);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,372);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (480,372);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,372);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (78,372);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,373);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (468,374);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (231,374);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,375);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (71,376);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,376);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (497,377);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,378);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,379);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,380);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (418,381);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,381);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,382);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,383);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (329,383);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,383);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,384);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (490,385);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (418,386);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,387);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,387);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (439,388);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,389);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (377,390);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,391);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,392);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,392);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,392);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (446,393);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (284,394);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,395);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (451,396);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,397);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (129,398);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (10,399);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,399);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,400);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,400);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,400);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,401);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (58,402);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (85,403);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (207,403);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (459,403);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (369,403);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (85,404);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (207,404);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,404);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,404);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (314,404);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (190,405);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,406);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,406);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (328,407);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,408);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,409);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (147,410);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,410);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (326,410);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (34,411);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (463,412);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (483,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (302,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (9,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (278,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (29,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (31,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (187,413);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,414);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,415);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,416);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,417);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,418);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (223,418);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (332,418);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (78,418);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (315,419);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,420);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (310,420);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,420);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (425,421);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (50,421);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (123,421);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,421);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (84,421);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,421);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,422);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (65,422);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,422);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,422);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,422);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,423);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (234,424);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,425);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (3,426);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,426);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (489,426);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,427);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,427);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (473,428);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,428);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,429);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,429);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,430);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (245,430);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,431);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,431);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,432);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (436,432);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,433);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,433);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (130,434);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (450,434);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (350,434);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (138,434);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,435);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (476,435);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (156,435);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (311,435);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (187,435);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,435);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (85,436);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (475,436);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (369,436);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (486,437);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,438);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,439);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (146,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (39,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (224,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (54,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (326,440);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (260,441);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,442);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (361,442);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (494,443);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,444);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (407,445);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (90,445);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,445);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,446);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (213,446);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,447);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (499,448);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (469,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (328,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (131,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (116,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (422,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (473,449);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (500,450);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (0,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (96,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (385,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (290,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (434,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (307,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (361,451);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,452);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,453);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (135,454);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,454);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (296,454);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (37,454);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (498,455);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (28,456);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,457);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (22,457);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (265,457);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (348,458);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (495,458);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (200,459);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (357,460);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (105,460);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (211,461);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,462);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (107,462);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,462);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (466,463);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (195,464);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (481,464);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (462,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (375,465);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (40,466);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (60,466);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (271,466);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (186,466);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (266,466);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (210,467);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,467);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (202,468);
+INSERT INTO help_relation (help_topic_id,help_keyword_id) VALUES (471,469);
+
+
+COMMIT;
 
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/msql2mysql.sh mysql-5.5-5.5.43/scripts/msql2mysql.sh
--- mysql-5.5-5.5.35+dfsg/scripts/msql2mysql.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/msql2mysql.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Copyright (C) 1979-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
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysqlaccess.sh mysql-5.5-5.5.43/scripts/mysqlaccess.sh
--- mysql-5.5-5.5.35+dfsg/scripts/mysqlaccess.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysqlaccess.sh	2015-02-27 08:30:34.000000000 +0000
@@ -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_Footer {
     if ($MySQLaccess::CMD) { #command-line mode
     print "\n"
-         ."BUGs can be reported by email to bugs\@mysql.com\n";
+         ."BUGs can be reported at http://bugs.mysql.com/\n";
     }
     if ($MySQLaccess::CGI) { #CGI-BIN mode
     if ($MySQLaccess::Param{'brief'}) {
@@ -2431,7 +2430,7 @@
     }
     print "<HR>\n"
          ."<ADDRESS>\n"
-         ."BUGs can be reported by email to <a href=mailto:bugs\@mysql.com>bugs\@mysql.com</a><BR>\n"
+         ."BUGs can be reported at <a href=\"http://bugs.mysql.com/\">http://bugs.mysql.com/</a><BR>\n"
 #         ."Don't forget to mention the version $VERSION!<BR>\n"
          ."</ADDRESS>\n"
          ."</BODY>\n"
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysqlbug.sh mysql-5.5-5.5.43/scripts/mysqlbug.sh
--- mysql-5.5-5.5.35+dfsg/scripts/mysqlbug.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysqlbug.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 #!/bin/sh
 # Copyright (C) 2000-2002, 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
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_config.pl.in mysql-5.5-5.5.43/scripts/mysql_config.pl.in
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_config.pl.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_config.pl.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 2014, 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
@@ -189,7 +189,7 @@
 }
 else
 {
-  my $linkpath   = "-L$pkglibdir";
+  my $linkpath   = "-L$pkglibdir @RPATH_OPTION@";
   @lib_opts   = ($linkpath,"-lmysqlclient");
   @lib_r_opts = ($linkpath,"-lmysqlclient_r");
   @lib_e_opts = ($linkpath,"-lmysqld");
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_config.sh mysql-5.5-5.5.43/scripts/mysql_config.sh
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_config.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_config.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2000, 2014, 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
@@ -76,7 +76,8 @@
 
 me=`get_full_path $0`
 
-basedir=`echo $me | sed -e 's;/bin/mysql_config;;'`
+# Script might have been renamed but assume mysql_<something>config<something>
+basedir=`echo $me | sed -e 's;/bin/mysql_.*config.*;;'`
 
 ldata='@localstatedir@'
 execdir='@libexecdir@'
@@ -85,11 +86,11 @@
 # If installed, search for the compiled in directory first (might be "lib64")
 pkglibdir='@pkglibdir@'
 pkglibdir_rel=`echo $pkglibdir | sed -e "s;^$basedir/;;"`
-fix_path pkglibdir $pkglibdir_rel lib/mysql lib
+fix_path pkglibdir $pkglibdir_rel @libsubdir@/mysql @libsubdir@
 
 plugindir='@pkgplugindir@'
 plugindir_rel=`echo $plugindir | sed -e "s;^$basedir/;;"`
-fix_path plugindir $plugindir_rel lib/mysql/plugin lib/plugin
+fix_path plugindir $plugindir_rel @libsubdir@/mysql/plugin @libsubdir@/plugin
 
 pkgincludedir='@pkgincludedir@'
 if [ -f "$basedir/include/mysql/mysql.h" ]; then
@@ -110,10 +111,10 @@
 
 # Create options 
 # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
-libs=" $ldflags -L$pkglibdir -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
+libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
 libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
-libs_r=" $ldflags -L$pkglibdir -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
-embedded_libs=" $ldflags -L$pkglibdir -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
+libs_r=" $ldflags -L$pkglibdir  @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ "
+embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ "
 
 if [ -r "$pkglibdir/libmygcc.a" ]; then
   # When linking against the static library with a different version of GCC
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysqld_safe.sh mysql-5.5-5.5.43/scripts/mysqld_safe.sh
--- mysql-5.5-5.5.35+dfsg/scripts/mysqld_safe.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysqld_safe.sh	2015-02-27 08:30:34.000000000 +0000
@@ -504,7 +504,7 @@
   plugin_dir="${PLUGIN_DIR}"
 else
   # Try to find plugin dir relative to basedir
-  for dir in lib/mysql/plugin lib/plugin
+  for dir in lib64/mysql/plugin lib64/plugin lib/mysql/plugin lib/plugin
   do
     if [ -d "${MY_BASEDIR_VERSION}/${dir}" ]; then
       plugin_dir="${MY_BASEDIR_VERSION}/${dir}"
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_install_db.pl.in mysql-5.5-5.5.43/scripts/mysql_install_db.pl.in
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_install_db.pl.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_install_db.pl.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/perl
 # -*- cperl -*-
 #
-# Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2007, 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
@@ -65,8 +65,8 @@
                        Read this file after the global files are read.
   --defaults-file=name Only read default options from the given file name.
   --force              Causes mysql_install_db to run even if DNS does not
-                       work.  In that case, grant table entries that normally
-                       use hostnames will use IP addresses.
+                       work.  In that case, grant table entries that
+                       normally use hostnames will use IP addresses.
   --help               Display this help and exit.                     
   --ldata=path         The path to the MySQL data directory. Same as --datadir.
   --no-defaults        Don't read default options from any option file.
@@ -365,7 +365,7 @@
 my $resolved;
 if ( !$opt->{'cross-bootstrap'} and !$opt->{rpm} and !$opt->{force} )
 {
-  my $resolveip;
+  my $resolveip = "$extra_bindir/resolveip";
 
   $resolved = `$resolveip $hostname 2>&1`;
   if ( $? != 0 )
@@ -375,14 +375,14 @@
     {
       error($opt,
             "Neither host '$hostname' nor 'localhost' could be looked up with",
-            "$bindir/resolveip",
+            "$resolveip",
             "Please configure the 'hostname' command to return a correct",
             "hostname.",
             "If you want to solve this at a later stage, restart this script",
             "with the --force option");
     }
     warning($opt,
-            "The host '$hostname' could not be looked up with resolveip.",
+            "The host '$hostname' could not be looked up with $resolveip.",
             "This probably means that your libc libraries are not 100 % compatible",
             "with this binary MySQL version. The MySQL daemon, mysqld, should work",
             "normally with the exception that host name resolving will not work.",
@@ -537,7 +537,7 @@
              "  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 @@
         "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 -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_install_db.sh mysql-5.5-5.5.43/scripts/mysql_install_db.sh
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_install_db.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_install_db.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+# 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 General Public License as published by
@@ -49,8 +49,8 @@
                        Read this file after the global files are read.
   --defaults-file=name Only read default options from the given file name.
   --force              Causes mysql_install_db to run even if DNS does not
-                       work.  In that case, grant table entries that normally
-                       use hostnames will use IP addresses.
+                       work.  In that case, grant table entries that
+                       normally use hostnames will use IP addresses.
   --help               Display this help and exit.                     
   --ldata=path         The path to the MySQL data directory. Same as --datadir.
   --no-defaults        Don't read default options from any option file.
@@ -426,8 +426,8 @@
   echo "describes problems on your OS.  Another information source are the"
   echo "MySQL email archives available at http://lists.mysql.com/."
   echo
-  echo "Please check all of the above before mailing us!  And remember, if"
-  echo "you do mail us, you MUST use the $scriptdir/mysqlbug script!"
+  echo "Please check all of the above before submitting a bug report"
+  echo "at http://bugs.mysql.com/"
   echo
   exit 1
 fi
@@ -478,7 +478,7 @@
   fi
 
   echo
-  echo "Please report any problems with the $scriptdir/mysqlbug script!"
+  echo "Please report any problems at http://bugs.mysql.com/"
   echo
 fi
 
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_setpermission.sh mysql-5.5-5.5.43/scripts/mysql_setpermission.sh
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_setpermission.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_setpermission.sh	2015-02-27 08:30:34.000000000 +0000
@@ -264,13 +264,13 @@
   foreach $host (@hosts) {
     # user privileges: SELECT
     if (($todo == 2) || ($todo == 3)) {
-      $sth = $dbh->do("GRANT SELECT ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
+      $sth = $dbh->do("GRANT SELECT ON $db.* TO \'$user\'@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 4) {
       # user privileges: SELECT,INSERT,UPDATE,DELETE
-      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
+      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE ON $db.* TO \'$user\'@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 5) {
       # user privileges: SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES
-      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES ON $db.* TO $user@\"$host\" IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
+      $sth = $dbh->do("GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP,INDEX,LOCK TABLES,CREATE TEMPORARY TABLES ON $db.* TO \'$user\'@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
     } elsif ($todo == 6) {
        # all privileges
        $sth = $dbh->do("GRANT ALL ON $db.* TO \'$user\'\@\'$host\' IDENTIFIED BY \'$pass\'") || die $dbh->errstr;
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_system_tables_fix.sql mysql-5.5-5.5.43/scripts/mysql_system_tables_fix.sql
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_system_tables_fix.sql	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_system_tables_fix.sql	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2003, 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
@@ -652,6 +652,23 @@
 INSERT INTO proxies_priv SELECT * FROM tmp_proxies_priv WHERE @had_proxies_priv_table=0;
 DROP TABLE tmp_proxies_priv;
 
+-- Checking for any duplicate hostname and username combination are exists.
+-- If exits we will throw error.
+DROP PROCEDURE IF EXISTS mysql.count_duplicate_host_names;
+DELIMITER //
+CREATE PROCEDURE mysql.count_duplicate_host_names()
+BEGIN
+  SET @duplicate_hosts=(SELECT count(*) FROM mysql.user GROUP BY user, lower(host) HAVING count(*) > 1 LIMIT 1);
+  IF @duplicate_hosts > 1 THEN
+    SIGNAL SQLSTATE '45000'  SET MESSAGE_TEXT = 'Multiple accounts exist for @user_name, @host_name that differ only in Host lettercase; remove all except one of them';
+  END IF;
+END //
+DELIMITER ;
+CALL mysql.count_duplicate_host_names();
+-- Get warnings (if any)
+SHOW WARNINGS;
+DROP PROCEDURE mysql.count_duplicate_host_names;
+
 # Convering the host name to lower case for existing users
 UPDATE user SET host=LOWER( host ) WHERE LOWER( host ) <> host;
 
diff -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_system_tables.sql mysql-5.5-5.5.43/scripts/mysql_system_tables.sql
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_system_tables.sql	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_system_tables.sql	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
--- Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+-- Copyright (c) 2007, 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 -Nru mysql-5.5-5.5.35+dfsg/scripts/mysql_test_data_timezone.sql mysql-5.5-5.5.43/scripts/mysql_test_data_timezone.sql
--- mysql-5.5-5.5.35+dfsg/scripts/mysql_test_data_timezone.sql	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/scripts/mysql_test_data_timezone.sql	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 -- 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/CMakeLists.txt mysql-5.5-5.5.43/sql/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/sql/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -80,6 +80,14 @@
                ${GEN_SOURCES}
                ${MYSYS_LIBWRAP_SOURCE})
 
+# These files have unused result errors, so we skip Werror
+CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR_FLAG)
+IF(HAVE_WERROR_FLAG)
+  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+  ADD_COMPILE_FLAGS(filesort.cc  COMPILE_FLAGS "-Wno-error")
+  ADD_COMPILE_FLAGS(opt_range.cc COMPILE_FLAGS "-Wno-error")
+ENDIF()
+
 MYSQL_ADD_PLUGIN(partition ha_partition.cc STORAGE_ENGINE DEFAULT STATIC_ONLY
 RECOMPILE_FOR_EMBEDDED)
 
@@ -237,14 +245,15 @@
 ENDIF()
 
 FOREACH(tool glibtoolize libtoolize aclocal autoconf autoheader automake gtar 
- tar bzr)
+ tar git)
  STRING(TOUPPER ${tool}  TOOL)
  FIND_PROGRAM(${TOOL}_EXECUTABLE ${tool} DOC "path to the executable")
  MARK_AS_ADVANCED(${TOOL}_EXECUTABLE)
 ENDFOREACH()
 
 CONFIGURE_FILE(
-  ${CMAKE_SOURCE_DIR}/cmake/make_dist.cmake.in ${CMAKE_BINARY_DIR}/make_dist.cmake @ONLY)
+  ${CMAKE_SOURCE_DIR}/cmake/make_dist.cmake.in
+  ${CMAKE_BINARY_DIR}/make_dist.cmake @ONLY)
 
 ADD_CUSTOM_TARGET(dist 
   COMMAND ${CMAKE_COMMAND} -P ${CMAKE_BINARY_DIR}/make_dist.cmake
@@ -254,8 +263,7 @@
 
 ADD_CUSTOM_TARGET(distclean
   COMMAND ${CMAKE_COMMAND} -E echo  WARNING: distclean target is not functional
-  COMMAND ${CMAKE_COMMAND} -E echo  Use 'bzr clean-tree' with --unknown and/or
-    --ignored parameter instead
+  COMMAND ${CMAKE_COMMAND} -E echo  Use 'git clean -fdx' instead
   VERBATIM
   )
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/custom_conf.h mysql-5.5-5.5.43/sql/custom_conf.h
--- mysql-5.5-5.5.35+dfsg/sql/custom_conf.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/custom_conf.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/sql/events.cc mysql-5.5-5.5.43/sql/events.cc
--- mysql-5.5-5.5.35+dfsg/sql/events.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/events.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/event_scheduler.cc mysql-5.5-5.5.43/sql/event_scheduler.cc
--- mysql-5.5-5.5.35+dfsg/sql/event_scheduler.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/event_scheduler.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2014, 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
@@ -22,6 +22,7 @@
 #include "event_db_repository.h"
 #include "sql_connect.h"         // init_new_connection_handler_thread
 #include "sql_acl.h"             // SUPER_ACL
+extern void delete_thd(THD *);   // Used in deinit_event_thread()
 
 /**
   @addtogroup Event_Scheduler
@@ -156,12 +157,13 @@
   DBUG_ASSERT(thd->net.buff != 0);
   net_end(&thd->net);
   DBUG_PRINT("exit", ("Event thread finishing"));
+  mysql_mutex_lock(&LOCK_thd_remove);
   mysql_mutex_lock(&LOCK_thread_count);
-  thread_count--;
   dec_thread_running();
-  delete thd;
+  delete_thd(thd);
   mysql_cond_broadcast(&COND_thread_count);
   mysql_mutex_unlock(&LOCK_thread_count);
+  mysql_mutex_unlock(&LOCK_thd_remove);
 }
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/event_scheduler.h mysql-5.5-5.5.43/sql/event_scheduler.h
--- mysql-5.5-5.5.35+dfsg/sql/event_scheduler.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/event_scheduler.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 #ifndef _EVENT_SCHEDULER_H_
 #define _EVENT_SCHEDULER_H_
-/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/events.h mysql-5.5-5.5.43/sql/events.h
--- mysql-5.5-5.5.35+dfsg/sql/events.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/events.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 #ifndef _EVENT_H_
 #define _EVENT_H_
-/* Copyright (c) 2004, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/field.cc mysql-5.5-5.5.43/sql/field.cc
--- mysql-5.5-5.5.35+dfsg/sql/field.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/field.cc	2015-02-27 08:30:34.000000000 +0000
@@ -7376,8 +7376,7 @@
       If content of the 'from'-address is cached in the 'value'-object
       it is possible that the content needs a character conversion.
     */
-    uint32 dummy_offset;
-    if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
+    if (!String::needs_conversion_on_storage(length, cs, field_charset))
     {
       Field_blob::store_length(length);
       bmove(ptr+packlength, &from, sizeof(char*));
@@ -7975,12 +7974,11 @@
 {
   ASSERT_COLUMN_MARKED_FOR_WRITE;
   int err= 0;
-  uint32 not_used;
   char buff[STRING_BUFFER_USUAL_SIZE];
   String tmpstr(buff,sizeof(buff), &my_charset_bin);
 
   /* Convert character set if necessary */
-  if (String::needs_conversion(length, cs, field_charset, &not_used))
+  if (String::needs_conversion_on_storage(length, cs, field_charset))
   { 
     uint dummy_errors;
     tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
@@ -8196,12 +8194,11 @@
   int err= 0;
   char *not_used;
   uint not_used2;
-  uint32 not_used_offset;
   char buff[STRING_BUFFER_USUAL_SIZE];
   String tmpstr(buff,sizeof(buff), &my_charset_bin);
 
   /* Convert character set if necessary */
-  if (String::needs_conversion(length, cs, field_charset, &not_used_offset))
+  if (String::needs_conversion_on_storage(length, cs, field_charset))
   { 
     uint dummy_errors;
     tmpstr.copy(from, length, cs, field_charset, &dummy_errors);
diff -Nru mysql-5.5-5.5.35+dfsg/sql/field.h mysql-5.5-5.5.43/sql/field.h
--- mysql-5.5-5.5.35+dfsg/sql/field.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/field.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef FIELD_INCLUDED
 #define FIELD_INCLUDED
 
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
@@ -1802,18 +1802,6 @@
   {
     store_length(ptr, packlength, number);
   }
-
-  /**
-     Return the packed length plus the length of the data. 
-
-     This is used to determine the size of the data plus the 
-     packed length portion in the row data.
-
-     @returns The length in the row plus the size of the data.
-  */
-  uint32 get_packed_size(const uchar *ptr_arg, bool low_byte_first)
-    {return packlength + get_length(ptr_arg, packlength, low_byte_first);}
-
   inline uint32 get_length(uint row_offset= 0)
   { return get_length(ptr+row_offset, this->packlength, table->s->db_low_byte_first); }
   uint32 get_length(const uchar *ptr, uint packlength, bool low_byte_first);
diff -Nru mysql-5.5-5.5.35+dfsg/sql/filesort.cc mysql-5.5-5.5.43/sql/filesort.cc
--- mysql-5.5-5.5.35+dfsg/sql/filesort.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/filesort.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -34,6 +34,7 @@
 #include "sql_test.h"                           // TEST_filesort
 #include "opt_range.h"                          // SQL_SELECT
 #include "debug_sync.h"
+#include "sql_base.h"
 
 /// How to write record_ref.
 #define WRITE_REF(file,from) \
@@ -337,6 +338,14 @@
   {
     int kill_errno= thd->killed_errno();
     DBUG_ASSERT(thd->is_error() || kill_errno);
+
+    /*
+      We replace the table->sort at the end.
+      Hence calling free_io_cache to make sure table->sort.io_cache
+      used for QUICK_INDEX_MERGE_SELECT is free.
+    */
+    free_io_cache(table);
+
     my_printf_error(ER_FILSORT_ABORT,
                     "%s: %s",
                     MYF(ME_ERROR + ME_WAITTANG),
@@ -363,6 +372,10 @@
 #ifdef SKIP_DBUG_IN_FILESORT
   DBUG_POP();			/* Ok to DBUG */
 #endif
+
+  /* table->sort.io_cache should be free by this time */
+  DBUG_ASSERT(NULL == table->sort.io_cache);
+
   memcpy(&table->sort, &table_sort, sizeof(FILESORT_INFO));
   DBUG_PRINT("exit",("num_rows: %ld", (long) num_rows));
   MYSQL_FILESORT_DONE(error, num_rows);
@@ -602,6 +615,7 @@
                        (uchar*) sort_form);
   sort_form->column_bitmaps_set(&sort_form->tmp_set, &sort_form->tmp_set);
 
+  DEBUG_SYNC(thd, "after_index_merge_phase1");
   for (;;)
   {
     if (quick_select)
@@ -652,7 +666,12 @@
       }
       make_sortkey(param,sort_keys[idx++],ref_pos);
     }
-    else
+
+    /*
+      Don't try unlocking the row if skip_record reported an error since in
+      this case the transaction might have been rolled back already.
+    */
+    else if (!thd->is_error())
       file->unlock_row();
     /* It does not make sense to read more keys in case of a fatal error */
     if (thd->is_error())
@@ -813,8 +832,6 @@
       {
         CHARSET_INFO *cs=item->collation.collation;
         char fill_char= ((cs->state & MY_CS_BINSORT) ? (char) 0 : ' ');
-        int diff;
-        uint sort_field_length;
 
         if (maybe_null)
           *to++=1;
@@ -842,25 +859,13 @@
           break;
         }
         length= res->length();
-        sort_field_length= sort_field->length - sort_field->suffix_length;
-        diff=(int) (sort_field_length - length);
-        if (diff < 0)
-        {
-          diff=0;
-          length= sort_field_length;
-        }
-        if (sort_field->suffix_length)
-        {
-          /* Store length last in result_string */
-          store_length(to + sort_field_length, length,
-                       sort_field->suffix_length);
-        }
         if (sort_field->need_strxnfrm)
         {
           char *from=(char*) res->ptr();
           uint tmp_length;
           if ((uchar*) from == to)
           {
+            DBUG_ASSERT(sort_field->length >= length);
             set_if_smaller(length,sort_field->length);
             memcpy(param->tmp_buffer,from,length);
             from=param->tmp_buffer;
@@ -871,6 +876,22 @@
         }
         else
         {
+          uint diff;
+          uint sort_field_length= sort_field->length -
+            sort_field->suffix_length;
+          if (sort_field_length < length)
+          {
+            diff= 0;
+            length= sort_field_length;
+          }
+          else
+            diff= sort_field_length - length;
+          if (sort_field->suffix_length)
+          {
+            /* Store length last in result_string */
+            store_length(to + sort_field_length, length,
+                         sort_field->suffix_length);
+          }
           my_strnxfrm(cs,(uchar*)to,length,(const uchar*)res->ptr(),length);
           cs->cset->fill(cs, (char *)to+length,diff,fill_char);
         }
diff -Nru mysql-5.5-5.5.35+dfsg/sql/ha_ndbcluster_cond.cc mysql-5.5-5.5.43/sql/ha_ndbcluster_cond.cc
--- mysql-5.5-5.5.35+dfsg/sql/ha_ndbcluster_cond.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/ha_ndbcluster_cond.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000, 2011, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/ha_ndbcluster_cond.h mysql-5.5-5.5.43/sql/ha_ndbcluster_cond.h
--- mysql-5.5-5.5.35+dfsg/sql/ha_ndbcluster_cond.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/ha_ndbcluster_cond.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef HA_NDBCLUSTER_COND_INCLUDED
 #define HA_NDBCLUSTER_COND_INCLUDED
 
-/* Copyright (C) 2000-2007 MySQL AB
+/* Copyright (c) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/ha_ndbcluster_tables.h mysql-5.5-5.5.43/sql/ha_ndbcluster_tables.h
--- mysql-5.5-5.5.35+dfsg/sql/ha_ndbcluster_tables.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/ha_ndbcluster_tables.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,8 @@
 #ifndef HA_NDBCLUSTER_TABLES_INCLUDED
 #define HA_NDBCLUSTER_TABLES_INCLUDED
 
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 2006, 2007 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/sql/handler.h mysql-5.5-5.5.43/sql/handler.h
--- mysql-5.5-5.5.35+dfsg/sql/handler.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/handler.h	2015-02-27 08:30:34.000000000 +0000
@@ -868,6 +868,7 @@
 #define HTON_TEMPORARY_NOT_SUPPORTED (1 << 6) //Having temporary tables not supported
 #define HTON_SUPPORT_LOG_TABLES      (1 << 7) //Engine supports log tables
 #define HTON_NO_PARTITION            (1 << 8) //You can not partition these tables
+#define HTON_SUPPORTS_FOREIGN_KEYS   (1 << 9) //Foreign key constraint supported.
 
 class Ha_trx_info;
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/ha_partition.cc mysql-5.5-5.5.43/sql/ha_partition.cc
--- mysql-5.5-5.5.35+dfsg/sql/ha_partition.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/ha_partition.cc	2015-02-27 08:30:34.000000000 +0000
@@ -5398,7 +5398,7 @@
 int ha_partition::handle_ordered_index_scan_key_not_found()
 {
   int error;
-  uint i;
+  uint i, old_elements= m_queue.elements;
   uchar *part_buf= m_ordered_rec_buffer;
   uchar *curr_rec_buf= NULL;
   DBUG_ENTER("ha_partition::handle_ordered_index_scan_key_not_found");
@@ -5433,9 +5433,12 @@
   bitmap_clear_all(&m_key_not_found_partitions);
   m_key_not_found= false;
 
-  /* Update m_top_entry, which may have changed. */
-  uchar *key_buffer= queue_top(&m_queue);
-  m_top_entry= uint2korr(key_buffer);
+  if (m_queue.elements > old_elements)
+  {
+    /* Update m_top_entry, which may have changed. */
+    uchar *key_buffer= queue_top(&m_queue);
+    m_top_entry= uint2korr(key_buffer);
+  }
   DBUG_RETURN(0);
 }
 
@@ -7485,19 +7488,29 @@
 
 int ha_partition::cmp_ref(const uchar *ref1, const uchar *ref2)
 {
-  uint part_id;
+  int cmp;
   my_ptrdiff_t diff1, diff2;
-  handler *file;
   DBUG_ENTER("ha_partition::cmp_ref");
 
+  cmp = m_file[0]->cmp_ref((ref1 + PARTITION_BYTES_IN_POS),
+			   (ref2 + PARTITION_BYTES_IN_POS));
+  if (cmp)
+    DBUG_RETURN(cmp);
+
   if ((ref1[0] == ref2[0]) && (ref1[1] == ref2[1]))
   {
-    part_id= uint2korr(ref1);
-    file= m_file[part_id];
-    DBUG_ASSERT(part_id < m_tot_parts);
-    DBUG_RETURN(file->cmp_ref((ref1 + PARTITION_BYTES_IN_POS),
-			      (ref2 + PARTITION_BYTES_IN_POS)));
+   /* This means that the references are same and are in same partition.*/
+    DBUG_RETURN(0);
   }
+
+  /*
+    In Innodb we compare with either primary key value or global DB_ROW_ID so
+    it is not possible that the two references are equal and are in different
+    partitions, but in myisam it is possible since we are comparing offsets.
+    Remove this assert if DB_ROW_ID is changed to be per partition.
+  */
+  DBUG_ASSERT(!m_innodb);
+
   diff1= ref2[1] - ref1[1];
   diff2= ref2[0] - ref1[0];
   if (diff1 > 0)
diff -Nru mysql-5.5-5.5.35+dfsg/sql/hostname.cc mysql-5.5-5.5.43/sql/hostname.cc
--- mysql-5.5-5.5.35+dfsg/sql/hostname.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/hostname.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/item.cc mysql-5.5-5.5.43/sql/item.cc
--- mysql-5.5-5.5.35+dfsg/sql/item.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -5143,6 +5143,18 @@
 }
 
 
+/**
+  Verifies that the input string is well-formed according to its character set.
+  @param send_error   If true, call my_error if string is not well-formed.
+
+  Will truncate input string if it is not well-formed.
+
+  @return
+  If well-formed: input string.
+  If not well-formed:
+    if strict mode: NULL pointer and we set this Item's value to NULL
+    if not strict mode: input string truncated up to last good character
+ */
 String *Item::check_well_formed_result(String *str, bool send_error)
 {
   /* Check whether we got a well-formed string */
@@ -5229,7 +5241,7 @@
 
   If max_length > CONVERT_IF_BIGGER_TO_BLOB create a blob @n
   If max_length > 0 create a varchar @n
-  If max_length == 0 create a CHAR(0) 
+  If max_length == 0 create a CHAR(0) (or VARCHAR(0) if we are grouping)
 
   @param table		Table for which the field is created
 */
@@ -5247,8 +5259,19 @@
     field= new Field_varstring(max_length, maybe_null, name, table->s,
                                collation.collation);
   else
-    field= new Field_string(max_length, maybe_null, name,
-                            collation.collation);
+  {
+    /*
+     marker == 4 : see create_tmp_table()
+     With CHAR(0) end_update() may write garbage into the next field.
+    */
+    if (max_length == 0 && marker == 4 && maybe_null &&
+        field_type() == MYSQL_TYPE_VAR_STRING && type() != Item::TYPE_HOLDER)
+      field= new Field_varstring(max_length, maybe_null, name, table->s,
+                                 collation.collation);
+    else
+      field= new Field_string(max_length, maybe_null, name,
+                              collation.collation);
+  }
   if (field)
     field->init(table);
   return field;
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item_cmpfunc.h mysql-5.5-5.5.43/sql/item_cmpfunc.h
--- mysql-5.5-5.5.35+dfsg/sql/item_cmpfunc.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_cmpfunc.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_CMPFUNC_INCLUDED
 #define ITEM_CMPFUNC_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/item_func.cc mysql-5.5-5.5.43/sql/item_func.cc
--- mysql-5.5-5.5.35+dfsg/sql/item_func.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_func.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -1649,9 +1649,11 @@
 {
   Item_result argtype= args[0]->result_type();
   /* use precision ony for the data type it is applicable for and valid */
-  max_length=args[0]->max_length -
-    (argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
-     args[0]->decimals : 0);
+  uint32 char_length= args[0]->max_char_length() -
+                      (argtype == DECIMAL_RESULT || argtype == INT_RESULT ?
+                       args[0]->decimals : 0);
+  fix_char_length(char_length > MY_INT64_NUM_DECIMAL_DIGITS ?
+                  MY_INT64_NUM_DECIMAL_DIGITS : char_length);
   maybe_null=1;
   unsigned_flag=args[0]->unsigned_flag | args[1]->unsigned_flag;
 }
@@ -1758,7 +1760,13 @@
   if ((null_value= args[0]->null_value))
     return 0;
   if (args[0]->unsigned_flag &&
-      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1)
+      (ulonglong) value > (ulonglong) LONGLONG_MAX + 1ULL)
+    return raise_integer_overflow();
+  // For some platforms we need special handling of LONGLONG_MIN to
+  // guarantee overflow.
+  if (value == LONGLONG_MIN &&
+      !args[0]->unsigned_flag &&
+      !unsigned_flag)
     return raise_integer_overflow();
   return check_integer_overflow(-value, !args[0]->unsigned_flag && value < 0);
 }
@@ -3343,8 +3351,12 @@
 	{
 	  f_args.args[i]=    (char*) res->ptr();
 	  f_args.lengths[i]= res->length();
-	  break;
 	}
+	else
+	{
+	  f_args.lengths[i]= 0;
+	}
+	break;
       }
     case INT_RESULT:
       *((longlong*) to) = args[i]->val_int();
@@ -6157,21 +6169,24 @@
   DBUG_ASSERT(fixed == 1);
   String *res=args[0]->val_str(&value);
   User_level_lock *ull;
+  longlong ret_val= 0LL;
 
   null_value=0;
   if (!res || !res->length())
   {
     null_value=1;
-    return 0;
+    return ret_val;
   }
   
   mysql_mutex_lock(&LOCK_user_locks);
   ull= (User_level_lock *) my_hash_search(&hash_user_locks, (uchar*) res->ptr(),
                                           (size_t) res->length());
-  mysql_mutex_unlock(&LOCK_user_locks);
   if (!ull || !ull->locked)
-    return 1;
-  return 0;
+    ret_val= 1;
+  mysql_mutex_unlock(&LOCK_user_locks);
+  DEBUG_SYNC(current_thd, "after_getting_user_level_lock_info");
+
+  return ret_val;
 }
 
 longlong Item_func_is_used_lock::val_int()
@@ -6179,6 +6194,7 @@
   DBUG_ASSERT(fixed == 1);
   String *res=args[0]->val_str(&value);
   User_level_lock *ull;
+  my_thread_id thread_id= 0UL;
 
   null_value=1;
   if (!res || !res->length())
@@ -6187,12 +6203,15 @@
   mysql_mutex_lock(&LOCK_user_locks);
   ull= (User_level_lock *) my_hash_search(&hash_user_locks, (uchar*) res->ptr(),
                                           (size_t) res->length());
+  if ((ull != NULL) && ull->locked)
+  {
+    null_value= 0;
+    thread_id= ull->thread_id;
+  }
   mysql_mutex_unlock(&LOCK_user_locks);
-  if (!ull || !ull->locked)
-    return 0;
+  DEBUG_SYNC(current_thd, "after_getting_user_level_lock_info");
 
-  null_value=0;
-  return ull->thread_id;
+  return thread_id;
 }
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item_func.h mysql-5.5-5.5.43/sql/item_func.h
--- mysql-5.5-5.5.35+dfsg/sql/item_func.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_func.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_FUNC_INCLUDED
 #define ITEM_FUNC_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -251,7 +251,8 @@
   inline longlong check_integer_overflow(longlong value, bool val_unsigned)
   {
     if ((unsigned_flag && !val_unsigned && value < 0) ||
-        (!unsigned_flag && val_unsigned && (ulonglong) value > LONGLONG_MAX))
+        (!unsigned_flag && val_unsigned &&
+         (ulonglong) value > (ulonglong) LONGLONG_MAX))
       return raise_integer_overflow();
     return value;
   }
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item.h mysql-5.5-5.5.43/sql/item.h
--- mysql-5.5-5.5.35+dfsg/sql/item.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_INCLUDED
 #define ITEM_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -3289,7 +3289,11 @@
     collation.set(item->collation);
     unsigned_flag= item->unsigned_flag;
     if (item->type() == FIELD_ITEM)
+    {
       cached_field= ((Item_field *)item)->field;
+      if (cached_field->table)
+        used_table_map= cached_field->table->map;
+    }
     return 0;
   };
   enum Type type() const { return CACHE_ITEM; }
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item_strfunc.cc mysql-5.5-5.5.43/sql/item_strfunc.cc
--- mysql-5.5-5.5.35+dfsg/sql/item_strfunc.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_strfunc.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -195,16 +195,27 @@
 }
 
 
+/*
+  The MD5()/SHA() functions treat their parameter as being a case sensitive.
+  Thus we set binary collation on it so different instances of MD5() will be
+  compared properly.
+*/
+static CHARSET_INFO *get_checksum_charset(const char *csname)
+{
+  CHARSET_INFO *cs= get_charset_by_csname(csname, MY_CS_BINSORT, MYF(0));
+  if (!cs)
+  {
+    // Charset has no binary collation: use my_charset_bin.
+    cs= &my_charset_bin;
+  }
+  return cs;
+}
+
+
 void Item_func_md5::fix_length_and_dec()
 {
-  /*
-    The MD5() function treats its parameter as being a case sensitive. Thus
-    we set binary collation on it so different instances of MD5() will be
-    compared properly.
-  */
-  args[0]->collation.set(
-      get_charset_by_csname(args[0]->collation.collation->csname,
-                            MY_CS_BINSORT,MYF(0)), DERIVATION_COERCIBLE);
+  CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
+  args[0]->collation.set(cs, DERIVATION_COERCIBLE);
   fix_length_and_charset(32, default_charset());
 }
 
@@ -239,14 +250,8 @@
 
 void Item_func_sha::fix_length_and_dec()
 {
-  /*
-    The SHA() function treats its parameter as being a case sensitive. Thus
-    we set binary collation on it so different instances of MD5() will be
-    compared properly.
-  */
-  args[0]->collation.set(
-      get_charset_by_csname(args[0]->collation.collation->csname,
-                            MY_CS_BINSORT,MYF(0)), DERIVATION_COERCIBLE);
+  CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
+  args[0]->collation.set(cs, DERIVATION_COERCIBLE);
   // size of hex representation of hash
   fix_length_and_charset(SHA1_HASH_SIZE * 2, default_charset());
 }
@@ -369,18 +374,9 @@
       ER(ER_WRONG_PARAMETERS_TO_NATIVE_FCT), "sha2");
   }
 
-  /*
-    The SHA2() function treats its parameter as being a case sensitive.
-    Thus we set binary collation on it so different instances of SHA2()
-    will be compared properly.
-  */
+  CHARSET_INFO *cs= get_checksum_charset(args[0]->collation.collation->csname);
+  args[0]->collation.set(cs, DERIVATION_COERCIBLE);
 
-  args[0]->collation.set(
-      get_charset_by_csname(
-        args[0]->collation.collation->csname,
-        MY_CS_BINSORT,
-        MYF(0)),
-      DERIVATION_COERCIBLE);
 #else
   push_warning_printf(current_thd,
     MYSQL_ERROR::WARN_LEVEL_WARN,
@@ -1005,6 +1001,7 @@
       if ((l= my_ismbchar(res->charset(),ptr,end)))
       {
         tmp-= l;
+        DBUG_ASSERT(tmp >= tmp_value.ptr());
         memcpy(tmp,ptr,l);
         ptr+= l;
       }
@@ -1587,6 +1584,42 @@
   return (&tmp_value);
 }
 
+
+/**
+  A helper function for trim(leading ...) for multibyte charsets.
+  @param res        Copy of 'res' in calling functions.
+  @param ptr        Where to start trimming.
+  @param end        End of string to be trimmed.
+  @param remove_str The string to be removed from [ptr .. end)
+  @return           Pointer to left-trimmed string.
+ */
+static inline
+char *trim_left_mb(String *res, char *ptr, char *end, String *remove_str)
+{
+  const char * const r_ptr= remove_str->ptr();
+  const uint remove_length= remove_str->length();
+
+  while (ptr + remove_length <= end)
+  {
+    uint num_bytes= 0;
+    while (num_bytes < remove_length)
+    {
+      uint len;
+      if ((len= my_ismbchar(res->charset(), ptr + num_bytes, end)))
+        num_bytes+= len;
+      else
+        ++num_bytes;
+    }
+    if (num_bytes != remove_length)
+      break;
+    if (memcmp(ptr, r_ptr, remove_length))
+      break;
+    ptr+= remove_length;
+  }
+  return ptr;
+}
+
+
 /*
 ** The trim functions are extension to ANSI SQL because they trim substrings
 ** They ltrim() and rtrim() functions are optimized for 1 byte strings
@@ -1621,19 +1654,28 @@
 
   ptr= (char*) res->ptr();
   end= ptr+res->length();
-  if (remove_length == 1)
+#ifdef USE_MB
+  if (use_mb(res->charset()))
   {
-    char chr=(*remove_str)[0];
-    while (ptr != end && *ptr == chr)
-      ptr++;
+    ptr= trim_left_mb(res, ptr, end, remove_str);
   }
   else
+#endif /* USE_MB */
   {
-    const char *r_ptr=remove_str->ptr();
-    end-=remove_length;
-    while (ptr <= end && !memcmp(ptr, r_ptr, remove_length))
-      ptr+=remove_length;
-    end+=remove_length;
+    if (remove_length == 1)
+    {
+      char chr=(*remove_str)[0];
+      while (ptr != end && *ptr == chr)
+        ptr++;
+    }
+    else
+    {
+      const char *r_ptr=remove_str->ptr();
+      end-=remove_length;
+      while (ptr <= end && !memcmp(ptr, r_ptr, remove_length))
+        ptr+=remove_length;
+      end+=remove_length;
+    }
   }
   if (ptr == res->ptr())
     return res;
@@ -1727,11 +1769,8 @@
 {
   DBUG_ASSERT(fixed == 1);
   char buff[MAX_FIELD_WIDTH], *ptr, *end;
-  const char *r_ptr;
   String tmp(buff, sizeof(buff), system_charset_info);
   String *res, *remove_str;
-  uint remove_length;
-  LINT_INIT(remove_length);
 
   res= args[0]->val_str(str);
   if ((null_value=args[0]->null_value))
@@ -1744,25 +1783,28 @@
       return 0;
   }
 
-  if ((remove_length= remove_str->length()) == 0 ||
+  const uint remove_length= remove_str->length();
+  if (remove_length == 0 ||
       remove_length > res->length())
     return res;
 
   ptr= (char*) res->ptr();
   end= ptr+res->length();
-  r_ptr= remove_str->ptr();
-  while (ptr+remove_length <= end && !memcmp(ptr,r_ptr,remove_length))
-    ptr+=remove_length;
+  const char * const r_ptr= remove_str->ptr();
 #ifdef USE_MB
   if (use_mb(res->charset()))
   {
+    ptr= trim_left_mb(res, ptr, end, remove_str);
+
     char *p=ptr;
     register uint32 l;
  loop:
     while (ptr + remove_length < end)
     {
-      if ((l=my_ismbchar(res->charset(), ptr,end))) ptr+=l;
-      else ++ptr;
+      if ((l= my_ismbchar(res->charset(), ptr,end)))
+        ptr+= l;
+      else
+        ++ptr;
     }
     if (ptr + remove_length == end && !memcmp(ptr,r_ptr,remove_length))
     {
@@ -1775,6 +1817,8 @@
   else
 #endif /* USE_MB */
   {
+    while (ptr+remove_length <= end && !memcmp(ptr,r_ptr,remove_length))
+      ptr+=remove_length;
     while (ptr + remove_length <= end &&
 	   !memcmp(end-remove_length,r_ptr,remove_length))
       end-=remove_length;
@@ -2770,6 +2814,16 @@
     rpad->set_charset(&my_charset_bin);
   }
 
+#ifdef USE_MB
+  if (use_mb(rpad->charset()))
+  {
+    // This will chop off any trailing illegal characters from rpad.
+    String *well_formed_pad= args[2]->check_well_formed_result(rpad, false);
+    if (!well_formed_pad)
+      goto err;
+  }
+#endif
+
   if (count <= (res_char_length= res->numchars()))
   {						// String to pad is big enough
     res->length(res->charpos((int) count));	// Shorten result if longer
@@ -2873,6 +2927,16 @@
     pad->set_charset(&my_charset_bin);
   }
 
+#ifdef USE_MB
+  if (use_mb(pad->charset()))
+  {
+    // This will chop off any trailing illegal characters from pad.
+    String *well_formed_pad= args[2]->check_well_formed_result(pad, false);
+    if (!well_formed_pad)
+      goto err;
+  }
+#endif
+
   res_char_length= res->numchars();
 
   if (count <= res_char_length)
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item_sum.cc mysql-5.5-5.5.43/sql/item_sum.cc
--- mysql-5.5-5.5.35+dfsg/sql/item_sum.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_sum.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013  Oracle and/or its affiliates. All
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
    rights reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -1052,18 +1052,19 @@
       endup_done= TRUE;
     }
   }
-  else
-  {
-    /*
-      We don't have a tree only if 'setup()' hasn't been called;
-      this is the case of sql_select.cc:return_zero_rows.
-    */
-    if (tree)
-      table->field[0]->set_notnull();
-  }
 
+ /*
+   We don't have a tree only if 'setup()' hasn't been called;
+   this is the case of sql_executor.cc:return_zero_rows.
+ */
   if (tree && !endup_done)
   {
+   /*
+     All tree's values are not NULL.
+     Note that value of field is changed as we walk the tree, in
+     Aggregator_distinct::unique_walk_function, but it's always not NULL.
+   */
+   table->field[0]->set_notnull();
     /* go over the tree of distinct keys and calculate the aggregate value */
     use_distinct_values= TRUE;
     tree->walk(item_sum_distinct_walk, (void*) this);
@@ -1334,7 +1335,7 @@
   {
     my_decimal value;
     const my_decimal *val= aggr->arg_val_decimal(&value);
-    if (!aggr->arg_is_null())
+    if (!aggr->arg_is_null(true))
     {
       my_decimal_add(E_DEC_FATAL_ERROR, dec_buffs + (curr_dec_buff^1),
                      val, dec_buffs + curr_dec_buff);
@@ -1345,7 +1346,7 @@
   else
   {
     sum+= aggr->arg_val_real();
-    if (!aggr->arg_is_null())
+    if (!aggr->arg_is_null(true))
       null_value= 0;
   }
   DBUG_RETURN(0);
@@ -1455,9 +1456,27 @@
 }
 
 
-bool Aggregator_simple::arg_is_null()
+bool Aggregator_simple::arg_is_null(bool use_null_value)
 {
-  return item_sum->args[0]->null_value;
+  Item **item= item_sum->args;
+  const uint item_count= item_sum->arg_count;
+  if (use_null_value)
+  {
+    for (uint i= 0; i < item_count; i++)
+    {
+      if (item[i]->null_value)
+        return true;
+    }
+  }
+  else
+  {
+    for (uint i= 0; i < item_count; i++)
+    {
+      if (item[i]->maybe_null && item[i]->is_null())
+        return true;
+    }
+  }
+  return false;
 }
 
 
@@ -1475,10 +1494,17 @@
 }
 
 
-bool Aggregator_distinct::arg_is_null()
+bool Aggregator_distinct::arg_is_null(bool use_null_value)
 {
-  return use_distinct_values ? table->field[0]->is_null() :
-    item_sum->args[0]->null_value;
+  if (use_distinct_values)
+  {
+    const bool rc= table->field[0]->is_null();
+    DBUG_ASSERT(!rc); // NULLs are never stored in 'tree'
+    return rc;
+  }
+  return use_null_value ?
+    item_sum->args[0]->null_value :
+    (item_sum->args[0]->maybe_null && item_sum->args[0]->is_null());
 }
 
 
@@ -1496,11 +1522,8 @@
 
 bool Item_sum_count::add()
 {
-  for (uint i=0; i<arg_count; i++)
-  {
-    if (args[i]->maybe_null && args[i]->is_null())
-      return 0;
-  }
+  if (aggr->arg_is_null(false))
+    return 0;
   count++;
   return 0;
 }
@@ -1591,7 +1614,7 @@
 {
   if (Item_sum_sum::add())
     return TRUE;
-  if (!aggr->arg_is_null())
+  if (!aggr->arg_is_null(true))
     count++;
   return FALSE;
 }
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item_sum.h mysql-5.5-5.5.43/sql/item_sum.h
--- mysql-5.5-5.5.35+dfsg/sql/item_sum.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_sum.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef ITEM_SUM_INCLUDED
 #define ITEM_SUM_INCLUDED
 
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights
+/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. reserved.
    reserved.
 
    This program is free software; you can redistribute it and/or modify
@@ -58,19 +58,8 @@
   /* the aggregate function class to act on */
   Item_sum *item_sum;
 
-  /**
-    When feeding back the data in endup() from Unique/temp table back to
-    Item_sum::add() methods we must read the data from Unique (and not 
-    recalculate the functions that are given as arguments to the aggregate
-    function. 
-    This flag is to tell the add() methods to take the data from the Unique
-    instead by calling the relevant val_..() method
-  */
-
-  bool use_distinct_values;
-
 public:
-  Aggregator (Item_sum *arg): item_sum(arg), use_distinct_values(FALSE) {}
+  Aggregator (Item_sum *arg): item_sum(arg) {}
   virtual ~Aggregator () {}                   /* Keep gcc happy */
 
   enum Aggregator_type { SIMPLE_AGGREGATOR, DISTINCT_AGGREGATOR }; 
@@ -107,10 +96,16 @@
   /** Floating point value of being-aggregated argument */
   virtual double arg_val_real() = 0;
   /**
-     NULLness of being-aggregated argument; can be called only after
-     arg_val_decimal() or arg_val_real().
+    NULLness of being-aggregated argument.
+
+    @param use_null_value Optimization: to determine if the argument is NULL
+    we must, in the general case, call is_null() on it, which itself might
+    call val_*() on it, which might be costly. If you just have called
+    arg_val*(), you can pass use_null_value=true; this way, arg_is_null()
+    might avoid is_null() and instead do a cheap read of the Item's null_value
+    (updated by arg_val*()).
   */
-  virtual bool arg_is_null() = 0;
+  virtual bool arg_is_null(bool use_null_value) = 0;
 };
 
 
@@ -480,7 +475,7 @@
 
   Item *get_arg(uint i) { return args[i]; }
   Item *set_arg(uint i, THD *thd, Item *new_val);
-  uint get_arg_count() { return arg_count; }
+  uint get_arg_count() const { return arg_count; }
 
   /* Initialization of distinct related members */
   void init_aggregator()
@@ -607,10 +602,20 @@
   */
   bool always_null;
 
+  /**
+    When feeding back the data in endup() from Unique/temp table back to
+    Item_sum::add() methods we must read the data from Unique (and not
+    recalculate the functions that are given as arguments to the aggregate
+    function.
+    This flag is to tell the arg_*() methods to take the data from the Unique
+    instead of calling the relevant val_..() method.
+  */
+  bool use_distinct_values;
+
 public:
   Aggregator_distinct (Item_sum *sum) :
     Aggregator(sum), table(NULL), tmp_table_param(NULL), tree(NULL),
-    always_null(FALSE) {}
+    always_null(false), use_distinct_values(false) {}
   virtual ~Aggregator_distinct ();
   Aggregator_type Aggrtype() { return DISTINCT_AGGREGATOR; }
 
@@ -620,7 +625,7 @@
   void endup();
   virtual my_decimal *arg_val_decimal(my_decimal * value);
   virtual double arg_val_real();
-  virtual bool arg_is_null();
+  virtual bool arg_is_null(bool use_null_value);
 
   bool unique_walk_function(void *element);
   static int composite_key_cmp(void* arg, uchar* key1, uchar* key2);
@@ -646,7 +651,7 @@
   void endup() {};
   virtual my_decimal *arg_val_decimal(my_decimal * value);
   virtual double arg_val_real();
-  virtual bool arg_is_null();
+  virtual bool arg_is_null(bool use_null_value);
 };
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/item_xmlfunc.cc mysql-5.5-5.5.43/sql/item_xmlfunc.cc
--- mysql-5.5-5.5.35+dfsg/sql/item_xmlfunc.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/item_xmlfunc.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 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
@@ -226,6 +226,9 @@
   {
     max_length= MAX_BLOB_WIDTH;
     collation.collation= pxml->charset();
+    // To avoid premature evaluation, mark all nodeset functions as non-const.
+    used_tables_cache= RAND_TABLE_BIT;
+    const_item_cache= false;
   }
   const char *func_name() const { return "nodeset"; }
 };
diff -Nru mysql-5.5-5.5.35+dfsg/sql/key.cc mysql-5.5-5.5.43/sql/key.cc
--- mysql-5.5-5.5.35+dfsg/sql/key.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/key.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/key.h mysql-5.5-5.5.43/sql/key.h
--- mysql-5.5-5.5.35+dfsg/sql/key.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/key.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/lex_symbol.h mysql-5.5-5.5.43/sql/lex_symbol.h
--- mysql-5.5-5.5.35+dfsg/sql/lex_symbol.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/lex_symbol.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB
+/* Copyright (c) 2000, 2001, 2004, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/log.cc mysql-5.5-5.5.43/sql/log.cc
--- mysql-5.5-5.5.35+dfsg/sql/log.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/log.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -2322,6 +2322,7 @@
                      const char *new_name, enum cache_type io_cache_type_arg)
 {
   char buff[FN_REFLEN];
+  MY_STAT f_stat;
   File file= -1;
   int open_flags= O_CREAT | O_BINARY;
   DBUG_ENTER("MYSQL_LOG::open");
@@ -2339,6 +2340,10 @@
                                  log_type_arg, io_cache_type_arg))
     goto err;
 
+  /* File is regular writable file */
+  if (my_stat(log_file_name, &f_stat, MYF(0)) && !MY_S_ISREG(f_stat.st_mode))
+    goto err;
+
   if (io_cache_type == SEQ_READ_APPEND)
     open_flags |= O_RDWR | O_APPEND;
   else
@@ -3428,6 +3433,13 @@
   ha_reset_logs(thd);
 
   /*
+    We need to get both locks to be sure that no one is trying to
+    write to the index log file.
+  */
+  mysql_mutex_lock(&LOCK_log);
+  mysql_mutex_lock(&LOCK_index);
+
+  /*
     The following mutex is needed to ensure that no threads call
     'delete thd' as we would then risk missing a 'rollback' from this
     thread. If the transaction involved MyISAM tables, it should go
@@ -3435,13 +3447,6 @@
   */
   mysql_mutex_lock(&LOCK_thread_count);
 
-  /*
-    We need to get both locks to be sure that no one is trying to
-    write to the index log file.
-  */
-  mysql_mutex_lock(&LOCK_log);
-  mysql_mutex_lock(&LOCK_index);
-
   /* Save variables so that we can reopen the log */
   save_name=name;
   name=0;					// Protect against free
diff -Nru mysql-5.5-5.5.35+dfsg/sql/log_event.cc mysql-5.5-5.5.43/sql/log_event.cc
--- mysql-5.5-5.5.35+dfsg/sql/log_event.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/log_event.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -18,6 +18,7 @@
 #ifdef MYSQL_CLIENT
 
 #include "sql_priv.h"
+#include "mysqld_error.h"
 
 #else
 
@@ -1306,7 +1307,7 @@
       ev = new Execute_load_log_event(buf, event_len, description_event);
       break;
     case START_EVENT_V3: /* this is sent only by MySQL <=4.x */
-      ev = new Start_log_event_v3(buf, description_event);
+      ev = new Start_log_event_v3(buf, event_len, description_event);
       break;
     case STOP_EVENT:
       ev = new Stop_log_event(buf, description_event);
@@ -1945,6 +1946,14 @@
     else
     {
       my_b_printf(file, "###   @%d=", i + 1);
+      size_t fsize= td->calc_field_size((uint)i, (uchar*) value);
+      if (value + fsize > m_rows_end)
+      {
+        my_b_printf(file, "***Corrupted replication event was detected."
+                    " Not printing the value***\n");
+        value+= fsize;
+        return 0;
+      }
       size_t size= log_event_print_value(file, value,
                                          td->type(i), td->field_metadata(i),
                                          typestr, sizeof(typestr));
@@ -2153,13 +2162,8 @@
   DBUG_ENTER("Log_event::print_timestamp");
   if (!ts)
     ts = &when;
-#ifdef MYSQL_SERVER				// This is always false
   struct tm tm_tmp;
   localtime_r(ts,(res= &tm_tmp));
-#else
-  res=localtime(ts);
-#endif
-
   my_b_printf(file,"%02d%02d%02d %2d:%02d:%02d",
               res->tm_year % 100,
               res->tm_mon+1,
@@ -3779,11 +3783,17 @@
   Start_log_event_v3::Start_log_event_v3()
 */
 
-Start_log_event_v3::Start_log_event_v3(const char* buf,
+Start_log_event_v3::Start_log_event_v3(const char* buf, uint event_len,
                                        const Format_description_log_event
                                        *description_event)
-  :Log_event(buf, description_event)
+  :Log_event(buf, description_event), binlog_version(BINLOG_VERSION)
 {
+  if (event_len < (uint)description_event->common_header_len +
+      ST_COMMON_HEADER_LEN_OFFSET)
+  {
+    server_version[0]= 0;
+    return;
+  }
   buf+= description_event->common_header_len;
   binlog_version= uint2korr(buf+ST_BINLOG_VER_OFFSET);
   memcpy(server_version, buf+ST_SERVER_VER_OFFSET,
@@ -4073,9 +4083,12 @@
                              const
                              Format_description_log_event*
                              description_event)
-  :Start_log_event_v3(buf, description_event), event_type_permutation(0)
+  :Start_log_event_v3(buf, event_len, description_event),
+   common_header_len(0), post_header_len(NULL), event_type_permutation(0)
 {
   DBUG_ENTER("Format_description_log_event::Format_description_log_event(char*,...)");
+  if (!Start_log_event_v3::is_valid())
+    DBUG_VOID_RETURN; /* sanity check */
   buf+= LOG_EVENT_MINIMAL_HEADER_LEN;
   if ((common_header_len=buf[ST_COMMON_HEADER_LEN_OFFSET]) < OLD_HEADER_LEN)
     DBUG_VOID_RETURN; /* sanity check */
@@ -4375,7 +4388,7 @@
   return
     //the DB name may double if we escape the quote character
     5 + 2*db_len + 3 +
-    18 + fname_len + 2 +                    // "LOAD DATA INFILE 'file''"
+    18 + fname_len*4 + 2 +                    // "LOAD DATA INFILE 'file''"
     11 +                                    // "CONCURRENT "
     7 +					    // LOCAL
     9 +                                     // " REPLACE or IGNORE "
@@ -4421,9 +4434,9 @@
 
   if (check_fname_outside_temp_buf())
     pos= strmov(pos, "LOCAL ");
-  pos= strmov(pos, "INFILE '");
-  memcpy(pos, fname, fname_len);
-  pos= strmov(pos+fname_len, "' ");
+  pos= strmov(pos, "INFILE ");
+  pos= pretty_print_str(pos, fname, fname_len);
+  pos= strmov(pos, " ");
 
   if (sql_ex.opt_flags & REPLACE_FLAG)
     pos= strmov(pos, "REPLACE ");
@@ -4711,11 +4724,22 @@
   fields = (char*)field_lens + num_fields;
   table_name  = fields + field_block_len;
   db = table_name + table_name_len + 1;
+  DBUG_EXECUTE_IF ("simulate_invalid_address",
+                   db_len = data_len;);
   fname = db + db_len + 1;
+  if ((db_len > data_len) || (fname > buf_end))
+    goto err;
   fname_len = (uint) strlen(fname);
+  if ((fname_len > data_len) || (fname + fname_len > buf_end))
+    goto err;
   // null termination is accomplished by the caller doing buf[event_len]=0
 
   DBUG_RETURN(0);
+
+err:
+  // Invalid event.
+  table_name = 0;
+  DBUG_RETURN(1);
 }
 
 
@@ -7319,9 +7343,9 @@
   if (local_fname)
   {
     my_b_write(&cache, (uchar*) query, fn_pos_start);
-    my_b_printf(&cache, " LOCAL INFILE \'");
-    my_b_printf(&cache, "%s", local_fname);
-    my_b_printf(&cache, "\'");
+    my_b_printf(&cache, " LOCAL INFILE ");
+    pretty_print_str(&cache, local_fname, strlen(local_fname));
+
     if (dup_handling == LOAD_DUP_REPLACE)
       my_b_printf(&cache, " REPLACE");
     my_b_printf(&cache, " INTO");
@@ -7747,8 +7771,31 @@
   if (static_cast<size_t>(m_rows_end - m_rows_cur) <= length)
   {
     size_t const block_size= 1024;
-    my_ptrdiff_t const cur_size= m_rows_cur - m_rows_buf;
-    my_ptrdiff_t const new_alloc= 
+    ulong cur_size= m_rows_cur - m_rows_buf;
+    DBUG_EXECUTE_IF("simulate_too_big_row_case1",
+                     cur_size= UINT_MAX32 - (block_size * 10);
+                     length= UINT_MAX32 - (block_size * 10););
+    DBUG_EXECUTE_IF("simulate_too_big_row_case2",
+                     cur_size= UINT_MAX32 - (block_size * 10);
+                     length= block_size * 10;);
+    DBUG_EXECUTE_IF("simulate_too_big_row_case3",
+                     cur_size= block_size * 10;
+                     length= UINT_MAX32 - (block_size * 10););
+    DBUG_EXECUTE_IF("simulate_too_big_row_case4",
+                     cur_size= UINT_MAX32 - (block_size * 10);
+                     length= (block_size * 10) - block_size + 1;);
+    ulong remaining_space= UINT_MAX32 - cur_size;
+    /* Check that the new data fits within remaining space and we can add
+       block_size without wrapping.
+     */
+    if (length > remaining_space ||
+        ((length + block_size) > remaining_space))
+    {
+      sql_print_error("The row data is greater than 4GB, which is too big to "
+                      "write to the binary log.");
+      DBUG_RETURN(ER_BINLOG_ROW_LOGGING_FAILED);
+    }
+    ulong const new_alloc= 
         block_size * ((cur_size + length + block_size - 1) / block_size);
 
     uchar* const new_buf= (uchar*)my_realloc((uchar*)m_rows_buf, (uint) new_alloc,
@@ -7961,6 +8008,14 @@
 
   DBUG_PRINT("debug", ("m_table: 0x%lx, m_table_id: %lu", (ulong) m_table, m_table_id));
 
+  /*
+    A row event comprising of a P_S table
+    - should not be replicated (i.e executed) by the slave SQL thread.
+    - should not be executed by the client in the  form BINLOG '...' stmts.
+  */
+  if (table && table->s->table_category == TABLE_CATEGORY_PERFORMANCE)
+    table= NULL;
+
   if (table)
   {
     bool transactional_table= table->file->has_transactions();
@@ -8019,10 +8074,14 @@
     /*
       Bug#56662 Assertion failed: next_insert_id == 0, file handler.cc
       Don't allow generation of auto_increment value when processing
-      rows event by setting 'MODE_NO_AUTO_VALUE_ON_ZERO'.
+      rows event by setting 'MODE_NO_AUTO_VALUE_ON_ZERO'. The exception
+      to this rule happens when the auto_inc column exists on some
+      extra columns on the slave. In that case, do not force
+      MODE_NO_AUTO_VALUE_ON_ZERO.
     */
     ulong saved_sql_mode= thd->variables.sql_mode;
-    thd->variables.sql_mode= MODE_NO_AUTO_VALUE_ON_ZERO;
+    if (!is_auto_inc_in_extra_columns())
+      thd->variables.sql_mode= MODE_NO_AUTO_VALUE_ON_ZERO;
 
     // row processing loop
 
@@ -9077,9 +9136,28 @@
    * table->auto_increment_field_not_null and SQL_MODE(if includes
    * MODE_NO_AUTO_VALUE_ON_ZERO) in update_auto_increment function.
    * SQL_MODE of slave sql thread is always consistency with master's.
-   * In RBR, auto_increment fields never are NULL.
+   * In RBR, auto_increment fields never are NULL, except if the auto_inc
+   * column exists only on the slave side (i.e., in an extra column
+   * on the slave's table).
    */
-  m_table->auto_increment_field_not_null= TRUE;
+  if (!is_auto_inc_in_extra_columns())
+    m_table->auto_increment_field_not_null= TRUE;
+  else
+  {
+    /*
+      Here we have checked that there is an extra field
+      on this server's table that has an auto_inc column.
+
+      Mark that the auto_increment field is null and mark
+      the read and write set bits.
+
+      (There can only be one AUTO_INC column, it is always
+       indexed and it cannot have a DEFAULT value).
+    */
+    m_table->auto_increment_field_not_null= FALSE;
+    m_table->mark_auto_increment_column();
+  }
+
   return error;
 }
 
@@ -9088,6 +9166,19 @@
                                               int error)
 {
   int local_error= 0;
+
+  /**
+    Clear the write_set bit for auto_inc field that only
+    existed on the destination table as an extra column.
+   */
+  if (is_auto_inc_in_extra_columns())
+  {
+    bitmap_clear_bit(m_table->write_set, m_table->next_number_field->field_index);
+    bitmap_clear_bit( m_table->read_set, m_table->next_number_field->field_index);
+
+    if (get_flags(STMT_END_F))
+      m_table->file->ha_release_auto_increment();
+  }
   m_table->next_number_field=0;
   m_table->auto_increment_field_not_null= FALSE;
   if ((slave_exec_mode == SLAVE_EXEC_MODE_IDEMPOTENT) ||
@@ -9211,7 +9302,13 @@
     ulong estimated_rows= (m_rows_end - m_curr_row) / (m_curr_row_end - m_curr_row);
     m_table->file->ha_start_bulk_insert(estimated_rows);
   }
-  
+
+  /*
+    Explicitly set the auto_inc to null to make sure that
+    it gets an auto_generated value.
+  */
+  if (is_auto_inc_in_extra_columns())
+    m_table->next_number_field->set_null();
   
 #ifndef DBUG_OFF
   DBUG_DUMP("record[0]", table->record[0], table->s->reclength);
@@ -9869,6 +9966,7 @@
             table->file->print_error(error, MYF(0));
             goto err;
           }
+          goto restart_rnd_next;
         }
         break;
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/log_event.h mysql-5.5-5.5.43/sql/log_event.h
--- mysql-5.5-5.5.35+dfsg/sql/log_event.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/log_event.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -2276,14 +2276,14 @@
   void print(FILE* file, PRINT_EVENT_INFO* print_event_info);
 #endif
 
-  Start_log_event_v3(const char* buf,
+  Start_log_event_v3(const char* buf, uint event_len,
                      const Format_description_log_event* description_event);
   ~Start_log_event_v3() {}
   Log_event_type get_type_code() { return START_EVENT_V3;}
 #ifdef MYSQL_SERVER
   bool write(IO_CACHE* file);
 #endif
-  bool is_valid() const { return 1; }
+  bool is_valid() const { return server_version[0] != 0; }
   int get_data_size()
   {
     return START_V3_HEADER_LEN; //no variable-sized part
@@ -3732,12 +3732,22 @@
     DBUG_ASSERT(m_table);
 
     ASSERT_OR_RETURN_ERROR(m_curr_row < m_rows_end, HA_ERR_CORRUPT_EVENT);
-    int const result= ::unpack_row(rli, m_table, m_width, m_curr_row, &m_cols,
-                                   &m_curr_row_end, &m_master_reclength);
-    if (m_curr_row_end > m_rows_end)
-      my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0));
-    ASSERT_OR_RETURN_ERROR(m_curr_row_end <= m_rows_end, HA_ERR_CORRUPT_EVENT);
-    return result;
+    return ::unpack_row(rli, m_table, m_width, m_curr_row, &m_cols,
+                                   &m_curr_row_end, &m_master_reclength, m_rows_end);
+  }
+
+  /**
+    Helper function to check whether there is an auto increment
+    column on the table where the event is to be applied.
+
+    @return true if there is an autoincrement field on the extra
+            columns, false otherwise.
+   */
+  inline bool is_auto_inc_in_extra_columns()
+  {
+    DBUG_ASSERT(m_table);
+    return (m_table->next_number_field &&
+            m_table->next_number_field->field_index >= m_width);
   }
 #endif
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/log_event_old.cc mysql-5.5-5.5.43/sql/log_event_old.cc
--- mysql-5.5-5.5.35+dfsg/sql/log_event_old.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/log_event_old.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2014, 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
@@ -2479,6 +2479,7 @@
             table->file->print_error(error, MYF(0));
             DBUG_RETURN(error);
           }
+          goto restart_rnd_next;
         }
         break;
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/log_event_old.h mysql-5.5-5.5.43/sql/log_event_old.h
--- mysql-5.5-5.5.35+dfsg/sql/log_event_old.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/log_event_old.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright 2007 MySQL AB. All rights reserved.
+/* Copyright (c) 2007, 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
@@ -203,10 +203,8 @@
   { 
     DBUG_ASSERT(m_table);
     ASSERT_OR_RETURN_ERROR(m_curr_row < m_rows_end, HA_ERR_CORRUPT_EVENT);
-    int const result= ::unpack_row(rli, m_table, m_width, m_curr_row, &m_cols,
-                                   &m_curr_row_end, &m_master_reclength);
-    ASSERT_OR_RETURN_ERROR(m_curr_row_end <= m_rows_end, HA_ERR_CORRUPT_EVENT);
-    return result;
+    return ::unpack_row(rli, m_table, m_width, m_curr_row, &m_cols,
+                                   &m_curr_row_end, &m_master_reclength, m_rows_end);
   }
 #endif
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/mem_root_array.h mysql-5.5-5.5.43/sql/mem_root_array.h
--- mysql-5.5-5.5.35+dfsg/sql/mem_root_array.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/mem_root_array.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/my_decimal.h mysql-5.5-5.5.43/sql/my_decimal.h
--- mysql-5.5-5.5.35+dfsg/sql/my_decimal.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/my_decimal.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/mysqld.cc mysql-5.5-5.5.43/sql/mysqld.cc
--- mysql-5.5-5.5.35+dfsg/sql/mysqld.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/mysqld.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -641,7 +642,7 @@
 pthread_key(MEM_ROOT**,THR_MALLOC);
 pthread_key(THD*, THR_THD);
 mysql_mutex_t LOCK_thread_created;
-mysql_mutex_t LOCK_thread_count;
+mysql_mutex_t LOCK_thread_count, LOCK_thd_remove;
 mysql_mutex_t
   LOCK_status, LOCK_error_log, LOCK_uuid_generator,
   LOCK_delayed_insert, LOCK_delayed_status, LOCK_delayed_create,
@@ -1606,6 +1607,7 @@
   mysql_mutex_destroy(&LOCK_prepared_stmt_count);
   mysql_mutex_destroy(&LOCK_error_messages);
   mysql_cond_destroy(&COND_thread_count);
+  mysql_mutex_destroy(&LOCK_thd_remove);
   mysql_cond_destroy(&COND_thread_cache);
   mysql_cond_destroy(&COND_flush_thread_cache);
   mysql_cond_destroy(&COND_manager);
@@ -1681,7 +1683,7 @@
   }
   if (!user)
   {
-    if (!opt_bootstrap)
+    if (!opt_bootstrap && !opt_help)
     {
       sql_print_error("Fatal error: Please read \"Security\" section of the manual to find out how to run mysqld as root!\n");
       unireg_abort(1);
@@ -2159,6 +2161,8 @@
 
 void delete_thd(THD *thd)
 {
+  mysql_mutex_assert_owner(&LOCK_thread_count);
+  mysql_mutex_assert_owner(&LOCK_thd_remove);
   thread_count--;
   delete thd;
 }
@@ -2172,7 +2176,7 @@
     thd		 Thread handler
 
   NOTES
-    LOCK_thread_count is locked and left locked
+    LOCK_thread_count, LOCK_thd_remove are locked and left locked
 */
 
 void unlink_thd(THD *thd)
@@ -2182,6 +2186,7 @@
 
   thd_cleanup(thd);
   dec_connection_count();
+  mysql_mutex_lock(&LOCK_thd_remove);
   mysql_mutex_lock(&LOCK_thread_count);
   /*
     Used by binlog_reset_master.  It would be cleaner to use
@@ -2294,6 +2299,7 @@
 {
   DBUG_ENTER("one_thread_per_connection_end");
   unlink_thd(thd);
+  mysql_mutex_unlock(&LOCK_thd_remove);
   if (put_in_cache)
     put_in_cache= cache_thread();
   mysql_mutex_unlock(&LOCK_thread_count);
@@ -3275,6 +3281,9 @@
     return 1;
   set_server_version();
 
+  sql_print_information("%s (mysqld %s) starting as process %lu ...",
+                        my_progname, server_version, (ulong) getpid());
+
 #ifndef EMBEDDED_LIBRARY
   if (opt_help && !opt_verbose)
     unireg_abort(0);
@@ -3588,6 +3597,8 @@
   mysql_mutex_init(key_LOCK_thread_created, &LOCK_thread_created, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_thread_count, &LOCK_thread_count, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_status, &LOCK_status, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_thd_remove,
+                   &LOCK_thd_remove, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_delayed_insert,
                    &LOCK_delayed_insert, MY_MUTEX_INIT_FAST);
   mysql_mutex_init(key_LOCK_delayed_status,
@@ -4786,7 +4797,7 @@
 
   /* We have to quote filename if it contains spaces */
   pos= add_quoted_string(path_and_service, file_path, end);
-  if (*extra_opt)
+  if (extra_opt && *extra_opt)
   {
     /* 
      Add option after file_path. There will be zero or one extra option.  It's 
@@ -5079,9 +5090,11 @@
                   ER_THD(thd, ER_CANT_CREATE_THREAD), error);
       net_send_error(thd, ER_CANT_CREATE_THREAD, error_message_buff, NULL);
       close_connection(thd);
+      mysql_mutex_lock(&LOCK_thd_remove);
       mysql_mutex_lock(&LOCK_thread_count);
       delete thd;
       mysql_mutex_unlock(&LOCK_thread_count);
+      mysql_mutex_unlock(&LOCK_thd_remove);
       return;
       /* purecov: end */
     }
@@ -7050,6 +7063,9 @@
     test_flags= argument ? (uint) atoi(argument) : 0;
     opt_endinfo=1;
     break;
+  case OPT_THREAD_CONCURRENCY:
+    WARN_DEPRECATED_NO_REPLACEMENT(NULL, "THREAD_CONCURRENCY");
+    break;
   case (int) OPT_ISAM_LOG:
     opt_myisam_log=1;
     break;
@@ -7872,6 +7888,7 @@
   key_structure_guard_mutex, key_TABLE_SHARE_LOCK_ha_data,
   key_LOCK_error_messages, key_LOG_INFO_lock, key_LOCK_thread_count,
   key_PARTITION_LOCK_auto_inc;
+PSI_mutex_key key_LOCK_thd_remove;
 PSI_mutex_key key_RELAYLOG_LOCK_index;
 PSI_mutex_key key_LOCK_thread_created;
 
@@ -7927,7 +7944,8 @@
   { &key_LOG_INFO_lock, "LOG_INFO::lock", 0},
   { &key_LOCK_thread_count, "LOCK_thread_count", PSI_FLAG_GLOBAL},
   { &key_PARTITION_LOCK_auto_inc, "HA_DATA_PARTITION::LOCK_auto_inc", 0},
-  { &key_LOCK_thread_created, "LOCK_thread_created", PSI_FLAG_GLOBAL }
+  { &key_LOCK_thread_created, "LOCK_thread_created", PSI_FLAG_GLOBAL },
+  { &key_LOCK_thd_remove, "LOCK_thd_remove", PSI_FLAG_GLOBAL}
 };
 
 PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
diff -Nru mysql-5.5-5.5.35+dfsg/sql/mysqld.h mysql-5.5-5.5.43/sql/mysqld.h
--- mysql-5.5-5.5.35+dfsg/sql/mysqld.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/mysqld.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 2014, 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
@@ -252,7 +252,8 @@
   key_relay_log_info_log_space_lock, key_relay_log_info_run_lock,
   key_relay_log_info_sleep_lock,
   key_structure_guard_mutex, key_TABLE_SHARE_LOCK_ha_data,
-  key_LOCK_error_messages, key_LOCK_thread_count, key_PARTITION_LOCK_auto_inc;
+  key_LOCK_error_messages, key_LOCK_thread_count, key_PARTITION_LOCK_auto_inc,
+  key_LOCK_thd_remove;
 extern PSI_mutex_key key_RELAYLOG_LOCK_index;
 
 extern PSI_rwlock_key key_rwlock_LOCK_grant, key_rwlock_LOCK_logger,
@@ -346,6 +347,7 @@
        LOCK_global_system_variables, LOCK_user_conn,
        LOCK_prepared_stmt_count, LOCK_error_messages, LOCK_connection_count;
 extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thread_count;
+extern MYSQL_PLUGIN_IMPORT mysql_mutex_t LOCK_thd_remove;
 #ifdef HAVE_OPENSSL
 extern mysql_mutex_t LOCK_des_key_file;
 #endif
@@ -409,6 +411,7 @@
   OPT_SSL_CERT,
   OPT_SSL_CIPHER,
   OPT_SSL_KEY,
+  OPT_THREAD_CONCURRENCY,
   OPT_UPDATE_LOG,
   OPT_WANT_CORE,
   OPT_ENGINE_CONDITION_PUSHDOWN,
@@ -438,7 +441,7 @@
 void unireg_end(void) __attribute__((noreturn));
 
 /* increment query_id and return it.  */
-inline query_id_t next_query_id()
+inline __attribute__((warn_unused_result)) query_id_t next_query_id()
 {
   query_id_t id;
   my_atomic_rwlock_wrlock(&global_query_id_lock);
@@ -447,16 +450,6 @@
   return (id+1);
 }
 
-inline query_id_t get_query_id()
-{
-  query_id_t id;
-  my_atomic_rwlock_wrlock(&global_query_id_lock);
-  id= my_atomic_load64(&global_query_id);
-  my_atomic_rwlock_wrunlock(&global_query_id_lock);
-  return id;
-}
-
-
 /*
   TODO: Replace this with an inline function.
  */
diff -Nru mysql-5.5-5.5.35+dfsg/sql/opt_range.cc mysql-5.5-5.5.43/sql/opt_range.cc
--- mysql-5.5-5.5.35+dfsg/sql/opt_range.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/opt_range.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -304,31 +305,54 @@
     :min_flag(0),elements(1),use_count(1),left(0),right(0),next_key_part(0),
     color(BLACK), type(type_arg)
   {}
-  inline bool is_same(SEL_ARG *arg)
+  /**
+    returns true if a range predicate is equal. Use all_same()
+    to check for equality of all the predicates on this keypart.
+  */
+  inline bool is_same(const SEL_ARG *arg) const
   {
     if (type != arg->type || part != arg->part)
-      return 0;
+      return false;
     if (type != KEY_RANGE)
-      return 1;
+      return true;
     return cmp_min_to_min(arg) == 0 && cmp_max_to_max(arg) == 0;
   }
+  /**
+    returns true if all the predicates in the keypart tree are equal
+  */
+  bool all_same(const SEL_ARG *arg) const
+  {
+    if (type != arg->type || part != arg->part)
+      return false;
+    if (type != KEY_RANGE)
+      return true;
+    if (arg == this)
+      return true;
+    const SEL_ARG *cmp_arg= arg->first();
+    const SEL_ARG *cur_arg= first();
+    for (; cur_arg && cmp_arg && cur_arg->is_same(cmp_arg);
+         cur_arg= cur_arg->next, cmp_arg= cmp_arg->next) ;
+    if (cur_arg || cmp_arg)
+      return false;
+    return true;
+  }
   inline void merge_flags(SEL_ARG *arg) { maybe_flag|=arg->maybe_flag; }
   inline void maybe_smaller() { maybe_flag=1; }
   /* Return true iff it's a single-point null interval */
   inline bool is_null_interval() { return maybe_null && max_value[0] == 1; } 
-  inline int cmp_min_to_min(SEL_ARG* arg)
+  inline int cmp_min_to_min(const SEL_ARG* arg) const
   {
     return sel_cmp(field,min_value, arg->min_value, min_flag, arg->min_flag);
   }
-  inline int cmp_min_to_max(SEL_ARG* arg)
+  inline int cmp_min_to_max(const SEL_ARG* arg) const
   {
     return sel_cmp(field,min_value, arg->max_value, min_flag, arg->max_flag);
   }
-  inline int cmp_max_to_max(SEL_ARG* arg)
+  inline int cmp_max_to_max(const SEL_ARG* arg) const
   {
     return sel_cmp(field,max_value, arg->max_value, max_flag, arg->max_flag);
   }
-  inline int cmp_max_to_min(SEL_ARG* arg)
+  inline int cmp_max_to_min(const SEL_ARG* arg) const
   {
     return sel_cmp(field,max_value, arg->min_value, max_flag, arg->min_flag);
   }
@@ -507,6 +531,7 @@
   void test_use_count(SEL_ARG *root);
 #endif
   SEL_ARG *first();
+  const SEL_ARG *first() const;
   SEL_ARG *last();
   void make_root();
   inline bool simple_key()
@@ -583,6 +608,18 @@
   SEL_ARG *clone_tree(RANGE_OPT_PARAM *param);
 };
 
+/**
+  Helper function to compare two SEL_ARG's.
+*/
+static bool all_same(const SEL_ARG *sa1, const SEL_ARG *sa2)
+{
+  if (sa1 == NULL && sa2 == NULL)
+    return true;
+  if ((sa1 != NULL && sa2 == NULL) || (sa1 == NULL && sa2 != NULL))
+    return false;
+  return sa1->all_same(sa2);
+}
+
 class SEL_IMERGE;
 
 
@@ -1770,6 +1807,13 @@
   return tmp;
 }
 
+/**
+  This gives the first SEL_ARG in the interval list, and the minimal element
+  in the red-black tree
+
+  @return
+  SEL_ARG   first SEL_ARG in the interval list
+*/
 SEL_ARG *SEL_ARG::first()
 {
   SEL_ARG *next_arg=this;
@@ -1780,6 +1824,11 @@
   return next_arg;
 }
 
+const SEL_ARG *SEL_ARG::first() const
+{
+  return const_cast<SEL_ARG*>(this)->first();
+}
+
 SEL_ARG *SEL_ARG::last()
 {
   SEL_ARG *next_arg=this;
@@ -9356,6 +9405,8 @@
 static inline uint get_field_keypart(KEY *index, Field *field);
 static inline SEL_ARG * get_index_range_tree(uint index, SEL_TREE* range_tree,
                                              PARAM *param, uint *param_idx);
+static bool get_sel_arg_for_keypart(Field *field, SEL_ARG *index_range_tree,
+                                    SEL_ARG **cur_range);
 static bool get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree,
                        KEY_PART_INFO *first_non_group_part,
                        KEY_PART_INFO *min_max_arg_part,
@@ -9420,6 +9471,16 @@
          never stored after a unique key lookup in the clustered index and
          furhter index_next/prev calls can not be used. So loose index scan
          optimization can not be used in this case.
+    SA7. If Q has both AGG_FUNC(DISTINCT ...) and MIN/MAX() functions then this
+         access method is not used.
+         For above queries MIN/MAX() aggregation has to be done at
+         nested_loops_join (end_send_group). But with current design MIN/MAX()
+         is always set as part of loose index scan. Because of this mismatch
+         MIN() and MAX() values will be set incorrectly. For such queries to
+         work we need a new interface for loose index scan. This new interface
+         should only fetch records with min and max values and let
+         end_send_group to do aggregation. Until then do not use
+         loose_index_scan.
     GA1. If Q has a GROUP BY clause, then GA is a prefix of I. That is, if
          G_i = A_j => i = j.
     GA2. If Q has a DISTINCT clause, then there is a permutation of SA that
@@ -9451,6 +9512,8 @@
          above tests. By transitivity then it also follows that each WA_i
          participates in the index I (if this was already tested for GA, NGA
          and C).
+    WA2. If there is a predicate on C, then it must be in conjunction
+         to all predicates on all earlier keyparts in I.
 
     C) Overall query form:
        SELECT EXPR([A_1,...,A_k], [B_1,...,B_m], [MIN(C)], [MAX(C)])
@@ -9583,6 +9646,13 @@
         DBUG_RETURN(NULL);
     }
   }
+
+  /* Check (SA7). */
+  if (is_agg_distinct && (have_max || have_min))
+  {
+    DBUG_RETURN(NULL);
+  }
+
   /* Check (SA5). */
   if (join->select_distinct)
   {
@@ -9856,6 +9926,25 @@
       }
     }
 
+    /**
+      Test WA2:If there are conditions on a column C participating in
+      MIN/MAX, those conditions must be conjunctions to all earlier
+      keyparts. Otherwise, Loose Index Scan cannot be used.
+    */
+    if (tree && min_max_arg_item)
+    {
+      uint dummy;
+      SEL_ARG *index_range_tree= get_index_range_tree(cur_index, tree, param,
+                                                      &dummy);
+      SEL_ARG *cur_range= NULL;
+      if (get_sel_arg_for_keypart(min_max_arg_part->field,
+                                  index_range_tree, &cur_range) ||
+          (cur_range && cur_range->type != SEL_ARG::KEY_RANGE))
+      {
+        goto next_index;
+      }
+    }
+
     /* If we got to this point, cur_index_info passes the test. */
     key_infix_parts= cur_key_infix_len ? (uint) 
                      (first_non_infix_part - first_non_group_part) : 0;
@@ -10099,73 +10188,75 @@
 
 
 /*
-  Get SEL_ARG tree, if any, for the keypart covering non grouping
-  attribute (NGA) field 'nga_field'.
-
-  This function enforces the NGA3 test: If 'keypart_tree' contains a
-  condition for 'nga_field', there can only be one range. In the
-  opposite case, this function returns with error and 'cur_range'
-  should not be used.
-
-  Note that the NGA1 and NGA2 requirements, like whether or not the
-  range predicate for 'nga_field' is equality, is not tested by this
-  function.
+  Get the SEL_ARG tree 'tree' for the keypart covering 'field', if
+  any. 'tree' must be a unique conjunction to ALL predicates in earlier
+  keyparts of 'keypart_tree'.
+
+  E.g., if 'keypart_tree' is for a composite index (kp1,kp2) and kp2
+  covers 'field', all these conditions satisfies the requirement:
+
+   1. "(kp1=2 OR kp1=3) AND kp2=10"    => returns "kp2=10"
+   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=10)"  => returns "kp2=10"
+   3. "(kp1=2 AND (kp2=10 OR kp2=11)) OR (kp1=3 AND (kp2=10 OR kp2=11))"
+                                       => returns "kp2=10  OR kp2=11"
+
+   whereas these do not
+   1. "(kp1=2 AND kp2=10) OR kp1=3"
+   2. "(kp1=2 AND kp2=10) OR (kp1=3 AND kp2=11)"
+   3. "(kp1=2 AND kp2=10) OR (kp1=3 AND (kp2=10 OR kp2=11))"
+
+   This function effectively tests requirement WA2. In combination with
+   a test that the returned tree has no more than one range it is also
+   a test of NGA3.
 
-  @param[in]   nga_field      The NGA field we want the SEL_ARG tree for
+  @param[in]   field          The field we want the SEL_ARG tree for
   @param[in]   keypart_tree   Root node of the SEL_ARG* tree for the index
   @param[out]  cur_range      The SEL_ARG tree, if any, for the keypart
                               covering field 'keypart_field'
-  @retval true   'keypart_tree' contained a predicate for 'nga_field' but
-                  multiple ranges exists. 'cur_range' should not be used.
+  @retval true   'keypart_tree' contained a predicate for 'field' that
+                  is not conjunction to all predicates on earlier keyparts
   @retval false  otherwise
 */
 
 static bool
-get_sel_arg_for_keypart(Field *nga_field,
+get_sel_arg_for_keypart(Field *field,
                         SEL_ARG *keypart_tree,
                         SEL_ARG **cur_range)
 {
-  if(keypart_tree == NULL)
+  if (keypart_tree == NULL)
     return false;
-  if(keypart_tree->field->eq(nga_field))
+  if (keypart_tree->field->eq(field))
   {
-    /*
-      Enforce NGA3: If a condition for nga_field has been found, only
-      a single range is allowed.
-    */
-  if (keypart_tree->prev || keypart_tree->next)
-      return true; // There are multiple ranges
-
     *cur_range= keypart_tree;
     return false;
   }
 
-  SEL_ARG *found_tree= NULL;
+  SEL_ARG *tree_first_range= NULL;
   SEL_ARG *first_kp=  keypart_tree->first();
 
-  for (SEL_ARG *cur_kp= first_kp; cur_kp && !found_tree;
-       cur_kp= cur_kp->next)
+  for (SEL_ARG *cur_kp= first_kp; cur_kp; cur_kp= cur_kp->next)
   {
+    SEL_ARG *curr_tree= NULL;
     if (cur_kp->next_key_part)
     {
-      if (get_sel_arg_for_keypart(nga_field,
+      if (get_sel_arg_for_keypart(field,
                                   cur_kp->next_key_part,
-                                  &found_tree))
+                                  &curr_tree))
         return true;
-
     }
     /*
-       Enforce NGA3: If a condition for nga_field has been found,only
-       a single range is allowed.
-    */
-    if (found_tree && first_kp->next)
-      return true; // There are multiple ranges
+      Check if the SEL_ARG tree for 'field' is identical for all ranges in
+      'keypart_tree
+     */
+    if (cur_kp == first_kp)
+      tree_first_range= curr_tree;
+    else if (!all_same(tree_first_range, curr_tree))
+      return true;
   }
-  *cur_range= found_tree;
+  *cur_range= tree_first_range;
   return false;
 }
 
-
 /*
   Extract a sequence of constants from a conjunction of equality predicates.
 
@@ -10188,7 +10279,8 @@
     (const_ci = NG_i).. In addition, there can only be one range when there is
     such a gap.
     Thus all the NGF_i attributes must fill the 'gap' between the last group-by
-    attribute and the MIN/MAX attribute in the index (if present). If these
+    attribute and the MIN/MAX attribute in the index (if present).  Also ensure
+    that there is only a single range on NGF_i (NGA3). If these
     conditions hold, copy each constant from its corresponding predicate into
     key_infix, in the order its NG_i attribute appears in the index, and update
     key_infix_len with the total length of the key parts in key_infix.
@@ -10197,7 +10289,6 @@
     TRUE  if the index passes the test
     FALSE o/w
 */
-
 static bool
 get_constant_key_infix(KEY *index_info, SEL_ARG *index_range_tree,
                        KEY_PART_INFO *first_non_group_part,
@@ -10217,32 +10308,42 @@
   {
     cur_range= NULL;
     /*
-      Find the range tree for the current keypart. We assume that
-      index_range_tree points to the first keypart in the index.
+      Check NGA3:
+      1. get_sel_arg_for_keypart gets the range tree for the 'field' and also
+         checks for a unique conjunction of this tree with all the predicates
+         on the earlier keyparts in the index.
+      2. Check for multiple ranges on the found keypart tree.
+
+      We assume that index_range_tree points to the leftmost keypart in
+      the index.
     */
-    if(get_sel_arg_for_keypart(cur_part->field, index_range_tree, &cur_range))
+    if (get_sel_arg_for_keypart(cur_part->field, index_range_tree,
+                                &cur_range))
+      return false;
+
+    if (cur_range && cur_range->elements > 1)
       return false;
 
     if (!cur_range)
     {
       if (min_max_arg_part)
-        return FALSE; /* The current keypart has no range predicates at all. */
+        return false; /* The current keypart has no range predicates at all. */
       else
       {
         *first_non_infix_part= cur_part;
-        return TRUE;
+        return true;
       }
     }
 
     if ((cur_range->min_flag & NO_MIN_RANGE) ||
         (cur_range->max_flag & NO_MAX_RANGE) ||
         (cur_range->min_flag & NEAR_MIN) || (cur_range->max_flag & NEAR_MAX))
-      return FALSE;
+      return false;
 
     uint field_length= cur_part->store_length;
     if (cur_range->maybe_null &&
          cur_range->min_value[0] && cur_range->max_value[0])
-    { 
+    {
       /*
         cur_range specifies 'IS NULL'. In this case the argument points
         to a "null value" (is_null_string) that may not always be long
@@ -10261,7 +10362,7 @@
       *key_infix_len+= field_length;
     }
     else
-      return FALSE;
+      return false;
   }
 
   if (!min_max_arg_part && (cur_part == last_part))
diff -Nru mysql-5.5-5.5.35+dfsg/sql/partition_element.h mysql-5.5-5.5.43/sql/partition_element.h
--- mysql-5.5-5.5.35+dfsg/sql/partition_element.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/partition_element.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef PARTITION_ELEMENT_INCLUDED
 #define PARTITION_ELEMENT_INCLUDED
 
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/partition_info.h mysql-5.5-5.5.43/sql/partition_info.h
--- mysql-5.5-5.5.35+dfsg/sql/partition_info.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/partition_info.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef PARTITION_INFO_INCLUDED
 #define PARTITION_INFO_INCLUDED
 
-/* Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/rpl_filter.cc mysql-5.5-5.5.43/sql/rpl_filter.cc
--- mysql-5.5-5.5.35+dfsg/sql/rpl_filter.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/rpl_filter.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/sql/rpl_record.cc mysql-5.5-5.5.43/sql/rpl_record.cc
--- mysql-5.5-5.5.35+dfsg/sql/rpl_record.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/rpl_record.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 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
@@ -169,11 +169,15 @@
    @param row_data
                   Packed row data
    @param cols    Pointer to bitset describing columns to fill in
-   @param row_end Pointer to variable that will hold the value of the
-                  one-after-end position for the row
+   @param curr_row_end
+                  Pointer to variable that will hold the value of the
+                  one-after-end position for the current row
    @param master_reclength
                   Pointer to variable that will be set to the length of the
                   record on the master side
+   @param row_end
+                  Pointer to variable that will hold the value of the
+                  end position for the data in the row event
 
    @retval 0 No error
 
@@ -185,7 +189,8 @@
 unpack_row(Relay_log_info const *rli,
            TABLE *table, uint const colcnt,
            uchar const *const row_data, MY_BITMAP const *cols,
-           uchar const **const row_end, ulong *const master_reclength)
+           uchar const **const current_row_end, ulong *const master_reclength,
+           uchar const *const row_end)
 {
   DBUG_ENTER("unpack_row");
   DBUG_ASSERT(row_data);
@@ -303,6 +308,13 @@
 #ifndef DBUG_OFF
         uchar const *const old_pack_ptr= pack_ptr;
 #endif
+        uint32 len= tabledef->calc_field_size(i, (uchar *) pack_ptr);
+        if ( pack_ptr + len > row_end )
+        {
+          pack_ptr+= len;
+          my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0));
+          DBUG_RETURN(ER_SLAVE_CORRUPT_EVENT);
+        }
         pack_ptr= f->unpack(f->ptr, pack_ptr, metadata, TRUE);
 	DBUG_PRINT("debug", ("field: %s; metadata: 0x%x;"
                              " pack_ptr: 0x%lx; pack_ptr': 0x%lx; bytes: %d",
@@ -369,6 +381,11 @@
         uint32 len= tabledef->calc_field_size(i, (uchar *) pack_ptr);
         DBUG_DUMP("field_data", pack_ptr, len);
         pack_ptr+= len;
+        if ( pack_ptr > row_end )
+        {
+          my_error(ER_SLAVE_CORRUPT_EVENT, MYF(0));
+          DBUG_RETURN(ER_SLAVE_CORRUPT_EVENT);
+        }
       }
       null_mask <<= 1;
     }
@@ -382,7 +399,7 @@
 
   DBUG_DUMP("row_data", row_data, pack_ptr - row_data);
 
-  *row_end = pack_ptr;
+  *current_row_end = pack_ptr;
   if (master_reclength)
   {
     if (*field_ptr)
diff -Nru mysql-5.5-5.5.35+dfsg/sql/rpl_record.h mysql-5.5-5.5.43/sql/rpl_record.h
--- mysql-5.5-5.5.35+dfsg/sql/rpl_record.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/rpl_record.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 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
@@ -32,7 +32,8 @@
 int unpack_row(Relay_log_info const *rli,
                TABLE *table, uint const colcnt,
                uchar const *const row_data, MY_BITMAP const *cols,
-               uchar const **const row_end, ulong *const master_reclength);
+               uchar const **const curr_row_end, ulong *const master_reclength,
+               uchar const *const row_end);
 
 // Fill table's record[0] with default values.
 int prepare_record(TABLE *const table, const uint skip, const bool check);
diff -Nru mysql-5.5-5.5.35+dfsg/sql/rpl_utility.cc mysql-5.5-5.5.43/sql/rpl_utility.cc
--- mysql-5.5-5.5.35+dfsg/sql/rpl_utility.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/rpl_utility.cc	2015-02-27 08:30:34.000000000 +0000
@@ -186,7 +186,7 @@
   DBUG_PRINT("result", ("%d", result));
   DBUG_RETURN(result);
 }
-
+#endif //MYSQL_CLIENT
 /*********************************************************************
  *                   table_def member definitions                    *
  *********************************************************************/
@@ -197,7 +197,7 @@
 */
 uint32 table_def::calc_field_size(uint col, uchar *master_data) const
 {
-  uint32 length;
+  uint32 length= 0;
 
   switch (type(col)) {
   case MYSQL_TYPE_NEWDECIMAL:
@@ -285,7 +285,6 @@
   case MYSQL_TYPE_VARCHAR:
   {
     length= m_field_metadata[col] > 255 ? 2 : 1; // c&p of Field_varstring::data_length()
-    DBUG_ASSERT(uint2korr(master_data) > 0);
     length+= length == 1 ? (uint32) *master_data : uint2korr(master_data);
     break;
   }
@@ -295,17 +294,6 @@
   case MYSQL_TYPE_BLOB:
   case MYSQL_TYPE_GEOMETRY:
   {
-#if 1
-    /*
-      BUG#29549: 
-      This is currently broken for NDB, which is using big-endian
-      order when packing length of BLOB. Once they have decided how to
-      fix the issue, we can enable the code below to make sure to
-      always read the length in little-endian order.
-    */
-    Field_blob fb(m_field_metadata[col]);
-    length= fb.get_packed_size(master_data, TRUE);
-#else
     /*
       Compute the length of the data. We cannot use get_length() here
       since it is dependent on the specific table (and also checks the
@@ -331,7 +319,6 @@
     }
 
     length+= m_field_metadata[col];
-#endif
     break;
   }
   default:
@@ -340,7 +327,7 @@
   return length;
 }
 
-
+#ifndef MYSQL_CLIENT
 /**
  */
 void show_sql_type(enum_field_types type, uint16 metadata, String *str, CHARSET_INFO *field_cs)
diff -Nru mysql-5.5-5.5.35+dfsg/sql/scheduler.cc mysql-5.5-5.5.43/sql/scheduler.cc
--- mysql-5.5-5.5.35+dfsg/sql/scheduler.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/scheduler.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 2014, 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
@@ -36,6 +36,7 @@
 {
   unlink_thd(thd);
   mysql_mutex_unlock(&LOCK_thread_count);
+  mysql_mutex_unlock(&LOCK_thd_remove);
   return 1;                                     // Abort handle_one_connection
 }
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/set_var.cc mysql-5.5-5.5.43/sql/set_var.cc
--- mysql-5.5-5.5.35+dfsg/sql/set_var.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/set_var.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/set_var.h mysql-5.5-5.5.43/sql/set_var.h
--- mysql-5.5-5.5.35+dfsg/sql/set_var.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/set_var.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 #ifndef SET_VAR_INCLUDED
 #define SET_VAR_INCLUDED
-/* Copyright (c) 2002, 2013 Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/armscii8.xml mysql-5.5-5.5.43/sql/share/charsets/armscii8.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/armscii8.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/armscii8.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/ascii.xml mysql-5.5-5.5.43/sql/share/charsets/ascii.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/ascii.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/ascii.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp1250.xml mysql-5.5-5.5.43/sql/share/charsets/cp1250.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp1250.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/cp1250.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp1256.xml mysql-5.5-5.5.43/sql/share/charsets/cp1256.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp1256.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/cp1256.xml	2015-02-27 08:30:34.000000000 +0000
@@ -6,6 +6,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp1257.xml mysql-5.5-5.5.43/sql/share/charsets/cp1257.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp1257.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/cp1257.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp850.xml mysql-5.5-5.5.43/sql/share/charsets/cp850.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp850.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/cp850.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp852.xml mysql-5.5-5.5.43/sql/share/charsets/cp852.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp852.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/cp852.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp866.xml mysql-5.5-5.5.43/sql/share/charsets/cp866.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/cp866.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/cp866.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/dec8.xml mysql-5.5-5.5.43/sql/share/charsets/dec8.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/dec8.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/dec8.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/geostd8.xml mysql-5.5-5.5.43/sql/share/charsets/geostd8.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/geostd8.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/geostd8.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/greek.xml mysql-5.5-5.5.43/sql/share/charsets/greek.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/greek.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/greek.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/hebrew.xml mysql-5.5-5.5.43/sql/share/charsets/hebrew.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/hebrew.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/hebrew.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/hp8.xml mysql-5.5-5.5.43/sql/share/charsets/hp8.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/hp8.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/hp8.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/Index.xml mysql-5.5-5.5.43/sql/share/charsets/Index.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/Index.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/Index.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets max-id="99">
 
 <copyright>
-  Copyright (c) 2003, 2012,  Oracle and/or its affiliates. All rights reserved.
+  Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/keybcs2.xml mysql-5.5-5.5.43/sql/share/charsets/keybcs2.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/keybcs2.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/keybcs2.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/koi8r.xml mysql-5.5-5.5.43/sql/share/charsets/koi8r.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/koi8r.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/koi8r.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/koi8u.xml mysql-5.5-5.5.43/sql/share/charsets/koi8u.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/koi8u.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/koi8u.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/languages.html mysql-5.5-5.5.43/sql/share/charsets/languages.html
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/languages.html	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/languages.html	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin1.xml mysql-5.5-5.5.43/sql/share/charsets/latin1.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin1.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/latin1.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin2.xml mysql-5.5-5.5.43/sql/share/charsets/latin2.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin2.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/latin2.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin5.xml mysql-5.5-5.5.43/sql/share/charsets/latin5.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin5.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/latin5.xml	2015-02-27 08:30:34.000000000 +0000
@@ -3,7 +3,8 @@
 <charsets>
 
 <copyright>
- Copyright (C) 2003 MySQL AB
+ Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin7.xml mysql-5.5-5.5.43/sql/share/charsets/latin7.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/latin7.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/latin7.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/macce.xml mysql-5.5-5.5.43/sql/share/charsets/macce.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/macce.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/macce.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/macroman.xml mysql-5.5-5.5.43/sql/share/charsets/macroman.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/macroman.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/macroman.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/share/charsets/swe7.xml mysql-5.5-5.5.43/sql/share/charsets/swe7.xml
--- mysql-5.5-5.5.35+dfsg/sql/share/charsets/swe7.xml	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/share/charsets/swe7.xml	2015-02-27 08:30:34.000000000 +0000
@@ -4,6 +4,7 @@
 
 <copyright>
  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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/signal_handler.cc mysql-5.5-5.5.43/sql/signal_handler.cc
--- mysql-5.5-5.5.35+dfsg/sql/signal_handler.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/signal_handler.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2011, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/slave.cc mysql-5.5-5.5.43/sql/slave.cc
--- mysql-5.5-5.5.35+dfsg/sql/slave.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/slave.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -3119,10 +3119,12 @@
   change_rpl_status(RPL_ACTIVE_SLAVE,RPL_IDLE_SLAVE);
   DBUG_ASSERT(thd->net.buff != 0);
   net_end(&thd->net); // destructor will not free it, because net.vio is 0
+  mysql_mutex_lock(&LOCK_thd_remove);
   mysql_mutex_lock(&LOCK_thread_count);
   THD_CHECK_SENTRY(thd);
   delete thd;
   mysql_mutex_unlock(&LOCK_thread_count);
+  mysql_mutex_unlock(&LOCK_thd_remove);
   mi->abort_slave= 0;
   mi->slave_running= 0;
   mi->io_thd= 0;
@@ -3518,10 +3520,12 @@
   THD_CHECK_SENTRY(thd);
   rli->sql_thd= 0;
   set_thd_in_use_temporary_tables(rli);  // (re)set sql_thd in use for saved temp tables
+  mysql_mutex_lock(&LOCK_thd_remove);
   mysql_mutex_lock(&LOCK_thread_count);
   THD_CHECK_SENTRY(thd);
   delete thd;
   mysql_mutex_unlock(&LOCK_thread_count);
+  mysql_mutex_unlock(&LOCK_thd_remove);
  /*
   Note: the order of the broadcast and unlock calls below (first broadcast, then unlock)
   is important. Otherwise a killer_thread can execute between the calls and
@@ -4276,7 +4280,23 @@
   }
 #endif
 
-  mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname);
+  /*
+    If server's default charset is not supported (like utf16, utf32) as client
+    charset, then set client charset to 'latin1' (default client charset).
+  */
+  if (is_supported_parser_charset(default_charset_info))
+    mysql_options(mysql, MYSQL_SET_CHARSET_NAME, default_charset_info->csname);
+  else
+  {
+    sql_print_information("'%s' can not be used as client character set. "
+                          "'%s' will be used as default client character set "
+                          "while connecting to master.",
+                          default_charset_info->csname,
+                          default_client_charset_info->csname);
+    mysql_options(mysql, MYSQL_SET_CHARSET_NAME,
+                  default_client_charset_info->csname);
+  }
+
   /* This one is not strictly needed but we have it here for completeness */
   mysql_options(mysql, MYSQL_SET_CHARSET_DIR, (char *) charsets_dir);
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sp.cc mysql-5.5-5.5.43/sql/sp.cc
--- mysql-5.5-5.5.35+dfsg/sql/sp.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sp.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2002, 2015, 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
@@ -1483,6 +1483,14 @@
     {
       char *sp_name= get_field(thd->mem_root,
                                table->field[MYSQL_PROC_FIELD_NAME]);
+      if (sp_name == NULL)
+      {
+        table->file->ha_index_end();
+        my_error(ER_SP_WRONG_NAME, MYF(0), "");
+        close_system_tables(thd, &open_tables_state_backup);
+        DBUG_RETURN(true);
+      }
+
       longlong sp_type= table->field[MYSQL_PROC_MYSQL_TYPE]->val_int();
       MDL_request *mdl_request= new (thd->mem_root) MDL_request;
       mdl_request->init(sp_type == TYPE_ENUM_FUNCTION ?
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_acl.cc mysql-5.5-5.5.43/sql/sql_acl.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_acl.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_acl.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
@@ -222,6 +222,7 @@
   const char *ssl_cipher, *x509_issuer, *x509_subject;
   LEX_STRING plugin;
   LEX_STRING auth_string;
+  bool can_authenticate;
 
   ACL_USER *copy(MEM_ROOT *root)
   {
@@ -811,6 +812,16 @@
   {
     ACL_USER user;
     bzero(&user, sizeof(user));
+
+    /*
+      All accounts can authenticate per default. This will change when
+      we add a new field to the user table.
+
+      Currently this flag is only set to false when authentication is attempted
+      using an unknown user name.
+    */
+    user.can_authenticate= true;
+
     update_hostname(&user.host, get_field(&mem, table->field[0]));
     user.user= get_field(&mem, table->field[1]);
     if (check_no_resolve && hostname_requires_resolving(user.host.hostname))
@@ -1465,6 +1476,14 @@
   ACL_USER acl_user;
 
   mysql_mutex_assert_owner(&acl_cache->lock);
+  /*
+     All accounts can authenticate per default. This will change when
+     we add a new field to the user table.
+
+     Currently this flag is only set to false when authentication is attempted
+     using an unknown user name.
+  */
+  acl_user.can_authenticate= true;
 
   acl_user.user=*user ? strdup_root(&mem,user) : 0;
   update_hostname(&acl_user.host, *host ? strdup_root(&mem, host): 0);
@@ -8000,6 +8019,10 @@
   char *host;
   Thd_charset_adapter *charset_adapter;
   LEX_STRING acl_user_plugin;
+  bool can_authenticate()
+  {
+    return (acl_user && acl_user->can_authenticate);
+  }
 };
 
 /**
@@ -8301,6 +8324,34 @@
 }
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
+
+/**
+  When authentication is attempted using an unknown username a dummy user
+  account with no authentication capabilites is assigned to the connection.
+  This is done increase the cost of enumerating user accounts based on
+  authentication protocol.
+*/
+
+ACL_USER *decoy_user(const LEX_STRING &username,
+                      MEM_ROOT *mem)
+{
+  ACL_USER *user= (ACL_USER *) alloc_root(mem, sizeof(ACL_USER));
+  user->can_authenticate= false;
+  user->user= strmake_root(mem, username.str, username.length);
+  user->auth_string= empty_lex_str;
+  user->ssl_cipher= empty_c_string;
+  user->x509_issuer= empty_c_string;
+  user->x509_subject= empty_c_string;
+  user->salt_len= 0;
+
+  /*
+    For now the common default account is used. Improvements might involve
+    mapping a consistent hash of a username to a range of plugins.
+  */
+  user->plugin= *default_auth_plugin_name;
+  return user;
+}
+
 /**
    Finds acl entry in user database for authentication purposes.
    
@@ -8342,8 +8393,14 @@
 
   if (!mpvio->acl_user)
   {
-    login_failed_error(mpvio, mpvio->auth_info.password_used);
-    DBUG_RETURN (1);
+    /*
+      Pretend the user exists; let the plugin decide how to handle
+      bad credentials.
+    */
+    LEX_STRING usr= { mpvio->auth_info.user_name,
+                      mpvio->auth_info.user_name_length };
+    mpvio->acl_user= decoy_user(usr, mpvio->mem_root);
+    mpvio->acl_user_plugin= mpvio->acl_user->plugin;
   }
 
   /* user account requires non-default plugin and the client is too old */
@@ -8465,7 +8522,9 @@
 
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   if (find_mpvio_user(mpvio))
+  {
     DBUG_RETURN(1);
+  }
 
   char *client_plugin;
   if (mpvio->client_capabilities & CLIENT_PLUGIN_AUTH)
@@ -9450,6 +9509,8 @@
 
     if (parse_com_change_user_packet(&mpvio, com_change_user_pkt_len))
     {
+      if (!thd->is_error())
+        login_failed_error(&mpvio, mpvio.auth_info.password_used);
       server_mpvio_update_thd(thd, &mpvio);
       DBUG_RETURN(1);
     }
@@ -9515,6 +9576,11 @@
                         mpvio.db.str ? mpvio.db.str : (char*) "");
   }
 
+  if (res == CR_OK && !mpvio.can_authenticate())
+  {
+    res= CR_ERROR;
+  }
+
   if (res > CR_OK && mpvio.status != MPVIO_EXT::SUCCESS)
   {
     DBUG_ASSERT(mpvio.status == MPVIO_EXT::FAILURE);
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_admin.h mysql-5.5-5.5.43/sql/sql_admin.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_admin.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_admin.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_analyse.cc mysql-5.5-5.5.43/sql/sql_analyse.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_analyse.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_analyse.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_audit.cc mysql-5.5-5.5.43/sql/sql_audit.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_audit.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_audit.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2007, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_audit.h mysql-5.5-5.5.43/sql/sql_audit.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_audit.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_audit.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef SQL_AUDIT_INCLUDED
 #define SQL_AUDIT_INCLUDED
 
-/* Copyright (c) 2007, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2007, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_base.cc mysql-5.5-5.5.43/sql/sql_base.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_base.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_base.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -4019,7 +4019,7 @@
   if (action_arg != OT_REOPEN_TABLES && m_has_locks)
   {
     my_error(ER_LOCK_DEADLOCK, MYF(0));
-    mark_transaction_to_rollback(m_thd, true);
+    m_thd->mark_transaction_to_rollback(true);
     return TRUE;
   }
   /*
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_binlog.cc mysql-5.5-5.5.43/sql/sql_binlog.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_binlog.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_binlog.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_bitmap.h mysql-5.5-5.5.43/sql/sql_bitmap.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_bitmap.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_bitmap.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_class.cc mysql-5.5-5.5.43/sql/sql_class.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_class.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_class.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -333,6 +333,26 @@
 }
 
 /**
+  Lock thread removal mutex
+
+  @param thd                       THD object
+*/
+void thd_lock_thread_remove(THD *)
+{
+  mysql_mutex_lock(&LOCK_thd_remove);
+}
+
+/**
+  Unlock thread removal mutex
+
+  @param thd                       THD object
+*/
+void thd_unlock_thread_remove(THD *)
+{
+  mysql_mutex_unlock(&LOCK_thd_remove);
+}
+
+/**
   Close the socket used by this connection
 
   @param thd                THD object
@@ -795,7 +815,7 @@
    stmt_da(&main_da),
    is_fatal_error(0),
    transaction_rollback_request(0),
-   is_fatal_sub_stmt_error(0),
+   is_fatal_sub_stmt_error(false),
    rand_used(0),
    time_zone_used(0),
    in_lock_tables(0),
@@ -1561,6 +1581,13 @@
     */
     if (mysys_var->current_cond && mysys_var->current_mutex)
     {
+      DBUG_EXECUTE_IF("before_dump_thread_acquires_current_mutex",
+                      {
+                      const char act[]=
+                      "now signal dump_thread_signal wait_for go";
+                      DBUG_ASSERT(!debug_sync_set_action(current_thd,
+                                                         STRING_WITH_LEN(act)));
+                      };);
       mysql_mutex_lock(mysys_var->current_mutex);
       mysql_cond_broadcast(mysys_var->current_cond);
       mysql_mutex_unlock(mysys_var->current_mutex);
@@ -3652,7 +3679,8 @@
 
 extern "C" void thd_mark_transaction_to_rollback(MYSQL_THD thd, bool all)
 {
-  mark_transaction_to_rollback(thd, all);
+  DBUG_ASSERT(thd);
+  thd->mark_transaction_to_rollback(all);
 }
 
 extern "C" bool thd_binlog_filter_ok(const MYSQL_THD thd)
@@ -3846,9 +3874,12 @@
     If we've left sub-statement mode, reset the fatal error flag.
     Otherwise keep the current value, to propagate it up the sub-statement
     stack.
+
+    NOTE: is_fatal_sub_stmt_error can be set only if we've been in the
+    sub-statement mode.
   */
   if (!in_sub_stmt)
-    is_fatal_sub_stmt_error= FALSE;
+    is_fatal_sub_stmt_error= false;
 
   if ((variables.option_bits & OPTION_BIN_LOG) && is_update_query(lex->sql_command) &&
        !is_current_stmt_binlog_format_row())
@@ -3961,27 +3992,28 @@
 /**
   Mark transaction to rollback and mark error as fatal to a sub-statement.
 
-  @param  thd   Thread handle
   @param  all   TRUE <=> rollback main transaction.
 */
 
-void mark_transaction_to_rollback(THD *thd, bool all)
+void THD::mark_transaction_to_rollback(bool all)
 {
-  if (thd)
-  {
-    thd->is_fatal_sub_stmt_error= TRUE;
-    thd->transaction_rollback_request= all;
-    /*
-      Aborted transactions can not be IGNOREd.
-      Switch off the IGNORE flag for the current
-      SELECT_LEX. This should allow my_error()
-      to report the error and abort the execution
-      flow, even in presence
-      of IGNORE clause.
-    */
-    if (thd->lex->current_select)
-      thd->lex->current_select->no_error= FALSE;
-  }
+  /*
+    There is no point in setting is_fatal_sub_stmt_error unless
+    we are actually in_sub_stmt.
+  */
+  if (in_sub_stmt)
+    is_fatal_sub_stmt_error= true;
+  transaction_rollback_request= all;
+  /*
+    Aborted transactions can not be IGNOREd.
+    Switch off the IGNORE flag for the current
+    SELECT_LEX. This should allow my_error()
+    to report the error and abort the execution
+    flow, even in presence
+    of IGNORE clause.
+  */
+  if (lex->current_select)
+    lex->current_select->no_error= false;
 }
 /***************************************************************************
   Handling of XA id cacheing
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_class.h mysql-5.5-5.5.43/sql/sql_class.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_class.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_class.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -595,8 +595,6 @@
 
 #define last_system_status_var questions
 
-void mark_transaction_to_rollback(THD *thd, bool all);
-
 #ifdef MYSQL_SERVER
 
 void free_tmp_table(THD *thd, TABLE *entry);
@@ -2864,6 +2862,7 @@
   LEX_STRING get_invoker_user() { return invoker_user; }
   LEX_STRING get_invoker_host() { return invoker_host; }
   bool has_invoker() { return invoker_user.length > 0; }
+  void mark_transaction_to_rollback(bool all);
 private:
 
   /** The current internal error handler for this thread, or NULL. */
@@ -3667,7 +3666,9 @@
 /**
   Skip the increase of the global query id counter. Commonly set for
   commands that are stateless (won't cause any change on the server
-  internal states).
+  internal states). This is made obsolete as query id is incremented for
+  ping and statistics commands as well because of race condition 
+  (Bug#58785).
 */
 #define CF_SKIP_QUERY_ID        (1U << 0)
 
@@ -3683,7 +3684,6 @@
 
 void add_diff_to_status(STATUS_VAR *to_var, STATUS_VAR *from_var,
                         STATUS_VAR *dec_var);
-void mark_transaction_to_rollback(THD *thd, bool all);
 
 /* Inline functions */
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_connect.cc mysql-5.5-5.5.43/sql/sql_connect.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_connect.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_connect.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2007, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_db.cc mysql-5.5-5.5.43/sql/sql_db.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_db.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_db.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -942,7 +942,7 @@
 
     if (!(query= (char*) thd->alloc(MAX_DROP_TABLE_Q_LEN)))
       goto exit; /* not much else we can do */
-    query_pos= query_data_start= strmov(query,"DROP TABLE ");
+    query_pos= query_data_start= strmov(query,"DROP TABLE IF EXISTS ");
     query_end= query + MAX_DROP_TABLE_Q_LEN;
     db_len= strlen(db);
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_help.cc mysql-5.5-5.5.43/sql/sql_help.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_help.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_help.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_insert.cc mysql-5.5-5.5.43/sql/sql_insert.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_insert.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_insert.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1933,6 +1933,7 @@
       close_thread_tables(&thd);
       thd.mdl_context.release_transactional_locks();
     }
+    mysql_mutex_lock(&LOCK_thd_remove);
     mysql_mutex_lock(&LOCK_thread_count);
     mysql_mutex_destroy(&mutex);
     mysql_cond_destroy(&cond);
@@ -1944,6 +1945,7 @@
     thread_count--;
     delayed_insert_threads--;
     mysql_mutex_unlock(&LOCK_thread_count);
+    mysql_mutex_unlock(&LOCK_thd_remove);
     mysql_cond_broadcast(&COND_thread_count); /* Tell main we are ready */
   }
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_lex.cc mysql-5.5-5.5.43/sql/sql_lex.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_lex.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_lex.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -29,7 +29,7 @@
 #include "sp.h"
 #include "sp_head.h"
 
-static int lex_one_token(void *arg, void *yythd);
+static int lex_one_token(YYSTYPE *yylval, THD *thd);
 
 /*
   We are using pointer to this variable for distinguishing between assignment
@@ -864,16 +864,17 @@
 /*
   MYSQLlex remember the following states from the following MYSQLlex()
 
+  @param yylval         [out]  semantic value of the token being parsed (yylval)
+  @param thd            THD
+
   - MY_LEX_EOQ			Found end of query
   - MY_LEX_OPERATOR_OR_IDENT	Last state was an ident, text or number
 				(which can't be followed by a signed number)
 */
 
-int MYSQLlex(void *arg, void *yythd)
+int MYSQLlex(YYSTYPE *yylval, THD *thd)
 {
-  THD *thd= (THD *)yythd;
   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
-  YYSTYPE *yylval=(YYSTYPE*) arg;
   int token;
 
   if (lip->lookahead_token >= 0)
@@ -889,7 +890,7 @@
     return token;
   }
 
-  token= lex_one_token(arg, yythd);
+  token= lex_one_token(yylval, thd);
 
   switch(token) {
   case WITH:
@@ -900,7 +901,7 @@
       to transform the grammar into a LALR(1) grammar,
       which sql_yacc.yy can process.
     */
-    token= lex_one_token(arg, yythd);
+    token= lex_one_token(yylval, thd);
     switch(token) {
     case CUBE_SYM:
       return WITH_CUBE_SYM;
@@ -923,17 +924,15 @@
   return token;
 }
 
-int lex_one_token(void *arg, void *yythd)
+static int lex_one_token(YYSTYPE *yylval, THD *thd)
 {
   reg1	uchar c= 0;
   bool comment_closed;
   int	tokval, result_state;
   uint length;
   enum my_lex_states state;
-  THD *thd= (THD *)yythd;
   Lex_input_stream *lip= & thd->m_parser_state->m_lip;
   LEX *lex= thd->lex;
-  YYSTYPE *yylval=(YYSTYPE*) arg;
   CHARSET_INFO *cs= thd->charset();
   uchar *state_map= cs->state_map;
   uchar *ident_map= cs->ident_map;
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_lex.h mysql-5.5-5.5.43/sql/sql_lex.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_lex.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_lex.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights
-   reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -2794,7 +2793,7 @@
 extern void lex_free(void);
 extern void lex_start(THD *thd);
 extern void lex_end(LEX *lex);
-extern int MYSQLlex(void *arg, void *yythd);
+extern int MYSQLlex(union YYSTYPE *yylval, class THD *thd);
 
 extern void trim_whitespace(CHARSET_INFO *cs, LEX_STRING *str);
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_load.cc mysql-5.5-5.5.43/sql/sql_load.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_load.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_load.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -56,13 +56,17 @@
 }
 
 
+#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
+#define PUSH(A) *(stack_pos++)=(A)
+
 class READ_INFO {
   File	file;
   uchar	*buffer,			/* Buffer for read text */
 	*end_of_buff;			/* Data in bufferts ends here */
   uint	buff_length,			/* Length of buffert */
 	max_length;			/* Max length of row */
-  char	*field_term_ptr,*line_term_ptr,*line_start_ptr,*line_start_end;
+  const uchar *field_term_ptr,*line_term_ptr;
+  const char  *line_start_ptr,*line_start_end;
   uint	field_term_length,line_term_length,enclosed_length;
   int	field_term_char,line_term_char,enclosed_char,escape_char;
   int	*stack,*stack_pos;
@@ -86,7 +90,7 @@
   int read_fixed_length(void);
   int next_line(void);
   char unescape(char chr);
-  int terminator(char *ptr,uint length);
+  int terminator(const uchar *ptr, uint length);
   bool find_start_of_fields();
   /* load xml */
   List<XML_TAG> taglist;
@@ -110,6 +114,15 @@
     either the table or THD value
   */
   void set_io_cache_arg(void* arg) { cache.arg = arg; }
+
+  /**
+    skip all data till the eof.
+  */
+  void skip_data_till_eof()
+  {
+    while (GET != my_b_EOF)
+      ;
+  }
 };
 
 static int read_fixed_length(THD *thd, COPY_INFO &info, TABLE_LIST *table_list,
@@ -534,8 +547,7 @@
   if (error)
   {
     if (read_file_from_client)
-      while (!read_info.next_line())
-	;
+      read_info.skip_data_till_eof();
 
 #ifndef EMBEDDED_LIBRARY
     if (mysql_bin_log.is_open())
@@ -740,7 +752,7 @@
       append_identifier(thd, &pfields, item->name, strlen(item->name));
       // Extract exact Item value
       str->copy();
-      pfields.append((char *)str->ptr());
+      pfields.append(str->ptr());
       str->free();
     }
     /*
@@ -756,17 +768,17 @@
   if (!(load_data_query= (char *)thd->alloc(lle.get_query_buffer_length() + 1 + pl)))
     return TRUE;
 
-  lle.print_query(FALSE, (const char *) ex->cs?ex->cs->csname:NULL,
+  lle.print_query(FALSE, ex->cs ? ex->cs->csname : NULL,
                   load_data_query, &end,
-                  (char **)&fname_start, (char **)&fname_end);
+                  &fname_start, &fname_end);
 
   strcpy(end, p);
   end += pl;
 
   Execute_load_query_log_event
     e(thd, load_data_query, end-load_data_query,
-      (uint) ((char*) fname_start - load_data_query - 1),
-      (uint) ((char*) fname_end - load_data_query),
+      static_cast<uint>(fname_start - load_data_query - 1),
+      static_cast<uint>(fname_end - load_data_query),
       (duplicates == DUP_REPLACE) ? LOAD_DUP_REPLACE :
       (ignore ? LOAD_DUP_IGNORE : LOAD_DUP_ERROR),
       transactional_table, FALSE, FALSE, errcode);
@@ -1308,10 +1320,18 @@
    found_end_of_line(false), eof(false), need_end_io_cache(false),
    error(false), line_cuted(false), found_null(false), read_charset(cs)
 {
-  field_term_ptr=(char*) field_term.ptr();
+  /*
+    Field and line terminators must be interpreted as sequence of unsigned char.
+    Otherwise, non-ascii terminators will be negative on some platforms,
+    and positive on others (depending on the implementation of char).
+  */
+  field_term_ptr=
+    static_cast<const uchar*>(static_cast<const void*>(field_term.ptr()));
   field_term_length= field_term.length();
-  line_term_ptr=(char*) line_term.ptr();
+  line_term_ptr=
+    static_cast<const uchar*>(static_cast<const void*>(line_term.ptr()));
   line_term_length= line_term.length();
+
   level= 0; /* for load xml */
   if (line_start.length() == 0)
   {
@@ -1320,7 +1340,7 @@
   }
   else
   {
-    line_start_ptr=(char*) line_start.ptr();
+    line_start_ptr= line_start.ptr();
     line_start_end=line_start_ptr+line_start.length();
     start_of_line= 1;
   }
@@ -1329,12 +1349,12 @@
       !memcmp(field_term_ptr,line_term_ptr,field_term_length))
   {
     line_term_length=0;
-    line_term_ptr=(char*) "";
+    line_term_ptr= NULL;
   }
   enclosed_char= (enclosed_length=enclosed_par.length()) ?
     (uchar) enclosed_par[0] : INT_MAX;
-  field_term_char= field_term_length ? (uchar) field_term_ptr[0] : INT_MAX;
-  line_term_char= line_term_length ? (uchar) line_term_ptr[0] : INT_MAX;
+  field_term_char= field_term_length ? field_term_ptr[0] : INT_MAX;
+  line_term_char= line_term_length ? line_term_ptr[0] : INT_MAX;
 
 
   /* Set of a stack for unget if long terminators */
@@ -1392,11 +1412,7 @@
 }
 
 
-#define GET (stack_pos != stack ? *--stack_pos : my_b_get(&cache))
-#define PUSH(A) *(stack_pos++)=(A)
-
-
-inline int READ_INFO::terminator(char *ptr,uint length)
+inline int READ_INFO::terminator(const uchar *ptr,uint length)
 {
   int chr=0;					// Keep gcc happy
   uint i;
@@ -1411,7 +1427,7 @@
     return 1;
   PUSH(chr);
   while (i-- > 1)
-    PUSH((uchar) *--ptr);
+    PUSH(*--ptr);
   return 0;
 }
 
@@ -1542,7 +1558,7 @@
       if (my_mbcharlen(read_charset, chr) > 1 &&
           to + my_mbcharlen(read_charset, chr) <= end_of_buff)
       {
-        uchar* p= (uchar*) to;
+        uchar* p= to;
         int ml, i;
         *to++ = chr;
 
@@ -1567,7 +1583,7 @@
                         (const char *)to))
           continue;
         for (i= 0; i < ml; i++)
-          PUSH((uchar) *--to);
+          PUSH(*--to);
         chr= GET;
       }
 #endif
@@ -1716,7 +1732,7 @@
       return 1;
     }
   } while ((char) chr != line_start_ptr[0]);
-  for (char *ptr=line_start_ptr+1 ; ptr != line_start_end ; ptr++)
+  for (const char *ptr=line_start_ptr+1 ; ptr != line_start_end ; ptr++)
   {
     chr=GET;					// Eof will be checked later
     if ((char) chr != *ptr)
@@ -1724,7 +1740,7 @@
       PUSH(chr);
       while (--ptr != line_start_ptr)
       {						// Restart with next char
-	PUSH((uchar) *ptr);
+	PUSH( *ptr);
       }
       goto try_again;
     }
@@ -1920,7 +1936,7 @@
       
       // row tag should be in ROWS IDENTIFIED BY '<row>' - stored in line_term 
       if((tag.length() == line_term_length -2) &&
-         (strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
+         (memcmp(tag.ptr(), line_term_ptr + 1, tag.length()) == 0))
       {
         DBUG_PRINT("read_xml", ("start-of-row: %i %s %s", 
                                 level,tag.c_ptr_safe(), line_term_ptr));
@@ -1982,7 +1998,7 @@
       }
       
       if((tag.length() == line_term_length -2) &&
-         (strncmp(tag.c_ptr_safe(), line_term_ptr + 1, tag.length()) == 0))
+         (memcmp(tag.ptr(), line_term_ptr + 1, tag.length()) == 0))
       {
          DBUG_PRINT("read_xml", ("found end-of-row %i %s", 
                                  level, tag.c_ptr_safe()));
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_manager.cc mysql-5.5-5.5.43/sql/sql_manager.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_manager.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_manager.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_parse.cc mysql-5.5-5.5.43/sql/sql_parse.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_parse.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_parse.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -237,8 +237,8 @@
   /* Initialize the server command flags array. */
   memset(server_command_flags, 0, sizeof(server_command_flags));
 
-  server_command_flags[COM_STATISTICS]= CF_SKIP_QUERY_ID | CF_SKIP_QUESTIONS;
-  server_command_flags[COM_PING]=       CF_SKIP_QUERY_ID | CF_SKIP_QUESTIONS;
+  server_command_flags[COM_STATISTICS]=   CF_SKIP_QUESTIONS;
+  server_command_flags[COM_PING]=         CF_SKIP_QUESTIONS;
   server_command_flags[COM_STMT_PREPARE]= CF_SKIP_QUESTIONS;
   server_command_flags[COM_STMT_CLOSE]=   CF_SKIP_QUESTIONS;
   server_command_flags[COM_STMT_RESET]=   CF_SKIP_QUESTIONS;
@@ -901,9 +901,7 @@
     thd->security_ctx->master_access|= SHUTDOWN_ACL;
     command= COM_SHUTDOWN;
   }
-  thd->set_query_id(get_query_id());
-  if (!(server_command_flags[command] & CF_SKIP_QUERY_ID))
-    next_query_id();
+  thd->set_query_id(next_query_id());
   inc_thread_running();
 
   if (!(server_command_flags[command] & CF_SKIP_QUESTIONS))
@@ -5253,6 +5251,121 @@
 #endif
 }
 
+
+/**
+  Checks foreign key's parent table access.
+
+  @param thd	       [in]	Thread handler
+  @param create_info   [in]     Create information (like MAX_ROWS, ENGINE or
+                                temporary table flag)
+  @param alter_info    [in]     Initial list of columns and indexes for the
+                                table to be created
+
+  @retval
+   false  ok.
+  @retval
+   true	  error or access denied. Error is sent to client in this case.
+*/
+bool check_fk_parent_table_access(THD *thd,
+                                  HA_CREATE_INFO *create_info,
+                                  Alter_info *alter_info)
+{
+  Key *key;
+  List_iterator<Key> key_iterator(alter_info->key_list);
+  handlerton *db_type= create_info->db_type ? create_info->db_type :
+                                             ha_default_handlerton(thd);
+
+  // Return if engine does not support Foreign key Constraint.
+  if (!ha_check_storage_engine_flag(db_type, HTON_SUPPORTS_FOREIGN_KEYS))
+    return false;
+
+  while ((key= key_iterator++))
+  {
+    if (key->type == Key::FOREIGN_KEY)
+    {
+      TABLE_LIST parent_table;
+      bool is_qualified_table_name;
+      Foreign_key *fk_key= (Foreign_key *)key;
+      LEX_STRING db_name;
+      LEX_STRING table_name= { fk_key->ref_table->table.str,
+                               fk_key->ref_table->table.length };
+      const ulong privileges= (SELECT_ACL | INSERT_ACL | UPDATE_ACL |
+                               DELETE_ACL | REFERENCES_ACL);
+
+      // Check if tablename is valid or not.
+      DBUG_ASSERT(table_name.str != NULL);
+      if (check_table_name(table_name.str, table_name.length, false))
+      {
+        my_error(ER_WRONG_TABLE_NAME, MYF(0), table_name.str);
+        return true;
+      }
+
+      if (fk_key->ref_table->db.str)
+      {
+        is_qualified_table_name= true;
+        db_name.str= (char *) thd->memdup(fk_key->ref_table->db.str,
+                                          fk_key->ref_table->db.length+1);
+        db_name.length= fk_key->ref_table->db.length;
+
+        // Check if database name is valid or not.
+        if (fk_key->ref_table->db.str && check_db_name(&db_name))
+        {
+          my_error(ER_WRONG_DB_NAME, MYF(0), db_name.str);
+          return true;
+        }
+      }
+      else if (thd->lex->copy_db_to(&db_name.str, &db_name.length))
+        return true;
+      else
+        is_qualified_table_name= false;
+
+      // if lower_case_table_names is set then convert tablename to lower case.
+      if (lower_case_table_names)
+      {
+        table_name.str= (char *) thd->memdup(fk_key->ref_table->table.str,
+                                             fk_key->ref_table->table.length+1);
+        table_name.length= my_casedn_str(files_charset_info, table_name.str);
+      }
+
+      parent_table.init_one_table(db_name.str, db_name.length,
+                                  table_name.str, table_name.length,
+                                  table_name.str, TL_IGNORE);
+
+      /*
+       Check if user has any of the "privileges" at table level on
+       "parent_table".
+       Having privilege on any of the parent_table column is not
+       enough so checking whether user has any of the "privileges"
+       at table level only here.
+      */
+      if (check_some_access(thd, privileges, &parent_table) ||
+          parent_table.grant.want_privilege)
+      {
+        if (is_qualified_table_name)
+        {
+          const size_t qualified_table_name_len= NAME_LEN + 1 + NAME_LEN + 1;
+          char *qualified_table_name= (char *) thd->alloc(qualified_table_name_len);
+
+          my_snprintf(qualified_table_name, qualified_table_name_len, "%s.%s",
+                      db_name.str, table_name.str);
+          table_name.str= qualified_table_name;
+        }
+
+        my_error(ER_TABLEACCESS_DENIED_ERROR, MYF(0),
+                 "REFERENCES",
+                 thd->security_ctx->priv_user,
+                 thd->security_ctx->host_or_ip,
+                 table_name.str);
+
+        return true;
+      }
+    }
+  }
+
+  return false;
+}
+
+
 /****************************************************************************
 	Check stack size; Send error if there isn't enough stack to continue
 ****************************************************************************/
@@ -7074,8 +7187,11 @@
     if (check_table_access(thd, SELECT_ACL, tables, FALSE, UINT_MAX, FALSE))
       goto err;
   }
-  error= FALSE;
 
+  if (check_fk_parent_table_access(thd, &lex->create_info, &lex->alter_info))
+    goto err;
+
+  error= FALSE;
 err:
   DBUG_RETURN(error);
 }
@@ -7361,7 +7477,7 @@
 }
 
 
-extern int MYSQLparse(void *thd); // from sql_yacc.cc
+extern int MYSQLparse(class THD *thd); // from sql_yacc.cc
 
 
 /**
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_parse.h mysql-5.5-5.5.43/sql/sql_parse.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_parse.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_parse.h	2015-02-27 08:30:34.000000000 +0000
@@ -45,6 +45,9 @@
 bool insert_precheck(THD *thd, TABLE_LIST *tables);
 bool create_table_precheck(THD *thd, TABLE_LIST *tables,
                            TABLE_LIST *create_table);
+bool check_fk_parent_table_access(THD *thd,
+                                  HA_CREATE_INFO *create_info,
+                                  Alter_info *alter_info);
 
 bool parse_sql(THD *thd,
                Parser_state *parser_state,
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_partition_admin.cc mysql-5.5-5.5.43/sql/sql_partition_admin.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_partition_admin.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_partition_admin.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sql_partition.cc mysql-5.5-5.5.43/sql/sql_partition.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_partition.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_partition.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2005, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2005, 2014, 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
@@ -3304,19 +3304,28 @@
   uint num_columns= part_info->part_field_list.elements;
   uint list_index;
   uint min_list_index= 0;
+  int cmp;
+  /* Notice that max_list_index = last_index + 1 here! */
   uint max_list_index= part_info->num_list_values;
   DBUG_ENTER("get_partition_id_cols_list_for_endpoint");
 
   /* Find the matching partition (including taking endpoint into account). */
   do
   {
-    /* Midpoint, adjusted down, so it can never be > last index. */
+    /* Midpoint, adjusted down, so it can never be >= max_list_index. */
     list_index= (max_list_index + min_list_index) >> 1;
-    if (cmp_rec_and_tuple_prune(list_col_array + list_index*num_columns,
-                                nparts, left_endpoint, include_endpoint) > 0)
+    cmp= cmp_rec_and_tuple_prune(list_col_array + list_index*num_columns,
+                                 nparts, left_endpoint, include_endpoint);
+    if (cmp > 0)
+    {
       min_list_index= list_index + 1;
+    }
     else
+    {
       max_list_index= list_index;
+      if (cmp == 0)
+        break;
+    }
   } while (max_list_index > min_list_index);
   list_index= max_list_index;
 
@@ -3333,12 +3342,10 @@
                                            nparts, left_endpoint,
                                            include_endpoint)));
 
-  if (!left_endpoint)
-  {
-    /* Set the end after this list tuple if not already after the last. */
-    if (list_index < part_info->num_parts)
-      list_index++;
-  }
+  /* Include the right endpoint if not already passed end of array. */
+  if (!left_endpoint && include_endpoint && cmp == 0 &&
+      list_index < part_info->num_list_values)
+    list_index++;
 
   DBUG_RETURN(list_index);
 }
@@ -5566,7 +5573,9 @@
        There was no partitioning before and no partitioning defined.
        Obviously no work needed.
     */
-    if (table->part_info)
+    partition_info *tab_part_info= table->part_info;
+
+    if (tab_part_info)
     {
       if (alter_info->flags & ALTER_REMOVE_PARTITIONING)
       {
@@ -5574,7 +5583,7 @@
         if (!(create_info->used_fields & HA_CREATE_USED_ENGINE))
         {
           DBUG_PRINT("info", ("No explicit engine used"));
-          create_info->db_type= table->part_info->default_engine_type;
+          create_info->db_type= tab_part_info->default_engine_type;
         }
         DBUG_PRINT("info", ("New engine type: %s",
                    ha_resolve_storage_engine_name(create_info->db_type)));
@@ -5586,16 +5595,20 @@
         /*
           Retain partitioning but possibly with a new storage engine
           beneath.
+
+          Create a copy of TABLE::part_info to be able to modify it freely.
         */
-        thd->work_part_info= table->part_info;
+        if (!(tab_part_info= tab_part_info->get_clone()))
+          DBUG_RETURN(TRUE);
+        thd->work_part_info= tab_part_info;
         if (create_info->used_fields & HA_CREATE_USED_ENGINE &&
-            create_info->db_type != table->part_info->default_engine_type)
+            create_info->db_type != tab_part_info->default_engine_type)
         {
           /*
             Make sure change of engine happens to all partitions.
           */
           DBUG_PRINT("info", ("partition changed"));
-          if (table->part_info->is_auto_partitioned)
+          if (tab_part_info->is_auto_partitioned)
           {
             /*
               If the user originally didn't specify partitioning to be
@@ -5623,7 +5636,7 @@
         Need to cater for engine types that can handle partition without
         using the partition handler.
       */
-      if (part_info != table->part_info)
+      if (part_info != tab_part_info)
       {
         if (part_info->fix_parser_data(thd))
         {
@@ -5651,8 +5664,8 @@
         part_info->default_engine_type= create_info->db_type;
       else
       {
-        if (table->part_info)
-          part_info->default_engine_type= table->part_info->default_engine_type;
+        if (tab_part_info)
+          part_info->default_engine_type= tab_part_info->default_engine_type;
         else
           part_info->default_engine_type= create_info->db_type;
       }
@@ -7493,15 +7506,13 @@
   field= val->part_info->part_field_array + n_vals_in_rec;
   if (!(*field))
   {
-    /*
-      Full match, if right endpoint and not including the endpoint,
-      (rec < part) return lesser.
-    */
-    if (!is_left_endpoint && !include_endpoint)
-      return -4;
-
-    /* Otherwise they are equal! */
-    return 0;
+    /* Full match. Only equal if including endpoint. */
+    if (include_endpoint)
+      return 0;
+
+    if (is_left_endpoint)
+      return +4;     /* Start of range, part_tuple < rec, return higher. */
+    return -4;     /* End of range, rec < part_tupe, return lesser. */
   }
   /*
     The prefix is equal and there are more partition columns to compare.
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_plugin.cc mysql-5.5-5.5.43/sql/sql_plugin.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_plugin.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_plugin.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2005, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2005, 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
@@ -33,6 +33,7 @@
 #include "sql_audit.h"
 #include <mysql/plugin_auth.h>
 #include "lock.h"                               // MYSQL_LOCK_IGNORE_TIMEOUT
+#include "debug_sync.h"
 #define REPORT_TO_LOG  1
 #define REPORT_TO_USER 2
 
@@ -132,6 +133,12 @@
 #include "sql_plugin_services.h"
 
 /*
+  A mutex LOCK_plugin_delete must be acquired before calling plugin_del
+  function. 
+*/
+mysql_mutex_t LOCK_plugin_delete;
+
+/*
   A mutex LOCK_plugin must be acquired before accessing the
   following variables/structures.
   We are always manipulating ref count, so a rwlock here is unneccessary.
@@ -949,6 +956,7 @@
 {
   DBUG_ENTER("plugin_del(plugin)");
   mysql_mutex_assert_owner(&LOCK_plugin);
+  mysql_mutex_assert_owner(&LOCK_plugin_delete);
   /* Free allocated strings before deleting the plugin. */
   mysql_rwlock_wrlock(&LOCK_system_variables_hash);
   mysql_del_sys_var_chain(plugin->system_vars);
@@ -996,11 +1004,14 @@
   while ((plugin= *(--list)))
     plugin_deinitialize(plugin, true);
 
+  mysql_mutex_lock(&LOCK_plugin_delete);
   mysql_mutex_lock(&LOCK_plugin);
 
   while ((plugin= *(--reap)))
     plugin_del(plugin);
 
+  mysql_mutex_unlock(&LOCK_plugin_delete);
+
   my_afree(reap);
 }
 
@@ -1205,10 +1216,12 @@
 
 #ifdef HAVE_PSI_INTERFACE
 static PSI_mutex_key key_LOCK_plugin;
+static PSI_mutex_key key_LOCK_plugin_delete;
 
 static PSI_mutex_info all_plugin_mutexes[]=
 {
-  { &key_LOCK_plugin, "LOCK_plugin", PSI_FLAG_GLOBAL}
+  { &key_LOCK_plugin, "LOCK_plugin", PSI_FLAG_GLOBAL},
+  { &key_LOCK_plugin_delete, "LOCK_plugin_delete", PSI_FLAG_GLOBAL}
 };
 
 static void init_plugin_psi_keys(void)
@@ -1259,6 +1272,7 @@
 
 
   mysql_mutex_init(key_LOCK_plugin, &LOCK_plugin, MY_MUTEX_INIT_FAST);
+  mysql_mutex_init(key_LOCK_plugin_delete, &LOCK_plugin_delete, MY_MUTEX_INIT_FAST);
 
   if (my_init_dynamic_array(&plugin_dl_array,
                             sizeof(struct st_plugin_dl *),16,16) ||
@@ -1401,8 +1415,10 @@
         plugin_ptr->load_option == PLUGIN_FORCE_PLUS_PERMANENT)
       reaped_mandatory_plugin= TRUE;
     plugin_deinitialize(plugin_ptr, true);
+    mysql_mutex_lock(&LOCK_plugin_delete);
     mysql_mutex_lock(&LOCK_plugin);
     plugin_del(plugin_ptr);
+    mysql_mutex_unlock(&LOCK_plugin_delete);
   }
 
   mysql_mutex_unlock(&LOCK_plugin);
@@ -1692,10 +1708,11 @@
       }
 
     /*
-      It's perfectly safe not to lock LOCK_plugin, as there're no
-      concurrent threads anymore. But some functions called from here
-      use mysql_mutex_assert_owner(), so we lock the mutex to satisfy it
+      It's perfectly safe not to lock LOCK_plugin, LOCK_plugin_delete, as
+      there're no concurrent threads anymore. But some functions called from
+      here use mysql_mutex_assert_owner(), so we lock the mutex to satisfy it
     */
+    mysql_mutex_lock(&LOCK_plugin_delete);
     mysql_mutex_lock(&LOCK_plugin);
 
     /*
@@ -1718,9 +1735,11 @@
     cleanup_variables(NULL, &global_system_variables);
     cleanup_variables(NULL, &max_system_variables);
     mysql_mutex_unlock(&LOCK_plugin);
+    mysql_mutex_unlock(&LOCK_plugin_delete);
 
     initialized= 0;
     mysql_mutex_destroy(&LOCK_plugin);
+    mysql_mutex_destroy(&LOCK_plugin_delete);
 
     my_afree(plugins);
   }
@@ -1795,6 +1814,7 @@
   mysql_audit_acquire_plugins(thd, MYSQL_AUDIT_GENERAL_CLASS);
 
   mysql_mutex_lock(&LOCK_plugin);
+  DEBUG_SYNC(thd, "acquired_LOCK_plugin");
   mysql_rwlock_wrlock(&LOCK_system_variables_hash);
 
   if (my_load_defaults(MYSQL_CONFIG_NAME, load_default_groups, &argc, &argv, NULL))
@@ -1930,6 +1950,49 @@
     goto err;
   }
 
+#ifdef HAVE_REPLICATION
+  /* Block Uninstallation of semi_sync plugins (Master/Slave)
+     when they are busy
+   */
+  char buff[20];
+  /*
+    Master: If there are active semi sync slaves for this Master,
+    then that means it is busy and rpl_semi_sync_master plugin
+    cannot be uninstalled. To check whether the master
+    has any semi sync slaves or not, check Rpl_semi_sync_master_cliens
+    status variable value, if it is not 0, that means it is busy.
+  */
+  if (!strcmp(name->str, "rpl_semi_sync_master") &&
+      get_status_var(thd,
+                     plugin->plugin->status_vars,
+                     "Rpl_semi_sync_master_clients",buff) &&
+      strcmp(buff,"0") )
+  {
+    sql_print_error("Plugin 'rpl_semi_sync_master' cannot be uninstalled now. "
+                    "Stop any active semisynchronous slaves of this master "
+                    "first.\n");
+    my_error(ER_UNKNOWN_ERROR, MYF(0), name->str);
+    goto err;
+  }
+  /* Slave: If there is semi sync enabled IO thread active on this Slave,
+    then that means plugin is busy and rpl_semi_sync_slave plugin
+    cannot be uninstalled. To check whether semi sync
+    IO thread is active or not, check Rpl_semi_sync_slave_status status
+    variable value, if it is ON, that means it is busy.
+  */
+  if (!strcmp(name->str, "rpl_semi_sync_slave") &&
+      get_status_var(thd, plugin->plugin->status_vars,
+                     "Rpl_semi_sync_slave_status", buff) &&
+      !strcmp(buff,"ON") )
+  {
+    sql_print_error("Plugin 'rpl_semi_sync_slave' cannot be uninstalled now. "
+                    "Stop any active semisynchronous I/O threads on this slave "
+                    "first.\n");
+    my_error(ER_UNKNOWN_ERROR, MYF(0), name->str);
+    goto err;
+  }
+#endif
+
   plugin->state= PLUGIN_IS_DELETED;
   if (plugin->ref_count)
     push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_plugin.h mysql-5.5-5.5.43/sql/sql_plugin.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_plugin.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_plugin.h	2015-02-27 08:30:34.000000000 +0000
@@ -40,6 +40,8 @@
 
 #include <my_sys.h>
 
+extern mysql_mutex_t LOCK_plugin_delete;
+
 #ifdef DBUG_OFF
 #define plugin_ref_to_int(A) A
 #define plugin_int_to_ref(A) A
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_priv.h mysql-5.5-5.5.43/sql/sql_priv.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_priv.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_priv.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -59,6 +59,33 @@
                         (Old), (New));                                      \
   } while(0)
 
+
+/*
+  Generates a warning that a feature is deprecated and there is no replacement.
+
+  Using it as
+
+  WARN_DEPRECATED_NO_REPLACEMENT(thd, "BAD");
+
+  Will result in a warning
+ 
+  "'BAD' is deprecated and will be removed in a future release."
+
+   Note that in macro arguments BAD is not quoted.
+*/
+
+#define WARN_DEPRECATED_NO_REPLACEMENT(Thd,Old)                             \
+  do {                                                                      \
+    if (((THD *) Thd) != NULL)                                              \
+      push_warning_printf(((THD *) Thd), MYSQL_ERROR::WARN_LEVEL_WARN,    \
+                        ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT,           \
+                        ER(ER_WARN_DEPRECATED_SYNTAX_NO_REPLACEMENT),       \
+                        (Old));                                             \
+    else                                                                    \
+      sql_print_warning("'%s' is deprecated and will be removed "           \
+                        "in a future release.", (Old));                     \
+  } while(0)
+
 /*************************************************************************/
 
 #endif
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_repl.cc mysql-5.5-5.5.43/sql/sql_repl.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_repl.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_repl.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -248,7 +248,10 @@
   size_t log_name_len = strlen(log_name) + 1;
   THD *tmp;
   bool result = 0;
-
+#ifndef BDUG_OFF
+  if (current_thd)
+    DEBUG_SYNC(current_thd,"purge_logs_after_lock_index_before_thread_count");
+#endif
   mysql_mutex_lock(&LOCK_thread_count);
   I_List_iterator<THD> it(threads);
 
@@ -476,7 +479,7 @@
     set_timespec_nsec(*heartbeat_ts, 0);
   }
   if (global_system_variables.log_warnings > 1)
-    sql_print_information("Start binlog_dump to slave_server(%d), pos(%s, %lu)",
+    sql_print_information("Start binlog_dump to slave_server(%u), pos(%s, %lu)",
                         thd->server_id, log_ident, (ulong)pos);
   if (RUN_HOOK(binlog_transmit, transmit_start, (thd, flags, log_ident, pos)))
   {
@@ -1965,6 +1968,7 @@
     DBUG_RETURN(TRUE);
   
   mysql_mutex_lock(mysql_bin_log.get_log_lock());
+  DEBUG_SYNC(thd, "show_binlogs_after_lock_log_before_lock_index");
   mysql_bin_log.lock_index();
   index_file=mysql_bin_log.get_index_file();
   
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_select.cc mysql-5.5-5.5.43/sql/sql_select.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_select.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_select.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -10963,8 +10963,6 @@
 err:
   thd->mem_root= mem_root_save;
   free_tmp_table(thd,table);                    /* purecov: inspected */
-  if (temp_pool_slot != MY_BIT_NONE)
-    bitmap_lock_clear_bit(&temp_pool, temp_pool_slot);
   DBUG_RETURN(NULL);				/* purecov: inspected */
 }
 
@@ -11225,6 +11223,16 @@
 		       HA_CREATE_TMP_TABLE)))
   {
     table->file->print_error(error,MYF(0));	/* purecov: inspected */
+    /*
+      Table name which was allocated from temp-pool is already occupied
+      in SE. Probably we hit a bug in server or some problem with system
+      configuration. Prevent problem from re-occurring by marking temp-pool
+      slot for this name as permanently busy, to do this we only need to set
+      TABLE::temp_pool_slot to MY_BIT_NONE in order to avoid freeing it
+      in free_tmp_table().
+    */
+    if (error == EEXIST)
+      table->temp_pool_slot= MY_BIT_NONE;
     table->db_stat=0;
     goto err;
   }
@@ -14641,18 +14649,33 @@
 
   for (;order;order=order->next,pos++)
   {
-    Item *item= order->item[0]->real_item();
+    Item *const item= order->item[0], *const real_item= item->real_item();
     pos->field= 0; pos->item= 0;
-    if (item->type() == Item::FIELD_ITEM)
-      pos->field= ((Item_field*) item)->field;
-    else if (item->type() == Item::SUM_FUNC_ITEM && !item->const_item())
-      pos->field= ((Item_sum*) item)->get_tmp_table_field();
-    else if (item->type() == Item::COPY_STR_ITEM)
-    {						// Blob patch
-      pos->item= ((Item_copy*) item)->get_item();
+    if (real_item->type() == Item::FIELD_ITEM)
+    {
+      // Could be a field, or Item_direct_view_ref wrapping a field
+      DBUG_ASSERT(item->type() == Item::FIELD_ITEM ||
+                  (item->type() == Item::REF_ITEM &&
+                   static_cast<Item_ref*>(item)->ref_type() ==
+                   Item_ref::VIEW_REF));
+      pos->field= static_cast<Item_field*>(real_item)->field;
+    }
+    else if (real_item->type() == Item::SUM_FUNC_ITEM &&
+             !real_item->const_item())
+    {
+      // Aggregate, or Item_aggregate_ref
+      DBUG_ASSERT(item->type() == Item::SUM_FUNC_ITEM ||
+                  (item->type() == Item::REF_ITEM &&
+                   static_cast<Item_ref*>(item)->ref_type() ==
+                   Item_ref::AGGREGATE_REF));
+      pos->field= item->get_tmp_table_field();
+    }
+    else if (real_item->type() == Item::COPY_STR_ITEM)
+    {                                           // Blob patch
+      pos->item= static_cast<Item_copy*>(real_item)->get_item();
     }
     else
-      pos->item= *order->item;
+      pos->item= item;
     pos->reverse=! order->asc;
   }
   *length=count;
@@ -15135,6 +15158,17 @@
   uint el= all_fields.elements;
   all_fields.push_front(order_item); /* Add new field to field list. */
   ref_pointer_array[el]= order_item;
+  /*
+     If the order_item is a SUM_FUNC_ITEM, when fix_fields is called
+     ref_by is set to order->item which is the address of order_item.
+     But this needs to be address of order_item in the all_fields list.
+     As a result, when it gets replaced with Item_aggregate_ref
+     object in Item::split_sum_func2, we will be able to retrieve the
+     newly created object.
+  */
+  if (order_item->type() == Item::SUM_FUNC_ITEM)
+    ((Item_sum *)order_item)->ref_by= all_fields.head_ref();
+
   order->item= ref_pointer_array + el;
   return FALSE;
 }
@@ -17299,6 +17333,11 @@
     unit->fake_select_lex->options|= SELECT_DESCRIBE;
     if (!(res= unit->prepare(thd, result, SELECT_NO_UNLOCK | SELECT_DESCRIBE)))
       res= unit->exec();
+    /*
+      Reset select option. Needed if fake_select_lex is used and not called
+      from select describe.
+    */
+    unit->fake_select_lex->options&= ~SELECT_DESCRIBE;
     res|= unit->cleanup();
   }
   else
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_show.cc mysql-5.5-5.5.43/sql/sql_show.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_show.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_show.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -1814,13 +1814,23 @@
                             Protocol::SEND_NUM_ROWS | Protocol::SEND_EOF))
     DBUG_VOID_RETURN;
 
-  mysql_mutex_lock(&LOCK_thread_count); // For unlink from list
+
   if (!thd->killed)
   {
+    /*
+      Acquire only LOCK_thd_remove and not LOCK_thread_count.
+      i.e., we allow new threads to be added to the list while processing
+      the list but we will not allow deletions from the list (Note that unlink
+      a thread is protected by both LOCK_thd_remove and LOCK_thread_count
+      mutexes).
+    */
+    mysql_mutex_lock(&LOCK_thd_remove);
     I_List_iterator<THD> it(threads);
     THD *tmp;
+    DEBUG_SYNC(thd,"before_one_element_read_from_threads_iterator");
     while ((tmp=it++))
     {
+      DEBUG_SYNC(thd,"after_one_element_read_from_threads_iterator");
       Security_context *tmp_sctx= tmp->security_ctx;
       struct st_my_thread_var *mysys_var;
       if ((tmp->vio_ok() || tmp->system_thread) &&
@@ -1845,6 +1855,11 @@
                                       tmp_sctx->get_host()->length() ?
                                       tmp_sctx->get_host()->ptr() : "");
         thd_info->command=(int) tmp->command;
+        DBUG_EXECUTE_IF("processlist_acquiring_dump_threads_LOCK_thd_data",
+                        {
+                         if (tmp->command == COM_BINLOG_DUMP)
+                           DEBUG_SYNC(thd, "processlist_after_LOCK_thd_count_before_LOCK_thd_data");
+                        });
         mysql_mutex_lock(&tmp->LOCK_thd_data);
         if ((thd_info->db= tmp->db))             // Safe test
           thd_info->db= thd->strdup(thd_info->db);
@@ -1869,8 +1884,8 @@
         thread_infos.append(thd_info);
       }
     }
+    mysql_mutex_unlock(&LOCK_thd_remove);
   }
-  mysql_mutex_unlock(&LOCK_thread_count);
 
   thread_info *thd_info;
   time_t now= my_time(0);
@@ -1910,10 +1925,15 @@
   user= thd->security_ctx->master_access & PROCESS_ACL ?
         NullS : thd->security_ctx->priv_user;
 
-  mysql_mutex_lock(&LOCK_thread_count);
-
   if (!thd->killed)
   {
+    /*
+      Acquire only LOCK_thd_remove and not LOCK_thread_count.
+      i.e., we allow new threads to be added to the list while processing
+      the list but we will not allow deletions from the list (Note that unlink
+      thread is also protected with LOCK_thd_remove mutex).
+    */
+    mysql_mutex_lock(&LOCK_thd_remove);
     I_List_iterator<THD> it(threads);
     THD* tmp;
 
@@ -1946,7 +1966,13 @@
       else
         table->field[2]->store(tmp_sctx->host_or_ip,
                                strlen(tmp_sctx->host_or_ip), cs);
+      DBUG_EXECUTE_IF("processlist_acquiring_dump_threads_LOCK_thd_data",
+                      {
+                       if (tmp->command == COM_BINLOG_DUMP)
+                         DEBUG_SYNC(thd, "processlist_after_LOCK_thd_count_before_LOCK_thd_data");
+                      });
       /* DB */
+      /* Lock THD mutex that protects its data when looking at it. */
       mysql_mutex_lock(&tmp->LOCK_thd_data);
       if ((db= tmp->db))
       {
@@ -1974,11 +2000,8 @@
 
       if (mysys_var)
         mysql_mutex_unlock(&mysys_var->mutex);
-      mysql_mutex_unlock(&tmp->LOCK_thd_data);
 
       /* INFO */
-      /* Lock THD mutex that protects its data when looking at it. */
-      mysql_mutex_lock(&tmp->LOCK_thd_data);
       if (tmp->query())
       {
         table->field[7]->store(tmp->query(),
@@ -1990,13 +2013,12 @@
 
       if (schema_table_store_record(thd, table))
       {
-        mysql_mutex_unlock(&LOCK_thread_count);
+        mysql_mutex_unlock(&LOCK_thd_remove);
         DBUG_RETURN(1);
       }
     }
+    mysql_mutex_unlock(&LOCK_thd_remove);
   }
-
-  mysql_mutex_unlock(&LOCK_thread_count);
   DBUG_RETURN(0);
 }
 
@@ -2117,6 +2139,59 @@
   delete_dynamic(&all_status_vars);
 }
 
+/**
+  @brief           Get the value of given status variable
+
+  @param[in]       thd        thread handler
+  @param[in]       list       list of SHOW_VAR objects in which function should
+                              search
+  @param[in]       name       name of the status variable
+  @param[in/out]   value      buffer in which value of the status variable
+                              needs to be filled in
+
+  @return          status
+    @retval        FALSE      if variable is not found in the list
+    @retval        TRUE       if variable is found in the list
+  NOTE: Currently this function is implemented just to support 'bool' status
+  variables and 'long' status variables *only*. It can be extended very easily
+  for further show_types in future if required.
+  TODO: Currently show_status_arary switch case is tightly coupled with
+  pos, end, buff, value variables and also it stores the values in a 'table'.
+  Decouple the switch case to fill the buffer value so that it can be used
+  in show_status_array() and get_status_var() to avoid duplicate code.
+ */
+
+bool get_status_var(THD* thd, SHOW_VAR *list, const char * name, char * const value)
+{
+  for (; list->name; list++)
+  {
+    int res= strcmp(list->name, name);
+    if (res == 0)
+    {
+      /*
+        if var->type is SHOW_FUNC, call the function.
+        Repeat as necessary, if new var is again SHOW_FUNC
+      */
+      SHOW_VAR tmp;
+      for (; list->type == SHOW_FUNC; list= &tmp)
+        ((mysql_show_var_func)(list->value))(thd, &tmp, value);
+      switch (list->type) {
+      case SHOW_BOOL:
+        strmov(value, *(bool*) list->value ? "ON" : "OFF");
+        break;
+      case SHOW_LONG:
+        int10_to_str(*(long*) list->value, value, 10);
+        break;
+      default:
+        /* not supported type */
+        DBUG_ASSERT(0);
+      }
+      return TRUE;
+    }
+  }
+  return FALSE;
+}
+
 /*
   Removes an array of SHOW_VAR entries from the output of SHOW STATUS
 
@@ -2394,10 +2469,38 @@
 /* This is only used internally, but we need it here as a forward reference */
 extern ST_SCHEMA_TABLE schema_tables[];
 
+/**
+  Condition pushdown used for INFORMATION_SCHEMA / SHOW queries.
+  This structure is to implement an optimization when
+  accessing data dictionary data in the INFORMATION_SCHEMA
+  or SHOW commands.
+  When the query contain a TABLE_SCHEMA or TABLE_NAME clause,
+  narrow the search for data based on the constraints given.
+*/
 typedef struct st_lookup_field_values
 {
-  LEX_STRING db_value, table_value;
-  bool wild_db_value, wild_table_value;
+  /**
+    Value of a TABLE_SCHEMA clause.
+    Note that this value length may exceed @c NAME_LEN.
+    @sa wild_db_value
+  */
+  LEX_STRING db_value;
+  /**
+    Value of a TABLE_NAME clause.
+    Note that this value length may exceed @c NAME_LEN.
+    @sa wild_table_value
+  */
+  LEX_STRING table_value;
+  /**
+    True when @c db_value is a LIKE clause,
+    false when @c db_value is an '=' clause.
+  */
+  bool wild_db_value;
+  /**
+    True when @c table_value is a LIKE clause,
+    false when @c table_value is an '=' clause.
+  */
+  bool wild_table_value;
 } LOOKUP_FIELD_VALUES;
 
 
@@ -2801,14 +2904,22 @@
 
 
   /*
-    If we have db lookup vaule we just add it to list and
+    If we have db lookup value we just add it to list and
     exit from the function.
     We don't do this for database names longer than the maximum
-    path length.
+    name length.
   */
-  if (lookup_field_vals->db_value.str && 
-      lookup_field_vals->db_value.length < FN_REFLEN)
+  if (lookup_field_vals->db_value.str)
   {
+    if (lookup_field_vals->db_value.length > NAME_LEN)
+    {
+      /*
+        Impossible value for a database name,
+        found in a WHERE DATABASE_NAME = 'xxx' clause.
+      */
+      return 0;
+    }
+
     if (is_infoschema_db(lookup_field_vals->db_value.str,
                          lookup_field_vals->db_value.length))
     {
@@ -2945,6 +3056,15 @@
   if (!lookup_field_vals->wild_table_value &&
       lookup_field_vals->table_value.str)
   {
+    if (lookup_field_vals->table_value.length > NAME_LEN)
+    {
+      /*
+        Impossible value for a table name,
+        found in a WHERE TABLE_NAME = 'xxx' clause.
+      */
+      return 0;
+    }
+
     if (with_i_schema)
     {
       LEX_STRING *name;
@@ -3411,6 +3531,9 @@
   bzero((char*) &table_list, sizeof(TABLE_LIST));
   bzero((char*) &tbl, sizeof(TABLE));
 
+  DBUG_ASSERT(db_name->length <= NAME_LEN);
+  DBUG_ASSERT(table_name->length <= NAME_LEN);
+
   if (lower_case_table_names)
   {
     /*
@@ -3742,6 +3865,7 @@
   it.rewind(); /* To get access to new elements in basis list */
   while ((db_name= it++))
   {
+    DBUG_ASSERT(db_name->length <= NAME_LEN);
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
     if (!(check_access(thd, SELECT_ACL, db_name->str,
                        &thd->col_access, NULL, 0, 1) ||
@@ -3763,6 +3887,7 @@
       List_iterator_fast<LEX_STRING> it_files(table_names);
       while ((table_name= it_files++))
       {
+        DBUG_ASSERT(table_name->length <= NAME_LEN);
 	restore_record(table, s->default_values);
         table->field[schema_table->idx_field1]->
           store(db_name->str, db_name->length, system_charset_info);
@@ -3909,6 +4034,7 @@
   List_iterator_fast<LEX_STRING> it(db_names);
   while ((db_name=it++))
   {
+    DBUG_ASSERT(db_name->length <= NAME_LEN);
     if (with_i_schema)       // information schema name is always first in list
     {
       if (store_schema_shemata(thd, table, db_name,
@@ -6166,6 +6292,7 @@
 int fill_variables(THD *thd, TABLE_LIST *tables, COND *cond)
 {
   DBUG_ENTER("fill_variables");
+  SHOW_VAR *sys_var_array;
   int res= 0;
   LEX *lex= thd->lex;
   const char *wild= lex->wild ? lex->wild->ptr() : NullS;
@@ -6179,10 +6306,21 @@
       schema_table_idx == SCH_GLOBAL_VARIABLES)
     option_type= OPT_GLOBAL;
 
+  /*
+    Lock LOCK_plugin_delete to avoid deletion of any plugins while creating
+    SHOW_VAR array and hold it until all variables are stored in the table.
+  */
+  mysql_mutex_lock(&LOCK_plugin_delete);
+  // Lock LOCK_system_variables_hash to prepare SHOW_VARs array.
   mysql_rwlock_rdlock(&LOCK_system_variables_hash);
-  res= show_status_array(thd, wild, enumerate_sys_vars(thd, sorted_vars, option_type),
-                         option_type, NULL, "", tables->table, upper_case_names, cond);
+  DEBUG_SYNC(thd, "acquired_LOCK_system_variables_hash");
+  sys_var_array= enumerate_sys_vars(thd, sorted_vars, option_type);
   mysql_rwlock_unlock(&LOCK_system_variables_hash);
+
+  res= show_status_array(thd, wild, sys_var_array, option_type, NULL, "",
+                         tables->table, upper_case_names, cond);
+
+  mysql_mutex_unlock(&LOCK_plugin_delete);
   DBUG_RETURN(res);
 }
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_show.h mysql-5.5-5.5.43/sql/sql_show.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_show.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_show.h	2015-02-27 08:30:34.000000000 +0000
@@ -113,6 +113,7 @@
 void remove_status_vars(SHOW_VAR *list);
 void init_status_vars();
 void free_status_vars();
+bool get_status_var(THD* thd, SHOW_VAR *list, const char *name, char * const buff);
 void reset_status_vars();
 bool show_create_trigger(THD *thd, const sp_name *trg_name);
 void view_store_options(THD *thd, TABLE_LIST *table, String *buff);
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_state.c mysql-5.5-5.5.43/sql/sql_state.c
--- mysql-5.5-5.5.35+dfsg/sql/sql_state.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_state.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2000-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
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_string.cc mysql-5.5-5.5.43/sql/sql_string.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_string.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_string.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
@@ -223,6 +223,42 @@
 }
 
 
+/*
+  Checks that the source string can just be copied to the destination string
+  without conversion.
+  Unlike needs_conversion it will require conversion on incoming binary data
+  to ensure the data are verified for vailidity first.
+
+  @param arg_length   Length of string to copy.
+  @param from_cs      Character set to copy from
+  @param to_cs        Character set to copy to
+
+  @return conversion needed
+*/
+bool String::needs_conversion_on_storage(uint32 arg_length,
+                                         CHARSET_INFO *cs_from,
+                                         CHARSET_INFO *cs_to)
+{
+  uint32 offset;
+  return (needs_conversion(arg_length, cs_from, cs_to, &offset) ||
+          /* force conversion when storing a binary string */
+          (cs_from == &my_charset_bin &&
+          /* into a non-binary destination */
+           cs_to != &my_charset_bin &&
+           /* and any of the following is true :*/
+           (
+            /* it's a variable length encoding */
+            cs_to->mbminlen != cs_to->mbmaxlen ||
+            /* longer than 2 bytes : neither 1 byte nor ucs2 */
+            cs_to->mbminlen > 2 ||
+            /* and is not a multiple of the char byte size */
+            0 != (arg_length % cs_to->mbmaxlen)
+           )
+          )
+         );
+}
+
+
 /*
   Copy a multi-byte character sets with adding leading zeros.
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_string.h mysql-5.5-5.5.43/sql/sql_string.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_string.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_string.h	2015-02-27 08:30:34.000000000 +0000
@@ -280,6 +280,9 @@
   static bool needs_conversion(uint32 arg_length,
   			       CHARSET_INFO *cs_from, CHARSET_INFO *cs_to,
 			       uint32 *offset);
+  static bool needs_conversion_on_storage(uint32 arg_length,
+                                          CHARSET_INFO *cs_from,
+                                          CHARSET_INFO *cs_to);
   bool copy_aligned(const char *s, uint32 arg_length, uint32 offset,
 		    CHARSET_INFO *cs);
   bool set_or_copy_aligned(const char *s, uint32 arg_length, CHARSET_INFO *cs);
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_table.cc mysql-5.5-5.5.43/sql/sql_table.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_table.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_table.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -3383,7 +3383,6 @@
     CHARSET_INFO *ft_key_charset=0;  // for FULLTEXT
     for (uint column_nr=0 ; (column=cols++) ; column_nr++)
     {
-      uint length;
       Key_part_spec *dup_column;
 
       it.rewind();
@@ -3460,7 +3459,7 @@
 	  }
           if (f_is_geom(sql_field->pack_flag) && sql_field->geom_type ==
               Field::GEOM_POINT)
-            column->length= 25;
+            column->length= MAX_LEN_GEOM_POINT_FIELD;
 	  if (!column->length)
 	  {
 	    my_error(ER_BLOB_KEY_WITHOUT_LENGTH, MYF(0), column->field_name.str);
@@ -3515,30 +3514,40 @@
       key_part_info->fieldnr= field;
       key_part_info->offset=  (uint16) sql_field->offset;
       key_part_info->key_type=sql_field->pack_flag;
-      length= sql_field->key_length;
+      uint key_part_length= sql_field->key_length;
 
       if (column->length)
       {
 	if (f_is_blob(sql_field->pack_flag))
 	{
-	  if ((length=column->length) > max_key_length ||
-	      length > file->max_key_part_length())
+          key_part_length= column->length;
+          /*
+            There is a possibility that the given prefix length is less
+            than the engine max key part length, but still greater
+            than the BLOB field max size. We handle this case
+            using the max_field_size variable below.
+          */
+          uint max_field_size= sql_field->key_length * sql_field->charset->mbmaxlen;
+	  if ((max_field_size && key_part_length > max_field_size) ||
+              key_part_length > max_key_length ||
+	      key_part_length > file->max_key_part_length())
 	  {
-	    length=min(max_key_length, file->max_key_part_length());
+            // Given prefix length is too large, adjust it.
+	    key_part_length= min(max_key_length, file->max_key_part_length());
+	    if (max_field_size)
+              key_part_length= min(key_part_length, max_field_size);
 	    if (key->type == Key::MULTIPLE)
 	    {
 	      /* not a critical problem */
-	      char warn_buff[MYSQL_ERRMSG_SIZE];
-	      my_snprintf(warn_buff, sizeof(warn_buff), ER(ER_TOO_LONG_KEY),
-			  length);
-	      push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-			   ER_TOO_LONG_KEY, warn_buff);
+	      push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+		           ER_TOO_LONG_KEY, ER(ER_TOO_LONG_KEY),
+                           key_part_length);
               /* Align key length to multibyte char boundary */
-              length-= length % sql_field->charset->mbmaxlen;
+              key_part_length-= key_part_length % sql_field->charset->mbmaxlen;
 	    }
 	    else
 	    {
-	      my_error(ER_TOO_LONG_KEY,MYF(0),length);
+	      my_error(ER_TOO_LONG_KEY, MYF(0), key_part_length);
 	      DBUG_RETURN(TRUE);
 	    }
 	  }
@@ -3546,9 +3555,9 @@
         // Catch invalid use of partial keys 
 	else if (!f_is_geom(sql_field->pack_flag) &&
                  // is the key partial? 
-                 column->length != length &&
+                 column->length != key_part_length &&
                  // is prefix length bigger than field length? 
-                 (column->length > length ||
+                 (column->length > key_part_length ||
                   // can the field have a partial key? 
                   !Field::type_can_have_key_part (sql_field->sql_type) ||
                   // a packed field can't be used in a partial key
@@ -3557,43 +3566,42 @@
                   ((file->ha_table_flags() & HA_NO_PREFIX_CHAR_KEYS) &&
                    // and is this a 'unique' key?
                    (key_info->flags & HA_NOSAME))))
-        {         
+        {
 	  my_message(ER_WRONG_SUB_KEY, ER(ER_WRONG_SUB_KEY), MYF(0));
 	  DBUG_RETURN(TRUE);
 	}
 	else if (!(file->ha_table_flags() & HA_NO_PREFIX_CHAR_KEYS))
-	  length=column->length;
+	  key_part_length= column->length;
       }
-      else if (length == 0)
+      else if (key_part_length == 0)
       {
 	my_error(ER_WRONG_KEY_COLUMN, MYF(0), column->field_name.str);
 	  DBUG_RETURN(TRUE);
       }
-      if (length > file->max_key_part_length() && key->type != Key::FULLTEXT)
+      if (key_part_length > file->max_key_part_length() &&
+          key->type != Key::FULLTEXT)
       {
-        length= file->max_key_part_length();
+        key_part_length= file->max_key_part_length();
 	if (key->type == Key::MULTIPLE)
 	{
 	  /* not a critical problem */
-	  char warn_buff[MYSQL_ERRMSG_SIZE];
-	  my_snprintf(warn_buff, sizeof(warn_buff), ER(ER_TOO_LONG_KEY),
-		      length);
-	  push_warning(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
-		       ER_TOO_LONG_KEY, warn_buff);
+	  push_warning_printf(thd, MYSQL_ERROR::WARN_LEVEL_WARN,
+		       ER_TOO_LONG_KEY, ER(ER_TOO_LONG_KEY),
+                       key_part_length);
           /* Align key length to multibyte char boundary */
-          length-= length % sql_field->charset->mbmaxlen;
+          key_part_length-= key_part_length % sql_field->charset->mbmaxlen;
 	}
 	else
 	{
-	  my_error(ER_TOO_LONG_KEY,MYF(0),length);
+	  my_error(ER_TOO_LONG_KEY, MYF(0), key_part_length);
 	  DBUG_RETURN(TRUE);
 	}
       }
-      key_part_info->length=(uint16) length;
+      key_part_info->length= (uint16) key_part_length;
       /* Use packed keys for long strings on the first column */
       if (!((*db_options) & HA_OPTION_NO_PACK_KEYS) &&
           !((create_info->table_options & HA_OPTION_NO_PACK_KEYS)) &&
-	  (length >= KEY_DEFAULT_PACK_LENGTH &&
+	  (key_part_length >= KEY_DEFAULT_PACK_LENGTH &&
 	   (sql_field->sql_type == MYSQL_TYPE_STRING ||
 	    sql_field->sql_type == MYSQL_TYPE_VARCHAR ||
 	    sql_field->pack_flag & FIELDFLAG_BLOB)))
@@ -3605,10 +3613,10 @@
 	  key_info->flags|= HA_PACK_KEY;
       }
       /* Check if the key segment is partial, set the key flag accordingly */
-      if (length != sql_field->key_length)
+      if (key_part_length != sql_field->key_length)
         key_info->flags|= HA_KEY_HAS_PART_KEY_SEG;
 
-      key_length+=length;
+      key_length+= key_part_length;
       key_part_info++;
 
       /* Create the key name based on the first column (if not given) */
@@ -5357,6 +5365,10 @@
   if (create_info->storage_media == HA_SM_DEFAULT)
     create_info->storage_media= table->s->default_storage_media;
 
+  /* Creation of federated table with LIKE clause needs connection string */
+  if (!(used_fields & HA_CREATE_USED_CONNECTION))
+    create_info->connect_string= table->s->connect_string;
+
   restore_record(table, s->default_values);     // Empty record for DEFAULT
   Create_field *def;
 
@@ -5997,6 +6009,18 @@
   }
 
   /*
+   If foreign key is added then check permission to access parent table.
+
+   In function "check_fk_parent_table_access", create_info->db_type is used
+   to identify whether engine supports FK constraint or not. Since
+   create_info->db_type is set here, check to parent table access is delayed
+   till this point for the alter operation.
+  */
+  if ((alter_info->flags & ALTER_FOREIGN_KEY) &&
+      check_fk_parent_table_access(thd, create_info, alter_info))
+    goto err;
+
+  /*
    If this is an ALTER TABLE and no explicit row type specified reuse
    the table's row type.
    Note : this is the same as if the row type was specified explicitly.
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_table.h mysql-5.5-5.5.43/sql/sql_table.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_table.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_table.h	2015-02-27 08:30:34.000000000 +0000
@@ -105,6 +105,9 @@
   EXPLAIN_PARTITIONS_AS_COMMENT
 };
 
+/* Maximum length of GEOM_POINT Field */
+#define MAX_LEN_GEOM_POINT_FIELD   25
+
 /* depends on errmsg.txt Database `db`, Table `t` ... */
 #define EXPLAIN_FILENAME_MAX_EXTRA_LENGTH 63
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_trigger.cc mysql-5.5-5.5.43/sql/sql_trigger.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_trigger.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_trigger.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2012, 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
@@ -458,6 +458,13 @@
     */
     thd->lex->sql_command= backup.sql_command;
 
+    if (opt_readonly && !(thd->security_ctx->master_access & SUPER_ACL) &&
+        !thd->slave_thread)
+    {
+      my_error(ER_OPTION_PREVENTS_STATEMENT, MYF(0), "--read-only");
+      goto end;
+    }
+
     if (add_table_for_trigger(thd, thd->lex->spname, if_exists, & tables))
       goto end;
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_truncate.cc mysql-5.5-5.5.43/sql/sql_truncate.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_truncate.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_truncate.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2010, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2015, 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
@@ -181,12 +181,19 @@
   @param  table_ref     Table list element for the table to be truncated.
   @param  is_tmp_table  True if element refers to a temp table.
 
-  @retval  0    Success.
-  @retval  > 0  Error code.
+  @retval TRUNCATE_OK   Truncate was successful and statement can be safely
+                        binlogged.
+  @retval TRUNCATE_FAILED_BUT_BINLOG Truncate failed but still go ahead with
+                        binlogging as in case of non transactional tables
+                        partial truncation is possible.
+
+  @retval TRUNCATE_FAILED_SKIP_BINLOG Truncate was not successful hence donot
+                        binlong the statement.
 */
 
-int Truncate_statement::handler_truncate(THD *thd, TABLE_LIST *table_ref,
-                                         bool is_tmp_table)
+enum Truncate_statement::truncate_result
+Truncate_statement::handler_truncate(THD *thd, TABLE_LIST *table_ref,
+                                     bool is_tmp_table)
 {
   int error= 0;
   uint flags;
@@ -228,16 +235,30 @@
 
   /* Open the table as it will handle some required preparations. */
   if (open_and_lock_tables(thd, table_ref, FALSE, flags))
-    DBUG_RETURN(1);
+    DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
 
   /* Whether to truncate regardless of foreign keys. */
   if (! (thd->variables.option_bits & OPTION_NO_FOREIGN_KEY_CHECKS))
-    error= fk_truncate_illegal_if_parent(thd, table_ref->table);
+    if (fk_truncate_illegal_if_parent(thd, table_ref->table))
+      DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
 
-  if (!error && (error= table_ref->table->file->ha_truncate()))
+  error= table_ref->table->file->ha_truncate();
+  if (error)
+  {
     table_ref->table->file->print_error(error, MYF(0));
-
-  DBUG_RETURN(error);
+    /*
+      If truncate method is not implemented then we don't binlog the
+      statement. If truncation has failed in a transactional engine then also we
+      donot binlog the statment. Only in non transactional engine we binlog
+      inspite of errors.
+     */
+    if (error == HA_ERR_WRONG_COMMAND ||
+        table_ref->table->file->has_transactions())
+      DBUG_RETURN(TRUNCATE_FAILED_SKIP_BINLOG);
+    else
+      DBUG_RETURN(TRUNCATE_FAILED_BUT_BINLOG);
+  }
+  DBUG_RETURN(TRUNCATE_OK);
 }
 
 
@@ -265,6 +286,12 @@
 
   table->file->info(HA_STATUS_AUTO | HA_STATUS_NO_LOCK);
 
+  /*
+    If LOCK TABLES list is not empty and contains this table
+    then unlock the table and remove it from this list.
+  */
+  mysql_lock_remove(thd, thd->lock, table);
+
   /* Don't free share. */
   close_temporary_table(thd, table, FALSE, FALSE);
 
@@ -470,10 +497,14 @@
 
       /*
         All effects of a TRUNCATE TABLE operation are committed even if
-        truncation fails. Thus, the query must be written to the binary
-        log. The only exception is a unimplemented truncate method.
+        truncation fails in the case of non transactional tables. Thus, the
+        query must be written to the binary log. The only exception is a
+        unimplemented truncate method.
       */
-      binlog_stmt= !error || error != HA_ERR_WRONG_COMMAND;
+      if (error == TRUNCATE_OK || error == TRUNCATE_FAILED_BUT_BINLOG)
+        binlog_stmt= true;
+      else
+        binlog_stmt= false;
     }
 
     /*
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_truncate.h mysql-5.5-5.5.43/sql/sql_truncate.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_truncate.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_truncate.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 #ifndef SQL_TRUNCATE_INCLUDED
 #define SQL_TRUNCATE_INCLUDED
-/* Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2010, 2014, 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
@@ -47,11 +47,17 @@
   bool execute(THD *thd);
 
 protected:
+  enum truncate_result{
+    TRUNCATE_OK=0,
+    TRUNCATE_FAILED_BUT_BINLOG,
+    TRUNCATE_FAILED_SKIP_BINLOG
+  };
+
   /** Handle locking a base table for truncate. */
   bool lock_table(THD *, TABLE_LIST *, bool *);
 
   /** Truncate table via the handler method. */
-  int handler_truncate(THD *, TABLE_LIST *, bool);
+  enum truncate_result handler_truncate(THD *, TABLE_LIST *, bool);
 
   /**
     Optimized delete of all rows by doing a full regenerate of the table.
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_union.cc mysql-5.5-5.5.43/sql/sql_union.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_union.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_union.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -511,6 +511,35 @@
           (select_limit_cnt == HA_POS_ERROR || sl->braces) ?
           sl->options & ~OPTION_FOUND_ROWS : sl->options | found_rows_for_union;
 	saved_error= sl->join->optimize();
+
+        /*
+          If called by explain statement then we may need to save the original
+          JOIN LAYOUT so that we can display the plan. Otherwise original plan
+          will be replaced by a simple scan on temp table if subquery uses temp
+          table.
+          We check for following conditions to force join_tmp creation
+          1. This is an EXPLAIN statement, and
+          2. JOIN not yet saved in JOIN::optimize(), and
+          3. Not called directly from select_describe(), and
+          4. Belongs to a subquery that is const, and
+          5. Need a temp table.
+        */
+        if (thd->lex->describe && // 1
+            !sl->uncacheable &&   // 2
+            !(sl->join->select_options & SELECT_DESCRIBE) && // 3
+            item && item->const_item()) // 4
+        {
+          /*
+            Force join->join_tmp creation, because this subquery will be
+            replaced by a simple select from the materialization temp table
+            by optimize() called by EXPLAIN and we need to preserve the
+            initial query structure so we can display it.
+          */
+          sl->uncacheable|= UNCACHEABLE_EXPLAIN;
+          sl->master_unit()->uncacheable|= UNCACHEABLE_EXPLAIN;
+          if (sl->join->need_tmp && sl->join->init_save_join_tab()) // 5
+            DBUG_RETURN(1);
+        }
       }
       if (!saved_error)
       {
@@ -528,7 +557,13 @@
                                     0);
 	if (!saved_error)
 	{
+          /*
+            Save the current examined row count locally and clear the global
+            counter, so that we can accumulate the number of evaluated rows for
+            the current query block.
+          */
 	  examined_rows+= thd->examined_row_count;
+          thd->examined_row_count= 0;
 	  if (union_result->flush())
 	  {
 	    thd->lex->current_select= lex_select_save;
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_view.cc mysql-5.5-5.5.43/sql/sql_view.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_view.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_view.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2014, 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
@@ -163,27 +163,61 @@
   Check if auto generated column names are conforming and
   possibly generate a conforming name for them if not.
 
-  @param item_list  List of Items which should be checked
+  @param lex  Lex for this thread.
+
+  @retval false Operation was a success.
+  @retval true  An error occurred.
 */
 
-static void make_valid_column_names(List<Item> &item_list)
+static bool make_valid_column_names(LEX *lex)
 {
   Item *item;
   uint name_len;
-  List_iterator_fast<Item> it(item_list);
   char buff[NAME_LEN];
+  uint column_no= 1;
   DBUG_ENTER("make_valid_column_names");
 
-  for (uint column_no= 1; (item= it++); column_no++)
+  for (SELECT_LEX *sl= &lex->select_lex; sl; sl= sl->next_select())
   {
-    if (!item->is_autogenerated_name || !check_column_name(item->name))
-      continue;
-    name_len= my_snprintf(buff, NAME_LEN, "Name_exp_%u", column_no);
-    item->orig_name= item->name;
-    item->set_name(buff, name_len, system_charset_info);
+    for (List_iterator_fast<Item> it(sl->item_list); (item= it++); column_no++)
+    {
+      if (!item->is_autogenerated_name || !check_column_name(item->name))
+        continue;
+      name_len= my_snprintf(buff, NAME_LEN, "Name_exp_%u", column_no);
+      item->orig_name= item->name;
+      item->set_name(buff, name_len, system_charset_info);
+    }
+
+    /*
+      There is a possibility of generating same name for column in more than
+      one SELECT_LEX. For Example:
+
+       CREATE TABLE t1 (Name_exp_1 INT, Name_exp_2 INT, Name_exp_3 INT);
+       CREATE TABLE t2 (Name_exp_1 INT, Name_exp_2 INT, Name_exp_3 INT);
+
+       CREATE VIEW v1 AS SELECT '', t1.Name_exp_2 AS Name_exp_2 FROM t1
+                         UNION
+                         SELECT '', t2.Name_exp_1 AS Name_exp_1 from t2;
+
+      But, column names of the first SELECT_LEX is considered
+      for the output.
+
+        mysql> SELECT * FROM v1;
+        +------------+------------+
+        | Name_exp_1 | Name_exp_2 |
+        +------------+------------+
+        |            |          2 |
+        |            |          3 |
+        +------------+------------+
+
+      So, checking for duplicate names in only "sl", current
+      SELECT_LEX.
+    */
+    if (check_duplicate_names(sl->item_list, 1))
+      DBUG_RETURN(true);
   }
 
-  DBUG_VOID_RETURN;
+  DBUG_RETURN(false);
 }
 
 
@@ -590,9 +624,7 @@
   }
 
   /* Check if the auto generated column names are conforming. */
-  make_valid_column_names(select_lex->item_list);
-
-  if (check_duplicate_names(select_lex->item_list, 1))
+  if (make_valid_column_names(lex))
   {
     res= TRUE;
     goto err;
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_yacc.cc mysql-5.5-5.5.43/sql/sql_yacc.cc
--- mysql-5.5-5.5.35+dfsg/sql/sql_yacc.cc	2013-11-05 07:19:38.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_yacc.cc	2015-02-27 08:30:47.000000000 +0000
@@ -76,15 +76,11 @@
 /* Copy the first part of user declarations.  */
 
 /* Line 189 of yacc.c  */
-#line 24 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 24 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
 
-/* thd is passed as an argument to yyparse(), and subsequently to yylex().
-** The type will be void*, so it must be  cast to (THD*) when used.
-** Use the YYTHD macro for this.
+/*
+Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
 */
-#define YYPARSE_PARAM yythd
-#define YYLEX_PARAM yythd
-#define YYTHD ((THD *)yythd)
 #define YYLIP (& YYTHD->m_parser_state->m_lip)
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
 
@@ -132,7 +128,7 @@
     ulong val= *(F);                          \
     if (my_yyoverflow((B), (D), &val))        \
     {                                         \
-      yyerror((char*) (A));                   \
+      yyerror(YYTHD, (char*) (A));            \
       return 2;                               \
     }                                         \
     else                                      \
@@ -230,10 +226,8 @@
   to abort from the parser.
 */
 
-void MYSQLerror(const char *s)
+void MYSQLerror(THD *thd, const char *s)
 {
-  THD *thd= current_thd;
-
   /*
     Restore the original LEX if it was replaced when parsing
     a stored procedure. We must ensure that a parsing error
@@ -500,6 +494,13 @@
   if (lex->spcont && tmp->var == Sys_autocommit_ptr)
     lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
 
+  if (val && val->type() == Item::FIELD_ITEM &&
+      ((Item_field*)val)->table_name)
+  {
+    my_error(ER_WRONG_TYPE_FOR_VAR, MYF(0), tmp->var->name.str);
+    return TRUE;
+  }
+
   if (! (var= new set_var(var_type, tmp->var, &tmp->base_name, val)))
     return TRUE;
 
@@ -785,7 +786,7 @@
 
 
 /* Line 189 of yacc.c  */
-#line 789 "/export/home/pb2/build/sb_0-10701388-1383635700.2/dist_GPL/sql/sql_yacc.cc"
+#line 790 "/export/home/pb2/build/sb_0-14562198-1425025410.01/dist_GPL/sql/sql_yacc.cc"
 
 /* Enabling traces.  */
 #ifndef YYDEBUG
@@ -2004,7 +2005,7 @@
 {
 
 /* Line 214 of yacc.c  */
-#line 730 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 731 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
 
   int  num;
   ulong ulong_num;
@@ -2056,7 +2057,7 @@
 
 
 /* Line 214 of yacc.c  */
-#line 2060 "/export/home/pb2/build/sb_0-10701388-1383635700.2/dist_GPL/sql/sql_yacc.cc"
+#line 2061 "/export/home/pb2/build/sb_0-14562198-1425025410.01/dist_GPL/sql/sql_yacc.cc"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
@@ -2067,13 +2068,13 @@
 /* Copy the second part of user declarations.  */
 
 /* Line 264 of yacc.c  */
-#line 779 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 780 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
 
 bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 
 
 /* Line 264 of yacc.c  */
-#line 2077 "/export/home/pb2/build/sb_0-10701388-1383635700.2/dist_GPL/sql/sql_yacc.cc"
+#line 2078 "/export/home/pb2/build/sb_0-14562198-1425025410.01/dist_GPL/sql/sql_yacc.cc"
 
 #ifdef short
 # undef short
@@ -3386,256 +3387,256 @@
 /* YYRLINE[YYN] -- source line where rule number YYN was defined.  */
 static const yytype_uint16 yyrline[] =
 {
-       0,  1660,  1660,  1673,  1672,  1697,  1704,  1706,  1710,  1711,
-    1716,  1717,  1718,  1719,  1720,  1721,  1722,  1723,  1724,  1725,
-    1726,  1727,  1728,  1729,  1730,  1731,  1732,  1733,  1734,  1735,
-    1736,  1737,  1738,  1739,  1740,  1741,  1742,  1743,  1744,  1745,
-    1746,  1747,  1748,  1749,  1750,  1751,  1752,  1753,  1754,  1755,
-    1756,  1757,  1758,  1759,  1760,  1761,  1762,  1763,  1764,  1765,
-    1766,  1770,  1780,  1781,  1785,  1795,  1802,  1813,  1812,  1823,
-    1825,  1829,  1830,  1834,  1847,  1846,  1866,  1865,  1879,  1880,
-    1884,  1888,  1892,  1896,  1900,  1904,  1909,  1913,  1917,  1921,
-    1925,  1929,  1935,  1966,  1971,  1974,  1976,  1977,  1981,  1995,
-    1999,  2015,  2019,  2031,  2030,  2072,  2071,  2083,  2081,  2094,
-    2092,  2104,  2103,  2116,  2115,  2123,  2127,  2131,  2135,  2142,
-    2155,  2156,  2160,  2164,  2168,  2172,  2176,  2180,  2184,  2192,
-    2191,  2223,  2222,  2229,  2236,  2237,  2243,  2249,  2259,  2265,
-    2271,  2273,  2280,  2281,  2285,  2291,  2300,  2301,  2309,  2309,
-    2367,  2368,  2369,  2370,  2371,  2372,  2373,  2374,  2375,  2376,
-    2377,  2378,  2379,  2384,  2398,  2414,  2433,  2434,  2438,  2439,
-    2444,  2446,  2448,  2450,  2452,  2454,  2456,  2462,  2463,  2464,
-    2468,  2472,  2480,  2479,  2492,  2494,  2497,  2499,  2503,  2507,
-    2514,  2516,  2520,  2521,  2526,  2545,  2571,  2573,  2577,  2578,
-    2582,  2608,  2609,  2610,  2611,  2615,  2616,  2620,  2621,  2626,
-    2629,  2656,  2655,  2720,  2736,  2735,  2789,  2815,  2815,  2838,
-    2839,  2844,  2846,  2851,  2874,  2887,  2891,  2908,  2909,  2913,
-    2917,  2926,  2933,  2940,  2950,  2965,  2988,  2994,  2995,  3001,
-    3004,  3008,  3016,  3036,  3038,  3056,  3062,  3064,  3066,  3068,
-    3070,  3072,  3074,  3076,  3078,  3080,  3082,  3084,  3089,  3104,
-    3119,  3137,  3138,  3142,  3143,  3144,  3145,  3146,  3147,  3148,
-    3149,  3150,  3151,  3152,  3153,  3154,  3159,  3158,  3165,  3165,
-    3222,  3221,  3250,  3250,  3264,  3317,  3360,  3381,  3380,  3402,
-    3421,  3423,  3424,  3428,  3448,  3471,  3473,  3489,  3471,  3508,
-    3510,  3511,  3515,  3516,  3521,  3527,  3520,  3548,  3547,  3563,
-    3564,  3568,  3569,  3574,  3578,  3573,  3599,  3603,  3598,  3622,
-    3632,  3637,  3636,  3672,  3673,  3678,  3677,  3710,  3710,  3725,
-    3724,  3760,  3772,  3774,  3771,  3801,  3800,  3821,  3823,  3828,
-    3830,  3832,  3849,  3854,  3860,  3867,  3868,  3876,  3882,  3891,
-    3897,  3903,  3904,  3908,  3908,  3913,  3914,  3915,  3919,  3920,
-    3921,  3925,  3929,  3930,  3931,  3935,  3936,  3937,  3938,  3939,
-    3940,  3941,  3942,  3946,  3950,  3951,  3952,  3956,  3957,  3958,
-    3959,  3960,  3964,  3968,  3969,  3970,  3974,  3975,  3976,  3977,
-    3978,  3979,  3980,  3984,  3988,  3989,  3990,  3994,  3995,  3996,
-    4001,  4009,  4017,  4025,  4037,  4049,  4054,  4059,  4067,  4075,
-    4083,  4091,  4099,  4107,  4115,  4128,  4141,  4154,  4156,  4160,
-    4165,  4178,  4179,  4230,  4231,  4234,  4249,  4267,  4272,  4270,
-    4277,  4279,  4278,  4282,  4281,  4287,  4324,  4325,  4330,  4329,
-    4348,  4367,  4366,  4383,  4387,  4395,  4394,  4397,  4399,  4401,
-    4403,  4408,  4409,  4415,  4416,  4433,  4434,  4438,  4439,  4443,
-    4462,  4472,  4483,  4492,  4493,  4509,  4511,  4510,  4515,  4513,
-    4524,  4525,  4529,  4547,  4563,  4564,  4580,  4595,  4617,  4618,
-    4623,  4622,  4646,  4656,  4678,  4677,  4695,  4694,  4714,  4736,
-    4740,  4769,  4781,  4782,  4787,  4798,  4786,  4823,  4824,  4828,
-    4841,  4862,  4875,  4901,  4902,  4907,  4906,  4943,  4948,  4949,
-    4953,  4954,  4958,  4960,  4966,  4968,  4970,  4972,  4974,  4976,
-    4986,  5001,  4985,  5015,  5016,  5020,  5021,  5025,  5026,  5030,
-    5031,  5035,  5036,  5040,  5041,  5045,  5049,  5050,  5053,  5055,
-    5059,  5060,  5064,  5065,  5066,  5070,  5075,  5080,  5085,  5090,
-    5095,  5100,  5105,  5120,  5126,  5131,  5136,  5141,  5147,  5146,
-    5172,  5173,  5174,  5179,  5184,  5189,  5191,  5193,  5195,  5201,
-    5209,  5227,  5244,  5267,  5281,  5282,  5283,  5284,  5285,  5286,
-    5290,  5291,  5292,  5296,  5297,  5301,  5302,  5303,  5304,  5309,
-    5316,  5317,  5321,  5322,  5326,  5327,  5334,  5339,  5345,  5351,
-    5357,  5375,  5381,  5383,  5387,  5391,  5392,  5396,  5401,  5400,
-    5423,  5424,  5425,  5426,  5431,  5435,  5440,  5445,  5449,  5454,
-    5459,  5465,  5470,  5476,  5480,  5485,  5490,  5508,  5510,  5512,
-    5525,  5527,  5532,  5537,  5549,  5554,  5559,  5564,  5566,  5568,
-    5570,  5572,  5574,  5576,  5578,  5581,  5580,  5585,  5584,  5588,
-    5590,  5599,  5600,  5601,  5606,  5607,  5608,  5609,  5610,  5614,
-    5618,  5619,  5623,  5624,  5628,  5629,  5630,  5631,  5632,  5636,
-    5637,  5638,  5639,  5640,  5644,  5649,  5651,  5657,  5658,  5660,
-    5665,  5674,  5675,  5679,  5680,  5684,  5685,  5686,  5690,  5691,
-    5692,  5693,  5696,  5697,  5701,  5702,  5706,  5707,  5711,  5712,
-    5716,  5717,  5718,  5719,  5726,  5727,  5733,  5739,  5745,  5751,
-    5752,  5769,  5790,  5796,  5801,  5802,  5806,  5814,  5818,  5819,
-    5823,  5824,  5828,  5837,  5841,  5842,  5846,  5857,  5858,  5862,
-    5863,  5867,  5868,  5873,  5874,  5878,  5885,  5894,  5902,  5913,
-    5914,  5915,  5916,  5917,  5918,  5923,  5931,  5932,  5936,  5938,
-    5942,  5954,  5955,  5959,  5966,  5979,  5980,  5982,  5984,  5990,
-    5995,  6001,  6007,  6014,  6024,  6025,  6026,  6027,  6028,  6032,
-    6036,  6037,  6041,  6042,  6046,  6047,  6051,  6052,  6053,  6057,
-    6058,  6062,  6066,  6079,  6091,  6092,  6096,  6097,  6101,  6102,
-    6106,  6107,  6111,  6112,  6116,  6117,  6121,  6122,  6126,  6127,
-    6131,  6133,  6137,  6138,  6142,  6146,  6147,  6160,  6161,  6162,
-    6166,  6167,  6171,  6177,  6191,  6192,  6196,  6197,  6201,  6202,
-    6210,  6209,  6248,  6247,  6261,  6273,  6272,  6291,  6290,  6309,
-    6308,  6327,  6321,  6341,  6340,  6373,  6378,  6383,  6388,  6393,
-    6403,  6404,  6405,  6406,  6410,  6411,  6423,  6424,  6428,  6429,
-    6432,  6434,  6435,  6436,  6438,  6440,  6441,  6450,  6451,  6455,
-    6464,  6462,  6476,  6490,  6489,  6503,  6501,  6515,  6522,  6533,
-    6537,  6544,  6548,  6553,  6552,  6568,  6570,  6575,  6583,  6582,
-    6598,  6602,  6601,  6613,  6614,  6618,  6633,  6634,  6638,  6647,
-    6651,  6656,  6661,  6660,  6671,  6680,  6670,  6695,  6704,  6708,
-    6717,  6726,  6732,  6738,  6747,  6756,  6775,  6796,  6806,  6810,
-    6818,  6819,  6823,  6824,  6828,  6829,  6830,  6834,  6835,  6836,
-    6840,  6841,  6842,  6843,  6852,  6851,  6862,  6870,  6869,  6879,
-    6888,  6897,  6898,  6905,  6905,  6911,  6912,  6916,  6917,  6918,
-    6922,  6923,  6939,  6940,  6945,  6944,  6956,  6957,  6958,  6963,
-    6962,  6984,  6985,  6989,  6990,  6994,  6995,  6996,  7001,  7000,
-    7022,  7031,  7030,  7057,  7058,  7062,  7063,  7067,  7068,  7069,
-    7070,  7071,  7072,  7077,  7076,  7098,  7099,  7100,  7105,  7104,
-    7110,  7117,  7122,  7130,  7131,  7135,  7149,  7148,  7161,  7162,
-    7166,  7167,  7171,  7181,  7191,  7192,  7197,  7196,  7207,  7208,
-    7212,  7213,  7217,  7227,  7238,  7237,  7245,  7245,  7256,  7257,
-    7262,  7263,  7272,  7281,  7282,  7286,  7291,  7296,  7301,  7306,
-    7305,  7325,  7333,  7325,  7340,  7341,  7342,  7343,  7344,  7348,
-    7355,  7362,  7364,  7375,  7376,  7380,  7381,  7409,  7439,  7441,
-    7447,  7457,  7458,  7459,  7474,  7481,  7507,  7513,  7519,  7520,
-    7521,  7522,  7523,  7527,  7528,  7533,  7584,  7591,  7634,  7640,
-    7646,  7652,  7658,  7664,  7670,  7676,  7680,  7686,  7692,  7698,
-    7704,  7710,  7714,  7720,  7730,  7736,  7744,  7750,  7760,  7766,
-    7775,  7785,  7791,  7801,  7807,  7816,  7820,  7826,  7832,  7838,
-    7844,  7850,  7856,  7862,  7868,  7874,  7880,  7886,  7892,  7898,
-    7904,  7908,  7909,  7913,  7914,  7918,  7919,  7923,  7924,  7928,
-    7929,  7930,  7931,  7932,  7933,  7937,  7938,  7942,  7943,  7944,
-    7945,  7946,  7947,  7959,  7960,  7961,  7962,  7963,  7969,  7973,
-    7979,  7985,  7991,  7997,  7999,  8006,  8013,  8019,  8021,  8030,
-    8037,  8045,  8051,  8058,  8064,  8078,  8085,  8101,  8107,  8113,
-    8121,  8127,  8133,  8139,  8145,  8160,  8172,  8178,  8184,  8190,
-    8196,  8202,  8208,  8214,  8220,  8226,  8232,  8238,  8244,  8250,
-    8256,  8262,  8268,  8276,  8297,  8304,  8310,  8317,  8324,  8331,
-    8338,  8345,  8351,  8357,  8364,  8371,  8377,  8384,  8390,  8396,
-    8402,  8408,  8414,  8432,  8442,  8448,  8454,  8461,  8468,  8483,
-    8489,  8495,  8501,  8507,  8514,  8520,  8526,  8532,  8538,  8550,
-    8556,  8562,  8568,  8574,  8586,  8592,  8608,  8614,  8621,  8628,
-    8635,  8642,  8649,  8653,  8673,  8672,  8745,  8787,  8789,  8794,
-    8795,  8799,  8800,  8804,  8805,  8809,  8816,  8824,  8850,  8856,
-    8862,  8868,  8874,  8880,  8889,  8896,  8898,  8895,  8905,  8916,
-    8922,  8928,  8934,  8940,  8946,  8952,  8958,  8964,  8971,  8970,
-    8990,  8989,  9004,  9014,  9022,  9038,  9039,  9044,  9049,  9052,
-    9055,  9054,  9071,  9073,  9079,  9078,  9095,  9097,  9099,  9101,
-    9103,  9105,  9107,  9109,  9111,  9113,  9115,  9120,  9121,  9125,
-    9132,  9140,  9141,  9145,  9152,  9160,  9161,  9165,  9166,  9170,
-    9178,  9189,  9190,  9199,  9210,  9211,  9217,  9218,  9238,  9240,
-    9244,  9242,  9259,  9257,  9275,  9273,  9280,  9289,  9287,  9305,
-    9304,  9314,  9325,  9323,  9342,  9341,  9352,  9363,  9364,  9365,
-    9377,  9377,  9391,  9431,  9503,  9514,  9519,  9511,  9538,  9558,
-    9566,  9558,  9575,  9574,  9597,  9614,  9597,  9621,  9625,  9651,
-    9652,  9657,  9660,  9661,  9662,  9666,  9667,  9672,  9671,  9677,
-    9676,  9684,  9685,  9688,  9690,  9690,  9694,  9694,  9699,  9700,
-    9704,  9706,  9711,  9712,  9716,  9727,  9740,  9741,  9742,  9743,
-    9744,  9745,  9746,  9747,  9748,  9749,  9750,  9751,  9755,  9756,
-    9757,  9758,  9759,  9760,  9761,  9762,  9763,  9767,  9768,  9769,
-    9770,  9773,  9775,  9776,  9780,  9781,  9789,  9791,  9795,  9797,
-    9796,  9810,  9813,  9812,  9827,  9833,  9848,  9850,  9854,  9856,
-    9861,  9862,  9882,  9907,  9911,  9912,  9916,  9929,  9931,  9936,
-    9935,  9970,  9972,  9977,  9978,  9979,  9984,  9990,  9994,  9995,
-    9999, 10006, 10013, 10020, 10030, 10064, 10068, 10074, 10080, 10090,
-   10094, 10104, 10105, 10106, 10107, 10108, 10109, 10113, 10114, 10115,
-   10116, 10117, 10121, 10122, 10123, 10124, 10125, 10129, 10130, 10131,
-   10132, 10136, 10141, 10142, 10145, 10148, 10147, 10178, 10179, 10183,
-   10184, 10188, 10200, 10200, 10210, 10211, 10215, 10234, 10267, 10266,
-   10279, 10287, 10278, 10289, 10301, 10313, 10312, 10330, 10329, 10340,
-   10340, 10356, 10363, 10386, 10407, 10419, 10424, 10423, 10433, 10439,
-   10446, 10451, 10456, 10466, 10467, 10471, 10482, 10483, 10487, 10498,
-   10499, 10503, 10504, 10512, 10520, 10511, 10530, 10537, 10529, 10547,
-   10559, 10560, 10568, 10572, 10573, 10584, 10585, 10589, 10598, 10599,
-   10600, 10602, 10601, 10612, 10613, 10617, 10618, 10620, 10619, 10623,
-   10622, 10628, 10629, 10633, 10634, 10638, 10648, 10649, 10653, 10654,
-   10659, 10658, 10672, 10673, 10677, 10682, 10690, 10691, 10699, 10701,
-   10701, 10709, 10717, 10708, 10739, 10740, 10744, 10752, 10753, 10757,
-   10767, 10768, 10775, 10774, 10790, 10789, 10801, 10800, 10812, 10811,
-   10825, 10826, 10830, 10843, 10859, 10860, 10864, 10865, 10869, 10870,
-   10871, 10876, 10875, 10897, 10899, 10902, 10904, 10907, 10908, 10911,
-   10915, 10919, 10923, 10927, 10931, 10935, 10939, 10943, 10951, 10954,
-   10964, 10963, 10978, 10985, 10993, 11001, 11009, 11017, 11025, 11032,
-   11034, 11036, 11045, 11049, 11054, 11053, 11059, 11058, 11063, 11072,
-   11079, 11088, 11097, 11102, 11104, 11106, 11108, 11110, 11112, 11119,
-   11127, 11129, 11137, 11144, 11151, 11161, 11168, 11174, 11183, 11191,
-   11195, 11199, 11206, 11213, 11219, 11226, 11233, 11238, 11243, 11251,
-   11253, 11255, 11260, 11261, 11264, 11266, 11270, 11271, 11275, 11276,
-   11280, 11281, 11285, 11286, 11290, 11291, 11294, 11296, 11303, 11314,
-   11313, 11329, 11328, 11338, 11339, 11343, 11344, 11345, 11349, 11350,
-   11351, 11366, 11365, 11378, 11387, 11377, 11389, 11393, 11394, 11408,
-   11409, 11414, 11416, 11418, 11420, 11422, 11424, 11426, 11428, 11430,
-   11432, 11434, 11436, 11441, 11443, 11445, 11450, 11451, 11456, 11455,
-   11465, 11466, 11470, 11470, 11472, 11473, 11477, 11478, 11483, 11482,
-   11493, 11497, 11501, 11513, 11523, 11524, 11525, 11531, 11543, 11555,
-   11565, 11575, 11542, 11583, 11584, 11588, 11589, 11593, 11594, 11606,
-   11610, 11611, 11612, 11615, 11617, 11621, 11622, 11626, 11631, 11638,
-   11643, 11650, 11652, 11656, 11657, 11661, 11666, 11674, 11675, 11678,
-   11680, 11688, 11690, 11694, 11695, 11696, 11700, 11702, 11707, 11708,
-   11717, 11718, 11722, 11723, 11727, 11747, 11771, 11783, 11794, 11813,
-   11821, 11833, 11848, 11869, 11870, 11871, 11879, 11880, 11881, 11888,
-   11894, 11900, 11906, 11912, 11941, 11969, 11970, 11971, 11975, 11985,
-   11995, 12001, 12010, 12025, 12026, 12030, 12039, 12055, 12059, 12106,
-   12110, 12128, 12132, 12211, 12236, 12267, 12268, 12284, 12294, 12298,
-   12304, 12310, 12320, 12326, 12335, 12345, 12346, 12376, 12392, 12408,
-   12425, 12426, 12437, 12438, 12449, 12450, 12451, 12455, 12472, 12494,
-   12509, 12510, 12511, 12512, 12513, 12514, 12515, 12516, 12517, 12518,
-   12519, 12520, 12521, 12522, 12523, 12524, 12525, 12526, 12527, 12528,
-   12529, 12530, 12531, 12532, 12533, 12534, 12535, 12536, 12537, 12538,
-   12539, 12540, 12541, 12542, 12543, 12544, 12545, 12546, 12547, 12548,
-   12549, 12550, 12551, 12552, 12553, 12554, 12555, 12556, 12557, 12558,
-   12568, 12569, 12570, 12571, 12572, 12573, 12574, 12575, 12576, 12577,
-   12578, 12579, 12580, 12581, 12582, 12583, 12584, 12585, 12586, 12587,
-   12588, 12589, 12590, 12591, 12592, 12593, 12594, 12595, 12596, 12597,
-   12598, 12599, 12600, 12601, 12602, 12603, 12604, 12605, 12606, 12607,
-   12608, 12609, 12610, 12611, 12612, 12613, 12614, 12615, 12616, 12617,
-   12618, 12619, 12620, 12621, 12622, 12623, 12624, 12625, 12626, 12627,
-   12628, 12629, 12630, 12631, 12632, 12633, 12634, 12635, 12636, 12637,
-   12638, 12639, 12640, 12641, 12642, 12643, 12644, 12645, 12646, 12647,
-   12648, 12649, 12650, 12651, 12652, 12653, 12654, 12655, 12656, 12657,
-   12658, 12659, 12660, 12661, 12662, 12663, 12664, 12665, 12666, 12667,
-   12668, 12669, 12670, 12671, 12672, 12673, 12674, 12675, 12676, 12677,
-   12678, 12679, 12680, 12681, 12682, 12683, 12684, 12685, 12686, 12687,
-   12688, 12689, 12690, 12691, 12692, 12693, 12694, 12695, 12696, 12697,
-   12698, 12699, 12700, 12701, 12702, 12703, 12704, 12705, 12706, 12707,
-   12708, 12709, 12710, 12711, 12712, 12713, 12714, 12715, 12716, 12717,
-   12718, 12719, 12720, 12721, 12722, 12723, 12724, 12725, 12726, 12727,
-   12728, 12729, 12730, 12731, 12732, 12733, 12734, 12735, 12736, 12737,
-   12738, 12739, 12740, 12741, 12742, 12743, 12744, 12745, 12746, 12747,
-   12748, 12749, 12750, 12751, 12752, 12753, 12754, 12755, 12756, 12757,
-   12758, 12759, 12760, 12761, 12762, 12763, 12764, 12765, 12766, 12767,
-   12768, 12769, 12770, 12771, 12772, 12773, 12774, 12775, 12776, 12777,
-   12778, 12779, 12780, 12781, 12782, 12783, 12784, 12785, 12786, 12787,
-   12788, 12789, 12790, 12791, 12792, 12793, 12794, 12795, 12796, 12797,
-   12798, 12799, 12800, 12801, 12802, 12803, 12804, 12805, 12806, 12807,
-   12808, 12809, 12810, 12811, 12812, 12813, 12814, 12815, 12816, 12817,
-   12818, 12819, 12820, 12821, 12822, 12823, 12824, 12825, 12826, 12827,
-   12828, 12829, 12830, 12831, 12832, 12833, 12834, 12835, 12836, 12837,
-   12838, 12839, 12840, 12841, 12842, 12843, 12844, 12845, 12852, 12851,
-   12866, 12867, 12871, 12872, 12876, 12876, 12958, 12959, 12960, 12961,
-   12965, 12966, 12970, 12971, 12972, 12973, 12977, 12978, 12979, 12980,
-   12984, 12985, 12989, 13031, 13050, 13061, 13074, 13088, 13103, 13122,
-   13149, 13162, 13189, 13232, 13246, 13247, 13248, 13249, 13253, 13254,
-   13263, 13275, 13276, 13277, 13283, 13289, 13301, 13300, 13316, 13317,
-   13321, 13322, 13326, 13339, 13340, 13341, 13342, 13347, 13346, 13366,
-   13378, 13391, 13390, 13423, 13424, 13428, 13429, 13433, 13434, 13435,
-   13436, 13438, 13437, 13450, 13451, 13452, 13453, 13454, 13460, 13465,
-   13471, 13482, 13493, 13497, 13507, 13512, 13519, 13531, 13543, 13552,
-   13554, 13558, 13559, 13566, 13568, 13572, 13573, 13578, 13577, 13581,
-   13580, 13584, 13583, 13587, 13586, 13589, 13590, 13591, 13592, 13593,
-   13594, 13595, 13596, 13597, 13598, 13599, 13600, 13601, 13602, 13603,
-   13604, 13605, 13606, 13607, 13608, 13609, 13610, 13611, 13612, 13613,
-   13614, 13618, 13619, 13623, 13624, 13628, 13638, 13648, 13661, 13676,
-   13689, 13702, 13714, 13719, 13727, 13732, 13740, 13769, 13776, 13784,
-   13792, 13798, 13802, 13806, 13807, 13811, 13838, 13840, 13844, 13848,
-   13852, 13859, 13860, 13864, 13865, 13869, 13870, 13874, 13875, 13881,
-   13887, 13893, 13903, 13902, 13912, 13913, 13918, 13919, 13920, 13925,
-   13926, 13927, 13931, 13932, 13936, 13948, 13957, 13967, 13976, 13990,
-   13991, 13996, 13995, 14011, 14012, 14013, 14017, 14018, 14022, 14022,
-   14046, 14047, 14051, 14052, 14053, 14057, 14061, 14068, 14071, 14069,
-   14085, 14092, 14113, 14130, 14132, 14136, 14137, 14141, 14142, 14150,
-   14151, 14152, 14153, 14159, 14165, 14175, 14177, 14179, 14184, 14185,
-   14186, 14187, 14188, 14192, 14193, 14194, 14195, 14196, 14197, 14207,
-   14208, 14213, 14226, 14239, 14241, 14243, 14248, 14253, 14255, 14257,
-   14263, 14264, 14266, 14272, 14271, 14289, 14290, 14294, 14299, 14307,
-   14307, 14332, 14333, 14338, 14339, 14341, 14343, 14361, 14367, 14372,
-   14354, 14434, 14452, 14477, 14509, 14513, 14521, 14544, 14473, 14609,
-   14633, 14642, 14650, 14608, 14671, 14675, 14679, 14683, 14687, 14691,
-   14698, 14705, 14712, 14722, 14723, 14727, 14728, 14729, 14733, 14734,
-   14739, 14741, 14740, 14746, 14747, 14751, 14761
+       0,  1663,  1663,  1676,  1675,  1700,  1707,  1709,  1713,  1714,
+    1719,  1720,  1721,  1722,  1723,  1724,  1725,  1726,  1727,  1728,
+    1729,  1730,  1731,  1732,  1733,  1734,  1735,  1736,  1737,  1738,
+    1739,  1740,  1741,  1742,  1743,  1744,  1745,  1746,  1747,  1748,
+    1749,  1750,  1751,  1752,  1753,  1754,  1755,  1756,  1757,  1758,
+    1759,  1760,  1761,  1762,  1763,  1764,  1765,  1766,  1767,  1768,
+    1769,  1773,  1783,  1784,  1788,  1798,  1805,  1816,  1815,  1826,
+    1828,  1832,  1833,  1837,  1850,  1849,  1869,  1868,  1882,  1883,
+    1887,  1891,  1895,  1899,  1903,  1907,  1912,  1916,  1920,  1924,
+    1928,  1932,  1938,  1969,  1974,  1977,  1979,  1980,  1984,  1998,
+    2002,  2018,  2022,  2034,  2033,  2075,  2074,  2086,  2084,  2097,
+    2095,  2107,  2106,  2119,  2118,  2126,  2130,  2134,  2138,  2145,
+    2158,  2159,  2163,  2167,  2171,  2175,  2179,  2183,  2187,  2195,
+    2194,  2226,  2225,  2232,  2239,  2240,  2246,  2252,  2262,  2268,
+    2274,  2276,  2283,  2284,  2288,  2294,  2303,  2304,  2312,  2312,
+    2370,  2371,  2372,  2373,  2374,  2375,  2376,  2377,  2378,  2379,
+    2380,  2381,  2382,  2387,  2401,  2417,  2436,  2437,  2441,  2442,
+    2447,  2449,  2451,  2453,  2455,  2457,  2459,  2465,  2466,  2467,
+    2471,  2475,  2483,  2482,  2495,  2497,  2500,  2502,  2506,  2510,
+    2517,  2519,  2523,  2524,  2529,  2548,  2574,  2576,  2580,  2581,
+    2585,  2611,  2612,  2613,  2614,  2618,  2619,  2623,  2624,  2629,
+    2632,  2659,  2658,  2723,  2739,  2738,  2792,  2818,  2818,  2841,
+    2842,  2847,  2849,  2854,  2877,  2890,  2894,  2911,  2912,  2916,
+    2920,  2929,  2936,  2943,  2953,  2968,  2991,  2997,  2998,  3004,
+    3007,  3011,  3019,  3039,  3041,  3059,  3065,  3067,  3069,  3071,
+    3073,  3075,  3077,  3079,  3081,  3083,  3085,  3087,  3092,  3107,
+    3122,  3140,  3141,  3145,  3146,  3147,  3148,  3149,  3150,  3151,
+    3152,  3153,  3154,  3155,  3156,  3157,  3162,  3161,  3168,  3168,
+    3225,  3224,  3253,  3253,  3267,  3320,  3363,  3384,  3383,  3405,
+    3424,  3426,  3427,  3431,  3451,  3474,  3476,  3492,  3474,  3511,
+    3513,  3514,  3518,  3519,  3524,  3530,  3523,  3551,  3550,  3566,
+    3567,  3571,  3572,  3577,  3581,  3576,  3602,  3606,  3601,  3625,
+    3635,  3640,  3639,  3675,  3676,  3681,  3680,  3713,  3713,  3728,
+    3727,  3763,  3775,  3777,  3774,  3804,  3803,  3824,  3826,  3831,
+    3833,  3835,  3852,  3857,  3863,  3870,  3871,  3879,  3885,  3894,
+    3900,  3906,  3907,  3911,  3911,  3916,  3917,  3918,  3922,  3923,
+    3924,  3928,  3932,  3933,  3934,  3938,  3939,  3940,  3941,  3942,
+    3943,  3944,  3945,  3949,  3953,  3954,  3955,  3959,  3960,  3961,
+    3962,  3963,  3967,  3971,  3972,  3973,  3977,  3978,  3979,  3980,
+    3981,  3982,  3983,  3987,  3991,  3992,  3993,  3997,  3998,  3999,
+    4004,  4012,  4020,  4028,  4040,  4052,  4057,  4062,  4070,  4078,
+    4086,  4094,  4102,  4110,  4118,  4131,  4144,  4157,  4159,  4163,
+    4168,  4181,  4182,  4233,  4234,  4237,  4252,  4270,  4275,  4273,
+    4280,  4282,  4281,  4285,  4284,  4290,  4327,  4328,  4333,  4332,
+    4351,  4370,  4369,  4386,  4390,  4398,  4397,  4400,  4402,  4404,
+    4406,  4411,  4412,  4418,  4419,  4436,  4437,  4441,  4442,  4446,
+    4465,  4475,  4486,  4495,  4496,  4512,  4514,  4513,  4518,  4516,
+    4527,  4528,  4532,  4550,  4566,  4567,  4583,  4598,  4620,  4621,
+    4626,  4625,  4649,  4659,  4681,  4680,  4698,  4697,  4717,  4739,
+    4743,  4772,  4784,  4785,  4790,  4801,  4789,  4826,  4827,  4831,
+    4844,  4865,  4878,  4904,  4905,  4910,  4909,  4946,  4951,  4952,
+    4956,  4957,  4961,  4963,  4969,  4971,  4973,  4975,  4977,  4979,
+    4989,  5004,  4988,  5018,  5019,  5023,  5024,  5028,  5029,  5033,
+    5034,  5038,  5039,  5043,  5044,  5048,  5052,  5053,  5056,  5058,
+    5062,  5063,  5067,  5068,  5069,  5073,  5078,  5083,  5088,  5093,
+    5098,  5103,  5108,  5123,  5129,  5134,  5139,  5144,  5150,  5149,
+    5175,  5176,  5177,  5182,  5187,  5192,  5194,  5196,  5198,  5204,
+    5212,  5230,  5247,  5270,  5284,  5285,  5286,  5287,  5288,  5289,
+    5293,  5294,  5295,  5299,  5300,  5304,  5305,  5306,  5307,  5312,
+    5319,  5320,  5324,  5325,  5329,  5330,  5337,  5342,  5348,  5354,
+    5360,  5378,  5384,  5386,  5390,  5394,  5395,  5399,  5404,  5403,
+    5426,  5427,  5428,  5429,  5434,  5438,  5443,  5448,  5452,  5457,
+    5462,  5468,  5473,  5479,  5483,  5488,  5493,  5511,  5513,  5515,
+    5528,  5530,  5535,  5540,  5552,  5557,  5562,  5567,  5569,  5571,
+    5573,  5575,  5577,  5579,  5581,  5584,  5583,  5588,  5587,  5591,
+    5593,  5602,  5603,  5604,  5610,  5611,  5612,  5613,  5614,  5618,
+    5622,  5623,  5627,  5628,  5632,  5633,  5634,  5635,  5636,  5640,
+    5641,  5642,  5643,  5644,  5648,  5653,  5655,  5661,  5662,  5664,
+    5669,  5678,  5679,  5683,  5684,  5688,  5689,  5690,  5694,  5695,
+    5696,  5697,  5700,  5701,  5705,  5706,  5710,  5711,  5715,  5716,
+    5720,  5721,  5722,  5723,  5730,  5731,  5737,  5743,  5749,  5755,
+    5756,  5773,  5794,  5800,  5805,  5806,  5810,  5818,  5822,  5823,
+    5827,  5828,  5832,  5841,  5845,  5846,  5850,  5861,  5862,  5866,
+    5867,  5871,  5872,  5877,  5878,  5882,  5889,  5898,  5906,  5917,
+    5918,  5919,  5920,  5921,  5922,  5927,  5935,  5936,  5940,  5942,
+    5946,  5958,  5959,  5963,  5970,  5983,  5984,  5986,  5988,  5994,
+    5999,  6005,  6011,  6018,  6028,  6029,  6030,  6031,  6032,  6036,
+    6040,  6041,  6045,  6046,  6050,  6051,  6055,  6056,  6057,  6061,
+    6062,  6066,  6070,  6083,  6095,  6096,  6100,  6101,  6105,  6106,
+    6110,  6111,  6115,  6116,  6120,  6121,  6125,  6126,  6130,  6131,
+    6135,  6137,  6141,  6142,  6146,  6150,  6151,  6164,  6165,  6166,
+    6170,  6171,  6175,  6181,  6195,  6196,  6200,  6201,  6205,  6206,
+    6214,  6213,  6252,  6251,  6265,  6277,  6276,  6295,  6294,  6313,
+    6312,  6331,  6325,  6345,  6344,  6377,  6382,  6387,  6392,  6397,
+    6407,  6408,  6409,  6410,  6414,  6415,  6427,  6428,  6432,  6433,
+    6436,  6438,  6439,  6440,  6442,  6444,  6445,  6454,  6455,  6459,
+    6468,  6466,  6480,  6494,  6493,  6507,  6505,  6519,  6526,  6537,
+    6541,  6548,  6552,  6557,  6556,  6572,  6574,  6579,  6587,  6586,
+    6602,  6606,  6605,  6617,  6618,  6622,  6637,  6638,  6642,  6651,
+    6655,  6660,  6665,  6664,  6675,  6684,  6674,  6699,  6708,  6712,
+    6721,  6730,  6736,  6742,  6751,  6760,  6779,  6800,  6810,  6814,
+    6822,  6823,  6827,  6828,  6832,  6833,  6834,  6838,  6839,  6840,
+    6844,  6845,  6846,  6847,  6856,  6855,  6866,  6874,  6873,  6883,
+    6892,  6901,  6902,  6909,  6909,  6915,  6916,  6920,  6921,  6922,
+    6926,  6927,  6943,  6944,  6949,  6948,  6960,  6961,  6962,  6967,
+    6966,  6988,  6989,  6993,  6994,  6998,  6999,  7000,  7005,  7004,
+    7026,  7035,  7034,  7061,  7062,  7066,  7067,  7071,  7072,  7073,
+    7074,  7075,  7076,  7081,  7080,  7102,  7103,  7104,  7109,  7108,
+    7114,  7121,  7126,  7134,  7135,  7139,  7153,  7152,  7165,  7166,
+    7170,  7171,  7175,  7185,  7195,  7196,  7201,  7200,  7211,  7212,
+    7216,  7217,  7221,  7231,  7242,  7241,  7249,  7249,  7260,  7261,
+    7266,  7267,  7276,  7285,  7286,  7290,  7295,  7300,  7305,  7310,
+    7309,  7329,  7337,  7329,  7344,  7345,  7346,  7347,  7348,  7352,
+    7359,  7366,  7368,  7379,  7380,  7384,  7385,  7413,  7443,  7445,
+    7451,  7461,  7462,  7463,  7478,  7485,  7511,  7517,  7523,  7524,
+    7525,  7526,  7527,  7531,  7532,  7537,  7588,  7595,  7638,  7644,
+    7650,  7656,  7662,  7668,  7674,  7680,  7684,  7690,  7696,  7702,
+    7708,  7714,  7718,  7724,  7734,  7740,  7748,  7754,  7764,  7770,
+    7779,  7789,  7795,  7805,  7811,  7820,  7824,  7830,  7836,  7842,
+    7848,  7854,  7860,  7866,  7872,  7878,  7884,  7890,  7896,  7902,
+    7908,  7912,  7913,  7917,  7918,  7922,  7923,  7927,  7928,  7932,
+    7933,  7934,  7935,  7936,  7937,  7941,  7942,  7946,  7947,  7948,
+    7949,  7950,  7951,  7963,  7964,  7965,  7966,  7967,  7973,  7977,
+    7983,  7989,  7995,  8001,  8003,  8010,  8017,  8023,  8025,  8034,
+    8041,  8049,  8055,  8062,  8068,  8082,  8089,  8105,  8111,  8117,
+    8125,  8131,  8137,  8143,  8149,  8164,  8176,  8182,  8188,  8194,
+    8200,  8206,  8212,  8218,  8224,  8230,  8236,  8242,  8248,  8254,
+    8260,  8266,  8272,  8280,  8301,  8308,  8314,  8321,  8328,  8335,
+    8342,  8349,  8355,  8361,  8368,  8375,  8381,  8388,  8394,  8400,
+    8406,  8412,  8418,  8436,  8446,  8452,  8458,  8465,  8472,  8487,
+    8493,  8499,  8505,  8511,  8518,  8524,  8530,  8536,  8542,  8554,
+    8560,  8566,  8572,  8578,  8590,  8596,  8612,  8618,  8625,  8632,
+    8639,  8646,  8653,  8657,  8677,  8676,  8749,  8791,  8793,  8798,
+    8799,  8803,  8804,  8808,  8809,  8813,  8820,  8828,  8854,  8860,
+    8866,  8872,  8878,  8884,  8893,  8900,  8902,  8899,  8909,  8920,
+    8926,  8932,  8938,  8944,  8950,  8956,  8962,  8968,  8975,  8974,
+    8994,  8993,  9008,  9018,  9026,  9042,  9043,  9048,  9053,  9056,
+    9059,  9058,  9075,  9077,  9083,  9082,  9099,  9101,  9103,  9105,
+    9107,  9109,  9111,  9113,  9115,  9117,  9119,  9124,  9125,  9129,
+    9136,  9144,  9145,  9149,  9156,  9164,  9165,  9169,  9170,  9174,
+    9182,  9193,  9194,  9203,  9214,  9215,  9221,  9222,  9242,  9244,
+    9248,  9246,  9263,  9261,  9279,  9277,  9284,  9293,  9291,  9309,
+    9308,  9318,  9329,  9327,  9346,  9345,  9356,  9367,  9368,  9369,
+    9381,  9381,  9395,  9435,  9507,  9518,  9523,  9515,  9542,  9562,
+    9570,  9562,  9579,  9578,  9601,  9618,  9601,  9625,  9629,  9655,
+    9656,  9661,  9664,  9665,  9666,  9670,  9671,  9676,  9675,  9681,
+    9680,  9688,  9689,  9692,  9694,  9694,  9698,  9698,  9703,  9704,
+    9708,  9710,  9715,  9716,  9720,  9731,  9744,  9745,  9746,  9747,
+    9748,  9749,  9750,  9751,  9752,  9753,  9754,  9755,  9759,  9760,
+    9761,  9762,  9763,  9764,  9765,  9766,  9767,  9771,  9772,  9773,
+    9774,  9777,  9779,  9780,  9784,  9785,  9793,  9795,  9799,  9801,
+    9800,  9814,  9817,  9816,  9831,  9837,  9852,  9854,  9858,  9860,
+    9865,  9866,  9886,  9911,  9915,  9916,  9920,  9933,  9935,  9940,
+    9939,  9974,  9976,  9981,  9982,  9983,  9988,  9994,  9998,  9999,
+   10003, 10010, 10017, 10024, 10034, 10068, 10072, 10078, 10084, 10094,
+   10098, 10108, 10109, 10110, 10111, 10112, 10113, 10117, 10118, 10119,
+   10120, 10121, 10125, 10126, 10127, 10128, 10129, 10133, 10134, 10135,
+   10136, 10140, 10145, 10146, 10149, 10152, 10151, 10182, 10183, 10187,
+   10188, 10192, 10204, 10204, 10214, 10215, 10219, 10238, 10271, 10270,
+   10283, 10291, 10282, 10293, 10305, 10317, 10316, 10334, 10333, 10344,
+   10344, 10360, 10367, 10390, 10411, 10423, 10428, 10427, 10437, 10443,
+   10450, 10455, 10460, 10470, 10471, 10475, 10486, 10487, 10491, 10502,
+   10503, 10507, 10508, 10516, 10524, 10515, 10534, 10541, 10533, 10551,
+   10563, 10564, 10572, 10576, 10577, 10588, 10589, 10593, 10602, 10603,
+   10604, 10606, 10605, 10616, 10617, 10621, 10622, 10624, 10623, 10627,
+   10626, 10632, 10633, 10637, 10638, 10642, 10652, 10653, 10657, 10658,
+   10663, 10662, 10676, 10677, 10681, 10686, 10694, 10695, 10703, 10705,
+   10705, 10713, 10721, 10712, 10743, 10744, 10748, 10756, 10757, 10761,
+   10771, 10772, 10779, 10778, 10794, 10793, 10805, 10804, 10816, 10815,
+   10829, 10830, 10834, 10847, 10863, 10864, 10868, 10869, 10873, 10874,
+   10875, 10880, 10879, 10901, 10903, 10906, 10908, 10911, 10912, 10915,
+   10919, 10923, 10927, 10931, 10935, 10939, 10943, 10947, 10955, 10958,
+   10968, 10967, 10982, 10989, 10997, 11005, 11013, 11021, 11029, 11036,
+   11038, 11040, 11049, 11053, 11058, 11057, 11063, 11062, 11067, 11076,
+   11083, 11092, 11101, 11106, 11108, 11110, 11112, 11114, 11116, 11123,
+   11131, 11133, 11141, 11148, 11155, 11165, 11172, 11178, 11187, 11195,
+   11199, 11203, 11210, 11217, 11223, 11230, 11237, 11242, 11247, 11255,
+   11257, 11259, 11264, 11265, 11268, 11270, 11274, 11275, 11279, 11280,
+   11284, 11285, 11289, 11290, 11294, 11295, 11298, 11300, 11307, 11318,
+   11317, 11333, 11332, 11342, 11343, 11347, 11348, 11349, 11353, 11354,
+   11355, 11370, 11369, 11382, 11391, 11381, 11393, 11397, 11398, 11412,
+   11413, 11418, 11420, 11422, 11424, 11426, 11428, 11430, 11432, 11434,
+   11436, 11438, 11440, 11445, 11447, 11449, 11454, 11455, 11460, 11459,
+   11469, 11470, 11474, 11474, 11476, 11477, 11481, 11482, 11487, 11486,
+   11497, 11501, 11505, 11517, 11527, 11528, 11529, 11535, 11547, 11559,
+   11569, 11579, 11546, 11587, 11588, 11592, 11593, 11597, 11598, 11610,
+   11614, 11615, 11616, 11619, 11621, 11625, 11626, 11630, 11635, 11642,
+   11647, 11654, 11656, 11660, 11661, 11665, 11670, 11678, 11679, 11682,
+   11684, 11692, 11694, 11698, 11699, 11700, 11704, 11706, 11711, 11712,
+   11721, 11722, 11726, 11727, 11731, 11751, 11775, 11787, 11798, 11817,
+   11825, 11837, 11852, 11873, 11874, 11875, 11883, 11884, 11885, 11892,
+   11898, 11904, 11910, 11916, 11945, 11973, 11974, 11975, 11979, 11989,
+   11999, 12005, 12014, 12029, 12030, 12034, 12043, 12059, 12063, 12110,
+   12114, 12132, 12136, 12215, 12240, 12271, 12272, 12288, 12298, 12302,
+   12308, 12314, 12324, 12330, 12339, 12349, 12350, 12380, 12396, 12412,
+   12429, 12430, 12441, 12442, 12453, 12454, 12455, 12459, 12476, 12498,
+   12513, 12514, 12515, 12516, 12517, 12518, 12519, 12520, 12521, 12522,
+   12523, 12524, 12525, 12526, 12527, 12528, 12529, 12530, 12531, 12532,
+   12533, 12534, 12535, 12536, 12537, 12538, 12539, 12540, 12541, 12542,
+   12543, 12544, 12545, 12546, 12547, 12548, 12549, 12550, 12551, 12552,
+   12553, 12554, 12555, 12556, 12557, 12558, 12559, 12560, 12561, 12562,
+   12572, 12573, 12574, 12575, 12576, 12577, 12578, 12579, 12580, 12581,
+   12582, 12583, 12584, 12585, 12586, 12587, 12588, 12589, 12590, 12591,
+   12592, 12593, 12594, 12595, 12596, 12597, 12598, 12599, 12600, 12601,
+   12602, 12603, 12604, 12605, 12606, 12607, 12608, 12609, 12610, 12611,
+   12612, 12613, 12614, 12615, 12616, 12617, 12618, 12619, 12620, 12621,
+   12622, 12623, 12624, 12625, 12626, 12627, 12628, 12629, 12630, 12631,
+   12632, 12633, 12634, 12635, 12636, 12637, 12638, 12639, 12640, 12641,
+   12642, 12643, 12644, 12645, 12646, 12647, 12648, 12649, 12650, 12651,
+   12652, 12653, 12654, 12655, 12656, 12657, 12658, 12659, 12660, 12661,
+   12662, 12663, 12664, 12665, 12666, 12667, 12668, 12669, 12670, 12671,
+   12672, 12673, 12674, 12675, 12676, 12677, 12678, 12679, 12680, 12681,
+   12682, 12683, 12684, 12685, 12686, 12687, 12688, 12689, 12690, 12691,
+   12692, 12693, 12694, 12695, 12696, 12697, 12698, 12699, 12700, 12701,
+   12702, 12703, 12704, 12705, 12706, 12707, 12708, 12709, 12710, 12711,
+   12712, 12713, 12714, 12715, 12716, 12717, 12718, 12719, 12720, 12721,
+   12722, 12723, 12724, 12725, 12726, 12727, 12728, 12729, 12730, 12731,
+   12732, 12733, 12734, 12735, 12736, 12737, 12738, 12739, 12740, 12741,
+   12742, 12743, 12744, 12745, 12746, 12747, 12748, 12749, 12750, 12751,
+   12752, 12753, 12754, 12755, 12756, 12757, 12758, 12759, 12760, 12761,
+   12762, 12763, 12764, 12765, 12766, 12767, 12768, 12769, 12770, 12771,
+   12772, 12773, 12774, 12775, 12776, 12777, 12778, 12779, 12780, 12781,
+   12782, 12783, 12784, 12785, 12786, 12787, 12788, 12789, 12790, 12791,
+   12792, 12793, 12794, 12795, 12796, 12797, 12798, 12799, 12800, 12801,
+   12802, 12803, 12804, 12805, 12806, 12807, 12808, 12809, 12810, 12811,
+   12812, 12813, 12814, 12815, 12816, 12817, 12818, 12819, 12820, 12821,
+   12822, 12823, 12824, 12825, 12826, 12827, 12828, 12829, 12830, 12831,
+   12832, 12833, 12834, 12835, 12836, 12837, 12838, 12839, 12840, 12841,
+   12842, 12843, 12844, 12845, 12846, 12847, 12848, 12849, 12856, 12855,
+   12870, 12871, 12875, 12876, 12880, 12880, 12962, 12963, 12964, 12965,
+   12969, 12970, 12974, 12975, 12976, 12977, 12981, 12982, 12983, 12984,
+   12988, 12989, 12993, 13035, 13054, 13065, 13078, 13092, 13107, 13126,
+   13153, 13166, 13193, 13236, 13250, 13251, 13252, 13253, 13257, 13258,
+   13267, 13279, 13280, 13281, 13287, 13293, 13305, 13304, 13320, 13321,
+   13325, 13326, 13330, 13343, 13344, 13345, 13346, 13351, 13350, 13370,
+   13382, 13395, 13394, 13427, 13428, 13432, 13433, 13437, 13438, 13439,
+   13440, 13442, 13441, 13454, 13455, 13456, 13457, 13458, 13464, 13469,
+   13475, 13486, 13497, 13501, 13511, 13516, 13523, 13535, 13547, 13556,
+   13558, 13562, 13563, 13570, 13572, 13576, 13577, 13582, 13581, 13585,
+   13584, 13588, 13587, 13591, 13590, 13593, 13594, 13595, 13596, 13597,
+   13598, 13599, 13600, 13601, 13602, 13603, 13604, 13605, 13606, 13607,
+   13608, 13609, 13610, 13611, 13612, 13613, 13614, 13615, 13616, 13617,
+   13618, 13622, 13623, 13627, 13628, 13632, 13642, 13652, 13665, 13680,
+   13693, 13706, 13718, 13723, 13731, 13736, 13744, 13773, 13780, 13788,
+   13796, 13802, 13806, 13810, 13811, 13815, 13842, 13844, 13848, 13852,
+   13856, 13863, 13864, 13868, 13869, 13873, 13874, 13878, 13879, 13885,
+   13891, 13897, 13907, 13906, 13916, 13917, 13922, 13923, 13924, 13929,
+   13930, 13931, 13935, 13936, 13940, 13952, 13961, 13971, 13980, 13994,
+   13995, 14000, 13999, 14015, 14016, 14017, 14021, 14022, 14026, 14026,
+   14050, 14051, 14055, 14056, 14057, 14061, 14065, 14072, 14075, 14073,
+   14089, 14096, 14117, 14141, 14143, 14147, 14148, 14152, 14153, 14161,
+   14162, 14163, 14164, 14170, 14176, 14186, 14188, 14190, 14195, 14196,
+   14197, 14198, 14199, 14203, 14204, 14205, 14206, 14207, 14208, 14218,
+   14219, 14224, 14237, 14250, 14252, 14254, 14259, 14264, 14266, 14268,
+   14274, 14275, 14277, 14283, 14282, 14300, 14301, 14305, 14310, 14318,
+   14318, 14343, 14344, 14349, 14350, 14352, 14354, 14372, 14378, 14383,
+   14365, 14445, 14463, 14488, 14520, 14524, 14532, 14555, 14484, 14620,
+   14644, 14653, 14661, 14619, 14682, 14686, 14690, 14694, 14698, 14702,
+   14709, 14716, 14723, 14733, 14734, 14738, 14739, 14740, 14744, 14745,
+   14750, 14752, 14751, 14757, 14758, 14762, 14772
 };
 #endif
 
@@ -16149,7 +16150,7 @@
     }								\
   else								\
     {								\
-      yyerror (YY_("syntax error: cannot back up")); \
+      yyerror (YYTHD, YY_("syntax error: cannot back up")); \
       YYERROR;							\
     }								\
 while (YYID (0))
@@ -16206,7 +16207,7 @@
 #ifdef YYLEX_PARAM
 # define YYLEX yylex (&yylval, YYLEX_PARAM)
 #else
-# define YYLEX yylex (&yylval)
+# define YYLEX yylex (&yylval, YYTHD)
 #endif
 
 /* Enable debugging if requested.  */
@@ -16229,7 +16230,7 @@
     {									  \
       YYFPRINTF (stderr, "%s ", Title);					  \
       yy_symbol_print (stderr,						  \
-		  Type, Value); \
+		  Type, Value, YYTHD); \
       YYFPRINTF (stderr, "\n");						  \
     }									  \
 } while (YYID (0))
@@ -16243,17 +16244,19 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_value_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, class THD *YYTHD)
 #else
 static void
-yy_symbol_value_print (yyoutput, yytype, yyvaluep)
+yy_symbol_value_print (yyoutput, yytype, yyvaluep, YYTHD)
     FILE *yyoutput;
     int yytype;
     YYSTYPE const * const yyvaluep;
+    class THD *YYTHD;
 #endif
 {
   if (!yyvaluep)
     return;
+  YYUSE (YYTHD);
 # ifdef YYPRINT
   if (yytype < YYNTOKENS)
     YYPRINT (yyoutput, yytoknum[yytype], *yyvaluep);
@@ -16275,13 +16278,14 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep)
+yy_symbol_print (FILE *yyoutput, int yytype, YYSTYPE const * const yyvaluep, class THD *YYTHD)
 #else
 static void
-yy_symbol_print (yyoutput, yytype, yyvaluep)
+yy_symbol_print (yyoutput, yytype, yyvaluep, YYTHD)
     FILE *yyoutput;
     int yytype;
     YYSTYPE const * const yyvaluep;
+    class THD *YYTHD;
 #endif
 {
   if (yytype < YYNTOKENS)
@@ -16289,7 +16293,7 @@
   else
     YYFPRINTF (yyoutput, "nterm %s (", yytname[yytype]);
 
-  yy_symbol_value_print (yyoutput, yytype, yyvaluep);
+  yy_symbol_value_print (yyoutput, yytype, yyvaluep, YYTHD);
   YYFPRINTF (yyoutput, ")");
 }
 
@@ -16332,12 +16336,13 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yy_reduce_print (YYSTYPE *yyvsp, int yyrule)
+yy_reduce_print (YYSTYPE *yyvsp, int yyrule, class THD *YYTHD)
 #else
 static void
-yy_reduce_print (yyvsp, yyrule)
+yy_reduce_print (yyvsp, yyrule, YYTHD)
     YYSTYPE *yyvsp;
     int yyrule;
+    class THD *YYTHD;
 #endif
 {
   int yynrhs = yyr2[yyrule];
@@ -16351,7 +16356,7 @@
       YYFPRINTF (stderr, "   $%d = ", yyi + 1);
       yy_symbol_print (stderr, yyrhs[yyprhs[yyrule] + yyi],
 		       &(yyvsp[(yyi + 1) - (yynrhs)])
-		       		       );
+		       		       , YYTHD);
       YYFPRINTF (stderr, "\n");
     }
 }
@@ -16359,7 +16364,7 @@
 # define YY_REDUCE_PRINT(Rule)		\
 do {					\
   if (yydebug)				\
-    yy_reduce_print (yyvsp, Rule); \
+    yy_reduce_print (yyvsp, Rule, YYTHD); \
 } while (YYID (0))
 
 /* Nonzero means print parse trace.  It is left uninitialized so that
@@ -16610,16 +16615,18 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 static void
-yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep)
+yydestruct (const char *yymsg, int yytype, YYSTYPE *yyvaluep, class THD *YYTHD)
 #else
 static void
-yydestruct (yymsg, yytype, yyvaluep)
+yydestruct (yymsg, yytype, yyvaluep, YYTHD)
     const char *yymsg;
     int yytype;
     YYSTYPE *yyvaluep;
+    class THD *YYTHD;
 #endif
 {
   YYUSE (yyvaluep);
+  YYUSE (YYTHD);
 
   if (!yymsg)
     yymsg = "Deleting";
@@ -16642,7 +16649,7 @@
 #endif
 #else /* ! YYPARSE_PARAM */
 #if defined __STDC__ || defined __cplusplus
-int yyparse (void);
+int yyparse (class THD *YYTHD);
 #else
 int yyparse ();
 #endif
@@ -16670,11 +16677,11 @@
 #if (defined __STDC__ || defined __C99__FUNC__ \
      || defined __cplusplus || defined _MSC_VER)
 int
-yyparse (void)
+yyparse (class THD *YYTHD)
 #else
 int
-yyparse ()
-
+yyparse (YYTHD)
+    class THD *YYTHD;
 #endif
 #endif
 {
@@ -16929,7 +16936,7 @@
         case 2:
 
 /* Line 1455 of yacc.c  */
-#line 1661 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1664 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             if (!thd->bootstrap &&
@@ -16946,7 +16953,7 @@
   case 3:
 
 /* Line 1455 of yacc.c  */
-#line 1673 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1676 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex_input_stream *lip = YYLIP;
 
@@ -16974,7 +16981,7 @@
   case 5:
 
 /* Line 1455 of yacc.c  */
-#line 1698 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1701 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* Single query, not terminated. */
             YYLIP->found_semicolon= NULL;
@@ -16984,7 +16991,7 @@
   case 61:
 
 /* Line 1455 of yacc.c  */
-#line 1771 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1774 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -16996,7 +17003,7 @@
   case 64:
 
 /* Line 1455 of yacc.c  */
-#line 1786 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1789 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17008,7 +17015,7 @@
   case 65:
 
 /* Line 1455 of yacc.c  */
-#line 1796 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1799 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17020,7 +17027,7 @@
   case 66:
 
 /* Line 1455 of yacc.c  */
-#line 1803 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1806 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17032,7 +17039,7 @@
   case 67:
 
 /* Line 1455 of yacc.c  */
-#line 1813 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1816 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17044,14 +17051,14 @@
   case 68:
 
 /* Line 1455 of yacc.c  */
-#line 1820 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1823 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 73:
 
 /* Line 1455 of yacc.c  */
-#line 1835 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1838 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             LEX_STRING *lexstr= (LEX_STRING*)sql_memdup(&(yyvsp[(2) - (2)].lex_str), sizeof(LEX_STRING));
@@ -17063,7 +17070,7 @@
   case 74:
 
 /* Line 1455 of yacc.c  */
-#line 1847 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1850 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->sphead)
             {
@@ -17076,7 +17083,7 @@
   case 75:
 
 /* Line 1455 of yacc.c  */
-#line 1855 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1858 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_HELP;
@@ -17087,7 +17094,7 @@
   case 76:
 
 /* Line 1455 of yacc.c  */
-#line 1866 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1869 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex = Lex;
             lex->sql_command = SQLCOM_CHANGE_MASTER;
@@ -17101,14 +17108,14 @@
   case 77:
 
 /* Line 1455 of yacc.c  */
-#line 1875 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1878 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 80:
 
 /* Line 1455 of yacc.c  */
-#line 1885 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1888 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.host = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17117,7 +17124,7 @@
   case 81:
 
 /* Line 1455 of yacc.c  */
-#line 1889 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1892 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.user = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17126,7 +17133,7 @@
   case 82:
 
 /* Line 1455 of yacc.c  */
-#line 1893 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1896 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.password = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17135,7 +17142,7 @@
   case 83:
 
 /* Line 1455 of yacc.c  */
-#line 1897 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1900 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.port = (yyvsp[(3) - (3)].ulong_num);
           }
@@ -17144,7 +17151,7 @@
   case 84:
 
 /* Line 1455 of yacc.c  */
-#line 1901 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1904 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.connect_retry = (yyvsp[(3) - (3)].ulong_num);
           }
@@ -17153,7 +17160,7 @@
   case 85:
 
 /* Line 1455 of yacc.c  */
-#line 1905 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1908 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl= (yyvsp[(3) - (3)].ulong_num) ? 
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
@@ -17163,7 +17170,7 @@
   case 86:
 
 /* Line 1455 of yacc.c  */
-#line 1910 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1913 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_ca= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17172,7 +17179,7 @@
   case 87:
 
 /* Line 1455 of yacc.c  */
-#line 1914 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1917 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_capath= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17181,7 +17188,7 @@
   case 88:
 
 /* Line 1455 of yacc.c  */
-#line 1918 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1921 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_cert= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17190,7 +17197,7 @@
   case 89:
 
 /* Line 1455 of yacc.c  */
-#line 1922 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1925 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_cipher= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17199,7 +17206,7 @@
   case 90:
 
 /* Line 1455 of yacc.c  */
-#line 1926 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1929 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_key= (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17208,7 +17215,7 @@
   case 91:
 
 /* Line 1455 of yacc.c  */
-#line 1930 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1933 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.ssl_verify_server_cert= (yyvsp[(3) - (3)].ulong_num) ?
               LEX_MASTER_INFO::LEX_MI_ENABLE : LEX_MASTER_INFO::LEX_MI_DISABLE;
@@ -17218,7 +17225,7 @@
   case 92:
 
 /* Line 1455 of yacc.c  */
-#line 1936 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1939 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.heartbeat_period= (float) (yyvsp[(3) - (3)].item_num)->val_real();
             if (Lex->mi.heartbeat_period > SLAVE_MAX_HEARTBEAT_PERIOD ||
@@ -17254,7 +17261,7 @@
   case 93:
 
 /* Line 1455 of yacc.c  */
-#line 1967 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1970 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.repl_ignore_server_ids_opt= LEX_MASTER_INFO::LEX_MI_ENABLE;
            }
@@ -17263,7 +17270,7 @@
   case 98:
 
 /* Line 1455 of yacc.c  */
-#line 1982 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1985 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->mi.repl_ignore_server_ids.elements == 0)
             {
@@ -17280,7 +17287,7 @@
   case 99:
 
 /* Line 1455 of yacc.c  */
-#line 1996 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 1999 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.log_file_name = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17289,7 +17296,7 @@
   case 100:
 
 /* Line 1455 of yacc.c  */
-#line 2000 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2003 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.pos = (yyvsp[(3) - (3)].ulonglong_number);
             /* 
@@ -17310,7 +17317,7 @@
   case 101:
 
 /* Line 1455 of yacc.c  */
-#line 2016 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2019 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.relay_log_name = (yyvsp[(3) - (3)].lex_str).str;
           }
@@ -17319,7 +17326,7 @@
   case 102:
 
 /* Line 1455 of yacc.c  */
-#line 2020 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2023 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->mi.relay_log_pos = (yyvsp[(3) - (3)].ulong_num);
             /* Adjust if < BIN_LOG_HEADER_SIZE (same comment as Lex->mi.pos) */
@@ -17330,7 +17337,7 @@
   case 103:
 
 /* Line 1455 of yacc.c  */
-#line 2031 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2034 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17360,7 +17367,7 @@
   case 104:
 
 /* Line 1455 of yacc.c  */
-#line 2056 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2059 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= YYTHD->lex;
             lex->current_select= &lex->select_lex; 
@@ -17381,7 +17388,7 @@
   case 105:
 
 /* Line 1455 of yacc.c  */
-#line 2072 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2075 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
               MYSQL_YYABORT;
@@ -17391,7 +17398,7 @@
   case 106:
 
 /* Line 1455 of yacc.c  */
-#line 2077 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2080 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
               MYSQL_YYABORT;
@@ -17401,7 +17408,7 @@
   case 107:
 
 /* Line 1455 of yacc.c  */
-#line 2083 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2086 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
               MYSQL_YYABORT;
@@ -17411,7 +17418,7 @@
   case 108:
 
 /* Line 1455 of yacc.c  */
-#line 2088 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2091 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
               MYSQL_YYABORT;
@@ -17421,7 +17428,7 @@
   case 109:
 
 /* Line 1455 of yacc.c  */
-#line 2094 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2097 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index_prepare(Lex, (yyvsp[(7) - (7)].table)))
               MYSQL_YYABORT;
@@ -17431,7 +17438,7 @@
   case 110:
 
 /* Line 1455 of yacc.c  */
-#line 2099 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2102 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index(Lex, (yyvsp[(2) - (12)].key_type), (yyvsp[(4) - (12)].lex_str)))
               MYSQL_YYABORT;
@@ -17441,7 +17448,7 @@
   case 111:
 
 /* Line 1455 of yacc.c  */
-#line 2104 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2107 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.default_table_charset= NULL;
             Lex->create_info.used_fields= 0;
@@ -17451,7 +17458,7 @@
   case 112:
 
 /* Line 1455 of yacc.c  */
-#line 2109 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2112 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_CREATE_DB;
@@ -17463,7 +17470,7 @@
   case 113:
 
 /* Line 1455 of yacc.c  */
-#line 2116 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2119 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_view_mode= VIEW_CREATE_NEW;
             Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED;
@@ -17474,14 +17481,14 @@
   case 114:
 
 /* Line 1455 of yacc.c  */
-#line 2122 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2125 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 115:
 
 /* Line 1455 of yacc.c  */
-#line 2124 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2127 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_CREATE_USER;
           }
@@ -17490,7 +17497,7 @@
   case 116:
 
 /* Line 1455 of yacc.c  */
-#line 2128 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2131 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_tablespace_info->ts_cmd_type= CREATE_LOGFILE_GROUP;
           }
@@ -17499,7 +17506,7 @@
   case 117:
 
 /* Line 1455 of yacc.c  */
-#line 2132 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2135 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_tablespace_info->ts_cmd_type= CREATE_TABLESPACE;
           }
@@ -17508,7 +17515,7 @@
   case 118:
 
 /* Line 1455 of yacc.c  */
-#line 2136 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2139 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_CREATE_SERVER;
           }
@@ -17517,7 +17524,7 @@
   case 119:
 
 /* Line 1455 of yacc.c  */
-#line 2147 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2150 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.server_name= (yyvsp[(2) - (10)].lex_str).str;
             Lex->server_options.server_name_length= (yyvsp[(2) - (10)].lex_str).length;
@@ -17528,7 +17535,7 @@
   case 122:
 
 /* Line 1455 of yacc.c  */
-#line 2161 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2164 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.username= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -17537,7 +17544,7 @@
   case 123:
 
 /* Line 1455 of yacc.c  */
-#line 2165 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2168 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.host= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -17546,7 +17553,7 @@
   case 124:
 
 /* Line 1455 of yacc.c  */
-#line 2169 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2172 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.db= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -17555,7 +17562,7 @@
   case 125:
 
 /* Line 1455 of yacc.c  */
-#line 2173 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2176 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.owner= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -17564,7 +17571,7 @@
   case 126:
 
 /* Line 1455 of yacc.c  */
-#line 2177 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2180 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.password= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -17573,7 +17580,7 @@
   case 127:
 
 /* Line 1455 of yacc.c  */
-#line 2181 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2184 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.socket= (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -17582,7 +17589,7 @@
   case 128:
 
 /* Line 1455 of yacc.c  */
-#line 2185 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2188 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->server_options.port= (yyvsp[(2) - (2)].ulong_num);
           }
@@ -17591,7 +17598,7 @@
   case 129:
 
 /* Line 1455 of yacc.c  */
-#line 2192 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2195 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex=Lex;
@@ -17612,7 +17619,7 @@
   case 130:
 
 /* Line 1455 of yacc.c  */
-#line 2212 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2215 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               sql_command is set here because some rules in ev_sql_stmt
@@ -17625,7 +17632,7 @@
   case 131:
 
 /* Line 1455 of yacc.c  */
-#line 2223 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2226 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_expression= (yyvsp[(2) - (3)].item);
             Lex->event_parse_data->interval= (yyvsp[(3) - (3)].interval);
@@ -17635,7 +17642,7 @@
   case 133:
 
 /* Line 1455 of yacc.c  */
-#line 2230 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2233 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_execute_at= (yyvsp[(2) - (2)].item);
           }
@@ -17644,14 +17651,14 @@
   case 134:
 
 /* Line 1455 of yacc.c  */
-#line 2236 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2239 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 135:
 
 /* Line 1455 of yacc.c  */
-#line 2238 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2241 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->status= Event_parse_data::ENABLED;
             Lex->event_parse_data->status_changed= true;
@@ -17662,7 +17669,7 @@
   case 136:
 
 /* Line 1455 of yacc.c  */
-#line 2244 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2247 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->status= Event_parse_data::SLAVESIDE_DISABLED;
             Lex->event_parse_data->status_changed= true; 
@@ -17673,7 +17680,7 @@
   case 137:
 
 /* Line 1455 of yacc.c  */
-#line 2250 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2253 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->status= Event_parse_data::DISABLED;
             Lex->event_parse_data->status_changed= true;
@@ -17684,7 +17691,7 @@
   case 138:
 
 /* Line 1455 of yacc.c  */
-#line 2259 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2262 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_now_local();
             if (item == NULL)
@@ -17696,7 +17703,7 @@
   case 139:
 
 /* Line 1455 of yacc.c  */
-#line 2266 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2269 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_starts= (yyvsp[(2) - (2)].item);
           }
@@ -17705,7 +17712,7 @@
   case 141:
 
 /* Line 1455 of yacc.c  */
-#line 2274 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2277 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->item_ends= (yyvsp[(2) - (2)].item);
           }
@@ -17714,14 +17721,14 @@
   case 142:
 
 /* Line 1455 of yacc.c  */
-#line 2280 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2283 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 144:
 
 /* Line 1455 of yacc.c  */
-#line 2286 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2289 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->on_completion=
                                   Event_parse_data::ON_COMPLETION_PRESERVE;
@@ -17732,7 +17739,7 @@
   case 145:
 
 /* Line 1455 of yacc.c  */
-#line 2292 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2295 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->event_parse_data->on_completion=
                                   Event_parse_data::ON_COMPLETION_DROP;
@@ -17743,14 +17750,14 @@
   case 146:
 
 /* Line 1455 of yacc.c  */
-#line 2300 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2303 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 147:
 
 /* Line 1455 of yacc.c  */
-#line 2302 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2305 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->comment= Lex->event_parse_data->comment= (yyvsp[(2) - (2)].lex_str);
             (yyval.num)= 1;
@@ -17760,7 +17767,7 @@
   case 148:
 
 /* Line 1455 of yacc.c  */
-#line 2309 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2312 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17808,7 +17815,7 @@
   case 149:
 
 /* Line 1455 of yacc.c  */
-#line 2352 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2355 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17826,7 +17833,7 @@
   case 163:
 
 /* Line 1455 of yacc.c  */
-#line 2384 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2387 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
            LEX *lex=Lex;
            lex->users_list.empty();
@@ -17843,7 +17850,7 @@
   case 164:
 
 /* Line 1455 of yacc.c  */
-#line 2399 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2402 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!(yyvsp[(1) - (3)].lex_str).str || check_db_name(&(yyvsp[(1) - (3)].lex_str)))
             {
@@ -17864,7 +17871,7 @@
   case 165:
 
 /* Line 1455 of yacc.c  */
-#line 2415 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2418 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -17885,105 +17892,105 @@
   case 166:
 
 /* Line 1455 of yacc.c  */
-#line 2433 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2436 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 167:
 
 /* Line 1455 of yacc.c  */
-#line 2434 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2437 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 168:
 
 /* Line 1455 of yacc.c  */
-#line 2438 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2441 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 169:
 
 /* Line 1455 of yacc.c  */
-#line 2439 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2442 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 170:
 
 /* Line 1455 of yacc.c  */
-#line 2445 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2448 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.comment= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 171:
 
 /* Line 1455 of yacc.c  */
-#line 2447 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2450 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* Just parse it, we only have one language for now. */ }
     break;
 
   case 172:
 
 /* Line 1455 of yacc.c  */
-#line 2449 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2452 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_NO_SQL; }
     break;
 
   case 173:
 
 /* Line 1455 of yacc.c  */
-#line 2451 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2454 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_CONTAINS_SQL; }
     break;
 
   case 174:
 
 /* Line 1455 of yacc.c  */
-#line 2453 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2456 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_READS_SQL_DATA; }
     break;
 
   case 175:
 
 /* Line 1455 of yacc.c  */
-#line 2455 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2458 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.daccess= SP_MODIFIES_SQL_DATA; }
     break;
 
   case 176:
 
 /* Line 1455 of yacc.c  */
-#line 2457 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2460 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 177:
 
 /* Line 1455 of yacc.c  */
-#line 2462 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2465 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 178:
 
 /* Line 1455 of yacc.c  */
-#line 2463 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2466 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.detistic= TRUE; }
     break;
 
   case 179:
 
 /* Line 1455 of yacc.c  */
-#line 2464 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2467 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sp_chistics.detistic= FALSE; }
     break;
 
   case 180:
 
 /* Line 1455 of yacc.c  */
-#line 2469 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2472 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sp_chistics.suid= SP_IS_SUID;
           }
@@ -17992,7 +17999,7 @@
   case 181:
 
 /* Line 1455 of yacc.c  */
-#line 2473 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2476 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sp_chistics.suid= SP_IS_NOT_SUID;
           }
@@ -18001,7 +18008,7 @@
   case 182:
 
 /* Line 1455 of yacc.c  */
-#line 2480 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2483 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex = Lex;
 
@@ -18015,14 +18022,14 @@
   case 183:
 
 /* Line 1455 of yacc.c  */
-#line 2488 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2491 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 188:
 
 /* Line 1455 of yacc.c  */
-#line 2504 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2507 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
            Lex->value_list.push_back((yyvsp[(3) - (3)].item));
           }
@@ -18031,7 +18038,7 @@
   case 189:
 
 /* Line 1455 of yacc.c  */
-#line 2508 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2511 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->value_list.push_back((yyvsp[(1) - (1)].item));
           }
@@ -18040,7 +18047,7 @@
   case 194:
 
 /* Line 1455 of yacc.c  */
-#line 2526 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2529 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -18062,7 +18069,7 @@
   case 195:
 
 /* Line 1455 of yacc.c  */
-#line 2546 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2549 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *spc= lex->spcont;
@@ -18090,7 +18097,7 @@
   case 200:
 
 /* Line 1455 of yacc.c  */
-#line 2583 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2586 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *spc= lex->spcont;
@@ -18118,49 +18125,49 @@
   case 201:
 
 /* Line 1455 of yacc.c  */
-#line 2608 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2611 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= sp_param_in; }
     break;
 
   case 202:
 
 /* Line 1455 of yacc.c  */
-#line 2609 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2612 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= sp_param_in; }
     break;
 
   case 203:
 
 /* Line 1455 of yacc.c  */
-#line 2610 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2613 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= sp_param_out; }
     break;
 
   case 204:
 
 /* Line 1455 of yacc.c  */
-#line 2611 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2614 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= sp_param_inout; }
     break;
 
   case 205:
 
 /* Line 1455 of yacc.c  */
-#line 2615 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2618 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 207:
 
 /* Line 1455 of yacc.c  */
-#line 2620 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2623 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 209:
 
 /* Line 1455 of yacc.c  */
-#line 2626 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2629 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.spblock).vars= (yyval.spblock).conds= (yyval.spblock).hndlrs= (yyval.spblock).curs= 0;
           }
@@ -18169,7 +18176,7 @@
   case 210:
 
 /* Line 1455 of yacc.c  */
-#line 2630 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2633 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* We check for declarations out of (standard) order this way
               because letting the grammar rules reflect it caused tricky
@@ -18197,7 +18204,7 @@
   case 211:
 
 /* Line 1455 of yacc.c  */
-#line 2656 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2659 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -18209,7 +18216,7 @@
   case 212:
 
 /* Line 1455 of yacc.c  */
-#line 2664 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2667 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -18271,7 +18278,7 @@
   case 213:
 
 /* Line 1455 of yacc.c  */
-#line 2721 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2724 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *spc= lex->spcont;
@@ -18291,7 +18298,7 @@
   case 214:
 
 /* Line 1455 of yacc.c  */
-#line 2736 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2739 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -18318,7 +18325,7 @@
   case 215:
 
 /* Line 1455 of yacc.c  */
-#line 2758 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2761 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -18355,7 +18362,7 @@
   case 216:
 
 /* Line 1455 of yacc.c  */
-#line 2790 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2793 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -18383,7 +18390,7 @@
   case 217:
 
 /* Line 1455 of yacc.c  */
-#line 2815 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2818 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sphead->reset_lex(YYTHD);
           }
@@ -18392,7 +18399,7 @@
   case 218:
 
 /* Line 1455 of yacc.c  */
-#line 2819 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2822 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -18414,35 +18421,35 @@
   case 219:
 
 /* Line 1455 of yacc.c  */
-#line 2838 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2841 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= SP_HANDLER_EXIT; }
     break;
 
   case 220:
 
 /* Line 1455 of yacc.c  */
-#line 2839 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2842 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= SP_HANDLER_CONTINUE; }
     break;
 
   case 221:
 
 /* Line 1455 of yacc.c  */
-#line 2845 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2848 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 222:
 
 /* Line 1455 of yacc.c  */
-#line 2847 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2850 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)+= 1; }
     break;
 
   case 223:
 
 /* Line 1455 of yacc.c  */
-#line 2852 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2855 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -18467,7 +18474,7 @@
   case 224:
 
 /* Line 1455 of yacc.c  */
-#line 2875 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2878 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* mysql errno */
             if ((yyvsp[(1) - (1)].ulong_num) == 0)
             {
@@ -18485,7 +18492,7 @@
   case 226:
 
 /* Line 1455 of yacc.c  */
-#line 2892 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2895 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* SQLSTATE */
             if (!sp_cond_check(&(yyvsp[(3) - (3)].lex_str)))
             {
@@ -18504,21 +18511,21 @@
   case 227:
 
 /* Line 1455 of yacc.c  */
-#line 2908 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2911 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 228:
 
 /* Line 1455 of yacc.c  */
-#line 2909 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2912 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 229:
 
 /* Line 1455 of yacc.c  */
-#line 2914 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2917 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.spcondtype)= (yyvsp[(1) - (1)].spcondtype);
           }
@@ -18527,7 +18534,7 @@
   case 230:
 
 /* Line 1455 of yacc.c  */
-#line 2918 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2921 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.spcondtype)= Lex->spcont->find_cond(&(yyvsp[(1) - (1)].lex_str));
             if ((yyval.spcondtype) == NULL)
@@ -18541,7 +18548,7 @@
   case 231:
 
 /* Line 1455 of yacc.c  */
-#line 2927 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2930 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.spcondtype)= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
             if ((yyval.spcondtype) == NULL)
@@ -18553,7 +18560,7 @@
   case 232:
 
 /* Line 1455 of yacc.c  */
-#line 2934 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2937 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.spcondtype)= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
             if ((yyval.spcondtype) == NULL)
@@ -18565,7 +18572,7 @@
   case 233:
 
 /* Line 1455 of yacc.c  */
-#line 2941 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2944 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.spcondtype)= (sp_cond_type_t *)YYTHD->alloc(sizeof(sp_cond_type_t));
             if ((yyval.spcondtype) == NULL)
@@ -18577,7 +18584,7 @@
   case 234:
 
 /* Line 1455 of yacc.c  */
-#line 2951 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2954 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18594,7 +18601,7 @@
   case 235:
 
 /* Line 1455 of yacc.c  */
-#line 2966 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2969 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_cond_type_t *cond;
@@ -18622,28 +18629,28 @@
   case 236:
 
 /* Line 1455 of yacc.c  */
-#line 2989 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2992 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.spcondtype)= (yyvsp[(1) - (1)].spcondtype); }
     break;
 
   case 237:
 
 /* Line 1455 of yacc.c  */
-#line 2994 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2997 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.spcondtype)= NULL; }
     break;
 
   case 238:
 
 /* Line 1455 of yacc.c  */
-#line 2996 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 2999 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.spcondtype)= (yyvsp[(1) - (1)].spcondtype); }
     break;
 
   case 239:
 
 /* Line 1455 of yacc.c  */
-#line 3001 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3004 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             YYTHD->m_parser_state->m_yacc.m_set_signal_info.clear();
           }
@@ -18652,7 +18659,7 @@
   case 241:
 
 /* Line 1455 of yacc.c  */
-#line 3009 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3012 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Set_signal_information *info;
             info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
@@ -18665,7 +18672,7 @@
   case 242:
 
 /* Line 1455 of yacc.c  */
-#line 3018 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3021 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Set_signal_information *info;
             info= & YYTHD->m_parser_state->m_yacc.m_set_signal_info;
@@ -18683,14 +18690,14 @@
   case 243:
 
 /* Line 1455 of yacc.c  */
-#line 3037 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3040 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 244:
 
 /* Line 1455 of yacc.c  */
-#line 3039 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3042 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (1)].item)->type() == Item::FUNC_ITEM)
             {
@@ -18713,98 +18720,98 @@
   case 245:
 
 /* Line 1455 of yacc.c  */
-#line 3057 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3060 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 246:
 
 /* Line 1455 of yacc.c  */
-#line 3063 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3066 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CLASS_ORIGIN; }
     break;
 
   case 247:
 
 /* Line 1455 of yacc.c  */
-#line 3065 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3068 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_SUBCLASS_ORIGIN; }
     break;
 
   case 248:
 
 /* Line 1455 of yacc.c  */
-#line 3067 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3070 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_CATALOG; }
     break;
 
   case 249:
 
 /* Line 1455 of yacc.c  */
-#line 3069 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3072 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_SCHEMA; }
     break;
 
   case 250:
 
 /* Line 1455 of yacc.c  */
-#line 3071 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3074 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CONSTRAINT_NAME; }
     break;
 
   case 251:
 
 /* Line 1455 of yacc.c  */
-#line 3073 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3076 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CATALOG_NAME; }
     break;
 
   case 252:
 
 /* Line 1455 of yacc.c  */
-#line 3075 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3078 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_SCHEMA_NAME; }
     break;
 
   case 253:
 
 /* Line 1455 of yacc.c  */
-#line 3077 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3080 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_TABLE_NAME; }
     break;
 
   case 254:
 
 /* Line 1455 of yacc.c  */
-#line 3079 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3082 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_COLUMN_NAME; }
     break;
 
   case 255:
 
 /* Line 1455 of yacc.c  */
-#line 3081 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3084 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_CURSOR_NAME; }
     break;
 
   case 256:
 
 /* Line 1455 of yacc.c  */
-#line 3083 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3086 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_MESSAGE_TEXT; }
     break;
 
   case 257:
 
 /* Line 1455 of yacc.c  */
-#line 3085 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3088 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.diag_condition_item_name)= DIAG_MYSQL_ERRNO; }
     break;
 
   case 258:
 
 /* Line 1455 of yacc.c  */
-#line 3090 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3093 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18821,7 +18828,7 @@
   case 259:
 
 /* Line 1455 of yacc.c  */
-#line 3105 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3108 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* NOTE: field definition is filled in sp_decl section. */
 
@@ -18841,7 +18848,7 @@
   case 260:
 
 /* Line 1455 of yacc.c  */
-#line 3120 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3123 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* NOTE: field definition is filled in sp_decl section. */
 
@@ -18861,35 +18868,35 @@
   case 261:
 
 /* Line 1455 of yacc.c  */
-#line 3137 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3140 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = NULL; }
     break;
 
   case 262:
 
 /* Line 1455 of yacc.c  */
-#line 3138 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3141 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(2) - (2)].item); }
     break;
 
   case 276:
 
 /* Line 1455 of yacc.c  */
-#line 3159 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3162 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sphead->new_cont_backpatch(NULL); }
     break;
 
   case 277:
 
 /* Line 1455 of yacc.c  */
-#line 3161 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3164 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sphead->do_cont_backpatch(); }
     break;
 
   case 278:
 
 /* Line 1455 of yacc.c  */
-#line 3165 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3168 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18903,7 +18910,7 @@
   case 279:
 
 /* Line 1455 of yacc.c  */
-#line 3174 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3177 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -18953,14 +18960,14 @@
   case 280:
 
 /* Line 1455 of yacc.c  */
-#line 3222 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3225 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sphead->reset_lex(YYTHD); }
     break;
 
   case 281:
 
 /* Line 1455 of yacc.c  */
-#line 3224 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3227 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -18989,7 +18996,7 @@
   case 282:
 
 /* Line 1455 of yacc.c  */
-#line 3250 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3253 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* Unlabeled controls get a secret label. */
             LEX *lex= Lex;
 
@@ -19000,7 +19007,7 @@
   case 283:
 
 /* Line 1455 of yacc.c  */
-#line 3256 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3259 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -19011,7 +19018,7 @@
   case 284:
 
 /* Line 1455 of yacc.c  */
-#line 3265 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3268 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp = lex->sphead;
@@ -19066,7 +19073,7 @@
   case 285:
 
 /* Line 1455 of yacc.c  */
-#line 3318 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3321 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19111,7 +19118,7 @@
   case 286:
 
 /* Line 1455 of yacc.c  */
-#line 3361 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3364 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19133,7 +19140,7 @@
   case 287:
 
 /* Line 1455 of yacc.c  */
-#line 3381 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3384 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19155,14 +19162,14 @@
   case 288:
 
 /* Line 1455 of yacc.c  */
-#line 3398 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3401 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 289:
 
 /* Line 1455 of yacc.c  */
-#line 3403 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3406 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19184,7 +19191,7 @@
   case 293:
 
 /* Line 1455 of yacc.c  */
-#line 3429 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3432 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19209,7 +19216,7 @@
   case 294:
 
 /* Line 1455 of yacc.c  */
-#line 3449 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3452 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19234,14 +19241,14 @@
   case 295:
 
 /* Line 1455 of yacc.c  */
-#line 3471 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3474 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sphead->reset_lex(YYTHD); }
     break;
 
   case 296:
 
 /* Line 1455 of yacc.c  */
-#line 3473 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3476 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19262,7 +19269,7 @@
   case 297:
 
 /* Line 1455 of yacc.c  */
-#line 3489 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3492 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             sp_head *sp= Lex->sphead;
             sp_pcontext *ctx= Lex->spcont;
@@ -19279,7 +19286,7 @@
   case 298:
 
 /* Line 1455 of yacc.c  */
-#line 3501 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3504 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -19290,7 +19297,7 @@
   case 304:
 
 /* Line 1455 of yacc.c  */
-#line 3521 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3524 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             case_stmt_action_case(lex);
@@ -19301,7 +19308,7 @@
   case 305:
 
 /* Line 1455 of yacc.c  */
-#line 3527 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3530 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (case_stmt_action_expr(lex, (yyvsp[(3) - (3)].item)))
@@ -19316,7 +19323,7 @@
   case 306:
 
 /* Line 1455 of yacc.c  */
-#line 3540 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3543 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             case_stmt_action_end_case(lex, true);
@@ -19326,7 +19333,7 @@
   case 307:
 
 /* Line 1455 of yacc.c  */
-#line 3548 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3551 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             case_stmt_action_case(lex);
@@ -19336,7 +19343,7 @@
   case 308:
 
 /* Line 1455 of yacc.c  */
-#line 3556 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3559 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             case_stmt_action_end_case(lex, false);
@@ -19346,7 +19353,7 @@
   case 313:
 
 /* Line 1455 of yacc.c  */
-#line 3574 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3577 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
           }
@@ -19355,7 +19362,7 @@
   case 314:
 
 /* Line 1455 of yacc.c  */
-#line 3578 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3581 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* Simple case: <caseval> = <whenval> */
 
@@ -19371,7 +19378,7 @@
   case 315:
 
 /* Line 1455 of yacc.c  */
-#line 3590 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3593 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (case_stmt_action_then(lex))
@@ -19382,7 +19389,7 @@
   case 316:
 
 /* Line 1455 of yacc.c  */
-#line 3599 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3602 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sphead->reset_lex(YYTHD); /* For expr $3 */
           }
@@ -19391,7 +19398,7 @@
   case 317:
 
 /* Line 1455 of yacc.c  */
-#line 3603 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3606 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (case_stmt_action_when(lex, (yyvsp[(3) - (3)].item), false))
@@ -19405,7 +19412,7 @@
   case 318:
 
 /* Line 1455 of yacc.c  */
-#line 3613 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3616 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (case_stmt_action_then(lex))
@@ -19416,7 +19423,7 @@
   case 319:
 
 /* Line 1455 of yacc.c  */
-#line 3622 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3625 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19432,7 +19439,7 @@
   case 321:
 
 /* Line 1455 of yacc.c  */
-#line 3637 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3640 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *ctx= lex->spcont;
@@ -19455,7 +19462,7 @@
   case 322:
 
 /* Line 1455 of yacc.c  */
-#line 3655 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3658 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_label_t *lab= lex->spcont->pop_label();
@@ -19475,21 +19482,21 @@
   case 323:
 
 /* Line 1455 of yacc.c  */
-#line 3672 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3675 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 324:
 
 /* Line 1455 of yacc.c  */
-#line 3673 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3676 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 325:
 
 /* Line 1455 of yacc.c  */
-#line 3678 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3681 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *ctx= lex->spcont;
@@ -19510,7 +19517,7 @@
   case 326:
 
 /* Line 1455 of yacc.c  */
-#line 3694 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3697 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_label_t *lab= lex->spcont->pop_label();
@@ -19529,7 +19536,7 @@
   case 327:
 
 /* Line 1455 of yacc.c  */
-#line 3710 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3713 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* Unlabeled blocks get a secret label. */
             LEX *lex= Lex;
             uint ip= lex->sphead->instructions();
@@ -19541,7 +19548,7 @@
   case 328:
 
 /* Line 1455 of yacc.c  */
-#line 3717 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3720 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->spcont->pop_label();
@@ -19551,7 +19558,7 @@
   case 329:
 
 /* Line 1455 of yacc.c  */
-#line 3725 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3728 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* QQ This is just a dummy for grouping declarations and statements
               together. No [[NOT] ATOMIC] yet, and we need to figure out how
               make it coexist with the existing BEGIN COMMIT/ROLLBACK. */
@@ -19563,7 +19570,7 @@
   case 330:
 
 /* Line 1455 of yacc.c  */
-#line 3734 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3737 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19592,7 +19599,7 @@
   case 331:
 
 /* Line 1455 of yacc.c  */
-#line 3762 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3765 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             uint ip= lex->sphead->instructions();
@@ -19607,14 +19614,14 @@
   case 332:
 
 /* Line 1455 of yacc.c  */
-#line 3772 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3775 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sphead->reset_lex(YYTHD); }
     break;
 
   case 333:
 
 /* Line 1455 of yacc.c  */
-#line 3774 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3777 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -19635,7 +19642,7 @@
   case 334:
 
 /* Line 1455 of yacc.c  */
-#line 3790 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3793 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             uint ip= lex->sphead->instructions();
@@ -19651,14 +19658,14 @@
   case 335:
 
 /* Line 1455 of yacc.c  */
-#line 3801 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3804 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sphead->reset_lex(YYTHD); }
     break;
 
   case 336:
 
 /* Line 1455 of yacc.c  */
-#line 3803 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3806 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             uint ip= lex->sphead->instructions();
@@ -19679,49 +19686,49 @@
   case 337:
 
 /* Line 1455 of yacc.c  */
-#line 3822 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3825 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->trg_chistics.action_time= TRG_ACTION_BEFORE; }
     break;
 
   case 338:
 
 /* Line 1455 of yacc.c  */
-#line 3824 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3827 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->trg_chistics.action_time= TRG_ACTION_AFTER; }
     break;
 
   case 339:
 
 /* Line 1455 of yacc.c  */
-#line 3829 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3832 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->trg_chistics.event= TRG_EVENT_INSERT; }
     break;
 
   case 340:
 
 /* Line 1455 of yacc.c  */
-#line 3831 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3834 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->trg_chistics.event= TRG_EVENT_UPDATE; }
     break;
 
   case 341:
 
 /* Line 1455 of yacc.c  */
-#line 3833 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3836 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->trg_chistics.event= TRG_EVENT_DELETE; }
     break;
 
   case 345:
 
 /* Line 1455 of yacc.c  */
-#line 3867 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3870 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 346:
 
 /* Line 1455 of yacc.c  */
-#line 3869 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3872 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->logfile_group_name= (yyvsp[(4) - (4)].lex_str).str;
@@ -19731,7 +19738,7 @@
   case 347:
 
 /* Line 1455 of yacc.c  */
-#line 3879 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3882 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_ADD_FILE; 
           }
@@ -19740,7 +19747,7 @@
   case 348:
 
 /* Line 1455 of yacc.c  */
-#line 3885 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3888 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             Lex->alter_tablespace_info->ts_alter_tablespace_type= ALTER_TABLESPACE_DROP_FILE; 
           }
@@ -19749,14 +19756,14 @@
   case 353:
 
 /* Line 1455 of yacc.c  */
-#line 3908 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 3911 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 400:
 
 /* Line 1455 of yacc.c  */
-#line 4002 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4005 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->data_file_name= (yyvsp[(2) - (2)].lex_str).str;
@@ -19766,7 +19773,7 @@
   case 401:
 
 /* Line 1455 of yacc.c  */
-#line 4010 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4013 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->undo_file_name= (yyvsp[(2) - (2)].lex_str).str;
@@ -19776,7 +19783,7 @@
   case 402:
 
 /* Line 1455 of yacc.c  */
-#line 4018 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4021 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->redo_file_name= (yyvsp[(2) - (2)].lex_str).str;
@@ -19786,7 +19793,7 @@
   case 403:
 
 /* Line 1455 of yacc.c  */
-#line 4026 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4029 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info= new st_alter_tablespace();
@@ -19800,7 +19807,7 @@
   case 404:
 
 /* Line 1455 of yacc.c  */
-#line 4038 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4041 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info= new st_alter_tablespace();
@@ -19814,7 +19821,7 @@
   case 405:
 
 /* Line 1455 of yacc.c  */
-#line 4050 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4053 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_access_mode= TS_READ_ONLY;
@@ -19824,7 +19831,7 @@
   case 406:
 
 /* Line 1455 of yacc.c  */
-#line 4055 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4058 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_access_mode= TS_READ_WRITE;
@@ -19834,7 +19841,7 @@
   case 407:
 
 /* Line 1455 of yacc.c  */
-#line 4060 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4063 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_access_mode= TS_NOT_ACCESSIBLE;
@@ -19844,7 +19851,7 @@
   case 408:
 
 /* Line 1455 of yacc.c  */
-#line 4068 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4071 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->initial_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -19854,7 +19861,7 @@
   case 409:
 
 /* Line 1455 of yacc.c  */
-#line 4076 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4079 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->autoextend_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -19864,7 +19871,7 @@
   case 410:
 
 /* Line 1455 of yacc.c  */
-#line 4084 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4087 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->max_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -19874,7 +19881,7 @@
   case 411:
 
 /* Line 1455 of yacc.c  */
-#line 4092 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4095 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->extent_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -19884,7 +19891,7 @@
   case 412:
 
 /* Line 1455 of yacc.c  */
-#line 4100 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4103 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->undo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -19894,7 +19901,7 @@
   case 413:
 
 /* Line 1455 of yacc.c  */
-#line 4108 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4111 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->redo_buffer_size= (yyvsp[(3) - (3)].ulonglong_number);
@@ -19904,7 +19911,7 @@
   case 414:
 
 /* Line 1455 of yacc.c  */
-#line 4116 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4119 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->alter_tablespace_info->nodegroup_id != UNDEF_NODEGROUP)
@@ -19919,7 +19926,7 @@
   case 415:
 
 /* Line 1455 of yacc.c  */
-#line 4129 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4132 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->alter_tablespace_info->ts_comment != NULL)
@@ -19934,7 +19941,7 @@
   case 416:
 
 /* Line 1455 of yacc.c  */
-#line 4142 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4145 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->alter_tablespace_info->storage_engine != NULL)
@@ -19950,7 +19957,7 @@
   case 419:
 
 /* Line 1455 of yacc.c  */
-#line 4161 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4164 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->wait_until_completed= TRUE;
@@ -19960,7 +19967,7 @@
   case 420:
 
 /* Line 1455 of yacc.c  */
-#line 4166 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4169 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!(lex->alter_tablespace_info->wait_until_completed))
@@ -19975,14 +19982,14 @@
   case 421:
 
 /* Line 1455 of yacc.c  */
-#line 4178 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4181 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ulonglong_number)= (yyvsp[(1) - (1)].ulonglong_number);}
     break;
 
   case 422:
 
 /* Line 1455 of yacc.c  */
-#line 4180 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4183 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             ulonglong number;
             uint text_shift_number= 0;
@@ -20031,21 +20038,21 @@
   case 423:
 
 /* Line 1455 of yacc.c  */
-#line 4230 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4233 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 424:
 
 /* Line 1455 of yacc.c  */
-#line 4233 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4236 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 425:
 
 /* Line 1455 of yacc.c  */
-#line 4235 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4238 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             TABLE_LIST *src_table;
@@ -20065,7 +20072,7 @@
   case 426:
 
 /* Line 1455 of yacc.c  */
-#line 4250 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4253 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             TABLE_LIST *src_table;
@@ -20085,63 +20092,63 @@
   case 427:
 
 /* Line 1455 of yacc.c  */
-#line 4269 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4272 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 428:
 
 /* Line 1455 of yacc.c  */
-#line 4272 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4275 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->set_braces(1);}
     break;
 
   case 429:
 
 /* Line 1455 of yacc.c  */
-#line 4273 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4276 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 430:
 
 /* Line 1455 of yacc.c  */
-#line 4277 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4280 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 431:
 
 /* Line 1455 of yacc.c  */
-#line 4279 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4282 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->set_braces(0);}
     break;
 
   case 432:
 
 /* Line 1455 of yacc.c  */
-#line 4280 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4283 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 433:
 
 /* Line 1455 of yacc.c  */
-#line 4282 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4285 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->set_braces(1);}
     break;
 
   case 434:
 
 /* Line 1455 of yacc.c  */
-#line 4283 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4286 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 435:
 
 /* Line 1455 of yacc.c  */
-#line 4288 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4291 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Remove all tables used in PARTITION clause from the global table
@@ -20156,14 +20163,14 @@
   case 436:
 
 /* Line 1455 of yacc.c  */
-#line 4324 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4327 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 438:
 
 /* Line 1455 of yacc.c  */
-#line 4330 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4333 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info= new partition_info();
@@ -20182,7 +20189,7 @@
   case 440:
 
 /* Line 1455 of yacc.c  */
-#line 4348 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4351 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef WITH_PARTITION_STORAGE_ENGINE
             LEX_STRING partition_name={C_STRING_WITH_LEN("partition")};
@@ -20203,7 +20210,7 @@
   case 441:
 
 /* Line 1455 of yacc.c  */
-#line 4367 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4370 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!lex->part_info)
@@ -20221,14 +20228,14 @@
   case 442:
 
 /* Line 1455 of yacc.c  */
-#line 4379 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4382 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 444:
 
 /* Line 1455 of yacc.c  */
-#line 4388 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4391 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->list_of_part_fields= TRUE;
@@ -20240,70 +20247,70 @@
   case 445:
 
 /* Line 1455 of yacc.c  */
-#line 4395 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4398 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->part_type= HASH_PARTITION; }
     break;
 
   case 446:
 
 /* Line 1455 of yacc.c  */
-#line 4396 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4399 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 447:
 
 /* Line 1455 of yacc.c  */
-#line 4398 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4401 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->part_type= RANGE_PARTITION; }
     break;
 
   case 448:
 
 /* Line 1455 of yacc.c  */
-#line 4400 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4403 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->part_type= RANGE_PARTITION; }
     break;
 
   case 449:
 
 /* Line 1455 of yacc.c  */
-#line 4402 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4405 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->part_type= LIST_PARTITION; }
     break;
 
   case 450:
 
 /* Line 1455 of yacc.c  */
-#line 4404 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4407 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->part_type= LIST_PARTITION; }
     break;
 
   case 451:
 
 /* Line 1455 of yacc.c  */
-#line 4408 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4411 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 452:
 
 /* Line 1455 of yacc.c  */
-#line 4410 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4413 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->linear_hash_ind= TRUE;}
     break;
 
   case 453:
 
 /* Line 1455 of yacc.c  */
-#line 4415 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4418 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->key_algorithm= partition_info::KEY_ALGORITHM_NONE;}
     break;
 
   case 454:
 
 /* Line 1455 of yacc.c  */
-#line 4417 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4420 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             switch ((yyvsp[(3) - (3)].ulong_num)) {
             case 1:
@@ -20322,35 +20329,35 @@
   case 455:
 
 /* Line 1455 of yacc.c  */
-#line 4433 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4436 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 456:
 
 /* Line 1455 of yacc.c  */
-#line 4434 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4437 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 457:
 
 /* Line 1455 of yacc.c  */
-#line 4438 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4441 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 458:
 
 /* Line 1455 of yacc.c  */
-#line 4439 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4442 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 459:
 
 /* Line 1455 of yacc.c  */
-#line 4444 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4447 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->num_columns++;
@@ -20371,7 +20378,7 @@
   case 460:
 
 /* Line 1455 of yacc.c  */
-#line 4463 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4466 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->column_list= TRUE;
@@ -20382,7 +20389,7 @@
   case 461:
 
 /* Line 1455 of yacc.c  */
-#line 4473 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4476 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->set_part_expr((yyvsp[(2) - (5)].simple_string)+1, (yyvsp[(3) - (5)].item), (yyvsp[(4) - (5)].simple_string), FALSE))
@@ -20395,7 +20402,7 @@
   case 462:
 
 /* Line 1455 of yacc.c  */
-#line 4484 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4487 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->part_info->set_part_expr((yyvsp[(2) - (5)].simple_string)+1, (yyvsp[(3) - (5)].item), (yyvsp[(4) - (5)].simple_string), TRUE))
             { MYSQL_YYABORT; }
@@ -20405,14 +20412,14 @@
   case 463:
 
 /* Line 1455 of yacc.c  */
-#line 4492 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4495 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 464:
 
 /* Line 1455 of yacc.c  */
-#line 4494 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4497 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             uint num_parts= (yyvsp[(2) - (2)].ulong_num);
             partition_info *part_info= Lex->part_info;
@@ -20430,28 +20437,28 @@
   case 465:
 
 /* Line 1455 of yacc.c  */
-#line 4509 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4512 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 466:
 
 /* Line 1455 of yacc.c  */
-#line 4511 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4514 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->subpart_type= HASH_PARTITION; }
     break;
 
   case 467:
 
 /* Line 1455 of yacc.c  */
-#line 4512 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4515 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 468:
 
 /* Line 1455 of yacc.c  */
-#line 4515 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4518 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->subpart_type= HASH_PARTITION;
@@ -20462,28 +20469,28 @@
   case 469:
 
 /* Line 1455 of yacc.c  */
-#line 4520 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4523 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 470:
 
 /* Line 1455 of yacc.c  */
-#line 4524 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4527 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 471:
 
 /* Line 1455 of yacc.c  */
-#line 4525 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4528 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 472:
 
 /* Line 1455 of yacc.c  */
-#line 4530 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4533 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->subpart_field_list.push_back((yyvsp[(1) - (1)].lex_str).str))
@@ -20503,7 +20510,7 @@
   case 473:
 
 /* Line 1455 of yacc.c  */
-#line 4548 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4551 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             bool not_corr_func;
@@ -20521,14 +20528,14 @@
   case 474:
 
 /* Line 1455 of yacc.c  */
-#line 4563 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4566 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 475:
 
 /* Line 1455 of yacc.c  */
-#line 4565 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4568 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             uint num_parts= (yyvsp[(2) - (2)].ulong_num);
             LEX *lex= Lex;
@@ -20545,7 +20552,7 @@
   case 476:
 
 /* Line 1455 of yacc.c  */
-#line 4580 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4583 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->part_type == RANGE_PARTITION)
@@ -20566,7 +20573,7 @@
   case 477:
 
 /* Line 1455 of yacc.c  */
-#line 4596 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4599 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             uint count_curr_parts= part_info->partitions.elements;
@@ -20590,21 +20597,21 @@
   case 478:
 
 /* Line 1455 of yacc.c  */
-#line 4617 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4620 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 479:
 
 /* Line 1455 of yacc.c  */
-#line 4618 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4621 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 480:
 
 /* Line 1455 of yacc.c  */
-#line 4623 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4626 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             partition_element *p_elem= new partition_element();
@@ -20625,14 +20632,14 @@
   case 481:
 
 /* Line 1455 of yacc.c  */
-#line 4642 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4645 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 482:
 
 /* Line 1455 of yacc.c  */
-#line 4647 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4650 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             partition_element *p_elem= part_info->curr_part_elem;
@@ -20643,7 +20650,7 @@
   case 483:
 
 /* Line 1455 of yacc.c  */
-#line 4656 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4659 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -20670,7 +20677,7 @@
   case 484:
 
 /* Line 1455 of yacc.c  */
-#line 4678 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4681 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -20691,14 +20698,14 @@
   case 485:
 
 /* Line 1455 of yacc.c  */
-#line 4693 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4696 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 486:
 
 /* Line 1455 of yacc.c  */
-#line 4695 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4698 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -20719,14 +20726,14 @@
   case 487:
 
 /* Line 1455 of yacc.c  */
-#line 4710 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4713 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 488:
 
 /* Line 1455 of yacc.c  */
-#line 4715 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4718 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
 
@@ -20753,14 +20760,14 @@
   case 489:
 
 /* Line 1455 of yacc.c  */
-#line 4736 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4739 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 490:
 
 /* Line 1455 of yacc.c  */
-#line 4741 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4744 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -20794,7 +20801,7 @@
   case 491:
 
 /* Line 1455 of yacc.c  */
-#line 4770 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4773 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->num_columns < 2U)
@@ -20808,21 +20815,21 @@
   case 492:
 
 /* Line 1455 of yacc.c  */
-#line 4781 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4784 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 493:
 
 /* Line 1455 of yacc.c  */
-#line 4782 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4785 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 494:
 
 /* Line 1455 of yacc.c  */
-#line 4787 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4790 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->print_debug("( part_value_item", NULL);
@@ -20839,14 +20846,14 @@
   case 495:
 
 /* Line 1455 of yacc.c  */
-#line 4798 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4801 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 496:
 
 /* Line 1455 of yacc.c  */
-#line 4800 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4803 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->print_debug(") part_value_item", NULL);
@@ -20872,21 +20879,21 @@
   case 497:
 
 /* Line 1455 of yacc.c  */
-#line 4823 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4826 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 498:
 
 /* Line 1455 of yacc.c  */
-#line 4824 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4827 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 499:
 
 /* Line 1455 of yacc.c  */
-#line 4829 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4832 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->part_type == LIST_PARTITION)
@@ -20904,7 +20911,7 @@
   case 500:
 
 /* Line 1455 of yacc.c  */
-#line 4842 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4845 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             partition_info *part_info= lex->part_info;
@@ -20925,7 +20932,7 @@
   case 501:
 
 /* Line 1455 of yacc.c  */
-#line 4862 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4865 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->num_subparts != 0 &&
@@ -20944,7 +20951,7 @@
   case 502:
 
 /* Line 1455 of yacc.c  */
-#line 4876 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4879 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             if (part_info->num_subparts != 0)
@@ -20972,21 +20979,21 @@
   case 503:
 
 /* Line 1455 of yacc.c  */
-#line 4901 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4904 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 504:
 
 /* Line 1455 of yacc.c  */
-#line 4902 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4905 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 505:
 
 /* Line 1455 of yacc.c  */
-#line 4907 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4910 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             partition_element *curr_part= part_info->current_partition;
@@ -21024,56 +21031,56 @@
   case 506:
 
 /* Line 1455 of yacc.c  */
-#line 4939 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4942 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 507:
 
 /* Line 1455 of yacc.c  */
-#line 4944 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4947 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->partition_name= (yyvsp[(1) - (1)].lex_str).str; }
     break;
 
   case 508:
 
 /* Line 1455 of yacc.c  */
-#line 4948 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4951 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 509:
 
 /* Line 1455 of yacc.c  */
-#line 4949 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4952 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 510:
 
 /* Line 1455 of yacc.c  */
-#line 4953 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4956 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 511:
 
 /* Line 1455 of yacc.c  */
-#line 4954 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4957 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 512:
 
 /* Line 1455 of yacc.c  */
-#line 4959 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4962 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->tablespace_name= (yyvsp[(3) - (3)].lex_str).str; }
     break;
 
   case 513:
 
 /* Line 1455 of yacc.c  */
-#line 4961 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4964 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->curr_part_elem->engine_type= (yyvsp[(4) - (4)].db_type);
@@ -21084,49 +21091,49 @@
   case 514:
 
 /* Line 1455 of yacc.c  */
-#line 4967 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4970 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->nodegroup_id= (uint16) (yyvsp[(3) - (3)].ulong_num); }
     break;
 
   case 515:
 
 /* Line 1455 of yacc.c  */
-#line 4969 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4972 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->part_max_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); }
     break;
 
   case 516:
 
 /* Line 1455 of yacc.c  */
-#line 4971 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4974 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->part_min_rows= (ha_rows) (yyvsp[(3) - (3)].ulonglong_number); }
     break;
 
   case 517:
 
 /* Line 1455 of yacc.c  */
-#line 4973 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4976 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->data_file_name= (yyvsp[(4) - (4)].lex_str).str; }
     break;
 
   case 518:
 
 /* Line 1455 of yacc.c  */
-#line 4975 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4978 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->index_file_name= (yyvsp[(4) - (4)].lex_str).str; }
     break;
 
   case 519:
 
 /* Line 1455 of yacc.c  */
-#line 4977 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4980 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->part_info->curr_part_elem->part_comment= (yyvsp[(3) - (3)].lex_str).str; }
     break;
 
   case 520:
 
 /* Line 1455 of yacc.c  */
-#line 4986 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 4989 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->sql_command == SQLCOM_INSERT)
@@ -21146,7 +21153,7 @@
   case 521:
 
 /* Line 1455 of yacc.c  */
-#line 5001 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5004 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -21155,7 +21162,7 @@
   case 522:
 
 /* Line 1455 of yacc.c  */
-#line 5005 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5008 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               The following work only with the local list, the global list
@@ -21168,112 +21175,112 @@
   case 523:
 
 /* Line 1455 of yacc.c  */
-#line 5015 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5018 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 524:
 
 /* Line 1455 of yacc.c  */
-#line 5016 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5019 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 525:
 
 /* Line 1455 of yacc.c  */
-#line 5020 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5023 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 526:
 
 /* Line 1455 of yacc.c  */
-#line 5021 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5024 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 527:
 
 /* Line 1455 of yacc.c  */
-#line 5025 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5028 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 528:
 
 /* Line 1455 of yacc.c  */
-#line 5026 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5029 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 529:
 
 /* Line 1455 of yacc.c  */
-#line 5030 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5033 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 530:
 
 /* Line 1455 of yacc.c  */
-#line 5031 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5034 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 531:
 
 /* Line 1455 of yacc.c  */
-#line 5035 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5038 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 532:
 
 /* Line 1455 of yacc.c  */
-#line 5036 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5039 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= (yyvsp[(1) - (1)].num);}
     break;
 
   case 533:
 
 /* Line 1455 of yacc.c  */
-#line 5040 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5043 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=(yyvsp[(1) - (1)].num); }
     break;
 
   case 534:
 
 /* Line 1455 of yacc.c  */
-#line 5041 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5044 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
     break;
 
   case 535:
 
 /* Line 1455 of yacc.c  */
-#line 5045 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5048 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=HA_LEX_CREATE_TMP_TABLE; }
     break;
 
   case 536:
 
 /* Line 1455 of yacc.c  */
-#line 5049 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5052 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 537:
 
 /* Line 1455 of yacc.c  */
-#line 5050 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5053 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=HA_LEX_CREATE_IF_NOT_EXISTS; }
     break;
 
   case 545:
 
 /* Line 1455 of yacc.c  */
-#line 5071 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5074 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.db_type= (yyvsp[(3) - (3)].db_type);
             Lex->create_info.used_fields|= HA_CREATE_USED_ENGINE;
@@ -21283,7 +21290,7 @@
   case 546:
 
 /* Line 1455 of yacc.c  */
-#line 5076 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5079 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.max_rows= (yyvsp[(3) - (3)].ulonglong_number);
             Lex->create_info.used_fields|= HA_CREATE_USED_MAX_ROWS;
@@ -21293,7 +21300,7 @@
   case 547:
 
 /* Line 1455 of yacc.c  */
-#line 5081 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5084 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.min_rows= (yyvsp[(3) - (3)].ulonglong_number);
             Lex->create_info.used_fields|= HA_CREATE_USED_MIN_ROWS;
@@ -21303,7 +21310,7 @@
   case 548:
 
 /* Line 1455 of yacc.c  */
-#line 5086 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5089 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.avg_row_length=(yyvsp[(3) - (3)].ulong_num);
             Lex->create_info.used_fields|= HA_CREATE_USED_AVG_ROW_LENGTH;
@@ -21313,7 +21320,7 @@
   case 549:
 
 /* Line 1455 of yacc.c  */
-#line 5091 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5094 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.password=(yyvsp[(3) - (3)].lex_str).str;
             Lex->create_info.used_fields|= HA_CREATE_USED_PASSWORD;
@@ -21323,7 +21330,7 @@
   case 550:
 
 /* Line 1455 of yacc.c  */
-#line 5096 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5099 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.comment=(yyvsp[(3) - (3)].lex_str);
             Lex->create_info.used_fields|= HA_CREATE_USED_COMMENT;
@@ -21333,7 +21340,7 @@
   case 551:
 
 /* Line 1455 of yacc.c  */
-#line 5101 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5104 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.auto_increment_value=(yyvsp[(3) - (3)].ulonglong_number);
             Lex->create_info.used_fields|= HA_CREATE_USED_AUTO;
@@ -21343,7 +21350,7 @@
   case 552:
 
 /* Line 1455 of yacc.c  */
-#line 5106 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5109 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             switch((yyvsp[(3) - (3)].ulong_num)) {
             case 0:
@@ -21363,7 +21370,7 @@
   case 553:
 
 /* Line 1455 of yacc.c  */
-#line 5121 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5124 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options&=
               ~(HA_OPTION_PACK_KEYS | HA_OPTION_NO_PACK_KEYS);
@@ -21374,7 +21381,7 @@
   case 554:
 
 /* Line 1455 of yacc.c  */
-#line 5127 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5130 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM;
             Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM;
@@ -21384,7 +21391,7 @@
   case 555:
 
 /* Line 1455 of yacc.c  */
-#line 5132 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5135 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
              Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_CHECKSUM : HA_OPTION_NO_CHECKSUM;
              Lex->create_info.used_fields|= HA_CREATE_USED_CHECKSUM;
@@ -21394,7 +21401,7 @@
   case 556:
 
 /* Line 1455 of yacc.c  */
-#line 5137 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5140 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.table_options|= (yyvsp[(3) - (3)].ulong_num) ? HA_OPTION_DELAY_KEY_WRITE : HA_OPTION_NO_DELAY_KEY_WRITE;
             Lex->create_info.used_fields|= HA_CREATE_USED_DELAY_KEY_WRITE;
@@ -21404,7 +21411,7 @@
   case 557:
 
 /* Line 1455 of yacc.c  */
-#line 5142 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5145 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.row_type= (yyvsp[(3) - (3)].row_type);
             Lex->create_info.used_fields|= HA_CREATE_USED_ROW_FORMAT;
@@ -21414,7 +21421,7 @@
   case 558:
 
 /* Line 1455 of yacc.c  */
-#line 5147 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5150 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->select_lex.table_list.save_and_clear(&Lex->save_list);
           }
@@ -21423,7 +21430,7 @@
   case 559:
 
 /* Line 1455 of yacc.c  */
-#line 5151 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5154 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Move the union list to the merge_list and exclude its tables
@@ -21450,7 +21457,7 @@
   case 562:
 
 /* Line 1455 of yacc.c  */
-#line 5175 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5178 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.merge_insert_method= (yyvsp[(3) - (3)].ulong_num);
             Lex->create_info.used_fields|= HA_CREATE_USED_INSERT_METHOD;
@@ -21460,7 +21467,7 @@
   case 563:
 
 /* Line 1455 of yacc.c  */
-#line 5180 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5183 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.data_file_name= (yyvsp[(4) - (4)].lex_str).str;
             Lex->create_info.used_fields|= HA_CREATE_USED_DATADIR;
@@ -21470,7 +21477,7 @@
   case 564:
 
 /* Line 1455 of yacc.c  */
-#line 5185 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5188 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.index_file_name= (yyvsp[(4) - (4)].lex_str).str;
             Lex->create_info.used_fields|= HA_CREATE_USED_INDEXDIR;
@@ -21480,28 +21487,28 @@
   case 565:
 
 /* Line 1455 of yacc.c  */
-#line 5190 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5193 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {Lex->create_info.tablespace= (yyvsp[(2) - (2)].lex_str).str;}
     break;
 
   case 566:
 
 /* Line 1455 of yacc.c  */
-#line 5192 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5195 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {Lex->create_info.storage_media= HA_SM_DISK;}
     break;
 
   case 567:
 
 /* Line 1455 of yacc.c  */
-#line 5194 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5197 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {Lex->create_info.storage_media= HA_SM_MEMORY;}
     break;
 
   case 568:
 
 /* Line 1455 of yacc.c  */
-#line 5196 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5199 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.connect_string.str= (yyvsp[(3) - (3)].lex_str).str;
             Lex->create_info.connect_string.length= (yyvsp[(3) - (3)].lex_str).length;
@@ -21512,7 +21519,7 @@
   case 569:
 
 /* Line 1455 of yacc.c  */
-#line 5202 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5205 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.used_fields|= HA_CREATE_USED_KEY_BLOCK_SIZE;
             Lex->create_info.key_block_size= (yyvsp[(3) - (3)].ulong_num);
@@ -21522,7 +21529,7 @@
   case 570:
 
 /* Line 1455 of yacc.c  */
-#line 5210 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5213 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             HA_CREATE_INFO *cinfo= &Lex->create_info;
             if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
@@ -21542,7 +21549,7 @@
   case 571:
 
 /* Line 1455 of yacc.c  */
-#line 5228 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5231 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             HA_CREATE_INFO *cinfo= &Lex->create_info;
             if ((cinfo->used_fields & HA_CREATE_USED_DEFAULT_CHARSET) &&
@@ -21561,7 +21568,7 @@
   case 572:
 
 /* Line 1455 of yacc.c  */
-#line 5245 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5248 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             plugin_ref plugin= ha_resolve_by_name(YYTHD, &(yyvsp[(1) - (1)].lex_str));
 
@@ -21586,7 +21593,7 @@
   case 573:
 
 /* Line 1455 of yacc.c  */
-#line 5268 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5271 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             plugin_ref plugin;
             if ((plugin= ha_resolve_by_name(YYTHD, &(yyvsp[(1) - (1)].lex_str))))
@@ -21602,105 +21609,105 @@
   case 574:
 
 /* Line 1455 of yacc.c  */
-#line 5281 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5284 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_DEFAULT; }
     break;
 
   case 575:
 
 /* Line 1455 of yacc.c  */
-#line 5282 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5285 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_FIXED; }
     break;
 
   case 576:
 
 /* Line 1455 of yacc.c  */
-#line 5283 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5286 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_DYNAMIC; }
     break;
 
   case 577:
 
 /* Line 1455 of yacc.c  */
-#line 5284 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5287 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_COMPRESSED; }
     break;
 
   case 578:
 
 /* Line 1455 of yacc.c  */
-#line 5285 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5288 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_REDUNDANT; }
     break;
 
   case 579:
 
 /* Line 1455 of yacc.c  */
-#line 5286 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5289 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.row_type)= ROW_TYPE_COMPACT; }
     break;
 
   case 580:
 
 /* Line 1455 of yacc.c  */
-#line 5290 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5293 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ulong_num)= MERGE_INSERT_DISABLED; }
     break;
 
   case 581:
 
 /* Line 1455 of yacc.c  */
-#line 5291 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5294 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ulong_num)= MERGE_INSERT_TO_FIRST; }
     break;
 
   case 582:
 
 /* Line 1455 of yacc.c  */
-#line 5292 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5295 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ulong_num)= MERGE_INSERT_TO_LAST; }
     break;
 
   case 583:
 
 /* Line 1455 of yacc.c  */
-#line 5296 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5299 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 585:
 
 /* Line 1455 of yacc.c  */
-#line 5301 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5304 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.num) = (int) STRING_RESULT; }
     break;
 
   case 586:
 
 /* Line 1455 of yacc.c  */
-#line 5302 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5305 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.num) = (int) REAL_RESULT; }
     break;
 
   case 587:
 
 /* Line 1455 of yacc.c  */
-#line 5303 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5306 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.num) = (int) DECIMAL_RESULT; }
     break;
 
   case 588:
 
 /* Line 1455 of yacc.c  */
-#line 5304 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5307 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.num) = (int) INT_RESULT; }
     break;
 
   case 589:
 
 /* Line 1455 of yacc.c  */
-#line 5310 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5313 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           Lex->create_last_non_select_table= Lex->last_table();
         }
@@ -21709,7 +21716,7 @@
   case 595:
 
 /* Line 1455 of yacc.c  */
-#line 5328 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5331 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->col_list.empty(); /* Alloced by sql_alloc */
           }
@@ -21718,7 +21725,7 @@
   case 596:
 
 /* Line 1455 of yacc.c  */
-#line 5335 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5338 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(1) - (7)].key_type), (yyvsp[(2) - (7)].lex_str)))
               MYSQL_YYABORT;
@@ -21728,7 +21735,7 @@
   case 597:
 
 /* Line 1455 of yacc.c  */
-#line 5341 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5344 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str)))
               MYSQL_YYABORT;
@@ -21738,7 +21745,7 @@
   case 598:
 
 /* Line 1455 of yacc.c  */
-#line 5347 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5350 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(1) - (8)].key_type), (yyvsp[(3) - (8)].lex_str)))
               MYSQL_YYABORT;
@@ -21748,7 +21755,7 @@
   case 599:
 
 /* Line 1455 of yacc.c  */
-#line 5353 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5356 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_create_index (Lex, (yyvsp[(2) - (8)].key_type), (yyvsp[(3) - (8)].lex_str).str ? (yyvsp[(3) - (8)].lex_str) : (yyvsp[(1) - (8)].lex_str)))
               MYSQL_YYABORT;
@@ -21758,7 +21765,7 @@
   case 600:
 
 /* Line 1455 of yacc.c  */
-#line 5358 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5361 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Key *key= new Foreign_key((yyvsp[(4) - (8)].lex_str).str ? (yyvsp[(4) - (8)].lex_str) : (yyvsp[(1) - (8)].lex_str), lex->col_list,
@@ -21781,7 +21788,7 @@
   case 601:
 
 /* Line 1455 of yacc.c  */
-#line 5376 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5379 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->col_list.empty(); /* Alloced by sql_alloc */
           }
@@ -21790,28 +21797,28 @@
   case 605:
 
 /* Line 1455 of yacc.c  */
-#line 5391 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5394 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 606:
 
 /* Line 1455 of yacc.c  */
-#line 5392 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5395 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 607:
 
 /* Line 1455 of yacc.c  */
-#line 5396 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5399 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 608:
 
 /* Line 1455 of yacc.c  */
-#line 5401 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5404 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->length=lex->dec=0;
@@ -21825,7 +21832,7 @@
   case 609:
 
 /* Line 1455 of yacc.c  */
-#line 5410 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5413 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (add_field_to_list(lex->thd, &(yyvsp[(1) - (4)].lex_str), (enum enum_field_types) (yyvsp[(3) - (4)].num),
@@ -21841,28 +21848,28 @@
   case 610:
 
 /* Line 1455 of yacc.c  */
-#line 5423 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5426 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=(yyvsp[(1) - (3)].num); }
     break;
 
   case 611:
 
 /* Line 1455 of yacc.c  */
-#line 5424 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5427 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=(yyvsp[(1) - (3)].num); }
     break;
 
   case 612:
 
 /* Line 1455 of yacc.c  */
-#line 5425 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5428 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_FLOAT; }
     break;
 
   case 613:
 
 /* Line 1455 of yacc.c  */
-#line 5427 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5430 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_BIT;
@@ -21872,7 +21879,7 @@
   case 614:
 
 /* Line 1455 of yacc.c  */
-#line 5432 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5435 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_BIT;
           }
@@ -21881,7 +21888,7 @@
   case 615:
 
 /* Line 1455 of yacc.c  */
-#line 5436 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5439 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_TINY;
@@ -21891,7 +21898,7 @@
   case 616:
 
 /* Line 1455 of yacc.c  */
-#line 5441 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5444 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_TINY;
@@ -21901,7 +21908,7 @@
   case 617:
 
 /* Line 1455 of yacc.c  */
-#line 5446 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5449 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_STRING;
           }
@@ -21910,7 +21917,7 @@
   case 618:
 
 /* Line 1455 of yacc.c  */
-#line 5450 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5453 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_STRING;
@@ -21920,7 +21927,7 @@
   case 619:
 
 /* Line 1455 of yacc.c  */
-#line 5455 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5458 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_STRING;
             Lex->charset=national_charset_info;
@@ -21930,7 +21937,7 @@
   case 620:
 
 /* Line 1455 of yacc.c  */
-#line 5460 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5463 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             (yyval.num)=MYSQL_TYPE_STRING;
@@ -21941,7 +21948,7 @@
   case 621:
 
 /* Line 1455 of yacc.c  */
-#line 5466 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5469 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_STRING;
@@ -21951,7 +21958,7 @@
   case 622:
 
 /* Line 1455 of yacc.c  */
-#line 5471 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5474 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->length= (char*) "1";
             Lex->charset=&my_charset_bin;
@@ -21962,7 +21969,7 @@
   case 623:
 
 /* Line 1455 of yacc.c  */
-#line 5477 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5480 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_TYPE_VARCHAR;
           }
@@ -21971,7 +21978,7 @@
   case 624:
 
 /* Line 1455 of yacc.c  */
-#line 5481 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5484 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_TYPE_VARCHAR;
             Lex->charset=national_charset_info;
@@ -21981,7 +21988,7 @@
   case 625:
 
 /* Line 1455 of yacc.c  */
-#line 5486 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5489 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)= MYSQL_TYPE_VARCHAR;
@@ -21991,7 +21998,7 @@
   case 626:
 
 /* Line 1455 of yacc.c  */
-#line 5491 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5494 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->length)
             {
@@ -22014,21 +22021,21 @@
   case 627:
 
 /* Line 1455 of yacc.c  */
-#line 5509 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5512 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DATE; }
     break;
 
   case 628:
 
 /* Line 1455 of yacc.c  */
-#line 5511 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5514 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_TIME; }
     break;
 
   case 629:
 
 /* Line 1455 of yacc.c  */
-#line 5513 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5516 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (YYTHD->variables.sql_mode & MODE_MAXDB)
               (yyval.num)=MYSQL_TYPE_DATETIME;
@@ -22046,14 +22053,14 @@
   case 630:
 
 /* Line 1455 of yacc.c  */
-#line 5526 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5529 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DATETIME; }
     break;
 
   case 631:
 
 /* Line 1455 of yacc.c  */
-#line 5528 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5531 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_TINY_BLOB;
@@ -22063,7 +22070,7 @@
   case 632:
 
 /* Line 1455 of yacc.c  */
-#line 5533 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5536 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_BLOB;
@@ -22073,7 +22080,7 @@
   case 633:
 
 /* Line 1455 of yacc.c  */
-#line 5538 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5541 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef HAVE_SPATIAL
             Lex->charset=&my_charset_bin;
@@ -22090,7 +22097,7 @@
   case 634:
 
 /* Line 1455 of yacc.c  */
-#line 5550 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5553 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
@@ -22100,7 +22107,7 @@
   case 635:
 
 /* Line 1455 of yacc.c  */
-#line 5555 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5558 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_LONG_BLOB;
@@ -22110,7 +22117,7 @@
   case 636:
 
 /* Line 1455 of yacc.c  */
-#line 5560 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5563 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset=&my_charset_bin;
             (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB;
@@ -22120,98 +22127,98 @@
   case 637:
 
 /* Line 1455 of yacc.c  */
-#line 5565 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5568 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
     break;
 
   case 638:
 
 /* Line 1455 of yacc.c  */
-#line 5567 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5570 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_TINY_BLOB; }
     break;
 
   case 639:
 
 /* Line 1455 of yacc.c  */
-#line 5569 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5572 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_BLOB; }
     break;
 
   case 640:
 
 /* Line 1455 of yacc.c  */
-#line 5571 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5574 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
     break;
 
   case 641:
 
 /* Line 1455 of yacc.c  */
-#line 5573 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5576 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_LONG_BLOB; }
     break;
 
   case 642:
 
 /* Line 1455 of yacc.c  */
-#line 5575 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5578 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
     break;
 
   case 643:
 
 /* Line 1455 of yacc.c  */
-#line 5577 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5580 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
     break;
 
   case 644:
 
 /* Line 1455 of yacc.c  */
-#line 5579 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5582 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_NEWDECIMAL;}
     break;
 
   case 645:
 
 /* Line 1455 of yacc.c  */
-#line 5581 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5584 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {Lex->interval_list.empty();}
     break;
 
   case 646:
 
 /* Line 1455 of yacc.c  */
-#line 5583 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5586 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_ENUM; }
     break;
 
   case 647:
 
 /* Line 1455 of yacc.c  */
-#line 5585 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5588 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->interval_list.empty();}
     break;
 
   case 648:
 
 /* Line 1455 of yacc.c  */
-#line 5587 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5590 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_SET; }
     break;
 
   case 649:
 
 /* Line 1455 of yacc.c  */
-#line 5589 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5592 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_MEDIUM_BLOB; }
     break;
 
   case 650:
 
 /* Line 1455 of yacc.c  */
-#line 5591 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5594 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)=MYSQL_TYPE_LONGLONG;
             Lex->type|= (AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNSIGNED_FLAG |
@@ -22222,23 +22229,24 @@
   case 651:
 
 /* Line 1455 of yacc.c  */
-#line 5599 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5602 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_GEOMETRY; }
     break;
 
   case 652:
 
 /* Line 1455 of yacc.c  */
-#line 5600 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5603 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_GEOMETRYCOLLECTION; }
     break;
 
   case 653:
 
 /* Line 1455 of yacc.c  */
-#line 5602 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5605 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
-            Lex->length= (char*)"25";
+            Lex->length= const_cast<char*>(STRINGIFY_ARG
+                                           (MAX_LEN_GEOM_POINT_FIELD));
             (yyval.num)= Field::GEOM_POINT;
           }
     break;
@@ -22246,147 +22254,147 @@
   case 654:
 
 /* Line 1455 of yacc.c  */
-#line 5606 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5610 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_MULTIPOINT; }
     break;
 
   case 655:
 
 /* Line 1455 of yacc.c  */
-#line 5607 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5611 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_LINESTRING; }
     break;
 
   case 656:
 
 /* Line 1455 of yacc.c  */
-#line 5608 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5612 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_MULTILINESTRING; }
     break;
 
   case 657:
 
 /* Line 1455 of yacc.c  */
-#line 5609 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5613 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_POLYGON; }
     break;
 
   case 658:
 
 /* Line 1455 of yacc.c  */
-#line 5610 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5614 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= Field::GEOM_MULTIPOLYGON; }
     break;
 
   case 659:
 
 /* Line 1455 of yacc.c  */
-#line 5614 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5618 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 660:
 
 /* Line 1455 of yacc.c  */
-#line 5618 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5622 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 661:
 
 /* Line 1455 of yacc.c  */
-#line 5619 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5623 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 662:
 
 /* Line 1455 of yacc.c  */
-#line 5623 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5627 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 663:
 
 /* Line 1455 of yacc.c  */
-#line 5624 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5628 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 664:
 
 /* Line 1455 of yacc.c  */
-#line 5628 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5632 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 665:
 
 /* Line 1455 of yacc.c  */
-#line 5629 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5633 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 666:
 
 /* Line 1455 of yacc.c  */
-#line 5630 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5634 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 667:
 
 /* Line 1455 of yacc.c  */
-#line 5631 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5635 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 668:
 
 /* Line 1455 of yacc.c  */
-#line 5632 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5636 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 669:
 
 /* Line 1455 of yacc.c  */
-#line 5636 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5640 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_LONG; }
     break;
 
   case 670:
 
 /* Line 1455 of yacc.c  */
-#line 5637 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5641 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_TINY; }
     break;
 
   case 671:
 
 /* Line 1455 of yacc.c  */
-#line 5638 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5642 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_SHORT; }
     break;
 
   case 672:
 
 /* Line 1455 of yacc.c  */
-#line 5639 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5643 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_INT24; }
     break;
 
   case 673:
 
 /* Line 1455 of yacc.c  */
-#line 5640 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5644 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_LONGLONG; }
     break;
 
   case 674:
 
 /* Line 1455 of yacc.c  */
-#line 5645 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5649 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)= YYTHD->variables.sql_mode & MODE_REAL_AS_FLOAT ?
               MYSQL_TYPE_FLOAT : MYSQL_TYPE_DOUBLE;
@@ -22396,42 +22404,42 @@
   case 675:
 
 /* Line 1455 of yacc.c  */
-#line 5650 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5654 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DOUBLE; }
     break;
 
   case 676:
 
 /* Line 1455 of yacc.c  */
-#line 5652 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5656 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=MYSQL_TYPE_DOUBLE; }
     break;
 
   case 677:
 
 /* Line 1455 of yacc.c  */
-#line 5657 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5661 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 678:
 
 /* Line 1455 of yacc.c  */
-#line 5659 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5663 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->dec= (char*)0; }
     break;
 
   case 679:
 
 /* Line 1455 of yacc.c  */
-#line 5661 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5665 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 680:
 
 /* Line 1455 of yacc.c  */
-#line 5666 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5670 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->length=(yyvsp[(2) - (5)].lex_str).str;
@@ -22442,154 +22450,154 @@
   case 681:
 
 /* Line 1455 of yacc.c  */
-#line 5674 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5678 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 682:
 
 /* Line 1455 of yacc.c  */
-#line 5675 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5679 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 683:
 
 /* Line 1455 of yacc.c  */
-#line 5679 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5683 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 684:
 
 /* Line 1455 of yacc.c  */
-#line 5680 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5684 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 685:
 
 /* Line 1455 of yacc.c  */
-#line 5684 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5688 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 686:
 
 /* Line 1455 of yacc.c  */
-#line 5685 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5689 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= UNSIGNED_FLAG;}
     break;
 
   case 687:
 
 /* Line 1455 of yacc.c  */
-#line 5686 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5690 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= UNSIGNED_FLAG | ZEROFILL_FLAG; }
     break;
 
   case 688:
 
 /* Line 1455 of yacc.c  */
-#line 5690 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5694 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 689:
 
 /* Line 1455 of yacc.c  */
-#line 5691 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5695 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 690:
 
 /* Line 1455 of yacc.c  */
-#line 5692 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5696 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 691:
 
 /* Line 1455 of yacc.c  */
-#line 5693 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5697 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->length= (yyvsp[(2) - (3)].lex_str).str; }
     break;
 
   case 692:
 
 /* Line 1455 of yacc.c  */
-#line 5696 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5700 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->length=(char*) 0; /* use default length */ }
     break;
 
   case 693:
 
 /* Line 1455 of yacc.c  */
-#line 5697 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5701 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 694:
 
 /* Line 1455 of yacc.c  */
-#line 5701 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5705 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 695:
 
 /* Line 1455 of yacc.c  */
-#line 5702 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5706 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 696:
 
 /* Line 1455 of yacc.c  */
-#line 5706 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5710 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 697:
 
 /* Line 1455 of yacc.c  */
-#line 5707 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5711 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 698:
 
 /* Line 1455 of yacc.c  */
-#line 5711 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5715 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 700:
 
 /* Line 1455 of yacc.c  */
-#line 5716 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5720 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type&= ~ NOT_NULL_FLAG; }
     break;
 
   case 701:
 
 /* Line 1455 of yacc.c  */
-#line 5717 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5721 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= NOT_NULL_FLAG; }
     break;
 
   case 702:
 
 /* Line 1455 of yacc.c  */
-#line 5718 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5722 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->default_value=(yyvsp[(2) - (2)].item); }
     break;
 
   case 703:
 
 /* Line 1455 of yacc.c  */
-#line 5720 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5724 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_now_local();
             if (item == NULL)
@@ -22601,14 +22609,14 @@
   case 704:
 
 /* Line 1455 of yacc.c  */
-#line 5726 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5730 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG; }
     break;
 
   case 705:
 
 /* Line 1455 of yacc.c  */
-#line 5728 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5732 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             LEX *lex=Lex;
             lex->type|= AUTO_INCREMENT_FLAG | NOT_NULL_FLAG | UNIQUE_FLAG;
@@ -22619,7 +22627,7 @@
   case 706:
 
 /* Line 1455 of yacc.c  */
-#line 5734 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5738 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type|= PRI_KEY_FLAG | NOT_NULL_FLAG;
@@ -22630,7 +22638,7 @@
   case 707:
 
 /* Line 1455 of yacc.c  */
-#line 5740 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5744 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type|= UNIQUE_FLAG; 
@@ -22641,7 +22649,7 @@
   case 708:
 
 /* Line 1455 of yacc.c  */
-#line 5746 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5750 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type|= UNIQUE_KEY_FLAG; 
@@ -22652,14 +22660,14 @@
   case 709:
 
 /* Line 1455 of yacc.c  */
-#line 5751 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5755 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->comment= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 710:
 
 /* Line 1455 of yacc.c  */
-#line 5753 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5757 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->charset && !my_charset_same(Lex->charset,(yyvsp[(2) - (2)].charset)))
             {
@@ -22677,7 +22685,7 @@
   case 711:
 
 /* Line 1455 of yacc.c  */
-#line 5770 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5774 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           (yyval.num)= (yyvsp[(1) - (2)].num);
 
@@ -22699,7 +22707,7 @@
   case 712:
 
 /* Line 1455 of yacc.c  */
-#line 5791 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5795 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_now_local();
             if ((yyval.item) == NULL)
@@ -22710,28 +22718,28 @@
   case 713:
 
 /* Line 1455 of yacc.c  */
-#line 5797 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5801 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 714:
 
 /* Line 1455 of yacc.c  */
-#line 5801 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5805 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 715:
 
 /* Line 1455 of yacc.c  */
-#line 5802 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5806 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 716:
 
 /* Line 1455 of yacc.c  */
-#line 5807 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5811 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0))))
             {
@@ -22744,42 +22752,42 @@
   case 717:
 
 /* Line 1455 of yacc.c  */
-#line 5814 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5818 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)= &my_charset_bin; }
     break;
 
   case 718:
 
 /* Line 1455 of yacc.c  */
-#line 5818 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5822 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(1) - (1)].charset);   }
     break;
 
   case 719:
 
 /* Line 1455 of yacc.c  */
-#line 5819 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5823 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 720:
 
 /* Line 1455 of yacc.c  */
-#line 5823 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5827 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)= NULL; }
     break;
 
   case 721:
 
 /* Line 1455 of yacc.c  */
-#line 5824 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5828 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)= (yyvsp[(2) - (2)].charset); }
     break;
 
   case 722:
 
 /* Line 1455 of yacc.c  */
-#line 5829 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5833 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyval.charset)=get_charset_by_csname((yyvsp[(1) - (1)].lex_str).str,MY_CS_PRIMARY,MYF(0))) &&
                 !((yyval.charset)=get_old_charset_by_name((yyvsp[(1) - (1)].lex_str).str)))
@@ -22793,28 +22801,28 @@
   case 723:
 
 /* Line 1455 of yacc.c  */
-#line 5837 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5841 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)= &my_charset_bin; }
     break;
 
   case 724:
 
 /* Line 1455 of yacc.c  */
-#line 5841 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5845 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(1) - (1)].charset);   }
     break;
 
   case 725:
 
 /* Line 1455 of yacc.c  */
-#line 5842 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5846 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 726:
 
 /* Line 1455 of yacc.c  */
-#line 5847 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5851 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyval.charset)=get_charset_by_name((yyvsp[(1) - (1)].lex_str).str,MYF(0))))
             {
@@ -22827,56 +22835,56 @@
   case 727:
 
 /* Line 1455 of yacc.c  */
-#line 5857 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5861 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 728:
 
 /* Line 1455 of yacc.c  */
-#line 5858 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5862 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(2) - (2)].charset); }
     break;
 
   case 729:
 
 /* Line 1455 of yacc.c  */
-#line 5862 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5866 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=(yyvsp[(1) - (1)].charset); }
     break;
 
   case 730:
 
 /* Line 1455 of yacc.c  */
-#line 5863 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5867 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.charset)=NULL; }
     break;
 
   case 731:
 
 /* Line 1455 of yacc.c  */
-#line 5867 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5871 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 732:
 
 /* Line 1455 of yacc.c  */
-#line 5868 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5872 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 733:
 
 /* Line 1455 of yacc.c  */
-#line 5873 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5877 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->charset= &my_charset_latin1; }
     break;
 
   case 734:
 
 /* Line 1455 of yacc.c  */
-#line 5875 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5879 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset= &my_charset_latin1_bin;
           }
@@ -22885,7 +22893,7 @@
   case 735:
 
 /* Line 1455 of yacc.c  */
-#line 5879 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5883 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset= &my_charset_latin1_bin;
           }
@@ -22894,7 +22902,7 @@
   case 736:
 
 /* Line 1455 of yacc.c  */
-#line 5886 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5890 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!(Lex->charset=get_charset_by_csname("ucs2",
                                                      MY_CS_PRIMARY,MYF(0))))
@@ -22908,7 +22916,7 @@
   case 737:
 
 /* Line 1455 of yacc.c  */
-#line 5895 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5899 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!(Lex->charset=get_charset_by_name("ucs2_bin", MYF(0))))
             {
@@ -22921,7 +22929,7 @@
   case 738:
 
 /* Line 1455 of yacc.c  */
-#line 5903 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5907 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!(Lex->charset=get_charset_by_name("ucs2_bin", MYF(0))))
             {
@@ -22934,28 +22942,28 @@
   case 739:
 
 /* Line 1455 of yacc.c  */
-#line 5913 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5917 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->charset=NULL; }
     break;
 
   case 742:
 
 /* Line 1455 of yacc.c  */
-#line 5916 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5920 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->charset=&my_charset_bin; }
     break;
 
   case 743:
 
 /* Line 1455 of yacc.c  */
-#line 5917 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5921 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->charset=(yyvsp[(2) - (3)].charset); }
     break;
 
   case 744:
 
 /* Line 1455 of yacc.c  */
-#line 5919 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5923 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset= NULL;
             Lex->type|= BINCMP_FLAG;
@@ -22965,7 +22973,7 @@
   case 745:
 
 /* Line 1455 of yacc.c  */
-#line 5924 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5928 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->charset= (yyvsp[(3) - (3)].charset);
             Lex->type|= BINCMP_FLAG;
@@ -22975,21 +22983,21 @@
   case 746:
 
 /* Line 1455 of yacc.c  */
-#line 5931 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5935 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 747:
 
 /* Line 1455 of yacc.c  */
-#line 5932 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5936 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= BINCMP_FLAG; }
     break;
 
   case 750:
 
 /* Line 1455 of yacc.c  */
-#line 5947 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5951 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.table)=(yyvsp[(2) - (5)].table);
           }
@@ -22998,14 +23006,14 @@
   case 751:
 
 /* Line 1455 of yacc.c  */
-#line 5954 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5958 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ref_list.empty(); }
     break;
 
   case 753:
 
 /* Line 1455 of yacc.c  */
-#line 5960 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5964 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Key_part_spec *key= new Key_part_spec((yyvsp[(3) - (3)].lex_str), 0);
             if (key == NULL)
@@ -23017,7 +23025,7 @@
   case 754:
 
 /* Line 1455 of yacc.c  */
-#line 5967 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5971 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Key_part_spec *key= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0);
             if (key == NULL)
@@ -23031,35 +23039,35 @@
   case 755:
 
 /* Line 1455 of yacc.c  */
-#line 5979 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5983 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_UNDEF; }
     break;
 
   case 756:
 
 /* Line 1455 of yacc.c  */
-#line 5981 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5985 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_FULL; }
     break;
 
   case 757:
 
 /* Line 1455 of yacc.c  */
-#line 5983 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5987 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_PARTIAL; }
     break;
 
   case 758:
 
 /* Line 1455 of yacc.c  */
-#line 5985 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5989 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->fk_match_option= Foreign_key::FK_MATCH_SIMPLE; }
     break;
 
   case 759:
 
 /* Line 1455 of yacc.c  */
-#line 5990 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 5994 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
@@ -23070,7 +23078,7 @@
   case 760:
 
 /* Line 1455 of yacc.c  */
-#line 5996 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6000 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= (yyvsp[(3) - (3)].m_fk_option);
@@ -23081,7 +23089,7 @@
   case 761:
 
 /* Line 1455 of yacc.c  */
-#line 6002 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6006 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= Foreign_key::FK_OPTION_UNDEF;
@@ -23092,7 +23100,7 @@
   case 762:
 
 /* Line 1455 of yacc.c  */
-#line 6009 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6013 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= (yyvsp[(3) - (6)].m_fk_option);
@@ -23103,7 +23111,7 @@
   case 763:
 
 /* Line 1455 of yacc.c  */
-#line 6016 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6020 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->fk_update_opt= (yyvsp[(6) - (6)].m_fk_option);
@@ -23114,126 +23122,126 @@
   case 764:
 
 /* Line 1455 of yacc.c  */
-#line 6024 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6028 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_RESTRICT; }
     break;
 
   case 765:
 
 /* Line 1455 of yacc.c  */
-#line 6025 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6029 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_CASCADE; }
     break;
 
   case 766:
 
 /* Line 1455 of yacc.c  */
-#line 6026 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6030 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_SET_NULL; }
     break;
 
   case 767:
 
 /* Line 1455 of yacc.c  */
-#line 6027 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6031 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_NO_ACTION; }
     break;
 
   case 768:
 
 /* Line 1455 of yacc.c  */
-#line 6028 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6032 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_fk_option)= Foreign_key::FK_OPTION_DEFAULT;  }
     break;
 
   case 769:
 
 /* Line 1455 of yacc.c  */
-#line 6032 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6036 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::MULTIPLE; }
     break;
 
   case 770:
 
 /* Line 1455 of yacc.c  */
-#line 6036 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6040 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::PRIMARY; }
     break;
 
   case 771:
 
 /* Line 1455 of yacc.c  */
-#line 6037 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6041 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::UNIQUE; }
     break;
 
   case 772:
 
 /* Line 1455 of yacc.c  */
-#line 6041 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6045 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 773:
 
 /* Line 1455 of yacc.c  */
-#line 6042 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6046 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 774:
 
 /* Line 1455 of yacc.c  */
-#line 6046 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6050 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 776:
 
 /* Line 1455 of yacc.c  */
-#line 6051 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6055 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 777:
 
 /* Line 1455 of yacc.c  */
-#line 6052 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6056 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 778:
 
 /* Line 1455 of yacc.c  */
-#line 6053 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6057 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 779:
 
 /* Line 1455 of yacc.c  */
-#line 6057 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6061 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::MULTIPLE; }
     break;
 
   case 780:
 
 /* Line 1455 of yacc.c  */
-#line 6058 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6062 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::UNIQUE; }
     break;
 
   case 781:
 
 /* Line 1455 of yacc.c  */
-#line 6062 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6066 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_type)= Key::FULLTEXT;}
     break;
 
   case 782:
 
 /* Line 1455 of yacc.c  */
-#line 6067 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6071 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef HAVE_SPATIAL
             (yyval.key_type)= Key::SPATIAL;
@@ -23248,7 +23256,7 @@
   case 783:
 
 /* Line 1455 of yacc.c  */
-#line 6079 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6083 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->key_create_info= default_key_create_info;
           }
@@ -23257,56 +23265,56 @@
   case 786:
 
 /* Line 1455 of yacc.c  */
-#line 6096 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6100 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 788:
 
 /* Line 1455 of yacc.c  */
-#line 6101 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6105 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 790:
 
 /* Line 1455 of yacc.c  */
-#line 6106 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6110 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 798:
 
 /* Line 1455 of yacc.c  */
-#line 6126 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6130 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); }
     break;
 
   case 799:
 
 /* Line 1455 of yacc.c  */
-#line 6127 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6131 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->key_create_info.algorithm= (yyvsp[(2) - (2)].key_alg); }
     break;
 
   case 800:
 
 /* Line 1455 of yacc.c  */
-#line 6132 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6136 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->key_create_info.block_size= (yyvsp[(3) - (3)].ulong_num); }
     break;
 
   case 801:
 
 /* Line 1455 of yacc.c  */
-#line 6133 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6137 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->key_create_info.comment= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 806:
 
 /* Line 1455 of yacc.c  */
-#line 6148 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6152 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (plugin_is_ready(&(yyvsp[(3) - (3)].lex_str), MYSQL_FTPARSER_PLUGIN))
               Lex->key_create_info.parser_name= (yyvsp[(3) - (3)].lex_str);
@@ -23321,42 +23329,42 @@
   case 807:
 
 /* Line 1455 of yacc.c  */
-#line 6160 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6164 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_alg)= HA_KEY_ALG_BTREE; }
     break;
 
   case 808:
 
 /* Line 1455 of yacc.c  */
-#line 6161 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6165 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_alg)= HA_KEY_ALG_RTREE; }
     break;
 
   case 809:
 
 /* Line 1455 of yacc.c  */
-#line 6162 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6166 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.key_alg)= HA_KEY_ALG_HASH; }
     break;
 
   case 810:
 
 /* Line 1455 of yacc.c  */
-#line 6166 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6170 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->col_list.push_back((yyvsp[(3) - (4)].key_part)); }
     break;
 
   case 811:
 
 /* Line 1455 of yacc.c  */
-#line 6167 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6171 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->col_list.push_back((yyvsp[(1) - (2)].key_part)); }
     break;
 
   case 812:
 
 /* Line 1455 of yacc.c  */
-#line 6172 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6176 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.key_part)= new Key_part_spec((yyvsp[(1) - (1)].lex_str), 0);
             if ((yyval.key_part) == NULL)
@@ -23367,7 +23375,7 @@
   case 813:
 
 /* Line 1455 of yacc.c  */
-#line 6178 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6182 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             int key_part_len= atoi((yyvsp[(3) - (4)].lex_str).str);
             if (!key_part_len)
@@ -23383,49 +23391,49 @@
   case 814:
 
 /* Line 1455 of yacc.c  */
-#line 6191 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6195 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 815:
 
 /* Line 1455 of yacc.c  */
-#line 6192 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6196 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 816:
 
 /* Line 1455 of yacc.c  */
-#line 6196 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6200 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= null_lex_str; }
     break;
 
   case 817:
 
 /* Line 1455 of yacc.c  */
-#line 6197 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6201 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 818:
 
 /* Line 1455 of yacc.c  */
-#line 6201 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6205 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->interval_list.push_back((yyvsp[(1) - (1)].string)); }
     break;
 
   case 819:
 
 /* Line 1455 of yacc.c  */
-#line 6202 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6206 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->interval_list.push_back((yyvsp[(3) - (3)].string)); }
     break;
 
   case 820:
 
 /* Line 1455 of yacc.c  */
-#line 6210 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6214 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23456,7 +23464,7 @@
   case 821:
 
 /* Line 1455 of yacc.c  */
-#line 6236 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6240 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23473,7 +23481,7 @@
   case 822:
 
 /* Line 1455 of yacc.c  */
-#line 6248 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6252 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_info.default_table_charset= NULL;
             Lex->create_info.used_fields= 0;
@@ -23483,7 +23491,7 @@
   case 823:
 
 /* Line 1455 of yacc.c  */
-#line 6253 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6257 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_ALTER_DB;
@@ -23497,7 +23505,7 @@
   case 824:
 
 /* Line 1455 of yacc.c  */
-#line 6262 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6266 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->sphead)
@@ -23513,7 +23521,7 @@
   case 825:
 
 /* Line 1455 of yacc.c  */
-#line 6273 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6277 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -23529,7 +23537,7 @@
   case 826:
 
 /* Line 1455 of yacc.c  */
-#line 6284 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6288 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -23541,7 +23549,7 @@
   case 827:
 
 /* Line 1455 of yacc.c  */
-#line 6291 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6295 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -23557,7 +23565,7 @@
   case 828:
 
 /* Line 1455 of yacc.c  */
-#line 6302 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6306 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -23569,7 +23577,7 @@
   case 829:
 
 /* Line 1455 of yacc.c  */
-#line 6309 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6313 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -23585,14 +23593,14 @@
   case 830:
 
 /* Line 1455 of yacc.c  */
-#line 6320 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6324 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 831:
 
 /* Line 1455 of yacc.c  */
-#line 6327 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6331 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -23609,14 +23617,14 @@
   case 832:
 
 /* Line 1455 of yacc.c  */
-#line 6339 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6343 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 833:
 
 /* Line 1455 of yacc.c  */
-#line 6341 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6345 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* 
               It is safe to use Lex->spname because
@@ -23637,7 +23645,7 @@
   case 834:
 
 /* Line 1455 of yacc.c  */
-#line 6361 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6365 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyvsp[(6) - (10)].num) || (yyvsp[(7) - (10)].num) || (yyvsp[(8) - (10)].num) || (yyvsp[(9) - (10)].num) || (yyvsp[(10) - (10)].num)))
             {
@@ -23655,7 +23663,7 @@
   case 835:
 
 /* Line 1455 of yacc.c  */
-#line 6374 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6378 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_TABLESPACE;
@@ -23665,7 +23673,7 @@
   case 836:
 
 /* Line 1455 of yacc.c  */
-#line 6379 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6383 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_LOGFILE_GROUP;
@@ -23675,7 +23683,7 @@
   case 837:
 
 /* Line 1455 of yacc.c  */
-#line 6384 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6388 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= CHANGE_FILE_TABLESPACE;
@@ -23685,7 +23693,7 @@
   case 838:
 
 /* Line 1455 of yacc.c  */
-#line 6389 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6393 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= ALTER_ACCESS_MODE_TABLESPACE;
@@ -23695,7 +23703,7 @@
   case 839:
 
 /* Line 1455 of yacc.c  */
-#line 6394 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6398 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_ALTER_SERVER;
@@ -23707,42 +23715,42 @@
   case 840:
 
 /* Line 1455 of yacc.c  */
-#line 6403 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6407 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0;}
     break;
 
   case 841:
 
 /* Line 1455 of yacc.c  */
-#line 6404 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6408 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 842:
 
 /* Line 1455 of yacc.c  */
-#line 6405 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6409 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 843:
 
 /* Line 1455 of yacc.c  */
-#line 6406 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6410 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 844:
 
 /* Line 1455 of yacc.c  */
-#line 6410 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6414 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0;}
     break;
 
   case 845:
 
 /* Line 1455 of yacc.c  */
-#line 6412 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6416 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Use lex's spname to hold the new name.
@@ -23756,49 +23764,49 @@
   case 846:
 
 /* Line 1455 of yacc.c  */
-#line 6423 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6427 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0;}
     break;
 
   case 847:
 
 /* Line 1455 of yacc.c  */
-#line 6424 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6428 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 848:
 
 /* Line 1455 of yacc.c  */
-#line 6428 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6432 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str).str= 0; (yyval.lex_str).length= 0; }
     break;
 
   case 849:
 
 /* Line 1455 of yacc.c  */
-#line 6429 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6433 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 851:
 
 /* Line 1455 of yacc.c  */
-#line 6434 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6438 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->alter_info.tablespace_op= DISCARD_TABLESPACE; }
     break;
 
   case 852:
 
 /* Line 1455 of yacc.c  */
-#line 6435 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6439 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->alter_info.tablespace_op= IMPORT_TABLESPACE; }
     break;
 
   case 858:
 
 /* Line 1455 of yacc.c  */
-#line 6452 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6456 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_DROP_PARTITION;
           }
@@ -23807,7 +23815,7 @@
   case 859:
 
 /* Line 1455 of yacc.c  */
-#line 6457 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6461 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_info.flags|= ALTER_REBUILD_PARTITION;
@@ -23818,7 +23826,7 @@
   case 860:
 
 /* Line 1455 of yacc.c  */
-#line 6464 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6468 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23835,7 +23843,7 @@
   case 862:
 
 /* Line 1455 of yacc.c  */
-#line 6478 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6482 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23852,7 +23860,7 @@
   case 863:
 
 /* Line 1455 of yacc.c  */
-#line 6490 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6494 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23868,7 +23876,7 @@
   case 865:
 
 /* Line 1455 of yacc.c  */
-#line 6503 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6507 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23885,7 +23893,7 @@
   case 867:
 
 /* Line 1455 of yacc.c  */
-#line 6516 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6520 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_info.flags|= ALTER_COALESCE_PARTITION;
@@ -23897,7 +23905,7 @@
   case 868:
 
 /* Line 1455 of yacc.c  */
-#line 6523 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6527 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -23913,7 +23921,7 @@
   case 870:
 
 /* Line 1455 of yacc.c  */
-#line 6538 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6542 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_REMOVE_PARTITIONING;
           }
@@ -23922,7 +23930,7 @@
   case 871:
 
 /* Line 1455 of yacc.c  */
-#line 6545 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6549 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_ALL_PARTITION;
           }
@@ -23931,7 +23939,7 @@
   case 873:
 
 /* Line 1455 of yacc.c  */
-#line 6553 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6557 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info= new partition_info();
@@ -23948,14 +23956,14 @@
   case 874:
 
 /* Line 1455 of yacc.c  */
-#line 6565 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6569 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 876:
 
 /* Line 1455 of yacc.c  */
-#line 6571 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6575 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info->num_parts= lex->part_info->partitions.elements;
@@ -23965,7 +23973,7 @@
   case 877:
 
 /* Line 1455 of yacc.c  */
-#line 6576 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6580 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->part_info->num_parts= (yyvsp[(2) - (2)].ulong_num);
           }
@@ -23974,7 +23982,7 @@
   case 878:
 
 /* Line 1455 of yacc.c  */
-#line 6583 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6587 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->part_info= new partition_info();
@@ -23990,7 +23998,7 @@
   case 880:
 
 /* Line 1455 of yacc.c  */
-#line 6598 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6602 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_TABLE_REORG;
           }
@@ -23999,7 +24007,7 @@
   case 881:
 
 /* Line 1455 of yacc.c  */
-#line 6602 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6606 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_REORGANIZE_PARTITION;
           }
@@ -24008,7 +24016,7 @@
   case 882:
 
 /* Line 1455 of yacc.c  */
-#line 6606 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6610 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             partition_info *part_info= Lex->part_info;
             part_info->num_parts= part_info->partitions.elements;
@@ -24018,21 +24026,21 @@
   case 883:
 
 /* Line 1455 of yacc.c  */
-#line 6613 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6617 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 884:
 
 /* Line 1455 of yacc.c  */
-#line 6614 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6618 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 885:
 
 /* Line 1455 of yacc.c  */
-#line 6619 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6623 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->alter_info.partition_names.push_back((yyvsp[(1) - (1)].lex_str).str))
             {
@@ -24045,7 +24053,7 @@
   case 888:
 
 /* Line 1455 of yacc.c  */
-#line 6639 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6643 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->change=0;
@@ -24056,7 +24064,7 @@
   case 889:
 
 /* Line 1455 of yacc.c  */
-#line 6648 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6652 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
           }
@@ -24065,7 +24073,7 @@
   case 890:
 
 /* Line 1455 of yacc.c  */
-#line 6652 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6656 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
             Lex->alter_info.flags|= ALTER_ADD_INDEX;
@@ -24075,7 +24083,7 @@
   case 891:
 
 /* Line 1455 of yacc.c  */
-#line 6657 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6661 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_ADD_COLUMN | ALTER_ADD_INDEX;
           }
@@ -24084,7 +24092,7 @@
   case 892:
 
 /* Line 1455 of yacc.c  */
-#line 6661 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6665 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->change= (yyvsp[(3) - (3)].lex_str).str;
@@ -24095,7 +24103,7 @@
   case 893:
 
 /* Line 1455 of yacc.c  */
-#line 6667 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6671 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
           }
@@ -24104,7 +24112,7 @@
   case 894:
 
 /* Line 1455 of yacc.c  */
-#line 6671 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6675 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->length=lex->dec=0; lex->type=0;
@@ -24118,7 +24126,7 @@
   case 895:
 
 /* Line 1455 of yacc.c  */
-#line 6680 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6684 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (add_field_to_list(lex->thd,&(yyvsp[(3) - (6)].lex_str),
@@ -24135,7 +24143,7 @@
   case 896:
 
 /* Line 1455 of yacc.c  */
-#line 6692 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6696 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->create_last_non_select_table= Lex->last_table();
           }
@@ -24144,7 +24152,7 @@
   case 897:
 
 /* Line 1455 of yacc.c  */
-#line 6696 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6700 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::COLUMN, (yyvsp[(3) - (4)].lex_str).str);
@@ -24158,7 +24166,7 @@
   case 898:
 
 /* Line 1455 of yacc.c  */
-#line 6705 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6709 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_DROP_INDEX | ALTER_FOREIGN_KEY;
           }
@@ -24167,7 +24175,7 @@
   case 899:
 
 /* Line 1455 of yacc.c  */
-#line 6709 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6713 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, primary_key_name);
@@ -24181,7 +24189,7 @@
   case 900:
 
 /* Line 1455 of yacc.c  */
-#line 6718 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6722 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (3)].lex_str).str);
@@ -24195,7 +24203,7 @@
   case 901:
 
 /* Line 1455 of yacc.c  */
-#line 6727 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6731 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.keys_onoff= DISABLE;
@@ -24206,7 +24214,7 @@
   case 902:
 
 /* Line 1455 of yacc.c  */
-#line 6733 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6737 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.keys_onoff= ENABLE;
@@ -24217,7 +24225,7 @@
   case 903:
 
 /* Line 1455 of yacc.c  */
-#line 6739 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6743 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_column *ac= new Alter_column((yyvsp[(3) - (6)].lex_str).str,(yyvsp[(6) - (6)].item));
@@ -24231,7 +24239,7 @@
   case 904:
 
 /* Line 1455 of yacc.c  */
-#line 6748 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6752 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_column *ac= new Alter_column((yyvsp[(3) - (5)].lex_str).str, (Item*) 0);
@@ -24245,7 +24253,7 @@
   case 905:
 
 /* Line 1455 of yacc.c  */
-#line 6757 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6761 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             size_t dummy;
@@ -24269,7 +24277,7 @@
   case 906:
 
 /* Line 1455 of yacc.c  */
-#line 6776 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6780 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!(yyvsp[(4) - (5)].charset))
             {
@@ -24295,7 +24303,7 @@
   case 907:
 
 /* Line 1455 of yacc.c  */
-#line 6797 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6801 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.flags|= ALTER_OPTIONS;
@@ -24310,7 +24318,7 @@
   case 908:
 
 /* Line 1455 of yacc.c  */
-#line 6807 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6811 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_RECREATE;
           }
@@ -24319,7 +24327,7 @@
   case 909:
 
 /* Line 1455 of yacc.c  */
-#line 6811 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6815 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->alter_info.flags|= ALTER_ORDER;
@@ -24329,105 +24337,105 @@
   case 910:
 
 /* Line 1455 of yacc.c  */
-#line 6818 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6822 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 911:
 
 /* Line 1455 of yacc.c  */
-#line 6819 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6823 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 912:
 
 /* Line 1455 of yacc.c  */
-#line 6823 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6827 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ignore= 0;}
     break;
 
   case 913:
 
 /* Line 1455 of yacc.c  */
-#line 6824 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6828 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ignore= 1;}
     break;
 
   case 914:
 
 /* Line 1455 of yacc.c  */
-#line 6828 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6832 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->drop_mode= DROP_DEFAULT; }
     break;
 
   case 915:
 
 /* Line 1455 of yacc.c  */
-#line 6829 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6833 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->drop_mode= DROP_RESTRICT; }
     break;
 
   case 916:
 
 /* Line 1455 of yacc.c  */
-#line 6830 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6834 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->drop_mode= DROP_CASCADE; }
     break;
 
   case 917:
 
 /* Line 1455 of yacc.c  */
-#line 6834 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6838 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 918:
 
 /* Line 1455 of yacc.c  */
-#line 6835 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6839 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { store_position_for_column((yyvsp[(2) - (2)].lex_str).str); }
     break;
 
   case 919:
 
 /* Line 1455 of yacc.c  */
-#line 6836 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6840 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { store_position_for_column(first_keyword); }
     break;
 
   case 920:
 
 /* Line 1455 of yacc.c  */
-#line 6840 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6844 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 921:
 
 /* Line 1455 of yacc.c  */
-#line 6841 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6845 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 922:
 
 /* Line 1455 of yacc.c  */
-#line 6842 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6846 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 923:
 
 /* Line 1455 of yacc.c  */
-#line 6843 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6847 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 924:
 
 /* Line 1455 of yacc.c  */
-#line 6852 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6856 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_START;
@@ -24441,14 +24449,14 @@
   case 925:
 
 /* Line 1455 of yacc.c  */
-#line 6861 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6865 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 926:
 
 /* Line 1455 of yacc.c  */
-#line 6863 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6867 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_STOP;
@@ -24460,7 +24468,7 @@
   case 927:
 
 /* Line 1455 of yacc.c  */
-#line 6870 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6874 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_START;
@@ -24473,14 +24481,14 @@
   case 928:
 
 /* Line 1455 of yacc.c  */
-#line 6878 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6882 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 929:
 
 /* Line 1455 of yacc.c  */
-#line 6880 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6884 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_SLAVE_STOP;
@@ -24491,7 +24499,7 @@
   case 930:
 
 /* Line 1455 of yacc.c  */
-#line 6889 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6893 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_BEGIN;
@@ -24502,14 +24510,14 @@
   case 931:
 
 /* Line 1455 of yacc.c  */
-#line 6897 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6901 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) = 0; }
     break;
 
   case 932:
 
 /* Line 1455 of yacc.c  */
-#line 6899 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6903 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)= MYSQL_START_TRANS_OPT_WITH_CONS_SNAPSHOT;
           }
@@ -24518,49 +24526,49 @@
   case 933:
 
 /* Line 1455 of yacc.c  */
-#line 6905 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6909 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->slave_thd_opt= 0; }
     break;
 
   case 934:
 
 /* Line 1455 of yacc.c  */
-#line 6907 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6911 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 937:
 
 /* Line 1455 of yacc.c  */
-#line 6916 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6920 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 938:
 
 /* Line 1455 of yacc.c  */
-#line 6917 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6921 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->slave_thd_opt|=SLAVE_SQL; }
     break;
 
   case 939:
 
 /* Line 1455 of yacc.c  */
-#line 6918 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6922 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->slave_thd_opt|=SLAVE_IO; }
     break;
 
   case 940:
 
 /* Line 1455 of yacc.c  */
-#line 6922 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6926 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 941:
 
 /* Line 1455 of yacc.c  */
-#line 6924 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6928 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (((lex->mi.log_file_name || lex->mi.pos) &&
@@ -24578,7 +24586,7 @@
   case 944:
 
 /* Line 1455 of yacc.c  */
-#line 6945 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6949 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_CHECKSUM;
@@ -24590,35 +24598,35 @@
   case 945:
 
 /* Line 1455 of yacc.c  */
-#line 6952 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6956 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 946:
 
 /* Line 1455 of yacc.c  */
-#line 6956 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6960 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags= 0; }
     break;
 
   case 947:
 
 /* Line 1455 of yacc.c  */
-#line 6957 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6961 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags= T_QUICK; }
     break;
 
   case 948:
 
 /* Line 1455 of yacc.c  */
-#line 6958 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6962 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags= T_EXTEND; }
     break;
 
   case 949:
 
 /* Line 1455 of yacc.c  */
-#line 6963 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6967 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_REPAIR;
@@ -24633,7 +24641,7 @@
   case 950:
 
 /* Line 1455 of yacc.c  */
-#line 6973 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6977 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -24647,56 +24655,56 @@
   case 951:
 
 /* Line 1455 of yacc.c  */
-#line 6984 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6988 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags = T_MEDIUM; }
     break;
 
   case 952:
 
 /* Line 1455 of yacc.c  */
-#line 6985 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6989 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 953:
 
 /* Line 1455 of yacc.c  */
-#line 6989 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6993 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 954:
 
 /* Line 1455 of yacc.c  */
-#line 6990 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6994 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 955:
 
 /* Line 1455 of yacc.c  */
-#line 6994 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6998 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_QUICK; }
     break;
 
   case 956:
 
 /* Line 1455 of yacc.c  */
-#line 6995 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 6999 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_EXTEND; }
     break;
 
   case 957:
 
 /* Line 1455 of yacc.c  */
-#line 6996 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7000 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.sql_flags|= TT_USEFRM; }
     break;
 
   case 958:
 
 /* Line 1455 of yacc.c  */
-#line 7001 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7005 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_ANALYZE;
@@ -24711,7 +24719,7 @@
   case 959:
 
 /* Line 1455 of yacc.c  */
-#line 7011 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7015 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -24725,7 +24733,7 @@
   case 960:
 
 /* Line 1455 of yacc.c  */
-#line 7023 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7027 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_BINLOG_BASE64_EVENT;
             Lex->comment= (yyvsp[(2) - (2)].lex_str);
@@ -24735,7 +24743,7 @@
   case 961:
 
 /* Line 1455 of yacc.c  */
-#line 7031 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7035 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -24755,7 +24763,7 @@
   case 962:
 
 /* Line 1455 of yacc.c  */
-#line 7046 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7050 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -24769,77 +24777,77 @@
   case 963:
 
 /* Line 1455 of yacc.c  */
-#line 7057 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7061 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags = T_MEDIUM; }
     break;
 
   case 964:
 
 /* Line 1455 of yacc.c  */
-#line 7058 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7062 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 965:
 
 /* Line 1455 of yacc.c  */
-#line 7062 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7066 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 966:
 
 /* Line 1455 of yacc.c  */
-#line 7063 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7067 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 967:
 
 /* Line 1455 of yacc.c  */
-#line 7067 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7071 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_QUICK; }
     break;
 
   case 968:
 
 /* Line 1455 of yacc.c  */
-#line 7068 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7072 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_FAST; }
     break;
 
   case 969:
 
 /* Line 1455 of yacc.c  */
-#line 7069 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7073 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_MEDIUM; }
     break;
 
   case 970:
 
 /* Line 1455 of yacc.c  */
-#line 7070 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7074 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_EXTEND; }
     break;
 
   case 971:
 
 /* Line 1455 of yacc.c  */
-#line 7071 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7075 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.flags|= T_CHECK_ONLY_CHANGED; }
     break;
 
   case 972:
 
 /* Line 1455 of yacc.c  */
-#line 7072 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7076 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->check_opt.sql_flags|= TT_FOR_UPGRADE; }
     break;
 
   case 973:
 
 /* Line 1455 of yacc.c  */
-#line 7077 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7081 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_OPTIMIZE;
@@ -24854,7 +24862,7 @@
   case 974:
 
 /* Line 1455 of yacc.c  */
-#line 7087 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7091 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -24868,28 +24876,28 @@
   case 975:
 
 /* Line 1455 of yacc.c  */
-#line 7098 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7102 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 976:
 
 /* Line 1455 of yacc.c  */
-#line 7099 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7103 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 977:
 
 /* Line 1455 of yacc.c  */
-#line 7100 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7104 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 978:
 
 /* Line 1455 of yacc.c  */
-#line 7105 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7109 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_RENAME_TABLE;
           }
@@ -24898,14 +24906,14 @@
   case 979:
 
 /* Line 1455 of yacc.c  */
-#line 7109 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7113 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 980:
 
 /* Line 1455 of yacc.c  */
-#line 7111 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7115 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_RENAME_USER;
           }
@@ -24914,7 +24922,7 @@
   case 981:
 
 /* Line 1455 of yacc.c  */
-#line 7118 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7122 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (3)].lex_user)) || Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -24924,7 +24932,7 @@
   case 982:
 
 /* Line 1455 of yacc.c  */
-#line 7123 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7127 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (5)].lex_user)) || Lex->users_list.push_back((yyvsp[(5) - (5)].lex_user)))
               MYSQL_YYABORT;
@@ -24934,7 +24942,7 @@
   case 985:
 
 /* Line 1455 of yacc.c  */
-#line 7136 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7140 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             SELECT_LEX *sl= lex->current_select;
@@ -24949,7 +24957,7 @@
   case 986:
 
 /* Line 1455 of yacc.c  */
-#line 7149 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7153 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.reset();
           }
@@ -24958,7 +24966,7 @@
   case 987:
 
 /* Line 1455 of yacc.c  */
-#line 7153 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7157 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ASSIGN_TO_KEYCACHE;
@@ -24969,7 +24977,7 @@
   case 992:
 
 /* Line 1455 of yacc.c  */
-#line 7172 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7176 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (2)].table), NULL, 0, TL_READ,
                                            MDL_SHARED_READ,
@@ -24981,7 +24989,7 @@
   case 993:
 
 /* Line 1455 of yacc.c  */
-#line 7182 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7186 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, 0, TL_READ, 
                                            MDL_SHARED_READ,
@@ -24993,21 +25001,21 @@
   case 994:
 
 /* Line 1455 of yacc.c  */
-#line 7191 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7195 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 995:
 
 /* Line 1455 of yacc.c  */
-#line 7192 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7196 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str) = default_key_cache_base; }
     break;
 
   case 996:
 
 /* Line 1455 of yacc.c  */
-#line 7197 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7201 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_PRELOAD_KEYS;
@@ -25018,14 +25026,14 @@
   case 997:
 
 /* Line 1455 of yacc.c  */
-#line 7203 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7207 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1002:
 
 /* Line 1455 of yacc.c  */
-#line 7218 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7222 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (3)].table), NULL, (yyvsp[(3) - (3)].num), TL_READ,
                                            MDL_SHARED_READ,
@@ -25037,7 +25045,7 @@
   case 1003:
 
 /* Line 1455 of yacc.c  */
-#line 7228 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7232 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (4)].table), NULL, (yyvsp[(4) - (4)].num), TL_READ,
                                            MDL_SHARED_READ,
@@ -25049,7 +25057,7 @@
   case 1004:
 
 /* Line 1455 of yacc.c  */
-#line 7238 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7242 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->alter_info.flags|= ALTER_ADMIN_PARTITION;
           }
@@ -25058,7 +25066,7 @@
   case 1006:
 
 /* Line 1455 of yacc.c  */
-#line 7245 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7249 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->select_lex.alloc_index_hints(YYTHD);
             Select->set_index_hint_type(INDEX_HINT_USE, 
@@ -25071,28 +25079,28 @@
   case 1008:
 
 /* Line 1455 of yacc.c  */
-#line 7256 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7260 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 1010:
 
 /* Line 1455 of yacc.c  */
-#line 7262 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7266 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1011:
 
 /* Line 1455 of yacc.c  */
-#line 7263 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7267 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= TL_OPTION_IGNORE_LEAVES; }
     break;
 
   case 1012:
 
 /* Line 1455 of yacc.c  */
-#line 7273 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7277 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SELECT;
@@ -25102,7 +25110,7 @@
   case 1015:
 
 /* Line 1455 of yacc.c  */
-#line 7287 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7291 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (setup_select_in_parentheses(Lex))
               MYSQL_YYABORT;
@@ -25112,7 +25120,7 @@
   case 1017:
 
 /* Line 1455 of yacc.c  */
-#line 7297 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7301 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (setup_select_in_parentheses(Lex))
               MYSQL_YYABORT;
@@ -25122,7 +25130,7 @@
   case 1019:
 
 /* Line 1455 of yacc.c  */
-#line 7306 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7310 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX * sel= lex->current_select;
@@ -25143,7 +25151,7 @@
   case 1021:
 
 /* Line 1455 of yacc.c  */
-#line 7325 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7329 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -25156,7 +25164,7 @@
   case 1022:
 
 /* Line 1455 of yacc.c  */
-#line 7333 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7337 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -25165,14 +25173,14 @@
   case 1024:
 
 /* Line 1455 of yacc.c  */
-#line 7340 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7344 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1029:
 
 /* Line 1455 of yacc.c  */
-#line 7350 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7354 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->context.table_list=
               Select->context.first_name_resolution_table=
@@ -25183,7 +25191,7 @@
   case 1032:
 
 /* Line 1455 of yacc.c  */
-#line 7365 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7369 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Select->options & SELECT_DISTINCT && Select->options & SELECT_ALL)
             {
@@ -25196,7 +25204,7 @@
   case 1036:
 
 /* Line 1455 of yacc.c  */
-#line 7382 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7386 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* 
               Allow this flag only on the first top-level SELECT statement, if
@@ -25229,7 +25237,7 @@
   case 1037:
 
 /* Line 1455 of yacc.c  */
-#line 7410 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7414 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* 
               Allow this flag only on the first top-level SELECT statement, if
@@ -25262,7 +25270,7 @@
   case 1039:
 
 /* Line 1455 of yacc.c  */
-#line 7442 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7446 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->current_select->set_lock_for_tables(TL_WRITE);
@@ -25273,7 +25281,7 @@
   case 1040:
 
 /* Line 1455 of yacc.c  */
-#line 7448 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7452 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->current_select->
@@ -25285,7 +25293,7 @@
   case 1043:
 
 /* Line 1455 of yacc.c  */
-#line 7460 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7464 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *item= new (thd->mem_root)
@@ -25302,7 +25310,7 @@
   case 1044:
 
 /* Line 1455 of yacc.c  */
-#line 7475 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7479 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -25314,7 +25322,7 @@
   case 1045:
 
 /* Line 1455 of yacc.c  */
-#line 7482 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7486 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             DBUG_ASSERT((yyvsp[(1) - (4)].simple_string) < (yyvsp[(3) - (4)].simple_string));
@@ -25342,7 +25350,7 @@
   case 1046:
 
 /* Line 1455 of yacc.c  */
-#line 7507 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7511 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_start();
           }
@@ -25351,7 +25359,7 @@
   case 1047:
 
 /* Line 1455 of yacc.c  */
-#line 7513 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7517 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.simple_string)= (char*) YYLIP->get_cpp_tok_end();
           }
@@ -25360,56 +25368,56 @@
   case 1048:
 
 /* Line 1455 of yacc.c  */
-#line 7519 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7523 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=null_lex_str;}
     break;
 
   case 1049:
 
 /* Line 1455 of yacc.c  */
-#line 7520 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7524 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 1050:
 
 /* Line 1455 of yacc.c  */
-#line 7521 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7525 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str); }
     break;
 
   case 1051:
 
 /* Line 1455 of yacc.c  */
-#line 7522 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7526 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1052:
 
 /* Line 1455 of yacc.c  */
-#line 7523 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7527 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1053:
 
 /* Line 1455 of yacc.c  */
-#line 7527 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7531 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1054:
 
 /* Line 1455 of yacc.c  */
-#line 7528 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7532 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1055:
 
 /* Line 1455 of yacc.c  */
-#line 7534 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7538 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Design notes:
@@ -25465,7 +25473,7 @@
   case 1056:
 
 /* Line 1455 of yacc.c  */
-#line 7585 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7589 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* XOR is a proprietary extension */
             (yyval.item) = new (YYTHD->mem_root) Item_cond_xor((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item));
@@ -25477,7 +25485,7 @@
   case 1057:
 
 /* Line 1455 of yacc.c  */
-#line 7592 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7596 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* See comments in rule expr: expr or expr */
             Item_cond_and *item1;
@@ -25525,7 +25533,7 @@
   case 1058:
 
 /* Line 1455 of yacc.c  */
-#line 7635 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7639 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -25536,7 +25544,7 @@
   case 1059:
 
 /* Line 1455 of yacc.c  */
-#line 7641 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7645 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_istrue((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25547,7 +25555,7 @@
   case 1060:
 
 /* Line 1455 of yacc.c  */
-#line 7647 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7651 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnottrue((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -25558,7 +25566,7 @@
   case 1061:
 
 /* Line 1455 of yacc.c  */
-#line 7653 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7657 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isfalse((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25569,7 +25577,7 @@
   case 1062:
 
 /* Line 1455 of yacc.c  */
-#line 7659 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7663 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnotfalse((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -25580,7 +25588,7 @@
   case 1063:
 
 /* Line 1455 of yacc.c  */
-#line 7665 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7669 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25591,7 +25599,7 @@
   case 1064:
 
 /* Line 1455 of yacc.c  */
-#line 7671 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7675 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -25602,7 +25610,7 @@
   case 1066:
 
 /* Line 1455 of yacc.c  */
-#line 7681 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7685 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnull((yyvsp[(1) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25613,7 +25621,7 @@
   case 1067:
 
 /* Line 1455 of yacc.c  */
-#line 7687 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7691 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_isnotnull((yyvsp[(1) - (4)].item));
             if ((yyval.item) == NULL)
@@ -25624,7 +25632,7 @@
   case 1068:
 
 /* Line 1455 of yacc.c  */
-#line 7693 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7697 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_equal((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25635,7 +25643,7 @@
   case 1069:
 
 /* Line 1455 of yacc.c  */
-#line 7699 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7703 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= (*(yyvsp[(2) - (3)].boolfunc2creator))(0)->create((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25646,7 +25654,7 @@
   case 1070:
 
 /* Line 1455 of yacc.c  */
-#line 7705 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7709 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= all_any_subquery_creator((yyvsp[(1) - (6)].item), (yyvsp[(2) - (6)].boolfunc2creator), (yyvsp[(3) - (6)].num), (yyvsp[(5) - (6)].select_lex));
             if ((yyval.item) == NULL)
@@ -25657,7 +25665,7 @@
   case 1072:
 
 /* Line 1455 of yacc.c  */
-#line 7715 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7719 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_in_subselect((yyvsp[(1) - (5)].item), (yyvsp[(4) - (5)].select_lex));
             if ((yyval.item) == NULL)
@@ -25668,7 +25676,7 @@
   case 1073:
 
 /* Line 1455 of yacc.c  */
-#line 7721 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7725 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *item= new (thd->mem_root) Item_in_subselect((yyvsp[(1) - (6)].item), (yyvsp[(5) - (6)].select_lex));
@@ -25683,7 +25691,7 @@
   case 1074:
 
 /* Line 1455 of yacc.c  */
-#line 7731 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7735 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (5)].item), true, (yyvsp[(4) - (5)].item));
             if ((yyval.item) == NULL)
@@ -25694,7 +25702,7 @@
   case 1075:
 
 /* Line 1455 of yacc.c  */
-#line 7737 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7741 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             (yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(4) - (7)].item));
             (yyvsp[(6) - (7)].item_list)->push_front((yyvsp[(1) - (7)].item));
@@ -25707,7 +25715,7 @@
   case 1076:
 
 /* Line 1455 of yacc.c  */
-#line 7745 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7749 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= handle_sql2003_note184_exception(YYTHD, (yyvsp[(1) - (6)].item), false, (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -25718,7 +25726,7 @@
   case 1077:
 
 /* Line 1455 of yacc.c  */
-#line 7751 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7755 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item));
             (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(1) - (8)].item));
@@ -25733,7 +25741,7 @@
   case 1078:
 
 /* Line 1455 of yacc.c  */
-#line 7761 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7765 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_between((yyvsp[(1) - (5)].item),(yyvsp[(3) - (5)].item),(yyvsp[(5) - (5)].item));
             if ((yyval.item) == NULL)
@@ -25744,7 +25752,7 @@
   case 1079:
 
 /* Line 1455 of yacc.c  */
-#line 7767 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7771 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item_func_between *item;
             item= new (YYTHD->mem_root) Item_func_between((yyvsp[(1) - (6)].item),(yyvsp[(4) - (6)].item),(yyvsp[(6) - (6)].item));
@@ -25758,7 +25766,7 @@
   case 1080:
 
 /* Line 1455 of yacc.c  */
-#line 7776 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7780 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *item1= new (YYTHD->mem_root) Item_func_soundex((yyvsp[(1) - (4)].item));
             Item *item4= new (YYTHD->mem_root) Item_func_soundex((yyvsp[(4) - (4)].item));
@@ -25773,7 +25781,7 @@
   case 1081:
 
 /* Line 1455 of yacc.c  */
-#line 7786 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7790 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_like((yyvsp[(1) - (4)].item),(yyvsp[(3) - (4)].item),(yyvsp[(4) - (4)].item),Lex->escape_used);
             if ((yyval.item) == NULL)
@@ -25784,7 +25792,7 @@
   case 1082:
 
 /* Line 1455 of yacc.c  */
-#line 7792 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7796 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_like((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].item),
                                                              Lex->escape_used);
@@ -25799,7 +25807,7 @@
   case 1083:
 
 /* Line 1455 of yacc.c  */
-#line 7802 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7806 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25810,7 +25818,7 @@
   case 1084:
 
 /* Line 1455 of yacc.c  */
-#line 7808 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7812 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_func_regex((yyvsp[(1) - (4)].item),(yyvsp[(4) - (4)].item));
             if (item == NULL)
@@ -25824,7 +25832,7 @@
   case 1086:
 
 /* Line 1455 of yacc.c  */
-#line 7821 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7825 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_or((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25835,7 +25843,7 @@
   case 1087:
 
 /* Line 1455 of yacc.c  */
-#line 7827 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7831 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_and((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25846,7 +25854,7 @@
   case 1088:
 
 /* Line 1455 of yacc.c  */
-#line 7833 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7837 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_shift_left((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25857,7 +25865,7 @@
   case 1089:
 
 /* Line 1455 of yacc.c  */
-#line 7839 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7843 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_shift_right((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25868,7 +25876,7 @@
   case 1090:
 
 /* Line 1455 of yacc.c  */
-#line 7845 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7849 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_plus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25879,7 +25887,7 @@
   case 1091:
 
 /* Line 1455 of yacc.c  */
-#line 7851 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7855 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_minus((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25890,7 +25898,7 @@
   case 1092:
 
 /* Line 1455 of yacc.c  */
-#line 7857 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7861 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),0);
             if ((yyval.item) == NULL)
@@ -25901,7 +25909,7 @@
   case 1093:
 
 /* Line 1455 of yacc.c  */
-#line 7863 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7867 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(1) - (5)].item),(yyvsp[(4) - (5)].item),(yyvsp[(5) - (5)].interval),1);
             if ((yyval.item) == NULL)
@@ -25912,7 +25920,7 @@
   case 1094:
 
 /* Line 1455 of yacc.c  */
-#line 7869 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7873 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_mul((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25923,7 +25931,7 @@
   case 1095:
 
 /* Line 1455 of yacc.c  */
-#line 7875 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7879 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25934,7 +25942,7 @@
   case 1096:
 
 /* Line 1455 of yacc.c  */
-#line 7881 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7885 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25945,7 +25953,7 @@
   case 1097:
 
 /* Line 1455 of yacc.c  */
-#line 7887 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7891 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_int_div((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25956,7 +25964,7 @@
   case 1098:
 
 /* Line 1455 of yacc.c  */
-#line 7893 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7897 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_mod((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25967,7 +25975,7 @@
   case 1099:
 
 /* Line 1455 of yacc.c  */
-#line 7899 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7903 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_xor((yyvsp[(1) - (3)].item),(yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -25978,63 +25986,63 @@
   case 1109:
 
 /* Line 1455 of yacc.c  */
-#line 7928 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7932 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_eq_creator; }
     break;
 
   case 1110:
 
 /* Line 1455 of yacc.c  */
-#line 7929 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7933 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_ge_creator; }
     break;
 
   case 1111:
 
 /* Line 1455 of yacc.c  */
-#line 7930 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7934 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_gt_creator; }
     break;
 
   case 1112:
 
 /* Line 1455 of yacc.c  */
-#line 7931 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7935 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_le_creator; }
     break;
 
   case 1113:
 
 /* Line 1455 of yacc.c  */
-#line 7932 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7936 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_lt_creator; }
     break;
 
   case 1114:
 
 /* Line 1455 of yacc.c  */
-#line 7933 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7937 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.boolfunc2creator) = &comp_ne_creator; }
     break;
 
   case 1115:
 
 /* Line 1455 of yacc.c  */
-#line 7937 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7941 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) = 1; }
     break;
 
   case 1116:
 
 /* Line 1455 of yacc.c  */
-#line 7938 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7942 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) = 0; }
     break;
 
   case 1122:
 
 /* Line 1455 of yacc.c  */
-#line 7948 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7952 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *i1= new (thd->mem_root) Item_string((yyvsp[(3) - (3)].lex_str).str,
@@ -26051,7 +26059,7 @@
   case 1127:
 
 /* Line 1455 of yacc.c  */
-#line 7964 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7968 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_concat((yyvsp[(1) - (3)].item), (yyvsp[(3) - (3)].item));
             if ((yyval.item) == NULL)
@@ -26062,7 +26070,7 @@
   case 1128:
 
 /* Line 1455 of yacc.c  */
-#line 7970 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7974 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= (yyvsp[(2) - (2)].item);
           }
@@ -26071,7 +26079,7 @@
   case 1129:
 
 /* Line 1455 of yacc.c  */
-#line 7974 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7978 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_neg((yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -26082,7 +26090,7 @@
   case 1130:
 
 /* Line 1455 of yacc.c  */
-#line 7980 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7984 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_bit_neg((yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -26093,7 +26101,7 @@
   case 1131:
 
 /* Line 1455 of yacc.c  */
-#line 7986 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7990 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= negate_expression(YYTHD, (yyvsp[(2) - (2)].item));
             if ((yyval.item) == NULL)
@@ -26104,7 +26112,7 @@
   case 1132:
 
 /* Line 1455 of yacc.c  */
-#line 7992 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 7996 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             (yyval.item)= new (YYTHD->mem_root) Item_singlerow_subselect((yyvsp[(2) - (3)].select_lex));
             if ((yyval.item) == NULL)
@@ -26115,14 +26123,14 @@
   case 1133:
 
 /* Line 1455 of yacc.c  */
-#line 7998 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8002 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(2) - (3)].item); }
     break;
 
   case 1134:
 
 /* Line 1455 of yacc.c  */
-#line 8000 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8004 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(4) - (5)].item_list)->push_front((yyvsp[(2) - (5)].item));
             (yyval.item)= new (YYTHD->mem_root) Item_row(*(yyvsp[(4) - (5)].item_list));
@@ -26134,7 +26142,7 @@
   case 1135:
 
 /* Line 1455 of yacc.c  */
-#line 8007 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8011 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(5) - (6)].item_list)->push_front((yyvsp[(3) - (6)].item));
             (yyval.item)= new (YYTHD->mem_root) Item_row(*(yyvsp[(5) - (6)].item_list));
@@ -26146,7 +26154,7 @@
   case 1136:
 
 /* Line 1455 of yacc.c  */
-#line 8014 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8018 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_exists_subselect((yyvsp[(3) - (4)].select_lex));
             if ((yyval.item) == NULL)
@@ -26157,14 +26165,14 @@
   case 1137:
 
 /* Line 1455 of yacc.c  */
-#line 8020 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8024 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(3) - (4)].item); }
     break;
 
   case 1138:
 
 /* Line 1455 of yacc.c  */
-#line 8022 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8026 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(2) - (7)].item_list)->push_front((yyvsp[(5) - (7)].item));
             Item_func_match *i1= new (YYTHD->mem_root) Item_func_match(*(yyvsp[(2) - (7)].item_list), (yyvsp[(6) - (7)].num));
@@ -26178,7 +26186,7 @@
   case 1139:
 
 /* Line 1455 of yacc.c  */
-#line 8031 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8035 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= create_func_cast(YYTHD, (yyvsp[(2) - (2)].item), ITEM_CAST_CHAR, NULL, NULL,
                                  &my_charset_bin);
@@ -26190,7 +26198,7 @@
   case 1140:
 
 /* Line 1455 of yacc.c  */
-#line 8038 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8042 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             (yyval.item)= create_func_cast(YYTHD, (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), lex->length, lex->dec,
@@ -26203,7 +26211,7 @@
   case 1141:
 
 /* Line 1455 of yacc.c  */
-#line 8046 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8050 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_case(* (yyvsp[(3) - (5)].item_list), (yyvsp[(2) - (5)].item), (yyvsp[(4) - (5)].item) );
             if ((yyval.item) == NULL)
@@ -26214,7 +26222,7 @@
   case 1142:
 
 /* Line 1455 of yacc.c  */
-#line 8052 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8056 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= create_func_cast(YYTHD, (yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].cast_type), Lex->length, Lex->dec,
                                  Lex->charset);
@@ -26226,7 +26234,7 @@
   case 1143:
 
 /* Line 1455 of yacc.c  */
-#line 8059 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8063 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_conv_charset((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].charset));
             if ((yyval.item) == NULL)
@@ -26237,7 +26245,7 @@
   case 1144:
 
 /* Line 1455 of yacc.c  */
-#line 8065 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8069 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if ((yyvsp[(3) - (4)].item)->is_splocal())
             {
@@ -26256,7 +26264,7 @@
   case 1145:
 
 /* Line 1455 of yacc.c  */
-#line 8079 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8083 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_insert_value(Lex->current_context(),
                                                         (yyvsp[(3) - (4)].item));
@@ -26268,7 +26276,7 @@
   case 1146:
 
 /* Line 1455 of yacc.c  */
-#line 8087 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8091 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(5) - (5)].item),(yyvsp[(2) - (5)].item),(yyvsp[(3) - (5)].interval),0);
             if ((yyval.item) == NULL)
@@ -26279,7 +26287,7 @@
   case 1147:
 
 /* Line 1455 of yacc.c  */
-#line 8102 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8106 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (4)].item_list));
             if ((yyval.item) == NULL)
@@ -26290,7 +26298,7 @@
   case 1148:
 
 /* Line 1455 of yacc.c  */
-#line 8108 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8112 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_char(*(yyvsp[(3) - (6)].item_list), (yyvsp[(5) - (6)].charset));
             if ((yyval.item) == NULL)
@@ -26301,7 +26309,7 @@
   case 1149:
 
 /* Line 1455 of yacc.c  */
-#line 8114 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8118 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_current_user(Lex->current_context());
             if ((yyval.item) == NULL)
@@ -26314,7 +26322,7 @@
   case 1150:
 
 /* Line 1455 of yacc.c  */
-#line 8122 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8126 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_typecast((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26325,7 +26333,7 @@
   case 1151:
 
 /* Line 1455 of yacc.c  */
-#line 8128 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8132 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_dayofmonth((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26336,7 +26344,7 @@
   case 1152:
 
 /* Line 1455 of yacc.c  */
-#line 8134 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8138 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_hour((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26347,7 +26355,7 @@
   case 1153:
 
 /* Line 1455 of yacc.c  */
-#line 8140 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8144 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_insert((yyvsp[(3) - (10)].item),(yyvsp[(5) - (10)].item),(yyvsp[(7) - (10)].item),(yyvsp[(9) - (10)].item));
             if ((yyval.item) == NULL)
@@ -26358,7 +26366,7 @@
   case 1154:
 
 /* Line 1455 of yacc.c  */
-#line 8146 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8150 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             List<Item> *list= new (thd->mem_root) List<Item>;
@@ -26378,7 +26386,7 @@
   case 1155:
 
 /* Line 1455 of yacc.c  */
-#line 8161 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8165 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             (yyvsp[(7) - (8)].item_list)->push_front((yyvsp[(5) - (8)].item));
@@ -26395,7 +26403,7 @@
   case 1156:
 
 /* Line 1455 of yacc.c  */
-#line 8173 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8177 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_left((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26406,7 +26414,7 @@
   case 1157:
 
 /* Line 1455 of yacc.c  */
-#line 8179 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8183 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_minute((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26417,7 +26425,7 @@
   case 1158:
 
 /* Line 1455 of yacc.c  */
-#line 8185 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8189 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_month((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26428,7 +26436,7 @@
   case 1159:
 
 /* Line 1455 of yacc.c  */
-#line 8191 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8195 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_right((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26439,7 +26447,7 @@
   case 1160:
 
 /* Line 1455 of yacc.c  */
-#line 8197 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8201 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_second((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26450,7 +26458,7 @@
   case 1161:
 
 /* Line 1455 of yacc.c  */
-#line 8203 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8207 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_time_typecast((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26461,7 +26469,7 @@
   case 1162:
 
 /* Line 1455 of yacc.c  */
-#line 8209 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8213 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_datetime_typecast((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26472,7 +26480,7 @@
   case 1163:
 
 /* Line 1455 of yacc.c  */
-#line 8215 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8219 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_add_time((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item), 1, 0);
             if ((yyval.item) == NULL)
@@ -26483,7 +26491,7 @@
   case 1164:
 
 /* Line 1455 of yacc.c  */
-#line 8221 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8225 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26494,7 +26502,7 @@
   case 1165:
 
 /* Line 1455 of yacc.c  */
-#line 8227 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8231 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
             if ((yyval.item) == NULL)
@@ -26505,7 +26513,7 @@
   case 1166:
 
 /* Line 1455 of yacc.c  */
-#line 8233 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8237 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
             if ((yyval.item) == NULL)
@@ -26516,7 +26524,7 @@
   case 1167:
 
 /* Line 1455 of yacc.c  */
-#line 8239 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8243 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(6) - (7)].item),(yyvsp[(4) - (7)].item));
             if ((yyval.item) == NULL)
@@ -26527,7 +26535,7 @@
   case 1168:
 
 /* Line 1455 of yacc.c  */
-#line 8245 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8249 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_ltrim((yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26538,7 +26546,7 @@
   case 1169:
 
 /* Line 1455 of yacc.c  */
-#line 8251 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8255 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_rtrim((yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26549,7 +26557,7 @@
   case 1170:
 
 /* Line 1455 of yacc.c  */
-#line 8257 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8261 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26560,7 +26568,7 @@
   case 1171:
 
 /* Line 1455 of yacc.c  */
-#line 8263 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8267 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_trim((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26571,7 +26579,7 @@
   case 1172:
 
 /* Line 1455 of yacc.c  */
-#line 8269 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8273 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_user();
             if ((yyval.item) == NULL)
@@ -26584,7 +26592,7 @@
   case 1173:
 
 /* Line 1455 of yacc.c  */
-#line 8277 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8281 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_year((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26595,7 +26603,7 @@
   case 1174:
 
 /* Line 1455 of yacc.c  */
-#line 8298 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8302 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
                                                              INTERVAL_DAY, 0);
@@ -26607,7 +26615,7 @@
   case 1175:
 
 /* Line 1455 of yacc.c  */
-#line 8305 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8309 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 0);
             if ((yyval.item) == NULL)
@@ -26618,7 +26626,7 @@
   case 1176:
 
 /* Line 1455 of yacc.c  */
-#line 8311 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8315 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_local();
             if ((yyval.item) == NULL)
@@ -26630,7 +26638,7 @@
   case 1177:
 
 /* Line 1455 of yacc.c  */
-#line 8318 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8322 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_local();
             if ((yyval.item) == NULL)
@@ -26642,7 +26650,7 @@
   case 1178:
 
 /* Line 1455 of yacc.c  */
-#line 8325 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8329 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_local((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26654,7 +26662,7 @@
   case 1179:
 
 /* Line 1455 of yacc.c  */
-#line 8333 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8337 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),0);
             if ((yyval.item) == NULL)
@@ -26665,7 +26673,7 @@
   case 1180:
 
 /* Line 1455 of yacc.c  */
-#line 8340 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8344 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item),(yyvsp[(6) - (8)].item),(yyvsp[(7) - (8)].interval),1);
             if ((yyval.item) == NULL)
@@ -26676,7 +26684,7 @@
   case 1181:
 
 /* Line 1455 of yacc.c  */
-#line 8346 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8350 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_extract( (yyvsp[(3) - (6)].interval), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26687,7 +26695,7 @@
   case 1182:
 
 /* Line 1455 of yacc.c  */
-#line 8352 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8356 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_get_format((yyvsp[(3) - (6)].date_time_type), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26698,7 +26706,7 @@
   case 1183:
 
 /* Line 1455 of yacc.c  */
-#line 8358 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8362 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_now_local();
             if ((yyval.item) == NULL)
@@ -26710,7 +26718,7 @@
   case 1184:
 
 /* Line 1455 of yacc.c  */
-#line 8365 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8369 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_now_local((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26722,7 +26730,7 @@
   case 1185:
 
 /* Line 1455 of yacc.c  */
-#line 8372 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8376 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_func_locate((yyvsp[(5) - (6)].item),(yyvsp[(3) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26733,7 +26741,7 @@
   case 1186:
 
 /* Line 1455 of yacc.c  */
-#line 8378 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8382 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
                                                              INTERVAL_DAY, 1);
@@ -26745,7 +26753,7 @@
   case 1187:
 
 /* Line 1455 of yacc.c  */
-#line 8385 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8389 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(3) - (8)].item), (yyvsp[(6) - (8)].item), (yyvsp[(7) - (8)].interval), 1);
             if ((yyval.item) == NULL)
@@ -26756,7 +26764,7 @@
   case 1188:
 
 /* Line 1455 of yacc.c  */
-#line 8391 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8395 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -26767,7 +26775,7 @@
   case 1189:
 
 /* Line 1455 of yacc.c  */
-#line 8397 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8401 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26778,7 +26786,7 @@
   case 1190:
 
 /* Line 1455 of yacc.c  */
-#line 8403 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8407 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -26789,7 +26797,7 @@
   case 1191:
 
 /* Line 1455 of yacc.c  */
-#line 8409 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8413 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_substr((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26800,7 +26808,7 @@
   case 1192:
 
 /* Line 1455 of yacc.c  */
-#line 8415 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8419 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Unlike other time-related functions, SYSDATE() is
@@ -26823,7 +26831,7 @@
   case 1193:
 
 /* Line 1455 of yacc.c  */
-#line 8433 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8437 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (global_system_variables.sysdate_is_now == 0)
               (yyval.item)= new (YYTHD->mem_root) Item_func_sysdate_local((yyvsp[(3) - (4)].item));
@@ -26838,7 +26846,7 @@
   case 1194:
 
 /* Line 1455 of yacc.c  */
-#line 8443 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8447 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_date_add_interval((yyvsp[(7) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(3) - (8)].interval_time_st),0);
             if ((yyval.item) == NULL)
@@ -26849,7 +26857,7 @@
   case 1195:
 
 /* Line 1455 of yacc.c  */
-#line 8449 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8453 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_timestamp_diff((yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item),(yyvsp[(3) - (8)].interval_time_st));
             if ((yyval.item) == NULL)
@@ -26860,7 +26868,7 @@
   case 1196:
 
 /* Line 1455 of yacc.c  */
-#line 8455 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8459 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curdate_utc();
             if ((yyval.item) == NULL)
@@ -26872,7 +26880,7 @@
   case 1197:
 
 /* Line 1455 of yacc.c  */
-#line 8462 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8466 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_curtime_utc();
             if ((yyval.item) == NULL)
@@ -26884,7 +26892,7 @@
   case 1198:
 
 /* Line 1455 of yacc.c  */
-#line 8469 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8473 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_now_utc();
             if ((yyval.item) == NULL)
@@ -26896,7 +26904,7 @@
   case 1199:
 
 /* Line 1455 of yacc.c  */
-#line 8484 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8488 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_ascii((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26907,7 +26915,7 @@
   case 1200:
 
 /* Line 1455 of yacc.c  */
-#line 8490 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8494 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_charset((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26918,7 +26926,7 @@
   case 1201:
 
 /* Line 1455 of yacc.c  */
-#line 8496 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8500 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_coalesce(* (yyvsp[(3) - (4)].item_list));
             if ((yyval.item) == NULL)
@@ -26929,7 +26937,7 @@
   case 1202:
 
 /* Line 1455 of yacc.c  */
-#line 8502 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8506 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_collation((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26940,7 +26948,7 @@
   case 1203:
 
 /* Line 1455 of yacc.c  */
-#line 8508 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8512 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_database();
             if ((yyval.item) == NULL)
@@ -26952,7 +26960,7 @@
   case 1204:
 
 /* Line 1455 of yacc.c  */
-#line 8515 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8519 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_if((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -26963,7 +26971,7 @@
   case 1205:
 
 /* Line 1455 of yacc.c  */
-#line 8521 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8525 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_microsecond((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26974,7 +26982,7 @@
   case 1206:
 
 /* Line 1455 of yacc.c  */
-#line 8527 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8531 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_func_mod((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -26985,7 +26993,7 @@
   case 1207:
 
 /* Line 1455 of yacc.c  */
-#line 8533 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8537 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)=  new (YYTHD->mem_root) Item_func_old_password((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -26996,7 +27004,7 @@
   case 1208:
 
 /* Line 1455 of yacc.c  */
-#line 8539 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8543 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item* i1;
@@ -27013,7 +27021,7 @@
   case 1209:
 
 /* Line 1455 of yacc.c  */
-#line 8551 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8555 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_func_quarter((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27024,7 +27032,7 @@
   case 1210:
 
 /* Line 1455 of yacc.c  */
-#line 8557 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8561 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_repeat((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -27035,7 +27043,7 @@
   case 1211:
 
 /* Line 1455 of yacc.c  */
-#line 8563 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8567 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_replace((yyvsp[(3) - (8)].item),(yyvsp[(5) - (8)].item),(yyvsp[(7) - (8)].item));
             if ((yyval.item) == NULL)
@@ -27046,7 +27054,7 @@
   case 1212:
 
 /* Line 1455 of yacc.c  */
-#line 8569 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8573 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_round((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item),1);
             if ((yyval.item) == NULL)
@@ -27057,7 +27065,7 @@
   case 1213:
 
 /* Line 1455 of yacc.c  */
-#line 8575 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8579 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Item *i1= new (thd->mem_root) Item_int((char*) "0",
@@ -27074,7 +27082,7 @@
   case 1214:
 
 /* Line 1455 of yacc.c  */
-#line 8587 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8591 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_week((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item));
             if ((yyval.item) == NULL)
@@ -27085,7 +27093,7 @@
   case 1215:
 
 /* Line 1455 of yacc.c  */
-#line 8593 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8597 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef HAVE_SPATIAL
             (yyval.item)= (yyvsp[(1) - (1)].item);
@@ -27103,7 +27111,7 @@
   case 1216:
 
 /* Line 1455 of yacc.c  */
-#line 8609 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8613 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_rel((yyvsp[(3) - (6)].item), (yyvsp[(5) - (6)].item),
@@ -27114,7 +27122,7 @@
   case 1217:
 
 /* Line 1455 of yacc.c  */
-#line 8615 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8619 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -27126,7 +27134,7 @@
   case 1218:
 
 /* Line 1455 of yacc.c  */
-#line 8622 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8626 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -27138,7 +27146,7 @@
   case 1219:
 
 /* Line 1455 of yacc.c  */
-#line 8629 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8633 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -27150,7 +27158,7 @@
   case 1220:
 
 /* Line 1455 of yacc.c  */
-#line 8636 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8640 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -27162,7 +27170,7 @@
   case 1221:
 
 /* Line 1455 of yacc.c  */
-#line 8643 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8647 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -27174,7 +27182,7 @@
   case 1222:
 
 /* Line 1455 of yacc.c  */
-#line 8650 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8654 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD, Item_func_point((yyvsp[(3) - (6)].item),(yyvsp[(5) - (6)].item)));
           }
@@ -27183,7 +27191,7 @@
   case 1223:
 
 /* Line 1455 of yacc.c  */
-#line 8654 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8658 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= GEOM_NEW(YYTHD,
                          Item_func_spatial_collection(* (yyvsp[(3) - (4)].item_list),
@@ -27195,7 +27203,7 @@
   case 1224:
 
 /* Line 1455 of yacc.c  */
-#line 8673 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8677 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef HAVE_DLOPEN
             udf_func *udf= 0;
@@ -27219,7 +27227,7 @@
   case 1225:
 
 /* Line 1455 of yacc.c  */
-#line 8692 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8696 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Create_func *builder;
@@ -27278,7 +27286,7 @@
   case 1226:
 
 /* Line 1455 of yacc.c  */
-#line 8746 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8750 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Create_qfunc *builder;
@@ -27322,63 +27330,63 @@
   case 1227:
 
 /* Line 1455 of yacc.c  */
-#line 8788 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8792 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= (yyvsp[(1) - (2)].num) | (yyvsp[(2) - (2)].num); }
     break;
 
   case 1228:
 
 /* Line 1455 of yacc.c  */
-#line 8790 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8794 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= FT_BOOL; }
     break;
 
   case 1229:
 
 /* Line 1455 of yacc.c  */
-#line 8794 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8798 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= FT_NL; }
     break;
 
   case 1230:
 
 /* Line 1455 of yacc.c  */
-#line 8795 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8799 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= FT_NL; }
     break;
 
   case 1231:
 
 /* Line 1455 of yacc.c  */
-#line 8799 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8803 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0;         }
     break;
 
   case 1232:
 
 /* Line 1455 of yacc.c  */
-#line 8800 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8804 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= FT_EXPAND; }
     break;
 
   case 1233:
 
 /* Line 1455 of yacc.c  */
-#line 8804 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8808 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item_list)= NULL; }
     break;
 
   case 1234:
 
 /* Line 1455 of yacc.c  */
-#line 8805 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8809 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
     break;
 
   case 1235:
 
 /* Line 1455 of yacc.c  */
-#line 8810 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8814 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
             if ((yyval.item_list) == NULL)
@@ -27390,7 +27398,7 @@
   case 1236:
 
 /* Line 1455 of yacc.c  */
-#line 8817 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8821 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
             (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
@@ -27400,7 +27408,7 @@
   case 1237:
 
 /* Line 1455 of yacc.c  */
-#line 8825 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8829 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
              Use Item::name as a storage for the attribute value of user
@@ -27428,7 +27436,7 @@
   case 1238:
 
 /* Line 1455 of yacc.c  */
-#line 8851 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8855 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(3) - (4)].item), FALSE);
             if ((yyval.item) == NULL)
@@ -27439,7 +27447,7 @@
   case 1239:
 
 /* Line 1455 of yacc.c  */
-#line 8857 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8861 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_avg((yyvsp[(4) - (5)].item), TRUE);
             if ((yyval.item) == NULL)
@@ -27450,7 +27458,7 @@
   case 1240:
 
 /* Line 1455 of yacc.c  */
-#line 8863 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8867 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_and((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27461,7 +27469,7 @@
   case 1241:
 
 /* Line 1455 of yacc.c  */
-#line 8869 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8873 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_or((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27472,7 +27480,7 @@
   case 1242:
 
 /* Line 1455 of yacc.c  */
-#line 8875 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8879 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_xor((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27483,7 +27491,7 @@
   case 1243:
 
 /* Line 1455 of yacc.c  */
-#line 8881 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8885 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *item= new (YYTHD->mem_root) Item_int((int32) 0L,1);
             if (item == NULL)
@@ -27497,7 +27505,7 @@
   case 1244:
 
 /* Line 1455 of yacc.c  */
-#line 8890 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8894 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_count((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27508,21 +27516,21 @@
   case 1245:
 
 /* Line 1455 of yacc.c  */
-#line 8896 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8900 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->in_sum_expr++; }
     break;
 
   case 1246:
 
 /* Line 1455 of yacc.c  */
-#line 8898 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8902 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->in_sum_expr--; }
     break;
 
   case 1247:
 
 /* Line 1455 of yacc.c  */
-#line 8900 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8904 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_count(* (yyvsp[(5) - (7)].item_list));
             if ((yyval.item) == NULL)
@@ -27533,7 +27541,7 @@
   case 1248:
 
 /* Line 1455 of yacc.c  */
-#line 8906 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8910 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27544,7 +27552,7 @@
   case 1249:
 
 /* Line 1455 of yacc.c  */
-#line 8917 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8921 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_min((yyvsp[(4) - (5)].item));
             if ((yyval.item) == NULL)
@@ -27555,7 +27563,7 @@
   case 1250:
 
 /* Line 1455 of yacc.c  */
-#line 8923 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8927 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(3) - (4)].item));
             if ((yyval.item) == NULL)
@@ -27566,7 +27574,7 @@
   case 1251:
 
 /* Line 1455 of yacc.c  */
-#line 8929 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8933 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_max((yyvsp[(4) - (5)].item));
             if ((yyval.item) == NULL)
@@ -27577,7 +27585,7 @@
   case 1252:
 
 /* Line 1455 of yacc.c  */
-#line 8935 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8939 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 0);
             if ((yyval.item) == NULL)
@@ -27588,7 +27596,7 @@
   case 1253:
 
 /* Line 1455 of yacc.c  */
-#line 8941 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8945 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 0);
             if ((yyval.item) == NULL)
@@ -27599,7 +27607,7 @@
   case 1254:
 
 /* Line 1455 of yacc.c  */
-#line 8947 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8951 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_std((yyvsp[(3) - (4)].item), 1);
             if ((yyval.item) == NULL)
@@ -27610,7 +27618,7 @@
   case 1255:
 
 /* Line 1455 of yacc.c  */
-#line 8953 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8957 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_variance((yyvsp[(3) - (4)].item), 1);
             if ((yyval.item) == NULL)
@@ -27621,7 +27629,7 @@
   case 1256:
 
 /* Line 1455 of yacc.c  */
-#line 8959 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8963 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(3) - (4)].item), FALSE);
             if ((yyval.item) == NULL)
@@ -27632,7 +27640,7 @@
   case 1257:
 
 /* Line 1455 of yacc.c  */
-#line 8965 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8969 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_sum_sum((yyvsp[(4) - (5)].item), TRUE);
             if ((yyval.item) == NULL)
@@ -27643,14 +27651,14 @@
   case 1258:
 
 /* Line 1455 of yacc.c  */
-#line 8971 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8975 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->in_sum_expr++; }
     break;
 
   case 1259:
 
 /* Line 1455 of yacc.c  */
-#line 8975 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8979 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->in_sum_expr--;
@@ -27667,7 +27675,7 @@
   case 1260:
 
 /* Line 1455 of yacc.c  */
-#line 8990 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 8994 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (! Lex->parsing_options.allows_variable)
             {
@@ -27680,7 +27688,7 @@
   case 1261:
 
 /* Line 1455 of yacc.c  */
-#line 8998 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9002 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= (yyvsp[(3) - (3)].item);
           }
@@ -27689,7 +27697,7 @@
   case 1262:
 
 /* Line 1455 of yacc.c  */
-#line 9005 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9009 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item_func_set_user_var *item;
             (yyval.item)= item= new (YYTHD->mem_root) Item_func_set_user_var((yyvsp[(1) - (3)].lex_str), (yyvsp[(3) - (3)].item), false);
@@ -27704,7 +27712,7 @@
   case 1263:
 
 /* Line 1455 of yacc.c  */
-#line 9015 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9019 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_func_get_user_var((yyvsp[(1) - (1)].lex_str));
             if ((yyval.item) == NULL)
@@ -27717,7 +27725,7 @@
   case 1264:
 
 /* Line 1455 of yacc.c  */
-#line 9023 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9027 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* disallow "SELECT @@global.global.variable" */
             if ((yyvsp[(3) - (4)].lex_str).str && (yyvsp[(4) - (4)].lex_str).str && check_reserved_words(&(yyvsp[(3) - (4)].lex_str)))
@@ -27735,21 +27743,21 @@
   case 1265:
 
 /* Line 1455 of yacc.c  */
-#line 9038 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9042 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) = 0; }
     break;
 
   case 1266:
 
 /* Line 1455 of yacc.c  */
-#line 9039 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9043 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) = 1; }
     break;
 
   case 1267:
 
 /* Line 1455 of yacc.c  */
-#line 9044 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9048 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.string)= new (YYTHD->mem_root) String(",", 1, &my_charset_latin1);
             if ((yyval.string) == NULL)
@@ -27760,14 +27768,14 @@
   case 1268:
 
 /* Line 1455 of yacc.c  */
-#line 9049 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9053 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.string) = (yyvsp[(2) - (2)].string); }
     break;
 
   case 1270:
 
 /* Line 1455 of yacc.c  */
-#line 9055 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9059 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -27785,21 +27793,21 @@
   case 1272:
 
 /* Line 1455 of yacc.c  */
-#line 9072 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9076 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { if (add_gorder_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
     break;
 
   case 1273:
 
 /* Line 1455 of yacc.c  */
-#line 9074 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9078 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { if (add_gorder_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
     break;
 
   case 1274:
 
 /* Line 1455 of yacc.c  */
-#line 9079 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9083 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->current_select->inc_in_sum_expr())
@@ -27813,7 +27821,7 @@
   case 1275:
 
 /* Line 1455 of yacc.c  */
-#line 9088 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9092 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->in_sum_expr--;
             (yyval.item)= (yyvsp[(3) - (3)].item);
@@ -27823,98 +27831,98 @@
   case 1276:
 
 /* Line 1455 of yacc.c  */
-#line 9096 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9100 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= &my_charset_bin; Lex->dec= 0; }
     break;
 
   case 1277:
 
 /* Line 1455 of yacc.c  */
-#line 9098 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9102 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->dec= 0; }
     break;
 
   case 1278:
 
 /* Line 1455 of yacc.c  */
-#line 9100 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9104 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_CHAR; Lex->charset= national_charset_info; Lex->dec=0; }
     break;
 
   case 1279:
 
 /* Line 1455 of yacc.c  */
-#line 9102 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9106 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1280:
 
 /* Line 1455 of yacc.c  */
-#line 9104 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9108 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_SIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1281:
 
 /* Line 1455 of yacc.c  */
-#line 9106 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9110 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1282:
 
 /* Line 1455 of yacc.c  */
-#line 9108 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9112 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_UNSIGNED_INT; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1283:
 
 /* Line 1455 of yacc.c  */
-#line 9110 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9114 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_DATE; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1284:
 
 /* Line 1455 of yacc.c  */
-#line 9112 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9116 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_TIME; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1285:
 
 /* Line 1455 of yacc.c  */
-#line 9114 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9118 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_DATETIME; Lex->charset= NULL; Lex->dec=Lex->length= (char*)0; }
     break;
 
   case 1286:
 
 /* Line 1455 of yacc.c  */
-#line 9116 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9120 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.cast_type)=ITEM_CAST_DECIMAL; Lex->charset= NULL; }
     break;
 
   case 1287:
 
 /* Line 1455 of yacc.c  */
-#line 9120 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9124 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item_list)= NULL; }
     break;
 
   case 1288:
 
 /* Line 1455 of yacc.c  */
-#line 9121 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9125 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(1) - (1)].item_list);}
     break;
 
   case 1289:
 
 /* Line 1455 of yacc.c  */
-#line 9126 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9130 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
             if ((yyval.item_list) == NULL)
@@ -27926,7 +27934,7 @@
   case 1290:
 
 /* Line 1455 of yacc.c  */
-#line 9133 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9137 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
             (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
@@ -27936,21 +27944,21 @@
   case 1291:
 
 /* Line 1455 of yacc.c  */
-#line 9140 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9144 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(1) - (1)].item_list); }
     break;
 
   case 1292:
 
 /* Line 1455 of yacc.c  */
-#line 9141 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9145 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item_list)= (yyvsp[(2) - (3)].item_list); }
     break;
 
   case 1293:
 
 /* Line 1455 of yacc.c  */
-#line 9146 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9150 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new (YYTHD->mem_root) List<Item>;
             if ((yyval.item_list) == NULL)
@@ -27962,7 +27970,7 @@
   case 1294:
 
 /* Line 1455 of yacc.c  */
-#line 9153 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9157 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (3)].item_list)->push_back((yyvsp[(3) - (3)].item));
             (yyval.item_list)= (yyvsp[(1) - (3)].item_list);
@@ -27972,35 +27980,35 @@
   case 1295:
 
 /* Line 1455 of yacc.c  */
-#line 9160 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9164 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= NULL; }
     break;
 
   case 1296:
 
 /* Line 1455 of yacc.c  */
-#line 9161 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9165 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1297:
 
 /* Line 1455 of yacc.c  */
-#line 9165 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9169 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= NULL; }
     break;
 
   case 1298:
 
 /* Line 1455 of yacc.c  */
-#line 9166 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9170 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(2) - (2)].item); }
     break;
 
   case 1299:
 
 /* Line 1455 of yacc.c  */
-#line 9171 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9175 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_list)= new List<Item>;
             if ((yyval.item_list) == NULL)
@@ -28013,7 +28021,7 @@
   case 1300:
 
 /* Line 1455 of yacc.c  */
-#line 9179 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9183 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(3) - (5)].item));
             (yyvsp[(1) - (5)].item_list)->push_back((yyvsp[(5) - (5)].item));
@@ -28024,14 +28032,14 @@
   case 1301:
 
 /* Line 1455 of yacc.c  */
-#line 9189 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9193 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
     break;
 
   case 1302:
 
 /* Line 1455 of yacc.c  */
-#line 9191 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9195 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!((yyval.table_list)= lex->current_select->nest_last_join(lex->thd)))
@@ -28042,35 +28050,35 @@
   case 1303:
 
 /* Line 1455 of yacc.c  */
-#line 9199 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9203 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { MYSQL_YYABORT_UNLESS((yyval.table_list)=(yyvsp[(1) - (1)].table_list)); }
     break;
 
   case 1304:
 
 /* Line 1455 of yacc.c  */
-#line 9210 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9214 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
     break;
 
   case 1305:
 
 /* Line 1455 of yacc.c  */
-#line 9211 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9215 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(3) - (4)].table_list); }
     break;
 
   case 1306:
 
 /* Line 1455 of yacc.c  */
-#line 9217 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9221 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.table_list)=(yyvsp[(1) - (1)].table_list); }
     break;
 
   case 1307:
 
 /* Line 1455 of yacc.c  */
-#line 9219 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9223 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list)));
           }
@@ -28079,21 +28087,21 @@
   case 1308:
 
 /* Line 1455 of yacc.c  */
-#line 9239 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9243 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); }
     break;
 
   case 1309:
 
 /* Line 1455 of yacc.c  */
-#line 9241 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9245 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].table_list) && ((yyval.table_list)=(yyvsp[(3) - (3)].table_list))); (yyvsp[(3) - (3)].table_list)->straight=1; }
     break;
 
   case 1310:
 
 /* Line 1455 of yacc.c  */
-#line 9244 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9248 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -28106,7 +28114,7 @@
   case 1311:
 
 /* Line 1455 of yacc.c  */
-#line 9252 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9256 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
             Lex->pop_context();
@@ -28117,7 +28125,7 @@
   case 1312:
 
 /* Line 1455 of yacc.c  */
-#line 9259 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9263 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -28130,7 +28138,7 @@
   case 1313:
 
 /* Line 1455 of yacc.c  */
-#line 9267 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9271 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(3) - (6)].table_list)->straight=1;
             add_join_on((yyvsp[(3) - (6)].table_list),(yyvsp[(6) - (6)].item));
@@ -28142,7 +28150,7 @@
   case 1314:
 
 /* Line 1455 of yacc.c  */
-#line 9275 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9279 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && (yyvsp[(3) - (4)].table_list));
           }
@@ -28151,14 +28159,14 @@
   case 1315:
 
 /* Line 1455 of yacc.c  */
-#line 9279 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9283 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { add_join_natural((yyvsp[(1) - (8)].table_list),(yyvsp[(3) - (8)].table_list),(yyvsp[(7) - (8)].string_list),Select); (yyval.table_list)=(yyvsp[(3) - (8)].table_list); }
     break;
 
   case 1316:
 
 /* Line 1455 of yacc.c  */
-#line 9281 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9285 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (4)].table_list) && ((yyval.table_list)=(yyvsp[(4) - (4)].table_list)));
             add_join_natural((yyvsp[(1) - (4)].table_list),(yyvsp[(4) - (4)].table_list),NULL,Select);
@@ -28168,7 +28176,7 @@
   case 1317:
 
 /* Line 1455 of yacc.c  */
-#line 9289 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9293 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -28181,7 +28189,7 @@
   case 1318:
 
 /* Line 1455 of yacc.c  */
-#line 9297 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9301 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             add_join_on((yyvsp[(5) - (8)].table_list),(yyvsp[(8) - (8)].item));
             Lex->pop_context();
@@ -28194,7 +28202,7 @@
   case 1319:
 
 /* Line 1455 of yacc.c  */
-#line 9305 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9309 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
           }
@@ -28203,7 +28211,7 @@
   case 1320:
 
 /* Line 1455 of yacc.c  */
-#line 9309 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9313 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             add_join_natural((yyvsp[(1) - (10)].table_list),(yyvsp[(5) - (10)].table_list),(yyvsp[(9) - (10)].string_list),Select); 
             (yyvsp[(5) - (10)].table_list)->outer_join|=JOIN_TYPE_LEFT; 
@@ -28214,7 +28222,7 @@
   case 1321:
 
 /* Line 1455 of yacc.c  */
-#line 9315 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9319 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list));
             add_join_natural((yyvsp[(1) - (6)].table_list),(yyvsp[(6) - (6)].table_list),NULL,Select);
@@ -28226,7 +28234,7 @@
   case 1322:
 
 /* Line 1455 of yacc.c  */
-#line 9325 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9329 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(5) - (6)].table_list));
             /* Change the current name resolution context to a local context. */
@@ -28239,7 +28247,7 @@
   case 1323:
 
 /* Line 1455 of yacc.c  */
-#line 9333 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9337 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -28253,7 +28261,7 @@
   case 1324:
 
 /* Line 1455 of yacc.c  */
-#line 9342 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9346 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].table_list) && (yyvsp[(5) - (5)].table_list));
           }
@@ -28262,7 +28270,7 @@
   case 1325:
 
 /* Line 1455 of yacc.c  */
-#line 9346 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9350 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (!((yyval.table_list)= lex->current_select->convert_right_join()))
@@ -28274,7 +28282,7 @@
   case 1326:
 
 /* Line 1455 of yacc.c  */
-#line 9353 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9357 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (6)].table_list) && (yyvsp[(6) - (6)].table_list));
             add_join_natural((yyvsp[(6) - (6)].table_list),(yyvsp[(1) - (6)].table_list),NULL,Select);
@@ -28287,28 +28295,28 @@
   case 1327:
 
 /* Line 1455 of yacc.c  */
-#line 9363 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9367 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1328:
 
 /* Line 1455 of yacc.c  */
-#line 9364 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9368 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1329:
 
 /* Line 1455 of yacc.c  */
-#line 9365 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9369 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1330:
 
 /* Line 1455 of yacc.c  */
-#line 9377 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9381 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->table_join_options= 0;
@@ -28318,7 +28326,7 @@
   case 1331:
 
 /* Line 1455 of yacc.c  */
-#line 9382 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9386 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyval.table_list)= Select->add_table_to_list(YYTHD, (yyvsp[(2) - (4)].table), (yyvsp[(3) - (4)].lex_str_ptr),
                                                 Select->get_table_join_options(),
@@ -28333,7 +28341,7 @@
   case 1332:
 
 /* Line 1455 of yacc.c  */
-#line 9392 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9396 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -28360,7 +28368,7 @@
   case 1333:
 
 /* Line 1455 of yacc.c  */
-#line 9432 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9436 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* Use $2 instead of Lex->current_select as derived table will
                alter value of Lex->current_select. */
@@ -28415,7 +28423,7 @@
   case 1334:
 
 /* Line 1455 of yacc.c  */
-#line 9504 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9508 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (2)].table_list) && (yyvsp[(2) - (2)].is_not_empty))
             {
@@ -28428,7 +28436,7 @@
   case 1335:
 
 /* Line 1455 of yacc.c  */
-#line 9514 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9518 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
               MYSQL_YYABORT;
@@ -28438,7 +28446,7 @@
   case 1336:
 
 /* Line 1455 of yacc.c  */
-#line 9519 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9523 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Remove from the name resolution context stack the context of the
@@ -28451,7 +28459,7 @@
   case 1337:
 
 /* Line 1455 of yacc.c  */
-#line 9527 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9531 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if ((yyvsp[(1) - (7)].table_list) != NULL)
             {
@@ -28464,7 +28472,7 @@
   case 1338:
 
 /* Line 1455 of yacc.c  */
-#line 9539 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9543 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX * sel= lex->current_select;
@@ -28485,7 +28493,7 @@
   case 1339:
 
 /* Line 1455 of yacc.c  */
-#line 9558 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9562 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -28498,7 +28506,7 @@
   case 1340:
 
 /* Line 1455 of yacc.c  */
-#line 9566 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9570 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -28507,7 +28515,7 @@
   case 1342:
 
 /* Line 1455 of yacc.c  */
-#line 9575 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9579 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if ((yyvsp[(1) - (1)].select_lex)->init_nested_join(lex->thd))
@@ -28518,7 +28526,7 @@
   case 1343:
 
 /* Line 1455 of yacc.c  */
-#line 9581 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9585 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             /* for normal joins, $3 != NULL and end_nested_join() != NULL,
@@ -28537,7 +28545,7 @@
   case 1344:
 
 /* Line 1455 of yacc.c  */
-#line 9597 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9601 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->derived_tables|= DERIVED_SUBQUERY;
@@ -28559,7 +28567,7 @@
   case 1345:
 
 /* Line 1455 of yacc.c  */
-#line 9614 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9618 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -28568,14 +28576,14 @@
   case 1347:
 
 /* Line 1455 of yacc.c  */
-#line 9621 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9625 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.select_lex)= Select; }
     break;
 
   case 1348:
 
 /* Line 1455 of yacc.c  */
-#line 9626 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9630 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -28603,21 +28611,21 @@
   case 1349:
 
 /* Line 1455 of yacc.c  */
-#line 9651 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9655 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1350:
 
 /* Line 1455 of yacc.c  */
-#line 9652 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9656 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1351:
 
 /* Line 1455 of yacc.c  */
-#line 9657 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9661 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.num)= old_mode ?  INDEX_HINT_MASK_JOIN : INDEX_HINT_MASK_ALL; 
           }
@@ -28626,42 +28634,42 @@
   case 1352:
 
 /* Line 1455 of yacc.c  */
-#line 9660 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9664 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= INDEX_HINT_MASK_JOIN;  }
     break;
 
   case 1353:
 
 /* Line 1455 of yacc.c  */
-#line 9661 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9665 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= INDEX_HINT_MASK_ORDER; }
     break;
 
   case 1354:
 
 /* Line 1455 of yacc.c  */
-#line 9662 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9666 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= INDEX_HINT_MASK_GROUP; }
     break;
 
   case 1355:
 
 /* Line 1455 of yacc.c  */
-#line 9666 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9670 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.index_hint)= INDEX_HINT_FORCE; }
     break;
 
   case 1356:
 
 /* Line 1455 of yacc.c  */
-#line 9667 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9671 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.index_hint)= INDEX_HINT_IGNORE; }
     break;
 
   case 1357:
 
 /* Line 1455 of yacc.c  */
-#line 9672 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9676 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->set_index_hint_type((yyvsp[(1) - (3)].index_hint), (yyvsp[(3) - (3)].num));
           }
@@ -28670,7 +28678,7 @@
   case 1359:
 
 /* Line 1455 of yacc.c  */
-#line 9677 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9681 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->set_index_hint_type(INDEX_HINT_USE, (yyvsp[(3) - (3)].num));
           }
@@ -28679,49 +28687,49 @@
   case 1364:
 
 /* Line 1455 of yacc.c  */
-#line 9690 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9694 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->alloc_index_hints(YYTHD); }
     break;
 
   case 1366:
 
 /* Line 1455 of yacc.c  */
-#line 9694 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9698 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {  Select->clear_index_hints(); }
     break;
 
   case 1368:
 
 /* Line 1455 of yacc.c  */
-#line 9699 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9703 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->add_index_hint(YYTHD, NULL, 0); }
     break;
 
   case 1369:
 
 /* Line 1455 of yacc.c  */
-#line 9700 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9704 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1370:
 
 /* Line 1455 of yacc.c  */
-#line 9705 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9709 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->add_index_hint(YYTHD, (yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length); }
     break;
 
   case 1371:
 
 /* Line 1455 of yacc.c  */
-#line 9707 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9711 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->add_index_hint(YYTHD, (char *)"PRIMARY", 7); }
     break;
 
   case 1374:
 
 /* Line 1455 of yacc.c  */
-#line 9717 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9721 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyval.string_list)= new List<String>))
               MYSQL_YYABORT;
@@ -28737,7 +28745,7 @@
   case 1375:
 
 /* Line 1455 of yacc.c  */
-#line 9728 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9732 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             String *s= new (YYTHD->mem_root) String((const char *) (yyvsp[(3) - (3)].lex_str).str,
                                                     (yyvsp[(3) - (3)].lex_str).length,
@@ -28752,189 +28760,189 @@
   case 1376:
 
 /* Line 1455 of yacc.c  */
-#line 9740 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9744 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1377:
 
 /* Line 1455 of yacc.c  */
-#line 9741 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9745 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_HOUR; }
     break;
 
   case 1378:
 
 /* Line 1455 of yacc.c  */
-#line 9742 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9746 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_MICROSECOND; }
     break;
 
   case 1379:
 
 /* Line 1455 of yacc.c  */
-#line 9743 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9747 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_MINUTE; }
     break;
 
   case 1380:
 
 /* Line 1455 of yacc.c  */
-#line 9744 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9748 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_DAY_SECOND; }
     break;
 
   case 1381:
 
 /* Line 1455 of yacc.c  */
-#line 9745 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9749 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_HOUR_MICROSECOND; }
     break;
 
   case 1382:
 
 /* Line 1455 of yacc.c  */
-#line 9746 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9750 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_HOUR_MINUTE; }
     break;
 
   case 1383:
 
 /* Line 1455 of yacc.c  */
-#line 9747 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9751 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_HOUR_SECOND; }
     break;
 
   case 1384:
 
 /* Line 1455 of yacc.c  */
-#line 9748 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9752 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_MINUTE_MICROSECOND; }
     break;
 
   case 1385:
 
 /* Line 1455 of yacc.c  */
-#line 9749 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9753 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_MINUTE_SECOND; }
     break;
 
   case 1386:
 
 /* Line 1455 of yacc.c  */
-#line 9750 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9754 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_SECOND_MICROSECOND; }
     break;
 
   case 1387:
 
 /* Line 1455 of yacc.c  */
-#line 9751 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9755 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval)=INTERVAL_YEAR_MONTH; }
     break;
 
   case 1388:
 
 /* Line 1455 of yacc.c  */
-#line 9755 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9759 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_DAY; }
     break;
 
   case 1389:
 
 /* Line 1455 of yacc.c  */
-#line 9756 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9760 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_WEEK; }
     break;
 
   case 1390:
 
 /* Line 1455 of yacc.c  */
-#line 9757 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9761 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_HOUR; }
     break;
 
   case 1391:
 
 /* Line 1455 of yacc.c  */
-#line 9758 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9762 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_MINUTE; }
     break;
 
   case 1392:
 
 /* Line 1455 of yacc.c  */
-#line 9759 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9763 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_MONTH; }
     break;
 
   case 1393:
 
 /* Line 1455 of yacc.c  */
-#line 9760 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9764 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_QUARTER; }
     break;
 
   case 1394:
 
 /* Line 1455 of yacc.c  */
-#line 9761 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9765 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_SECOND; }
     break;
 
   case 1395:
 
 /* Line 1455 of yacc.c  */
-#line 9762 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9766 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_MICROSECOND; }
     break;
 
   case 1396:
 
 /* Line 1455 of yacc.c  */
-#line 9763 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9767 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.interval_time_st)=INTERVAL_YEAR; }
     break;
 
   case 1397:
 
 /* Line 1455 of yacc.c  */
-#line 9767 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9771 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.date_time_type)=MYSQL_TIMESTAMP_DATE;}
     break;
 
   case 1398:
 
 /* Line 1455 of yacc.c  */
-#line 9768 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9772 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.date_time_type)=MYSQL_TIMESTAMP_TIME;}
     break;
 
   case 1399:
 
 /* Line 1455 of yacc.c  */
-#line 9769 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9773 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
     break;
 
   case 1400:
 
 /* Line 1455 of yacc.c  */
-#line 9770 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9774 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.date_time_type)=MYSQL_TIMESTAMP_DATETIME;}
     break;
 
   case 1404:
 
 /* Line 1455 of yacc.c  */
-#line 9780 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9784 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str_ptr)=0; }
     break;
 
   case 1405:
 
 /* Line 1455 of yacc.c  */
-#line 9782 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9786 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.lex_str_ptr)= (LEX_STRING*) sql_memdup(&(yyvsp[(2) - (2)].lex_str),sizeof(LEX_STRING));
             if ((yyval.lex_str_ptr) == NULL)
@@ -28945,14 +28953,14 @@
   case 1408:
 
 /* Line 1455 of yacc.c  */
-#line 9795 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9799 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->where= 0; }
     break;
 
   case 1409:
 
 /* Line 1455 of yacc.c  */
-#line 9797 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9801 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= IN_WHERE;
           }
@@ -28961,7 +28969,7 @@
   case 1410:
 
 /* Line 1455 of yacc.c  */
-#line 9801 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9805 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *select= Select;
             select->where= (yyvsp[(3) - (3)].item);
@@ -28974,7 +28982,7 @@
   case 1412:
 
 /* Line 1455 of yacc.c  */
-#line 9813 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9817 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= IN_HAVING;
           }
@@ -28983,7 +28991,7 @@
   case 1413:
 
 /* Line 1455 of yacc.c  */
-#line 9817 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9821 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->having= (yyvsp[(3) - (3)].item);
@@ -28996,7 +29004,7 @@
   case 1414:
 
 /* Line 1455 of yacc.c  */
-#line 9828 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9832 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->escape_used= TRUE;
             (yyval.item)= (yyvsp[(2) - (2)].item);
@@ -29006,7 +29014,7 @@
   case 1415:
 
 /* Line 1455 of yacc.c  */
-#line 9833 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9837 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             Lex->escape_used= FALSE;
@@ -29021,28 +29029,28 @@
   case 1418:
 
 /* Line 1455 of yacc.c  */
-#line 9855 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9859 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { if (add_group_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
     break;
 
   case 1419:
 
 /* Line 1455 of yacc.c  */
-#line 9857 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9861 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { if (add_group_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
     break;
 
   case 1420:
 
 /* Line 1455 of yacc.c  */
-#line 9861 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9865 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1421:
 
 /* Line 1455 of yacc.c  */
-#line 9863 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9867 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               'WITH CUBE' is reserved in the MySQL syntax, but not implemented,
@@ -29067,7 +29075,7 @@
   case 1422:
 
 /* Line 1455 of yacc.c  */
-#line 9883 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9887 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               'WITH ROLLUP' is needed for backward compatibility,
@@ -29090,7 +29098,7 @@
   case 1426:
 
 /* Line 1455 of yacc.c  */
-#line 9917 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9921 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             bool ascending= ((yyvsp[(2) - (2)].num) == 1) ? true : false;
@@ -29102,7 +29110,7 @@
   case 1429:
 
 /* Line 1455 of yacc.c  */
-#line 9936 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9940 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -29138,42 +29146,42 @@
   case 1431:
 
 /* Line 1455 of yacc.c  */
-#line 9971 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9975 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { if (add_order_to_list(YYTHD, (yyvsp[(3) - (4)].item),(bool) (yyvsp[(4) - (4)].num))) MYSQL_YYABORT; }
     break;
 
   case 1432:
 
 /* Line 1455 of yacc.c  */
-#line 9973 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9977 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { if (add_order_to_list(YYTHD, (yyvsp[(1) - (2)].item),(bool) (yyvsp[(2) - (2)].num))) MYSQL_YYABORT; }
     break;
 
   case 1433:
 
 /* Line 1455 of yacc.c  */
-#line 9977 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9981 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) =  1; }
     break;
 
   case 1434:
 
 /* Line 1455 of yacc.c  */
-#line 9978 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9982 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) =1; }
     break;
 
   case 1435:
 
 /* Line 1455 of yacc.c  */
-#line 9979 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9983 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num) =0; }
     break;
 
   case 1436:
 
 /* Line 1455 of yacc.c  */
-#line 9984 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9988 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             SELECT_LEX *sel= lex->current_select;
@@ -29185,28 +29193,28 @@
   case 1437:
 
 /* Line 1455 of yacc.c  */
-#line 9990 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9994 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1438:
 
 /* Line 1455 of yacc.c  */
-#line 9994 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9998 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1439:
 
 /* Line 1455 of yacc.c  */
-#line 9995 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 9999 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1440:
 
 /* Line 1455 of yacc.c  */
-#line 10000 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10004 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_LIMIT);
           }
@@ -29215,7 +29223,7 @@
   case 1441:
 
 /* Line 1455 of yacc.c  */
-#line 10007 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10011 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(1) - (1)].item);
@@ -29227,7 +29235,7 @@
   case 1442:
 
 /* Line 1455 of yacc.c  */
-#line 10014 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10018 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(3) - (3)].item);
@@ -29239,7 +29247,7 @@
   case 1443:
 
 /* Line 1455 of yacc.c  */
-#line 10021 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10025 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(1) - (3)].item);
@@ -29251,7 +29259,7 @@
   case 1444:
 
 /* Line 1455 of yacc.c  */
-#line 10031 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10035 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           Item_splocal *splocal;
           THD *thd= YYTHD;
@@ -29290,7 +29298,7 @@
   case 1445:
 
 /* Line 1455 of yacc.c  */
-#line 10065 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10069 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           ((Item_param *) (yyvsp[(1) - (1)].item))->limit_clause_param= TRUE;
         }
@@ -29299,7 +29307,7 @@
   case 1446:
 
 /* Line 1455 of yacc.c  */
-#line 10069 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10073 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -29310,7 +29318,7 @@
   case 1447:
 
 /* Line 1455 of yacc.c  */
-#line 10075 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10079 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -29321,7 +29329,7 @@
   case 1448:
 
 /* Line 1455 of yacc.c  */
-#line 10081 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10085 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -29332,7 +29340,7 @@
   case 1449:
 
 /* Line 1455 of yacc.c  */
-#line 10090 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10094 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->current_select->select_limit= 0;
@@ -29342,7 +29350,7 @@
   case 1450:
 
 /* Line 1455 of yacc.c  */
-#line 10095 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10099 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             sel->select_limit= (yyvsp[(2) - (2)].item);
@@ -29354,154 +29362,154 @@
   case 1451:
 
 /* Line 1455 of yacc.c  */
-#line 10104 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10108 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1452:
 
 /* Line 1455 of yacc.c  */
-#line 10105 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10109 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
     break;
 
   case 1453:
 
 /* Line 1455 of yacc.c  */
-#line 10106 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10110 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1454:
 
 /* Line 1455 of yacc.c  */
-#line 10107 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10111 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1455:
 
 /* Line 1455 of yacc.c  */
-#line 10108 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10112 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1456:
 
 /* Line 1455 of yacc.c  */
-#line 10109 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10113 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1457:
 
 /* Line 1455 of yacc.c  */
-#line 10113 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10117 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1458:
 
 /* Line 1455 of yacc.c  */
-#line 10114 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10118 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ulong_num)= (ulong) strtol((yyvsp[(1) - (1)].lex_str).str, (char**) 0, 16); }
     break;
 
   case 1459:
 
 /* Line 1455 of yacc.c  */
-#line 10115 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10119 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1460:
 
 /* Line 1455 of yacc.c  */
-#line 10116 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10120 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulong_num)= (ulong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1461:
 
 /* Line 1455 of yacc.c  */
-#line 10117 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10121 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { MYSQL_YYABORT; }
     break;
 
   case 1462:
 
 /* Line 1455 of yacc.c  */
-#line 10121 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10125 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1463:
 
 /* Line 1455 of yacc.c  */
-#line 10122 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10126 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1464:
 
 /* Line 1455 of yacc.c  */
-#line 10123 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10127 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1465:
 
 /* Line 1455 of yacc.c  */
-#line 10124 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10128 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1466:
 
 /* Line 1455 of yacc.c  */
-#line 10125 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10129 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1467:
 
 /* Line 1455 of yacc.c  */
-#line 10129 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10133 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1468:
 
 /* Line 1455 of yacc.c  */
-#line 10130 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10134 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1469:
 
 /* Line 1455 of yacc.c  */
-#line 10131 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10135 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { int error; (yyval.ulonglong_number)= (ulonglong) my_strtoll10((yyvsp[(1) - (1)].lex_str).str, (char**) 0, &error); }
     break;
 
   case 1470:
 
 /* Line 1455 of yacc.c  */
-#line 10132 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10136 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { MYSQL_YYABORT; }
     break;
 
   case 1471:
 
 /* Line 1455 of yacc.c  */
-#line 10137 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10141 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { my_parse_error(ER(ER_ONLY_INTEGERS_ALLOWED)); }
     break;
 
   case 1475:
 
 /* Line 1455 of yacc.c  */
-#line 10148 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10152 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -29533,21 +29541,21 @@
   case 1477:
 
 /* Line 1455 of yacc.c  */
-#line 10178 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10182 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1478:
 
 /* Line 1455 of yacc.c  */
-#line 10179 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10183 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1481:
 
 /* Line 1455 of yacc.c  */
-#line 10189 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10193 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -29561,7 +29569,7 @@
   case 1482:
 
 /* Line 1455 of yacc.c  */
-#line 10200 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10204 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->describe && (!(lex->result= new select_dumpvar())))
@@ -29572,21 +29580,21 @@
   case 1483:
 
 /* Line 1455 of yacc.c  */
-#line 10206 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10210 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1485:
 
 /* Line 1455 of yacc.c  */
-#line 10211 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10215 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1486:
 
 /* Line 1455 of yacc.c  */
-#line 10216 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10220 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->result) 
@@ -29610,7 +29618,7 @@
   case 1487:
 
 /* Line 1455 of yacc.c  */
-#line 10235 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10239 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             sp_variable_t *t;
@@ -29644,7 +29652,7 @@
   case 1488:
 
 /* Line 1455 of yacc.c  */
-#line 10267 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10271 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (! Lex->parsing_options.allows_select_into)
             {
@@ -29657,7 +29665,7 @@
   case 1490:
 
 /* Line 1455 of yacc.c  */
-#line 10279 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10283 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
@@ -29670,14 +29678,14 @@
   case 1491:
 
 /* Line 1455 of yacc.c  */
-#line 10287 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10291 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->exchange->cs= (yyvsp[(4) - (4)].charset); }
     break;
 
   case 1493:
 
 /* Line 1455 of yacc.c  */
-#line 10290 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10294 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->describe)
@@ -29694,7 +29702,7 @@
   case 1494:
 
 /* Line 1455 of yacc.c  */
-#line 10302 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10306 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->uncacheable(UNCACHEABLE_SIDEEFFECT);
           }
@@ -29703,7 +29711,7 @@
   case 1495:
 
 /* Line 1455 of yacc.c  */
-#line 10313 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10317 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_DO;
@@ -29714,7 +29722,7 @@
   case 1496:
 
 /* Line 1455 of yacc.c  */
-#line 10319 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10323 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->insert_list= (yyvsp[(3) - (3)].item_list);
           }
@@ -29723,7 +29731,7 @@
   case 1497:
 
 /* Line 1455 of yacc.c  */
-#line 10330 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10334 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_DROP_TABLE;
@@ -29737,21 +29745,21 @@
   case 1498:
 
 /* Line 1455 of yacc.c  */
-#line 10339 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10343 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1499:
 
 /* Line 1455 of yacc.c  */
-#line 10340 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10344 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1500:
 
 /* Line 1455 of yacc.c  */
-#line 10341 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10345 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             Alter_drop *ad= new Alter_drop(Alter_drop::KEY, (yyvsp[(3) - (6)].lex_str).str);
@@ -29772,7 +29780,7 @@
   case 1501:
 
 /* Line 1455 of yacc.c  */
-#line 10357 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10361 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_DROP_DB;
@@ -29784,7 +29792,7 @@
   case 1502:
 
 /* Line 1455 of yacc.c  */
-#line 10364 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10368 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -29812,7 +29820,7 @@
   case 1503:
 
 /* Line 1455 of yacc.c  */
-#line 10387 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10391 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -29838,7 +29846,7 @@
   case 1504:
 
 /* Line 1455 of yacc.c  */
-#line 10408 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10412 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->sphead)
@@ -29855,7 +29863,7 @@
   case 1505:
 
 /* Line 1455 of yacc.c  */
-#line 10420 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10424 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_DROP_USER;
           }
@@ -29864,7 +29872,7 @@
   case 1506:
 
 /* Line 1455 of yacc.c  */
-#line 10424 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10428 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DROP_VIEW;
@@ -29877,14 +29885,14 @@
   case 1507:
 
 /* Line 1455 of yacc.c  */
-#line 10432 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10436 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1508:
 
 /* Line 1455 of yacc.c  */
-#line 10434 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10438 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->drop_if_exists= (yyvsp[(3) - (4)].num);
             Lex->spname= (yyvsp[(4) - (4)].spname);
@@ -29895,7 +29903,7 @@
   case 1509:
 
 /* Line 1455 of yacc.c  */
-#line 10440 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10444 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DROP_TRIGGER;
@@ -29907,7 +29915,7 @@
   case 1510:
 
 /* Line 1455 of yacc.c  */
-#line 10447 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10451 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= DROP_TABLESPACE;
@@ -29917,7 +29925,7 @@
   case 1511:
 
 /* Line 1455 of yacc.c  */
-#line 10452 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10456 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->alter_tablespace_info->ts_cmd_type= DROP_LOGFILE_GROUP;
@@ -29927,7 +29935,7 @@
   case 1512:
 
 /* Line 1455 of yacc.c  */
-#line 10457 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10461 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_DROP_SERVER;
             Lex->drop_if_exists= (yyvsp[(3) - (4)].num);
@@ -29939,7 +29947,7 @@
   case 1515:
 
 /* Line 1455 of yacc.c  */
-#line 10472 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10476 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
                                            TL_OPTION_UPDATING,
@@ -29952,7 +29960,7 @@
   case 1518:
 
 /* Line 1455 of yacc.c  */
-#line 10488 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10492 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(1) - (1)].table), NULL,
                                            TL_OPTION_UPDATING | TL_OPTION_ALIAS,
@@ -29965,35 +29973,35 @@
   case 1519:
 
 /* Line 1455 of yacc.c  */
-#line 10498 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10502 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1520:
 
 /* Line 1455 of yacc.c  */
-#line 10499 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10503 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 1521:
 
 /* Line 1455 of yacc.c  */
-#line 10503 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10507 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 1522:
 
 /* Line 1455 of yacc.c  */
-#line 10504 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10508 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 1523:
 
 /* Line 1455 of yacc.c  */
-#line 10512 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10516 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_INSERT;
@@ -30005,7 +30013,7 @@
   case 1524:
 
 /* Line 1455 of yacc.c  */
-#line 10520 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10524 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->set_lock_for_tables((yyvsp[(3) - (5)].lock_type));
             Lex->current_select= &Lex->select_lex;
@@ -30015,14 +30023,14 @@
   case 1525:
 
 /* Line 1455 of yacc.c  */
-#line 10525 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10529 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1526:
 
 /* Line 1455 of yacc.c  */
-#line 10530 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10534 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_REPLACE;
@@ -30034,7 +30042,7 @@
   case 1527:
 
 /* Line 1455 of yacc.c  */
-#line 10537 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10541 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->set_lock_for_tables((yyvsp[(3) - (4)].lock_type));
             Lex->current_select= &Lex->select_lex;
@@ -30044,14 +30052,14 @@
   case 1528:
 
 /* Line 1455 of yacc.c  */
-#line 10542 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10546 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1529:
 
 /* Line 1455 of yacc.c  */
-#line 10547 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10551 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef HAVE_QUERY_CACHE
             /*
@@ -30069,14 +30077,14 @@
   case 1530:
 
 /* Line 1455 of yacc.c  */
-#line 10559 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10563 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1531:
 
 /* Line 1455 of yacc.c  */
-#line 10561 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10565 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
                                                     YYTHD->query());
@@ -30089,21 +30097,21 @@
   case 1532:
 
 /* Line 1455 of yacc.c  */
-#line 10568 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10572 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE; }
     break;
 
   case 1533:
 
 /* Line 1455 of yacc.c  */
-#line 10572 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10576 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= (yyvsp[(1) - (1)].lock_type); }
     break;
 
   case 1534:
 
 /* Line 1455 of yacc.c  */
-#line 10574 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10578 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           Lex->keyword_delayed_begin_offset= (uint)(YYLIP->get_tok_start() -
                                                     YYTHD->query());
@@ -30116,21 +30124,21 @@
   case 1535:
 
 /* Line 1455 of yacc.c  */
-#line 10584 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10588 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1536:
 
 /* Line 1455 of yacc.c  */
-#line 10585 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10589 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1537:
 
 /* Line 1455 of yacc.c  */
-#line 10590 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10594 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->field_list.empty();
@@ -30142,28 +30150,28 @@
   case 1538:
 
 /* Line 1455 of yacc.c  */
-#line 10598 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10602 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1539:
 
 /* Line 1455 of yacc.c  */
-#line 10599 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10603 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1540:
 
 /* Line 1455 of yacc.c  */
-#line 10600 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10604 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1541:
 
 /* Line 1455 of yacc.c  */
-#line 10602 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10606 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!(lex->insert_list = new List_item) ||
@@ -30175,63 +30183,63 @@
   case 1543:
 
 /* Line 1455 of yacc.c  */
-#line 10612 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10616 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
     break;
 
   case 1544:
 
 /* Line 1455 of yacc.c  */
-#line 10613 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10617 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
     break;
 
   case 1545:
 
 /* Line 1455 of yacc.c  */
-#line 10617 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10621 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1546:
 
 /* Line 1455 of yacc.c  */
-#line 10618 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10622 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1547:
 
 /* Line 1455 of yacc.c  */
-#line 10620 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10624 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->set_braces(0);}
     break;
 
   case 1548:
 
 /* Line 1455 of yacc.c  */
-#line 10621 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10625 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1549:
 
 /* Line 1455 of yacc.c  */
-#line 10623 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10627 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->set_braces(1);}
     break;
 
   case 1550:
 
 /* Line 1455 of yacc.c  */
-#line 10624 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10628 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1555:
 
 /* Line 1455 of yacc.c  */
-#line 10639 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10643 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->field_list.push_back((yyvsp[(1) - (3)].item)) ||
@@ -30243,35 +30251,35 @@
   case 1556:
 
 /* Line 1455 of yacc.c  */
-#line 10648 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10652 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1557:
 
 /* Line 1455 of yacc.c  */
-#line 10649 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10653 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1558:
 
 /* Line 1455 of yacc.c  */
-#line 10653 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10657 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1559:
 
 /* Line 1455 of yacc.c  */
-#line 10654 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10658 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1560:
 
 /* Line 1455 of yacc.c  */
-#line 10659 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10663 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
               if (!(Lex->insert_list = new List_item))
                 MYSQL_YYABORT;
@@ -30281,7 +30289,7 @@
   case 1561:
 
 /* Line 1455 of yacc.c  */
-#line 10664 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10668 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->many_values.push_back(lex->insert_list))
@@ -30292,14 +30300,14 @@
   case 1562:
 
 /* Line 1455 of yacc.c  */
-#line 10672 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10676 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1564:
 
 /* Line 1455 of yacc.c  */
-#line 10678 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10682 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->insert_list->push_back((yyvsp[(3) - (3)].item)))
               MYSQL_YYABORT;
@@ -30309,7 +30317,7 @@
   case 1565:
 
 /* Line 1455 of yacc.c  */
-#line 10683 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10687 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->insert_list->push_back((yyvsp[(1) - (1)].item)))
               MYSQL_YYABORT;
@@ -30319,14 +30327,14 @@
   case 1566:
 
 /* Line 1455 of yacc.c  */
-#line 10690 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10694 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item);}
     break;
 
   case 1567:
 
 /* Line 1455 of yacc.c  */
-#line 10692 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10696 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_default_value(Lex->current_context());
             if ((yyval.item) == NULL)
@@ -30337,14 +30345,14 @@
   case 1569:
 
 /* Line 1455 of yacc.c  */
-#line 10701 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10705 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->duplicates= DUP_UPDATE; }
     break;
 
   case 1571:
 
 /* Line 1455 of yacc.c  */
-#line 10709 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10713 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             mysql_init_select(lex);
@@ -30356,7 +30364,7 @@
   case 1572:
 
 /* Line 1455 of yacc.c  */
-#line 10717 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10721 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->select_lex.table_list.elements > 1)
@@ -30380,14 +30388,14 @@
   case 1573:
 
 /* Line 1455 of yacc.c  */
-#line 10735 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10739 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1576:
 
 /* Line 1455 of yacc.c  */
-#line 10745 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10749 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_item_to_list(YYTHD, (yyvsp[(1) - (3)].item)) || add_value_to_list(YYTHD, (yyvsp[(3) - (3)].item)))
               MYSQL_YYABORT;
@@ -30397,7 +30405,7 @@
   case 1579:
 
 /* Line 1455 of yacc.c  */
-#line 10758 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10762 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
           LEX *lex= Lex;
           if (lex->update_list.push_back((yyvsp[(1) - (3)].item)) || 
@@ -30409,21 +30417,21 @@
   case 1580:
 
 /* Line 1455 of yacc.c  */
-#line 10767 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10771 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_DEFAULT; }
     break;
 
   case 1581:
 
 /* Line 1455 of yacc.c  */
-#line 10768 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10772 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1582:
 
 /* Line 1455 of yacc.c  */
-#line 10775 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10779 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_DELETE;
@@ -30439,7 +30447,7 @@
   case 1584:
 
 /* Line 1455 of yacc.c  */
-#line 10790 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10794 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(2) - (2)].table), NULL, TL_OPTION_UPDATING,
                                            YYPS->m_lock_type,
@@ -30453,14 +30461,14 @@
   case 1585:
 
 /* Line 1455 of yacc.c  */
-#line 10799 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10803 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1586:
 
 /* Line 1455 of yacc.c  */
-#line 10801 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10805 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             mysql_init_multi_delete(Lex);
             YYPS->m_lock_type= TL_READ_DEFAULT;
@@ -30471,7 +30479,7 @@
   case 1587:
 
 /* Line 1455 of yacc.c  */
-#line 10807 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10811 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (multi_delete_set_locks_and_link_aux_tables(Lex))
               MYSQL_YYABORT;
@@ -30481,7 +30489,7 @@
   case 1588:
 
 /* Line 1455 of yacc.c  */
-#line 10812 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10816 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             mysql_init_multi_delete(Lex);
             YYPS->m_lock_type= TL_READ_DEFAULT;
@@ -30492,7 +30500,7 @@
   case 1589:
 
 /* Line 1455 of yacc.c  */
-#line 10818 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10822 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (multi_delete_set_locks_and_link_aux_tables(Lex))
               MYSQL_YYABORT;
@@ -30502,7 +30510,7 @@
   case 1592:
 
 /* Line 1455 of yacc.c  */
-#line 10831 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10835 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Table_ident *ti= new Table_ident((yyvsp[(1) - (2)].lex_str));
             if (ti == NULL)
@@ -30520,7 +30528,7 @@
   case 1593:
 
 /* Line 1455 of yacc.c  */
-#line 10844 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10848 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Table_ident *ti= new Table_ident(YYTHD, (yyvsp[(1) - (4)].lex_str), (yyvsp[(3) - (4)].lex_str), 0);
             if (ti == NULL)
@@ -30538,56 +30546,56 @@
   case 1594:
 
 /* Line 1455 of yacc.c  */
-#line 10859 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10863 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1595:
 
 /* Line 1455 of yacc.c  */
-#line 10860 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10864 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1596:
 
 /* Line 1455 of yacc.c  */
-#line 10864 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10868 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1597:
 
 /* Line 1455 of yacc.c  */
-#line 10865 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10869 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1598:
 
 /* Line 1455 of yacc.c  */
-#line 10869 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10873 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->options|= OPTION_QUICK; }
     break;
 
   case 1599:
 
 /* Line 1455 of yacc.c  */
-#line 10870 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10874 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { YYPS->m_lock_type= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1600:
 
 /* Line 1455 of yacc.c  */
-#line 10871 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10875 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ignore= 1; }
     break;
 
   case 1601:
 
 /* Line 1455 of yacc.c  */
-#line 10876 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10880 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX* lex= Lex;
             lex->sql_command= SQLCOM_TRUNCATE;
@@ -30603,7 +30611,7 @@
   case 1602:
 
 /* Line 1455 of yacc.c  */
-#line 10887 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10891 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX* lex= thd->lex;
@@ -30617,7 +30625,7 @@
   case 1609:
 
 /* Line 1455 of yacc.c  */
-#line 10912 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10916 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_CPU;
     }
@@ -30626,7 +30634,7 @@
   case 1610:
 
 /* Line 1455 of yacc.c  */
-#line 10916 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10920 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_MEMORY;
     }
@@ -30635,7 +30643,7 @@
   case 1611:
 
 /* Line 1455 of yacc.c  */
-#line 10920 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10924 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_BLOCK_IO;
     }
@@ -30644,7 +30652,7 @@
   case 1612:
 
 /* Line 1455 of yacc.c  */
-#line 10924 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10928 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_CONTEXT;
     }
@@ -30653,7 +30661,7 @@
   case 1613:
 
 /* Line 1455 of yacc.c  */
-#line 10928 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10932 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_PAGE_FAULTS;
     }
@@ -30662,7 +30670,7 @@
   case 1614:
 
 /* Line 1455 of yacc.c  */
-#line 10932 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10936 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_IPC;
     }
@@ -30671,7 +30679,7 @@
   case 1615:
 
 /* Line 1455 of yacc.c  */
-#line 10936 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10940 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_SWAPS;
     }
@@ -30680,7 +30688,7 @@
   case 1616:
 
 /* Line 1455 of yacc.c  */
-#line 10940 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10944 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_SOURCE;
     }
@@ -30689,7 +30697,7 @@
   case 1617:
 
 /* Line 1455 of yacc.c  */
-#line 10944 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10948 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_options|= PROFILE_ALL;
     }
@@ -30698,7 +30706,7 @@
   case 1618:
 
 /* Line 1455 of yacc.c  */
-#line 10951 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10955 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_query_id= 0;
     }
@@ -30707,7 +30715,7 @@
   case 1619:
 
 /* Line 1455 of yacc.c  */
-#line 10955 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10959 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
       Lex->profile_query_id= atoi((yyvsp[(3) - (3)].lex_str).str);
     }
@@ -30716,7 +30724,7 @@
   case 1620:
 
 /* Line 1455 of yacc.c  */
-#line 10964 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10968 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->wild=0;
@@ -30729,7 +30737,7 @@
   case 1621:
 
 /* Line 1455 of yacc.c  */
-#line 10972 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10976 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -30738,7 +30746,7 @@
   case 1622:
 
 /* Line 1455 of yacc.c  */
-#line 10979 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10983 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_DATABASES;
@@ -30750,7 +30758,7 @@
   case 1623:
 
 /* Line 1455 of yacc.c  */
-#line 10986 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10990 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_TABLES;
@@ -30763,7 +30771,7 @@
   case 1624:
 
 /* Line 1455 of yacc.c  */
-#line 10994 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 10998 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_TRIGGERS;
@@ -30776,7 +30784,7 @@
   case 1625:
 
 /* Line 1455 of yacc.c  */
-#line 11002 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11006 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_EVENTS;
@@ -30789,7 +30797,7 @@
   case 1626:
 
 /* Line 1455 of yacc.c  */
-#line 11010 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11014 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
              LEX *lex= Lex;
              lex->sql_command= SQLCOM_SHOW_TABLE_STATUS;
@@ -30802,7 +30810,7 @@
   case 1627:
 
 /* Line 1455 of yacc.c  */
-#line 11018 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11022 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_OPEN_TABLES;
@@ -30815,7 +30823,7 @@
   case 1628:
 
 /* Line 1455 of yacc.c  */
-#line 11026 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11030 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_PLUGINS;
@@ -30827,21 +30835,21 @@
   case 1629:
 
 /* Line 1455 of yacc.c  */
-#line 11033 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11037 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_info.db_type= (yyvsp[(2) - (3)].db_type); }
     break;
 
   case 1630:
 
 /* Line 1455 of yacc.c  */
-#line 11035 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11039 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_info.db_type= NULL; }
     break;
 
   case 1631:
 
 /* Line 1455 of yacc.c  */
-#line 11037 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11041 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_FIELDS;
@@ -30855,7 +30863,7 @@
   case 1632:
 
 /* Line 1455 of yacc.c  */
-#line 11046 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11050 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_BINLOGS;
           }
@@ -30864,7 +30872,7 @@
   case 1633:
 
 /* Line 1455 of yacc.c  */
-#line 11050 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11054 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_SLAVE_HOSTS;
           }
@@ -30873,7 +30881,7 @@
   case 1634:
 
 /* Line 1455 of yacc.c  */
-#line 11054 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11058 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_BINLOG_EVENTS;
@@ -30883,7 +30891,7 @@
   case 1636:
 
 /* Line 1455 of yacc.c  */
-#line 11059 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11063 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_RELAYLOG_EVENTS;
@@ -30893,7 +30901,7 @@
   case 1638:
 
 /* Line 1455 of yacc.c  */
-#line 11064 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11068 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_KEYS;
@@ -30907,7 +30915,7 @@
   case 1639:
 
 /* Line 1455 of yacc.c  */
-#line 11073 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11077 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_STORAGE_ENGINES;
@@ -30919,7 +30927,7 @@
   case 1640:
 
 /* Line 1455 of yacc.c  */
-#line 11080 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11084 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_AUTHORS;
@@ -30933,7 +30941,7 @@
   case 1641:
 
 /* Line 1455 of yacc.c  */
-#line 11089 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11093 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_CONTRIBUTORS;
@@ -30947,7 +30955,7 @@
   case 1642:
 
 /* Line 1455 of yacc.c  */
-#line 11098 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11102 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_PRIVILEGES;
@@ -30957,42 +30965,42 @@
   case 1643:
 
 /* Line 1455 of yacc.c  */
-#line 11103 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11107 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (void) create_select_for_variable("warning_count"); }
     break;
 
   case 1644:
 
 /* Line 1455 of yacc.c  */
-#line 11105 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11109 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (void) create_select_for_variable("error_count"); }
     break;
 
   case 1645:
 
 /* Line 1455 of yacc.c  */
-#line 11107 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11111 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command = SQLCOM_SHOW_WARNS;}
     break;
 
   case 1646:
 
 /* Line 1455 of yacc.c  */
-#line 11109 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11113 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command = SQLCOM_SHOW_ERRORS;}
     break;
 
   case 1647:
 
 /* Line 1455 of yacc.c  */
-#line 11111 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11115 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command = SQLCOM_SHOW_PROFILES; }
     break;
 
   case 1648:
 
 /* Line 1455 of yacc.c  */
-#line 11113 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11117 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_PROFILE;
@@ -31004,7 +31012,7 @@
   case 1649:
 
 /* Line 1455 of yacc.c  */
-#line 11120 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11124 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_STATUS;
@@ -31017,14 +31025,14 @@
   case 1650:
 
 /* Line 1455 of yacc.c  */
-#line 11128 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11132 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_PROCESSLIST;}
     break;
 
   case 1651:
 
 /* Line 1455 of yacc.c  */
-#line 11130 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11134 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_VARIABLES;
@@ -31037,7 +31045,7 @@
   case 1652:
 
 /* Line 1455 of yacc.c  */
-#line 11138 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11142 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_CHARSETS;
@@ -31049,7 +31057,7 @@
   case 1653:
 
 /* Line 1455 of yacc.c  */
-#line 11145 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11149 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_COLLATIONS;
@@ -31061,7 +31069,7 @@
   case 1654:
 
 /* Line 1455 of yacc.c  */
-#line 11152 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11156 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -31076,7 +31084,7 @@
   case 1655:
 
 /* Line 1455 of yacc.c  */
-#line 11162 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11166 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SHOW_GRANTS;
@@ -31088,7 +31096,7 @@
   case 1656:
 
 /* Line 1455 of yacc.c  */
-#line 11169 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11173 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command=SQLCOM_SHOW_CREATE_DB;
             Lex->create_info.options=(yyvsp[(3) - (4)].num);
@@ -31099,7 +31107,7 @@
   case 1657:
 
 /* Line 1455 of yacc.c  */
-#line 11175 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11179 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -31113,7 +31121,7 @@
   case 1658:
 
 /* Line 1455 of yacc.c  */
-#line 11184 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11188 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command = SQLCOM_SHOW_CREATE;
@@ -31126,7 +31134,7 @@
   case 1659:
 
 /* Line 1455 of yacc.c  */
-#line 11192 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11196 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_MASTER_STAT;
           }
@@ -31135,7 +31143,7 @@
   case 1660:
 
 /* Line 1455 of yacc.c  */
-#line 11196 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11200 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_SHOW_SLAVE_STAT;
           }
@@ -31144,7 +31152,7 @@
   case 1661:
 
 /* Line 1455 of yacc.c  */
-#line 11200 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11204 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -31156,7 +31164,7 @@
   case 1662:
 
 /* Line 1455 of yacc.c  */
-#line 11207 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11211 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -31168,7 +31176,7 @@
   case 1663:
 
 /* Line 1455 of yacc.c  */
-#line 11214 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11218 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_CREATE_TRIGGER;
@@ -31179,7 +31187,7 @@
   case 1664:
 
 /* Line 1455 of yacc.c  */
-#line 11220 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11224 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_STATUS_PROC;
@@ -31191,7 +31199,7 @@
   case 1665:
 
 /* Line 1455 of yacc.c  */
-#line 11227 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11231 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_SHOW_STATUS_FUNC;
@@ -31203,7 +31211,7 @@
   case 1666:
 
 /* Line 1455 of yacc.c  */
-#line 11234 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11238 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_SHOW_PROC_CODE;
             Lex->spname= (yyvsp[(3) - (3)].spname);
@@ -31213,7 +31221,7 @@
   case 1667:
 
 /* Line 1455 of yacc.c  */
-#line 11239 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11243 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command= SQLCOM_SHOW_FUNC_CODE;
             Lex->spname= (yyvsp[(3) - (3)].spname);
@@ -31223,7 +31231,7 @@
   case 1668:
 
 /* Line 1455 of yacc.c  */
-#line 11244 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11248 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->spname= (yyvsp[(3) - (3)].spname);
             Lex->sql_command = SQLCOM_SHOW_CREATE_EVENT;
@@ -31233,84 +31241,84 @@
   case 1669:
 
 /* Line 1455 of yacc.c  */
-#line 11252 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11256 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_ENGINE_STATUS; }
     break;
 
   case 1670:
 
 /* Line 1455 of yacc.c  */
-#line 11254 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11258 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_ENGINE_MUTEX; }
     break;
 
   case 1671:
 
 /* Line 1455 of yacc.c  */
-#line 11256 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11260 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->sql_command= SQLCOM_SHOW_ENGINE_LOGS; }
     break;
 
   case 1676:
 
 /* Line 1455 of yacc.c  */
-#line 11270 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11274 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.simple_string)= 0; }
     break;
 
   case 1677:
 
 /* Line 1455 of yacc.c  */
-#line 11271 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11275 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.simple_string)= (yyvsp[(2) - (2)].lex_str).str; }
     break;
 
   case 1678:
 
 /* Line 1455 of yacc.c  */
-#line 11275 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11279 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->verbose=0; }
     break;
 
   case 1679:
 
 /* Line 1455 of yacc.c  */
-#line 11276 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11280 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->verbose=1; }
     break;
 
   case 1682:
 
 /* Line 1455 of yacc.c  */
-#line 11285 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11289 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->mi.log_file_name = 0; }
     break;
 
   case 1683:
 
 /* Line 1455 of yacc.c  */
-#line 11286 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11290 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->mi.log_file_name = (yyvsp[(2) - (2)].lex_str).str; }
     break;
 
   case 1684:
 
 /* Line 1455 of yacc.c  */
-#line 11290 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11294 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->mi.pos = 4; /* skip magic number */ }
     break;
 
   case 1685:
 
 /* Line 1455 of yacc.c  */
-#line 11291 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11295 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->mi.pos = (yyvsp[(2) - (2)].ulonglong_number); }
     break;
 
   case 1687:
 
 /* Line 1455 of yacc.c  */
-#line 11297 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11301 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->wild= new (YYTHD->mem_root) String((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length,
                                                     system_charset_info);
@@ -31322,7 +31330,7 @@
   case 1688:
 
 /* Line 1455 of yacc.c  */
-#line 11304 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11308 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->where= (yyvsp[(2) - (2)].item);
             if ((yyvsp[(2) - (2)].item))
@@ -31333,7 +31341,7 @@
   case 1689:
 
 /* Line 1455 of yacc.c  */
-#line 11314 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11318 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             mysql_init_select(lex);
@@ -31349,7 +31357,7 @@
   case 1690:
 
 /* Line 1455 of yacc.c  */
-#line 11325 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11329 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Select->parsing_place= NO_MATTER;
           }
@@ -31358,14 +31366,14 @@
   case 1691:
 
 /* Line 1455 of yacc.c  */
-#line 11329 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11333 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->describe|= DESCRIBE_NORMAL; }
     break;
 
   case 1692:
 
 /* Line 1455 of yacc.c  */
-#line 11331 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11335 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->select_lex.options|= SELECT_DESCRIBE;
@@ -31375,42 +31383,42 @@
   case 1695:
 
 /* Line 1455 of yacc.c  */
-#line 11343 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11347 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1696:
 
 /* Line 1455 of yacc.c  */
-#line 11344 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11348 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->describe|= DESCRIBE_EXTENDED; }
     break;
 
   case 1697:
 
 /* Line 1455 of yacc.c  */
-#line 11345 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11349 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->describe|= DESCRIBE_PARTITIONS; }
     break;
 
   case 1698:
 
 /* Line 1455 of yacc.c  */
-#line 11349 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11353 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1699:
 
 /* Line 1455 of yacc.c  */
-#line 11350 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11354 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->wild= (yyvsp[(1) - (1)].string); }
     break;
 
   case 1700:
 
 /* Line 1455 of yacc.c  */
-#line 11352 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11356 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->wild= new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,
                                                     (yyvsp[(1) - (1)].lex_str).length,
@@ -31423,7 +31431,7 @@
   case 1701:
 
 /* Line 1455 of yacc.c  */
-#line 11366 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11370 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_FLUSH;
@@ -31435,14 +31443,14 @@
   case 1702:
 
 /* Line 1455 of yacc.c  */
-#line 11373 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11377 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1703:
 
 /* Line 1455 of yacc.c  */
-#line 11378 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11382 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->type|= REFRESH_TABLES;
             /*
@@ -31457,28 +31465,28 @@
   case 1704:
 
 /* Line 1455 of yacc.c  */
-#line 11387 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11391 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1705:
 
 /* Line 1455 of yacc.c  */
-#line 11388 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11392 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1707:
 
 /* Line 1455 of yacc.c  */
-#line 11393 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11397 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1708:
 
 /* Line 1455 of yacc.c  */
-#line 11395 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11399 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             TABLE_LIST *tables= Lex->query_tables;
             Lex->type|= REFRESH_READ_LOCK;
@@ -31494,91 +31502,91 @@
   case 1710:
 
 /* Line 1455 of yacc.c  */
-#line 11410 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11414 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1711:
 
 /* Line 1455 of yacc.c  */
-#line 11415 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11419 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_ERROR_LOG; }
     break;
 
   case 1712:
 
 /* Line 1455 of yacc.c  */
-#line 11417 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11421 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_ENGINE_LOG; }
     break;
 
   case 1713:
 
 /* Line 1455 of yacc.c  */
-#line 11419 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11423 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_GENERAL_LOG; }
     break;
 
   case 1714:
 
 /* Line 1455 of yacc.c  */
-#line 11421 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11425 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_SLOW_LOG; }
     break;
 
   case 1715:
 
 /* Line 1455 of yacc.c  */
-#line 11423 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11427 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_BINARY_LOG; }
     break;
 
   case 1716:
 
 /* Line 1455 of yacc.c  */
-#line 11425 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11429 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_RELAY_LOG; }
     break;
 
   case 1717:
 
 /* Line 1455 of yacc.c  */
-#line 11427 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11431 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_QUERY_CACHE_FREE; }
     break;
 
   case 1718:
 
 /* Line 1455 of yacc.c  */
-#line 11429 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11433 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_HOSTS; }
     break;
 
   case 1719:
 
 /* Line 1455 of yacc.c  */
-#line 11431 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11435 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_GRANT; }
     break;
 
   case 1720:
 
 /* Line 1455 of yacc.c  */
-#line 11433 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11437 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_LOG; }
     break;
 
   case 1721:
 
 /* Line 1455 of yacc.c  */
-#line 11435 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11439 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_STATUS; }
     break;
 
   case 1722:
 
 /* Line 1455 of yacc.c  */
-#line 11437 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11441 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             Lex->type|= REFRESH_SLAVE;
             Lex->reset_slave_info.all= false;
@@ -31588,42 +31596,42 @@
   case 1723:
 
 /* Line 1455 of yacc.c  */
-#line 11442 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11446 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_MASTER; }
     break;
 
   case 1724:
 
 /* Line 1455 of yacc.c  */
-#line 11444 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11448 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_DES_KEY_FILE; }
     break;
 
   case 1725:
 
 /* Line 1455 of yacc.c  */
-#line 11446 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11450 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_USER_RESOURCES; }
     break;
 
   case 1726:
 
 /* Line 1455 of yacc.c  */
-#line 11450 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11454 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1727:
 
 /* Line 1455 of yacc.c  */
-#line 11451 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11455 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1728:
 
 /* Line 1455 of yacc.c  */
-#line 11456 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11460 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RESET; lex->type=0;
@@ -31633,56 +31641,56 @@
   case 1729:
 
 /* Line 1455 of yacc.c  */
-#line 11461 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11465 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1732:
 
 /* Line 1455 of yacc.c  */
-#line 11470 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11474 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_SLAVE; }
     break;
 
   case 1733:
 
 /* Line 1455 of yacc.c  */
-#line 11471 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11475 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 1734:
 
 /* Line 1455 of yacc.c  */
-#line 11472 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11476 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_MASTER; }
     break;
 
   case 1735:
 
 /* Line 1455 of yacc.c  */
-#line 11473 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11477 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type|= REFRESH_QUERY_CACHE;}
     break;
 
   case 1736:
 
 /* Line 1455 of yacc.c  */
-#line 11477 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11481 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->reset_slave_info.all= false; }
     break;
 
   case 1737:
 
 /* Line 1455 of yacc.c  */
-#line 11478 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11482 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->reset_slave_info.all= true; }
     break;
 
   case 1738:
 
 /* Line 1455 of yacc.c  */
-#line 11483 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11487 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->type=0;
@@ -31693,14 +31701,14 @@
   case 1739:
 
 /* Line 1455 of yacc.c  */
-#line 11489 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11493 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1741:
 
 /* Line 1455 of yacc.c  */
-#line 11498 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11502 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->to_log = (yyvsp[(2) - (2)].lex_str).str;
           }
@@ -31709,7 +31717,7 @@
   case 1742:
 
 /* Line 1455 of yacc.c  */
-#line 11502 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11506 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->value_list.empty();
@@ -31721,7 +31729,7 @@
   case 1743:
 
 /* Line 1455 of yacc.c  */
-#line 11514 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11518 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->value_list.empty();
@@ -31733,28 +31741,28 @@
   case 1744:
 
 /* Line 1455 of yacc.c  */
-#line 11523 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11527 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type= 0; }
     break;
 
   case 1745:
 
 /* Line 1455 of yacc.c  */
-#line 11524 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11528 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type= 0; }
     break;
 
   case 1746:
 
 /* Line 1455 of yacc.c  */
-#line 11525 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11529 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->type= ONLY_KILL_QUERY; }
     break;
 
   case 1747:
 
 /* Line 1455 of yacc.c  */
-#line 11532 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11536 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command=SQLCOM_CHANGE_DB;
@@ -31765,7 +31773,7 @@
   case 1748:
 
 /* Line 1455 of yacc.c  */
-#line 11543 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11547 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -31782,7 +31790,7 @@
   case 1749:
 
 /* Line 1455 of yacc.c  */
-#line 11555 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11559 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_LOAD;
@@ -31797,7 +31805,7 @@
   case 1750:
 
 /* Line 1455 of yacc.c  */
-#line 11565 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11569 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!Select->add_table_to_list(YYTHD, (yyvsp[(12) - (12)].table), NULL, TL_OPTION_UPDATING,
@@ -31812,56 +31820,56 @@
   case 1751:
 
 /* Line 1455 of yacc.c  */
-#line 11575 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11579 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->exchange->cs= (yyvsp[(14) - (14)].charset); }
     break;
 
   case 1752:
 
 /* Line 1455 of yacc.c  */
-#line 11579 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11583 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1753:
 
 /* Line 1455 of yacc.c  */
-#line 11583 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11587 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.filetype)= FILETYPE_CSV; }
     break;
 
   case 1754:
 
 /* Line 1455 of yacc.c  */
-#line 11584 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11588 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.filetype)= FILETYPE_XML; }
     break;
 
   case 1755:
 
 /* Line 1455 of yacc.c  */
-#line 11588 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11592 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=0;}
     break;
 
   case 1756:
 
 /* Line 1455 of yacc.c  */
-#line 11589 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11593 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=1;}
     break;
 
   case 1757:
 
 /* Line 1455 of yacc.c  */
-#line 11593 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11597 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_DEFAULT; }
     break;
 
   case 1758:
 
 /* Line 1455 of yacc.c  */
-#line 11595 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11599 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
 #ifdef HAVE_QUERY_CACHE
             /*
@@ -31878,35 +31886,35 @@
   case 1759:
 
 /* Line 1455 of yacc.c  */
-#line 11606 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11610 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lock_type)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 1760:
 
 /* Line 1455 of yacc.c  */
-#line 11610 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11614 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->duplicates=DUP_ERROR; }
     break;
 
   case 1761:
 
 /* Line 1455 of yacc.c  */
-#line 11611 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11615 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->duplicates=DUP_REPLACE; }
     break;
 
   case 1762:
 
 /* Line 1455 of yacc.c  */
-#line 11612 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11616 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ignore= 1; }
     break;
 
   case 1767:
 
 /* Line 1455 of yacc.c  */
-#line 11627 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11631 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->field_term= (yyvsp[(3) - (3)].string);
@@ -31916,7 +31924,7 @@
   case 1768:
 
 /* Line 1455 of yacc.c  */
-#line 11632 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11636 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             DBUG_ASSERT(lex->exchange != 0);
@@ -31928,7 +31936,7 @@
   case 1769:
 
 /* Line 1455 of yacc.c  */
-#line 11639 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11643 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->enclosed= (yyvsp[(3) - (3)].string);
@@ -31938,7 +31946,7 @@
   case 1770:
 
 /* Line 1455 of yacc.c  */
-#line 11644 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11648 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->escaped= (yyvsp[(3) - (3)].string);
@@ -31948,7 +31956,7 @@
   case 1775:
 
 /* Line 1455 of yacc.c  */
-#line 11662 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11666 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->line_term= (yyvsp[(3) - (3)].string);
@@ -31958,7 +31966,7 @@
   case 1776:
 
 /* Line 1455 of yacc.c  */
-#line 11667 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11671 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->line_start= (yyvsp[(3) - (3)].string);
@@ -31968,21 +31976,21 @@
   case 1777:
 
 /* Line 1455 of yacc.c  */
-#line 11674 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11678 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 1778:
 
 /* Line 1455 of yacc.c  */
-#line 11676 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11680 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->exchange->line_term = (yyvsp[(4) - (4)].string); }
     break;
 
   case 1780:
 
 /* Line 1455 of yacc.c  */
-#line 11681 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11685 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             DBUG_ASSERT(Lex->exchange != 0);
             Lex->exchange->skip_lines= atol((yyvsp[(2) - (3)].lex_str).str);
@@ -31992,63 +32000,63 @@
   case 1781:
 
 /* Line 1455 of yacc.c  */
-#line 11688 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11692 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 1782:
 
 /* Line 1455 of yacc.c  */
-#line 11690 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11694 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { }
     break;
 
   case 1783:
 
 /* Line 1455 of yacc.c  */
-#line 11694 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11698 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1784:
 
 /* Line 1455 of yacc.c  */
-#line 11695 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11699 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1785:
 
 /* Line 1455 of yacc.c  */
-#line 11696 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11700 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1786:
 
 /* Line 1455 of yacc.c  */
-#line 11701 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11705 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(3) - (3)].item)); }
     break;
 
   case 1787:
 
 /* Line 1455 of yacc.c  */
-#line 11703 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11707 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->field_list.push_back((yyvsp[(1) - (1)].item)); }
     break;
 
   case 1788:
 
 /* Line 1455 of yacc.c  */
-#line 11707 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11711 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {(yyval.item)= (yyvsp[(1) - (1)].item);}
     break;
 
   case 1789:
 
 /* Line 1455 of yacc.c  */
-#line 11709 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11713 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_user_var_as_out_param((yyvsp[(2) - (2)].lex_str));
             if ((yyval.item) == NULL)
@@ -32059,21 +32067,21 @@
   case 1790:
 
 /* Line 1455 of yacc.c  */
-#line 11717 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11721 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1791:
 
 /* Line 1455 of yacc.c  */
-#line 11718 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11722 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1794:
 
 /* Line 1455 of yacc.c  */
-#line 11728 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11732 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             uint length= (uint) ((yyvsp[(5) - (5)].simple_string) - (yyvsp[(3) - (5)].simple_string));
@@ -32093,7 +32101,7 @@
   case 1795:
 
 /* Line 1455 of yacc.c  */
-#line 11748 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11752 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX_STRING tmp;
             THD *thd= YYTHD;
@@ -32122,7 +32130,7 @@
   case 1796:
 
 /* Line 1455 of yacc.c  */
-#line 11772 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11776 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             uint repertoire= Lex->text_string_is_7bit ?
                              MY_REPERTOIRE_ASCII : MY_REPERTOIRE_UNICODE30;
@@ -32139,7 +32147,7 @@
   case 1797:
 
 /* Line 1455 of yacc.c  */
-#line 11784 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11788 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item_string *str= new (YYTHD->mem_root) Item_string((yyvsp[(2) - (2)].lex_str).str,
                                                                 (yyvsp[(2) - (2)].lex_str).length, (yyvsp[(1) - (2)].charset));
@@ -32155,7 +32163,7 @@
   case 1798:
 
 /* Line 1455 of yacc.c  */
-#line 11795 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11799 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item_string* item= (Item_string*) (yyvsp[(1) - (2)].item);
             item->append((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
@@ -32176,7 +32184,7 @@
   case 1799:
 
 /* Line 1455 of yacc.c  */
-#line 11814 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11818 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.string)= new (YYTHD->mem_root) String((yyvsp[(1) - (1)].lex_str).str,
                                              (yyvsp[(1) - (1)].lex_str).length,
@@ -32189,7 +32197,7 @@
   case 1800:
 
 /* Line 1455 of yacc.c  */
-#line 11822 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11826 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if (tmp == NULL)
@@ -32206,7 +32214,7 @@
   case 1801:
 
 /* Line 1455 of yacc.c  */
-#line 11834 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11838 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if (tmp == NULL)
@@ -32223,7 +32231,7 @@
   case 1802:
 
 /* Line 1455 of yacc.c  */
-#line 11849 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11853 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -32246,21 +32254,21 @@
   case 1803:
 
 /* Line 1455 of yacc.c  */
-#line 11869 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11873 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); }
     break;
 
   case 1804:
 
 /* Line 1455 of yacc.c  */
-#line 11870 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11874 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(2) - (2)].item_num); }
     break;
 
   case 1805:
 
 /* Line 1455 of yacc.c  */
-#line 11872 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11876 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyvsp[(2) - (2)].item_num)->max_length++;
             (yyval.item)= (yyvsp[(2) - (2)].item_num)->neg();
@@ -32270,21 +32278,21 @@
   case 1806:
 
 /* Line 1455 of yacc.c  */
-#line 11879 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11883 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item); }
     break;
 
   case 1807:
 
 /* Line 1455 of yacc.c  */
-#line 11880 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11884 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(1) - (1)].item_num); }
     break;
 
   case 1808:
 
 /* Line 1455 of yacc.c  */
-#line 11882 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11886 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_null();
             if ((yyval.item) == NULL)
@@ -32296,7 +32304,7 @@
   case 1809:
 
 /* Line 1455 of yacc.c  */
-#line 11889 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11893 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_int((char*) "FALSE",0,1);
             if ((yyval.item) == NULL)
@@ -32307,7 +32315,7 @@
   case 1810:
 
 /* Line 1455 of yacc.c  */
-#line 11895 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11899 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_int((char*) "TRUE",1,1);
             if ((yyval.item) == NULL)
@@ -32318,7 +32326,7 @@
   case 1811:
 
 /* Line 1455 of yacc.c  */
-#line 11901 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11905 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item) = new (YYTHD->mem_root) Item_hex_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -32329,7 +32337,7 @@
   case 1812:
 
 /* Line 1455 of yacc.c  */
-#line 11907 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11911 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)= new (YYTHD->mem_root) Item_bin_string((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item) == NULL)
@@ -32340,7 +32348,7 @@
   case 1813:
 
 /* Line 1455 of yacc.c  */
-#line 11913 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11917 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_hex_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
             if (tmp == NULL)
@@ -32374,7 +32382,7 @@
   case 1814:
 
 /* Line 1455 of yacc.c  */
-#line 11942 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11946 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item *tmp= new (YYTHD->mem_root) Item_bin_string((yyvsp[(2) - (2)].lex_str).str, (yyvsp[(2) - (2)].lex_str).length);
             if (tmp == NULL)
@@ -32407,28 +32415,28 @@
   case 1815:
 
 /* Line 1455 of yacc.c  */
-#line 11969 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11973 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(2) - (2)].item); }
     break;
 
   case 1816:
 
 /* Line 1455 of yacc.c  */
-#line 11970 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11974 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(2) - (2)].item); }
     break;
 
   case 1817:
 
 /* Line 1455 of yacc.c  */
-#line 11971 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11975 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item) = (yyvsp[(2) - (2)].item); }
     break;
 
   case 1818:
 
 /* Line 1455 of yacc.c  */
-#line 11976 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11980 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             int error;
             (yyval.item_num)= new (YYTHD->mem_root)
@@ -32443,7 +32451,7 @@
   case 1819:
 
 /* Line 1455 of yacc.c  */
-#line 11986 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 11990 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             int error;
             (yyval.item_num)= new (YYTHD->mem_root)
@@ -32458,7 +32466,7 @@
   case 1820:
 
 /* Line 1455 of yacc.c  */
-#line 11996 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12000 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_num)= new (YYTHD->mem_root) Item_uint((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if ((yyval.item_num) == NULL)
@@ -32469,7 +32477,7 @@
   case 1821:
 
 /* Line 1455 of yacc.c  */
-#line 12002 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12006 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_num)= new (YYTHD->mem_root) Item_decimal((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length,
                                                    YYTHD->charset());
@@ -32483,7 +32491,7 @@
   case 1822:
 
 /* Line 1455 of yacc.c  */
-#line 12011 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12015 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item_num)= new (YYTHD->mem_root) Item_float((yyvsp[(1) - (1)].lex_str).str, (yyvsp[(1) - (1)].lex_str).length);
             if (((yyval.item_num) == NULL) || (YYTHD->is_error()))
@@ -32496,21 +32504,21 @@
   case 1823:
 
 /* Line 1455 of yacc.c  */
-#line 12025 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12029 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 1824:
 
 /* Line 1455 of yacc.c  */
-#line 12026 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12030 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 1825:
 
 /* Line 1455 of yacc.c  */
-#line 12031 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12035 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             SELECT_LEX *sel= Select;
             (yyval.item)= new (YYTHD->mem_root) Item_field(Lex->current_context(),
@@ -32524,7 +32532,7 @@
   case 1826:
 
 /* Line 1455 of yacc.c  */
-#line 12040 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12044 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             SELECT_LEX *sel= Select;
@@ -32542,14 +32550,14 @@
   case 1827:
 
 /* Line 1455 of yacc.c  */
-#line 12055 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12059 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 1828:
 
 /* Line 1455 of yacc.c  */
-#line 12060 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12064 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -32601,14 +32609,14 @@
   case 1829:
 
 /* Line 1455 of yacc.c  */
-#line 12106 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12110 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1830:
 
 /* Line 1455 of yacc.c  */
-#line 12111 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12115 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             SELECT_LEX *sel=Select;
@@ -32631,14 +32639,14 @@
   case 1831:
 
 /* Line 1455 of yacc.c  */
-#line 12128 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12132 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)= (yyvsp[(1) - (1)].item); }
     break;
 
   case 1832:
 
 /* Line 1455 of yacc.c  */
-#line 12133 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12137 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -32722,7 +32730,7 @@
   case 1833:
 
 /* Line 1455 of yacc.c  */
-#line 12212 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12216 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -32752,7 +32760,7 @@
   case 1834:
 
 /* Line 1455 of yacc.c  */
-#line 12237 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12241 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -32785,14 +32793,14 @@
   case 1835:
 
 /* Line 1455 of yacc.c  */
-#line 12267 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12271 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1836:
 
 /* Line 1455 of yacc.c  */
-#line 12269 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12273 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             TABLE_LIST *table= Select->table_list.first;
             if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (5)].lex_str).str, table->db))
@@ -32813,7 +32821,7 @@
   case 1837:
 
 /* Line 1455 of yacc.c  */
-#line 12285 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12289 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             TABLE_LIST *table= Select->table_list.first;
             if (my_strcasecmp(table_alias_charset, (yyvsp[(1) - (3)].lex_str).str, table->alias))
@@ -32828,14 +32836,14 @@
   case 1838:
 
 /* Line 1455 of yacc.c  */
-#line 12294 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12298 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(2) - (2)].lex_str);}
     break;
 
   case 1839:
 
 /* Line 1455 of yacc.c  */
-#line 12299 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12303 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident((yyvsp[(1) - (1)].lex_str));
             if ((yyval.table) == NULL)
@@ -32846,7 +32854,7 @@
   case 1840:
 
 /* Line 1455 of yacc.c  */
-#line 12305 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12309 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident(YYTHD, (yyvsp[(1) - (3)].lex_str),(yyvsp[(3) - (3)].lex_str),0);
             if ((yyval.table) == NULL)
@@ -32857,7 +32865,7 @@
   case 1841:
 
 /* Line 1455 of yacc.c  */
-#line 12311 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12315 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /* For Delphi */
             (yyval.table)= new Table_ident((yyvsp[(2) - (2)].lex_str));
@@ -32869,7 +32877,7 @@
   case 1842:
 
 /* Line 1455 of yacc.c  */
-#line 12321 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12325 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident((yyvsp[(1) - (2)].lex_str));
             if ((yyval.table) == NULL)
@@ -32880,7 +32888,7 @@
   case 1843:
 
 /* Line 1455 of yacc.c  */
-#line 12327 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12331 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.table)= new Table_ident(YYTHD, (yyvsp[(1) - (4)].lex_str),(yyvsp[(3) - (4)].lex_str),0);
             if ((yyval.table) == NULL)
@@ -32891,7 +32899,7 @@
   case 1844:
 
 /* Line 1455 of yacc.c  */
-#line 12336 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12340 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX_STRING db={(char*) any_db,3};
             (yyval.table)= new Table_ident(YYTHD, db,(yyvsp[(1) - (1)].lex_str),0);
@@ -32903,14 +32911,14 @@
   case 1845:
 
 /* Line 1455 of yacc.c  */
-#line 12345 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12349 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)= (yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1846:
 
 /* Line 1455 of yacc.c  */
-#line 12347 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12351 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -32942,7 +32950,7 @@
   case 1847:
 
 /* Line 1455 of yacc.c  */
-#line 12377 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12381 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -32960,7 +32968,7 @@
   case 1848:
 
 /* Line 1455 of yacc.c  */
-#line 12393 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12397 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -32978,7 +32986,7 @@
   case 1849:
 
 /* Line 1455 of yacc.c  */
-#line 12409 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12413 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
 
@@ -32997,14 +33005,14 @@
   case 1850:
 
 /* Line 1455 of yacc.c  */
-#line 12425 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12429 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1851:
 
 /* Line 1455 of yacc.c  */
-#line 12427 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12431 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
@@ -33017,14 +33025,14 @@
   case 1852:
 
 /* Line 1455 of yacc.c  */
-#line 12437 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12441 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str); }
     break;
 
   case 1853:
 
 /* Line 1455 of yacc.c  */
-#line 12439 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12443 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             (yyval.lex_str).str= thd->strmake((yyvsp[(1) - (1)].symbol).str, (yyvsp[(1) - (1)].symbol).length);
@@ -33037,28 +33045,28 @@
   case 1854:
 
 /* Line 1455 of yacc.c  */
-#line 12449 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12453 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1855:
 
 /* Line 1455 of yacc.c  */
-#line 12450 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12454 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1856:
 
 /* Line 1455 of yacc.c  */
-#line 12451 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12455 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_str)=(yyvsp[(1) - (1)].lex_str);}
     break;
 
   case 1857:
 
 /* Line 1455 of yacc.c  */
-#line 12456 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12460 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@@ -33080,7 +33088,7 @@
   case 1858:
 
 /* Line 1455 of yacc.c  */
-#line 12473 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12477 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             if (!((yyval.lex_user)=(LEX_USER*) thd->alloc(sizeof(st_lex_user))))
@@ -33107,7 +33115,7 @@
   case 1859:
 
 /* Line 1455 of yacc.c  */
-#line 12495 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12499 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (!((yyval.lex_user)=(LEX_USER*) YYTHD->alloc(sizeof(st_lex_user))))
               MYSQL_YYABORT;
@@ -33123,2303 +33131,2303 @@
   case 1860:
 
 /* Line 1455 of yacc.c  */
-#line 12509 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12513 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1861:
 
 /* Line 1455 of yacc.c  */
-#line 12510 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12514 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1862:
 
 /* Line 1455 of yacc.c  */
-#line 12511 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12515 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1863:
 
 /* Line 1455 of yacc.c  */
-#line 12512 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12516 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1864:
 
 /* Line 1455 of yacc.c  */
-#line 12513 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12517 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1865:
 
 /* Line 1455 of yacc.c  */
-#line 12514 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12518 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1866:
 
 /* Line 1455 of yacc.c  */
-#line 12515 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12519 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1867:
 
 /* Line 1455 of yacc.c  */
-#line 12516 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12520 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1868:
 
 /* Line 1455 of yacc.c  */
-#line 12517 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12521 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1869:
 
 /* Line 1455 of yacc.c  */
-#line 12518 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12522 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1870:
 
 /* Line 1455 of yacc.c  */
-#line 12519 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12523 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1871:
 
 /* Line 1455 of yacc.c  */
-#line 12520 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12524 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1872:
 
 /* Line 1455 of yacc.c  */
-#line 12521 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12525 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1873:
 
 /* Line 1455 of yacc.c  */
-#line 12522 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12526 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1874:
 
 /* Line 1455 of yacc.c  */
-#line 12523 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12527 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1875:
 
 /* Line 1455 of yacc.c  */
-#line 12524 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12528 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1876:
 
 /* Line 1455 of yacc.c  */
-#line 12525 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12529 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1877:
 
 /* Line 1455 of yacc.c  */
-#line 12526 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12530 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1878:
 
 /* Line 1455 of yacc.c  */
-#line 12527 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12531 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1879:
 
 /* Line 1455 of yacc.c  */
-#line 12528 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12532 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1880:
 
 /* Line 1455 of yacc.c  */
-#line 12529 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12533 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1881:
 
 /* Line 1455 of yacc.c  */
-#line 12530 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12534 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1882:
 
 /* Line 1455 of yacc.c  */
-#line 12531 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12535 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1883:
 
 /* Line 1455 of yacc.c  */
-#line 12532 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12536 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1884:
 
 /* Line 1455 of yacc.c  */
-#line 12533 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12537 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1885:
 
 /* Line 1455 of yacc.c  */
-#line 12534 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12538 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1886:
 
 /* Line 1455 of yacc.c  */
-#line 12535 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12539 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1887:
 
 /* Line 1455 of yacc.c  */
-#line 12536 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12540 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1888:
 
 /* Line 1455 of yacc.c  */
-#line 12537 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12541 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1889:
 
 /* Line 1455 of yacc.c  */
-#line 12538 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12542 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1890:
 
 /* Line 1455 of yacc.c  */
-#line 12539 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12543 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1891:
 
 /* Line 1455 of yacc.c  */
-#line 12540 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12544 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1892:
 
 /* Line 1455 of yacc.c  */
-#line 12541 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12545 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1893:
 
 /* Line 1455 of yacc.c  */
-#line 12542 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12546 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1894:
 
 /* Line 1455 of yacc.c  */
-#line 12543 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12547 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1895:
 
 /* Line 1455 of yacc.c  */
-#line 12544 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12548 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1896:
 
 /* Line 1455 of yacc.c  */
-#line 12545 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12549 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1897:
 
 /* Line 1455 of yacc.c  */
-#line 12546 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12550 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1898:
 
 /* Line 1455 of yacc.c  */
-#line 12547 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12551 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1899:
 
 /* Line 1455 of yacc.c  */
-#line 12548 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12552 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1900:
 
 /* Line 1455 of yacc.c  */
-#line 12549 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12553 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1901:
 
 /* Line 1455 of yacc.c  */
-#line 12550 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12554 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1902:
 
 /* Line 1455 of yacc.c  */
-#line 12551 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12555 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1903:
 
 /* Line 1455 of yacc.c  */
-#line 12552 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12556 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1904:
 
 /* Line 1455 of yacc.c  */
-#line 12553 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12557 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1905:
 
 /* Line 1455 of yacc.c  */
-#line 12554 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12558 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1906:
 
 /* Line 1455 of yacc.c  */
-#line 12555 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12559 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1907:
 
 /* Line 1455 of yacc.c  */
-#line 12556 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12560 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1908:
 
 /* Line 1455 of yacc.c  */
-#line 12557 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12561 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1909:
 
 /* Line 1455 of yacc.c  */
-#line 12558 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12562 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1910:
 
 /* Line 1455 of yacc.c  */
-#line 12568 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12572 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1911:
 
 /* Line 1455 of yacc.c  */
-#line 12569 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12573 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1912:
 
 /* Line 1455 of yacc.c  */
-#line 12570 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12574 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1913:
 
 /* Line 1455 of yacc.c  */
-#line 12571 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12575 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1914:
 
 /* Line 1455 of yacc.c  */
-#line 12572 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12576 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1915:
 
 /* Line 1455 of yacc.c  */
-#line 12573 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12577 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1916:
 
 /* Line 1455 of yacc.c  */
-#line 12574 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12578 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1917:
 
 /* Line 1455 of yacc.c  */
-#line 12575 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12579 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1918:
 
 /* Line 1455 of yacc.c  */
-#line 12576 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12580 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1919:
 
 /* Line 1455 of yacc.c  */
-#line 12577 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12581 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1920:
 
 /* Line 1455 of yacc.c  */
-#line 12578 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12582 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1921:
 
 /* Line 1455 of yacc.c  */
-#line 12579 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12583 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1922:
 
 /* Line 1455 of yacc.c  */
-#line 12580 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12584 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1923:
 
 /* Line 1455 of yacc.c  */
-#line 12581 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12585 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1924:
 
 /* Line 1455 of yacc.c  */
-#line 12582 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12586 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1925:
 
 /* Line 1455 of yacc.c  */
-#line 12583 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12587 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1926:
 
 /* Line 1455 of yacc.c  */
-#line 12584 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12588 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1927:
 
 /* Line 1455 of yacc.c  */
-#line 12585 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12589 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1928:
 
 /* Line 1455 of yacc.c  */
-#line 12586 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12590 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1929:
 
 /* Line 1455 of yacc.c  */
-#line 12587 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12591 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1930:
 
 /* Line 1455 of yacc.c  */
-#line 12588 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12592 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1931:
 
 /* Line 1455 of yacc.c  */
-#line 12589 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12593 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1932:
 
 /* Line 1455 of yacc.c  */
-#line 12590 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12594 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1933:
 
 /* Line 1455 of yacc.c  */
-#line 12591 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12595 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1934:
 
 /* Line 1455 of yacc.c  */
-#line 12592 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12596 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1935:
 
 /* Line 1455 of yacc.c  */
-#line 12593 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12597 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1936:
 
 /* Line 1455 of yacc.c  */
-#line 12594 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12598 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1937:
 
 /* Line 1455 of yacc.c  */
-#line 12595 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12599 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1938:
 
 /* Line 1455 of yacc.c  */
-#line 12596 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12600 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1939:
 
 /* Line 1455 of yacc.c  */
-#line 12597 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12601 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1940:
 
 /* Line 1455 of yacc.c  */
-#line 12598 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12602 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1941:
 
 /* Line 1455 of yacc.c  */
-#line 12599 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12603 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1942:
 
 /* Line 1455 of yacc.c  */
-#line 12600 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12604 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1943:
 
 /* Line 1455 of yacc.c  */
-#line 12601 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12605 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1944:
 
 /* Line 1455 of yacc.c  */
-#line 12602 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12606 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1945:
 
 /* Line 1455 of yacc.c  */
-#line 12603 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12607 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1946:
 
 /* Line 1455 of yacc.c  */
-#line 12604 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12608 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1947:
 
 /* Line 1455 of yacc.c  */
-#line 12605 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12609 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1948:
 
 /* Line 1455 of yacc.c  */
-#line 12606 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12610 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1949:
 
 /* Line 1455 of yacc.c  */
-#line 12607 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12611 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1950:
 
 /* Line 1455 of yacc.c  */
-#line 12608 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12612 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1951:
 
 /* Line 1455 of yacc.c  */
-#line 12609 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12613 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1952:
 
 /* Line 1455 of yacc.c  */
-#line 12610 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12614 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1953:
 
 /* Line 1455 of yacc.c  */
-#line 12611 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12615 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1954:
 
 /* Line 1455 of yacc.c  */
-#line 12612 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12616 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1955:
 
 /* Line 1455 of yacc.c  */
-#line 12613 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12617 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1956:
 
 /* Line 1455 of yacc.c  */
-#line 12614 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12618 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1957:
 
 /* Line 1455 of yacc.c  */
-#line 12615 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12619 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1958:
 
 /* Line 1455 of yacc.c  */
-#line 12616 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12620 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1959:
 
 /* Line 1455 of yacc.c  */
-#line 12617 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12621 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1960:
 
 /* Line 1455 of yacc.c  */
-#line 12618 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12622 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1961:
 
 /* Line 1455 of yacc.c  */
-#line 12619 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12623 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1962:
 
 /* Line 1455 of yacc.c  */
-#line 12620 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12624 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1963:
 
 /* Line 1455 of yacc.c  */
-#line 12621 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12625 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1964:
 
 /* Line 1455 of yacc.c  */
-#line 12622 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12626 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1965:
 
 /* Line 1455 of yacc.c  */
-#line 12623 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12627 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1966:
 
 /* Line 1455 of yacc.c  */
-#line 12624 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12628 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1967:
 
 /* Line 1455 of yacc.c  */
-#line 12625 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12629 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1968:
 
 /* Line 1455 of yacc.c  */
-#line 12626 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12630 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1969:
 
 /* Line 1455 of yacc.c  */
-#line 12627 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12631 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1970:
 
 /* Line 1455 of yacc.c  */
-#line 12628 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12632 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1971:
 
 /* Line 1455 of yacc.c  */
-#line 12629 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12633 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1972:
 
 /* Line 1455 of yacc.c  */
-#line 12630 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12634 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1973:
 
 /* Line 1455 of yacc.c  */
-#line 12631 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12635 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1974:
 
 /* Line 1455 of yacc.c  */
-#line 12632 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12636 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1975:
 
 /* Line 1455 of yacc.c  */
-#line 12633 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12637 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1976:
 
 /* Line 1455 of yacc.c  */
-#line 12634 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12638 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1977:
 
 /* Line 1455 of yacc.c  */
-#line 12635 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12639 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1978:
 
 /* Line 1455 of yacc.c  */
-#line 12636 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12640 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1979:
 
 /* Line 1455 of yacc.c  */
-#line 12637 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12641 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1980:
 
 /* Line 1455 of yacc.c  */
-#line 12638 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12642 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1981:
 
 /* Line 1455 of yacc.c  */
-#line 12639 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12643 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1982:
 
 /* Line 1455 of yacc.c  */
-#line 12640 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12644 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1983:
 
 /* Line 1455 of yacc.c  */
-#line 12641 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12645 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1984:
 
 /* Line 1455 of yacc.c  */
-#line 12642 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12646 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1985:
 
 /* Line 1455 of yacc.c  */
-#line 12643 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12647 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1986:
 
 /* Line 1455 of yacc.c  */
-#line 12644 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12648 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1987:
 
 /* Line 1455 of yacc.c  */
-#line 12645 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12649 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1988:
 
 /* Line 1455 of yacc.c  */
-#line 12646 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12650 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1989:
 
 /* Line 1455 of yacc.c  */
-#line 12647 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12651 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1990:
 
 /* Line 1455 of yacc.c  */
-#line 12648 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12652 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1991:
 
 /* Line 1455 of yacc.c  */
-#line 12649 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12653 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1992:
 
 /* Line 1455 of yacc.c  */
-#line 12650 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12654 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1993:
 
 /* Line 1455 of yacc.c  */
-#line 12651 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12655 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1994:
 
 /* Line 1455 of yacc.c  */
-#line 12652 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12656 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1995:
 
 /* Line 1455 of yacc.c  */
-#line 12653 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12657 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1996:
 
 /* Line 1455 of yacc.c  */
-#line 12654 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12658 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1997:
 
 /* Line 1455 of yacc.c  */
-#line 12655 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12659 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1998:
 
 /* Line 1455 of yacc.c  */
-#line 12656 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12660 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 1999:
 
 /* Line 1455 of yacc.c  */
-#line 12657 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12661 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2000:
 
 /* Line 1455 of yacc.c  */
-#line 12658 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12662 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2001:
 
 /* Line 1455 of yacc.c  */
-#line 12659 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12663 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2002:
 
 /* Line 1455 of yacc.c  */
-#line 12660 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12664 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2003:
 
 /* Line 1455 of yacc.c  */
-#line 12661 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12665 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2004:
 
 /* Line 1455 of yacc.c  */
-#line 12662 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12666 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2005:
 
 /* Line 1455 of yacc.c  */
-#line 12663 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12667 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2006:
 
 /* Line 1455 of yacc.c  */
-#line 12664 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12668 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2007:
 
 /* Line 1455 of yacc.c  */
-#line 12665 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12669 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2008:
 
 /* Line 1455 of yacc.c  */
-#line 12666 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12670 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2009:
 
 /* Line 1455 of yacc.c  */
-#line 12667 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12671 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2010:
 
 /* Line 1455 of yacc.c  */
-#line 12668 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12672 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2011:
 
 /* Line 1455 of yacc.c  */
-#line 12669 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12673 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2012:
 
 /* Line 1455 of yacc.c  */
-#line 12670 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12674 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2013:
 
 /* Line 1455 of yacc.c  */
-#line 12671 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12675 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2014:
 
 /* Line 1455 of yacc.c  */
-#line 12672 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12676 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2015:
 
 /* Line 1455 of yacc.c  */
-#line 12673 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12677 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2016:
 
 /* Line 1455 of yacc.c  */
-#line 12674 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12678 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2017:
 
 /* Line 1455 of yacc.c  */
-#line 12675 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12679 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2018:
 
 /* Line 1455 of yacc.c  */
-#line 12676 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12680 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2019:
 
 /* Line 1455 of yacc.c  */
-#line 12677 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12681 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2020:
 
 /* Line 1455 of yacc.c  */
-#line 12678 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12682 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2021:
 
 /* Line 1455 of yacc.c  */
-#line 12679 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12683 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2022:
 
 /* Line 1455 of yacc.c  */
-#line 12680 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12684 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2023:
 
 /* Line 1455 of yacc.c  */
-#line 12681 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12685 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2024:
 
 /* Line 1455 of yacc.c  */
-#line 12682 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12686 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2025:
 
 /* Line 1455 of yacc.c  */
-#line 12683 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12687 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2026:
 
 /* Line 1455 of yacc.c  */
-#line 12684 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12688 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2027:
 
 /* Line 1455 of yacc.c  */
-#line 12685 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12689 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2028:
 
 /* Line 1455 of yacc.c  */
-#line 12686 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12690 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2029:
 
 /* Line 1455 of yacc.c  */
-#line 12687 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12691 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2030:
 
 /* Line 1455 of yacc.c  */
-#line 12688 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12692 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2031:
 
 /* Line 1455 of yacc.c  */
-#line 12689 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12693 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2032:
 
 /* Line 1455 of yacc.c  */
-#line 12690 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12694 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2033:
 
 /* Line 1455 of yacc.c  */
-#line 12691 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12695 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2034:
 
 /* Line 1455 of yacc.c  */
-#line 12692 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12696 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2035:
 
 /* Line 1455 of yacc.c  */
-#line 12693 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12697 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2036:
 
 /* Line 1455 of yacc.c  */
-#line 12694 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12698 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2037:
 
 /* Line 1455 of yacc.c  */
-#line 12695 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12699 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2038:
 
 /* Line 1455 of yacc.c  */
-#line 12696 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12700 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2039:
 
 /* Line 1455 of yacc.c  */
-#line 12697 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12701 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2040:
 
 /* Line 1455 of yacc.c  */
-#line 12698 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12702 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2041:
 
 /* Line 1455 of yacc.c  */
-#line 12699 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12703 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2042:
 
 /* Line 1455 of yacc.c  */
-#line 12700 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12704 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2043:
 
 /* Line 1455 of yacc.c  */
-#line 12701 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12705 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2044:
 
 /* Line 1455 of yacc.c  */
-#line 12702 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12706 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2045:
 
 /* Line 1455 of yacc.c  */
-#line 12703 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12707 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2046:
 
 /* Line 1455 of yacc.c  */
-#line 12704 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12708 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2047:
 
 /* Line 1455 of yacc.c  */
-#line 12705 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12709 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2048:
 
 /* Line 1455 of yacc.c  */
-#line 12706 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12710 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2049:
 
 /* Line 1455 of yacc.c  */
-#line 12707 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12711 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2050:
 
 /* Line 1455 of yacc.c  */
-#line 12708 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12712 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2051:
 
 /* Line 1455 of yacc.c  */
-#line 12709 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12713 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2052:
 
 /* Line 1455 of yacc.c  */
-#line 12710 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12714 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2053:
 
 /* Line 1455 of yacc.c  */
-#line 12711 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12715 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2054:
 
 /* Line 1455 of yacc.c  */
-#line 12712 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12716 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2055:
 
 /* Line 1455 of yacc.c  */
-#line 12713 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12717 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2056:
 
 /* Line 1455 of yacc.c  */
-#line 12714 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12718 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2057:
 
 /* Line 1455 of yacc.c  */
-#line 12715 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12719 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2058:
 
 /* Line 1455 of yacc.c  */
-#line 12716 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12720 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2059:
 
 /* Line 1455 of yacc.c  */
-#line 12717 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12721 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2060:
 
 /* Line 1455 of yacc.c  */
-#line 12718 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12722 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2061:
 
 /* Line 1455 of yacc.c  */
-#line 12719 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12723 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2062:
 
 /* Line 1455 of yacc.c  */
-#line 12720 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12724 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2063:
 
 /* Line 1455 of yacc.c  */
-#line 12721 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12725 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2064:
 
 /* Line 1455 of yacc.c  */
-#line 12722 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12726 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2065:
 
 /* Line 1455 of yacc.c  */
-#line 12723 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12727 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2066:
 
 /* Line 1455 of yacc.c  */
-#line 12724 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12728 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2067:
 
 /* Line 1455 of yacc.c  */
-#line 12725 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12729 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2068:
 
 /* Line 1455 of yacc.c  */
-#line 12726 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12730 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2069:
 
 /* Line 1455 of yacc.c  */
-#line 12727 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12731 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2070:
 
 /* Line 1455 of yacc.c  */
-#line 12728 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12732 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2071:
 
 /* Line 1455 of yacc.c  */
-#line 12729 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12733 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2072:
 
 /* Line 1455 of yacc.c  */
-#line 12730 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12734 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2073:
 
 /* Line 1455 of yacc.c  */
-#line 12731 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12735 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2074:
 
 /* Line 1455 of yacc.c  */
-#line 12732 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12736 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2075:
 
 /* Line 1455 of yacc.c  */
-#line 12733 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12737 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2076:
 
 /* Line 1455 of yacc.c  */
-#line 12734 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12738 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2077:
 
 /* Line 1455 of yacc.c  */
-#line 12735 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12739 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2078:
 
 /* Line 1455 of yacc.c  */
-#line 12736 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12740 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2079:
 
 /* Line 1455 of yacc.c  */
-#line 12737 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12741 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2080:
 
 /* Line 1455 of yacc.c  */
-#line 12738 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12742 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2081:
 
 /* Line 1455 of yacc.c  */
-#line 12739 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12743 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2082:
 
 /* Line 1455 of yacc.c  */
-#line 12740 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12744 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2083:
 
 /* Line 1455 of yacc.c  */
-#line 12741 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12745 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2084:
 
 /* Line 1455 of yacc.c  */
-#line 12742 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12746 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2085:
 
 /* Line 1455 of yacc.c  */
-#line 12743 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12747 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2086:
 
 /* Line 1455 of yacc.c  */
-#line 12744 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12748 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2087:
 
 /* Line 1455 of yacc.c  */
-#line 12745 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12749 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2088:
 
 /* Line 1455 of yacc.c  */
-#line 12746 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12750 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2089:
 
 /* Line 1455 of yacc.c  */
-#line 12747 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12751 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2090:
 
 /* Line 1455 of yacc.c  */
-#line 12748 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12752 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2091:
 
 /* Line 1455 of yacc.c  */
-#line 12749 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12753 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2092:
 
 /* Line 1455 of yacc.c  */
-#line 12750 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12754 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2093:
 
 /* Line 1455 of yacc.c  */
-#line 12751 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12755 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2094:
 
 /* Line 1455 of yacc.c  */
-#line 12752 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12756 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2095:
 
 /* Line 1455 of yacc.c  */
-#line 12753 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12757 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2096:
 
 /* Line 1455 of yacc.c  */
-#line 12754 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12758 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2097:
 
 /* Line 1455 of yacc.c  */
-#line 12755 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12759 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2098:
 
 /* Line 1455 of yacc.c  */
-#line 12756 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12760 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2099:
 
 /* Line 1455 of yacc.c  */
-#line 12757 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12761 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2100:
 
 /* Line 1455 of yacc.c  */
-#line 12758 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12762 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2101:
 
 /* Line 1455 of yacc.c  */
-#line 12759 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12763 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2102:
 
 /* Line 1455 of yacc.c  */
-#line 12760 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12764 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2103:
 
 /* Line 1455 of yacc.c  */
-#line 12761 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12765 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2104:
 
 /* Line 1455 of yacc.c  */
-#line 12762 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12766 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2105:
 
 /* Line 1455 of yacc.c  */
-#line 12763 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12767 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2106:
 
 /* Line 1455 of yacc.c  */
-#line 12764 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12768 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2107:
 
 /* Line 1455 of yacc.c  */
-#line 12765 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12769 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2108:
 
 /* Line 1455 of yacc.c  */
-#line 12766 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12770 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2109:
 
 /* Line 1455 of yacc.c  */
-#line 12767 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12771 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2110:
 
 /* Line 1455 of yacc.c  */
-#line 12768 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12772 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2111:
 
 /* Line 1455 of yacc.c  */
-#line 12769 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12773 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2112:
 
 /* Line 1455 of yacc.c  */
-#line 12770 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12774 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2113:
 
 /* Line 1455 of yacc.c  */
-#line 12771 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12775 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2114:
 
 /* Line 1455 of yacc.c  */
-#line 12772 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12776 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2115:
 
 /* Line 1455 of yacc.c  */
-#line 12773 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12777 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2116:
 
 /* Line 1455 of yacc.c  */
-#line 12774 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12778 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2117:
 
 /* Line 1455 of yacc.c  */
-#line 12775 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12779 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2118:
 
 /* Line 1455 of yacc.c  */
-#line 12776 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12780 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2119:
 
 /* Line 1455 of yacc.c  */
-#line 12777 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12781 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2120:
 
 /* Line 1455 of yacc.c  */
-#line 12778 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12782 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2121:
 
 /* Line 1455 of yacc.c  */
-#line 12779 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12783 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2122:
 
 /* Line 1455 of yacc.c  */
-#line 12780 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12784 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2123:
 
 /* Line 1455 of yacc.c  */
-#line 12781 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12785 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2124:
 
 /* Line 1455 of yacc.c  */
-#line 12782 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12786 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2125:
 
 /* Line 1455 of yacc.c  */
-#line 12783 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12787 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2126:
 
 /* Line 1455 of yacc.c  */
-#line 12784 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12788 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2127:
 
 /* Line 1455 of yacc.c  */
-#line 12785 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12789 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2128:
 
 /* Line 1455 of yacc.c  */
-#line 12786 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12790 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2129:
 
 /* Line 1455 of yacc.c  */
-#line 12787 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12791 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2130:
 
 /* Line 1455 of yacc.c  */
-#line 12788 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12792 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2131:
 
 /* Line 1455 of yacc.c  */
-#line 12789 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12793 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2132:
 
 /* Line 1455 of yacc.c  */
-#line 12790 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12794 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2133:
 
 /* Line 1455 of yacc.c  */
-#line 12791 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12795 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2134:
 
 /* Line 1455 of yacc.c  */
-#line 12792 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12796 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2135:
 
 /* Line 1455 of yacc.c  */
-#line 12793 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12797 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2136:
 
 /* Line 1455 of yacc.c  */
-#line 12794 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12798 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2137:
 
 /* Line 1455 of yacc.c  */
-#line 12795 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12799 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2138:
 
 /* Line 1455 of yacc.c  */
-#line 12796 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12800 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2139:
 
 /* Line 1455 of yacc.c  */
-#line 12797 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12801 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2140:
 
 /* Line 1455 of yacc.c  */
-#line 12798 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12802 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2141:
 
 /* Line 1455 of yacc.c  */
-#line 12799 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12803 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2142:
 
 /* Line 1455 of yacc.c  */
-#line 12800 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12804 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2143:
 
 /* Line 1455 of yacc.c  */
-#line 12801 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12805 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2144:
 
 /* Line 1455 of yacc.c  */
-#line 12802 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12806 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2145:
 
 /* Line 1455 of yacc.c  */
-#line 12803 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12807 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2146:
 
 /* Line 1455 of yacc.c  */
-#line 12804 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12808 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2147:
 
 /* Line 1455 of yacc.c  */
-#line 12805 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12809 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2148:
 
 /* Line 1455 of yacc.c  */
-#line 12806 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12810 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2149:
 
 /* Line 1455 of yacc.c  */
-#line 12807 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12811 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2150:
 
 /* Line 1455 of yacc.c  */
-#line 12808 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12812 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2151:
 
 /* Line 1455 of yacc.c  */
-#line 12809 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12813 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2152:
 
 /* Line 1455 of yacc.c  */
-#line 12810 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12814 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2153:
 
 /* Line 1455 of yacc.c  */
-#line 12811 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12815 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2154:
 
 /* Line 1455 of yacc.c  */
-#line 12812 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12816 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2155:
 
 /* Line 1455 of yacc.c  */
-#line 12813 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12817 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2156:
 
 /* Line 1455 of yacc.c  */
-#line 12814 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12818 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2157:
 
 /* Line 1455 of yacc.c  */
-#line 12815 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12819 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2158:
 
 /* Line 1455 of yacc.c  */
-#line 12816 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12820 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2159:
 
 /* Line 1455 of yacc.c  */
-#line 12817 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12821 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2160:
 
 /* Line 1455 of yacc.c  */
-#line 12818 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12822 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2161:
 
 /* Line 1455 of yacc.c  */
-#line 12819 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12823 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2162:
 
 /* Line 1455 of yacc.c  */
-#line 12820 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12824 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2163:
 
 /* Line 1455 of yacc.c  */
-#line 12821 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12825 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2164:
 
 /* Line 1455 of yacc.c  */
-#line 12822 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12826 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2165:
 
 /* Line 1455 of yacc.c  */
-#line 12823 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12827 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2166:
 
 /* Line 1455 of yacc.c  */
-#line 12824 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12828 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2167:
 
 /* Line 1455 of yacc.c  */
-#line 12825 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12829 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2168:
 
 /* Line 1455 of yacc.c  */
-#line 12826 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12830 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2169:
 
 /* Line 1455 of yacc.c  */
-#line 12827 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12831 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2170:
 
 /* Line 1455 of yacc.c  */
-#line 12828 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12832 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2171:
 
 /* Line 1455 of yacc.c  */
-#line 12829 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12833 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2172:
 
 /* Line 1455 of yacc.c  */
-#line 12830 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12834 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2173:
 
 /* Line 1455 of yacc.c  */
-#line 12831 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12835 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2174:
 
 /* Line 1455 of yacc.c  */
-#line 12832 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12836 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2175:
 
 /* Line 1455 of yacc.c  */
-#line 12833 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12837 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2176:
 
 /* Line 1455 of yacc.c  */
-#line 12834 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12838 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2177:
 
 /* Line 1455 of yacc.c  */
-#line 12835 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12839 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2178:
 
 /* Line 1455 of yacc.c  */
-#line 12836 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12840 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2179:
 
 /* Line 1455 of yacc.c  */
-#line 12837 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12841 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2180:
 
 /* Line 1455 of yacc.c  */
-#line 12838 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12842 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2181:
 
 /* Line 1455 of yacc.c  */
-#line 12839 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12843 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2182:
 
 /* Line 1455 of yacc.c  */
-#line 12840 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12844 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2183:
 
 /* Line 1455 of yacc.c  */
-#line 12841 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12845 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2184:
 
 /* Line 1455 of yacc.c  */
-#line 12842 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12846 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2185:
 
 /* Line 1455 of yacc.c  */
-#line 12843 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12847 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2186:
 
 /* Line 1455 of yacc.c  */
-#line 12844 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12848 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2187:
 
 /* Line 1455 of yacc.c  */
-#line 12845 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12849 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2188:
 
 /* Line 1455 of yacc.c  */
-#line 12852 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12856 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SET_OPTION;
@@ -35434,28 +35442,28 @@
   case 2189:
 
 /* Line 1455 of yacc.c  */
-#line 12862 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12866 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2190:
 
 /* Line 1455 of yacc.c  */
-#line 12866 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12870 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2191:
 
 /* Line 1455 of yacc.c  */
-#line 12867 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12871 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2194:
 
 /* Line 1455 of yacc.c  */
-#line 12876 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12880 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35491,7 +35499,7 @@
   case 2195:
 
 /* Line 1455 of yacc.c  */
-#line 12907 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12911 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35545,105 +35553,105 @@
   case 2196:
 
 /* Line 1455 of yacc.c  */
-#line 12958 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12962 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2197:
 
 /* Line 1455 of yacc.c  */
-#line 12959 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12963 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_GLOBAL; }
     break;
 
   case 2198:
 
 /* Line 1455 of yacc.c  */
-#line 12960 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12964 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2199:
 
 /* Line 1455 of yacc.c  */
-#line 12961 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12965 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2200:
 
 /* Line 1455 of yacc.c  */
-#line 12965 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12969 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= OPT_DEFAULT; }
     break;
 
   case 2201:
 
 /* Line 1455 of yacc.c  */
-#line 12966 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12970 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->one_shot_set= 1; (yyval.num)= OPT_SESSION; }
     break;
 
   case 2202:
 
 /* Line 1455 of yacc.c  */
-#line 12970 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12974 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2203:
 
 /* Line 1455 of yacc.c  */
-#line 12971 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12975 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_GLOBAL; }
     break;
 
   case 2204:
 
 /* Line 1455 of yacc.c  */
-#line 12972 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12976 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2205:
 
 /* Line 1455 of yacc.c  */
-#line 12973 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12977 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2206:
 
 /* Line 1455 of yacc.c  */
-#line 12977 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12981 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_DEFAULT; }
     break;
 
   case 2207:
 
 /* Line 1455 of yacc.c  */
-#line 12978 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12982 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_GLOBAL; }
     break;
 
   case 2208:
 
 /* Line 1455 of yacc.c  */
-#line 12979 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12983 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2209:
 
 /* Line 1455 of yacc.c  */
-#line 12980 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12984 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.var_type)=OPT_SESSION; }
     break;
 
   case 2212:
 
 /* Line 1455 of yacc.c  */
-#line 12990 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 12994 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -35690,7 +35698,7 @@
   case 2213:
 
 /* Line 1455 of yacc.c  */
-#line 13032 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13036 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex=Lex;
@@ -35711,7 +35719,7 @@
   case 2214:
 
 /* Line 1455 of yacc.c  */
-#line 13051 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13055 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Item_func_set_user_var *item;
             item= new (YYTHD->mem_root) Item_func_set_user_var((yyvsp[(2) - (4)].lex_str), (yyvsp[(4) - (4)].item), false);
@@ -35727,7 +35735,7 @@
   case 2215:
 
 /* Line 1455 of yacc.c  */
-#line 13062 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13066 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             struct sys_var_with_base tmp= (yyvsp[(4) - (6)].variable);
@@ -35745,7 +35753,7 @@
   case 2216:
 
 /* Line 1455 of yacc.c  */
-#line 13075 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13079 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35764,7 +35772,7 @@
   case 2217:
 
 /* Line 1455 of yacc.c  */
-#line 13089 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13093 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_pcontext *spc= lex->spcont;
@@ -35784,7 +35792,7 @@
   case 2218:
 
 /* Line 1455 of yacc.c  */
-#line 13104 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13108 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             CHARSET_INFO *cs2;
@@ -35808,7 +35816,7 @@
   case 2219:
 
 /* Line 1455 of yacc.c  */
-#line 13123 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13127 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -35840,7 +35848,7 @@
   case 2220:
 
 /* Line 1455 of yacc.c  */
-#line 13150 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13154 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             set_var_password *var= new set_var_password((yyvsp[(3) - (5)].lex_user),(yyvsp[(5) - (5)].simple_string));
             if (var == NULL)
@@ -35855,7 +35863,7 @@
   case 2221:
 
 /* Line 1455 of yacc.c  */
-#line 13163 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13167 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             sp_pcontext *spc= thd->lex->spcont;
@@ -35887,7 +35895,7 @@
   case 2222:
 
 /* Line 1455 of yacc.c  */
-#line 13190 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13194 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (check_reserved_words(&(yyvsp[(1) - (3)].lex_str)))
@@ -35935,7 +35943,7 @@
   case 2223:
 
 /* Line 1455 of yacc.c  */
-#line 13233 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13237 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             sys_var *tmp=find_sys_var(YYTHD, (yyvsp[(3) - (3)].lex_str).str, (yyvsp[(3) - (3)].lex_str).length);
             if (!tmp)
@@ -35951,42 +35959,42 @@
   case 2224:
 
 /* Line 1455 of yacc.c  */
-#line 13246 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13250 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_READ_UNCOMMITTED; }
     break;
 
   case 2225:
 
 /* Line 1455 of yacc.c  */
-#line 13247 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13251 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_READ_COMMITTED; }
     break;
 
   case 2226:
 
 /* Line 1455 of yacc.c  */
-#line 13248 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13252 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_REPEATABLE_READ; }
     break;
 
   case 2227:
 
 /* Line 1455 of yacc.c  */
-#line 13249 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13253 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.tx_isolation)= ISO_SERIALIZABLE; }
     break;
 
   case 2228:
 
 /* Line 1455 of yacc.c  */
-#line 13253 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13257 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.simple_string)=(yyvsp[(1) - (1)].lex_str).str;}
     break;
 
   case 2229:
 
 /* Line 1455 of yacc.c  */
-#line 13255 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13259 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? YYTHD->variables.old_passwords ?
               Item_func_old_password::alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str, (yyvsp[(3) - (4)].lex_str).length) :
@@ -36000,7 +36008,7 @@
   case 2230:
 
 /* Line 1455 of yacc.c  */
-#line 13264 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13268 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.simple_string)= (yyvsp[(3) - (4)].lex_str).length ? Item_func_old_password::alloc(YYTHD, (yyvsp[(3) - (4)].lex_str).str,
                                                           (yyvsp[(3) - (4)].lex_str).length) :
@@ -36013,21 +36021,21 @@
   case 2231:
 
 /* Line 1455 of yacc.c  */
-#line 13275 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13279 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)=(yyvsp[(1) - (1)].item); }
     break;
 
   case 2232:
 
 /* Line 1455 of yacc.c  */
-#line 13276 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13280 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.item)=0; }
     break;
 
   case 2233:
 
 /* Line 1455 of yacc.c  */
-#line 13278 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13282 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_string("ON",  2, system_charset_info);
             if ((yyval.item) == NULL)
@@ -36038,7 +36046,7 @@
   case 2234:
 
 /* Line 1455 of yacc.c  */
-#line 13284 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13288 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_string("ALL", 3, system_charset_info);
             if ((yyval.item) == NULL)
@@ -36049,7 +36057,7 @@
   case 2235:
 
 /* Line 1455 of yacc.c  */
-#line 13290 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13294 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.item)=new (YYTHD->mem_root) Item_string("binary", 6, system_charset_info);
             if ((yyval.item) == NULL)
@@ -36060,7 +36068,7 @@
   case 2236:
 
 /* Line 1455 of yacc.c  */
-#line 13301 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13305 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -36076,14 +36084,14 @@
   case 2237:
 
 /* Line 1455 of yacc.c  */
-#line 13312 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13316 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2242:
 
 /* Line 1455 of yacc.c  */
-#line 13327 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13331 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             thr_lock_type lock_type= (thr_lock_type) (yyvsp[(3) - (3)].num);
             bool lock_for_write= (lock_type >= TL_WRITE_ALLOW_WRITE);
@@ -36098,35 +36106,35 @@
   case 2243:
 
 /* Line 1455 of yacc.c  */
-#line 13339 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13343 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= TL_READ_NO_INSERT; }
     break;
 
   case 2244:
 
 /* Line 1455 of yacc.c  */
-#line 13340 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13344 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= TL_WRITE_DEFAULT; }
     break;
 
   case 2245:
 
 /* Line 1455 of yacc.c  */
-#line 13341 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13345 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= TL_WRITE_LOW_PRIORITY; }
     break;
 
   case 2246:
 
 /* Line 1455 of yacc.c  */
-#line 13342 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13346 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= TL_READ; }
     break;
 
   case 2247:
 
 /* Line 1455 of yacc.c  */
-#line 13347 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13351 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
 
@@ -36142,14 +36150,14 @@
   case 2248:
 
 /* Line 1455 of yacc.c  */
-#line 13358 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13362 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2249:
 
 /* Line 1455 of yacc.c  */
-#line 13367 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13371 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->sphead)
@@ -36166,7 +36174,7 @@
   case 2250:
 
 /* Line 1455 of yacc.c  */
-#line 13379 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13383 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->sphead)
@@ -36183,7 +36191,7 @@
   case 2251:
 
 /* Line 1455 of yacc.c  */
-#line 13391 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13395 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->sphead)
@@ -36207,7 +36215,7 @@
   case 2252:
 
 /* Line 1455 of yacc.c  */
-#line 13410 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13414 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->expr_allows_subselect= TRUE;
             /* Stored functions are not supported for HANDLER READ. */
@@ -36223,63 +36231,63 @@
   case 2253:
 
 /* Line 1455 of yacc.c  */
-#line 13423 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13427 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ident= null_lex_str; }
     break;
 
   case 2254:
 
 /* Line 1455 of yacc.c  */
-#line 13424 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13428 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ident= (yyvsp[(1) - (2)].lex_str); }
     break;
 
   case 2255:
 
 /* Line 1455 of yacc.c  */
-#line 13428 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13432 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ha_read_mode = RFIRST; }
     break;
 
   case 2256:
 
 /* Line 1455 of yacc.c  */
-#line 13429 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13433 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ha_read_mode = RNEXT;  }
     break;
 
   case 2257:
 
 /* Line 1455 of yacc.c  */
-#line 13433 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13437 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ha_read_mode = RFIRST; }
     break;
 
   case 2258:
 
 /* Line 1455 of yacc.c  */
-#line 13434 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13438 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ha_read_mode = RNEXT;  }
     break;
 
   case 2259:
 
 /* Line 1455 of yacc.c  */
-#line 13435 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13439 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ha_read_mode = RPREV;  }
     break;
 
   case 2260:
 
 /* Line 1455 of yacc.c  */
-#line 13436 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13440 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->ha_read_mode = RLAST;  }
     break;
 
   case 2261:
 
 /* Line 1455 of yacc.c  */
-#line 13438 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13442 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->ha_read_mode = RKEY;
@@ -36292,56 +36300,56 @@
   case 2262:
 
 /* Line 1455 of yacc.c  */
-#line 13446 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13450 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2263:
 
 /* Line 1455 of yacc.c  */
-#line 13450 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13454 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_KEY_EXACT;   }
     break;
 
   case 2264:
 
 /* Line 1455 of yacc.c  */
-#line 13451 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13455 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_NEXT; }
     break;
 
   case 2265:
 
 /* Line 1455 of yacc.c  */
-#line 13452 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13456 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_KEY_OR_PREV; }
     break;
 
   case 2266:
 
 /* Line 1455 of yacc.c  */
-#line 13453 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13457 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_AFTER_KEY;   }
     break;
 
   case 2267:
 
 /* Line 1455 of yacc.c  */
-#line 13454 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13458 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.ha_rkey_mode)=HA_READ_BEFORE_KEY;  }
     break;
 
   case 2268:
 
 /* Line 1455 of yacc.c  */
-#line 13461 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13465 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2269:
 
 /* Line 1455 of yacc.c  */
-#line 13466 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13470 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_REVOKE;
@@ -36352,7 +36360,7 @@
   case 2270:
 
 /* Line 1455 of yacc.c  */
-#line 13472 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13476 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -36368,7 +36376,7 @@
   case 2271:
 
 /* Line 1455 of yacc.c  */
-#line 13483 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13487 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -36384,7 +36392,7 @@
   case 2272:
 
 /* Line 1455 of yacc.c  */
-#line 13494 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13498 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_REVOKE_ALL;
           }
@@ -36393,7 +36401,7 @@
   case 2273:
 
 /* Line 1455 of yacc.c  */
-#line 13498 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13502 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->users_list.push_front ((yyvsp[(3) - (5)].lex_user));
@@ -36405,14 +36413,14 @@
   case 2274:
 
 /* Line 1455 of yacc.c  */
-#line 13508 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13512 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2275:
 
 /* Line 1455 of yacc.c  */
-#line 13514 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13518 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_GRANT;
@@ -36423,7 +36431,7 @@
   case 2276:
 
 /* Line 1455 of yacc.c  */
-#line 13521 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13525 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -36439,7 +36447,7 @@
   case 2277:
 
 /* Line 1455 of yacc.c  */
-#line 13533 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13537 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             if (lex->columns.elements)
@@ -36455,7 +36463,7 @@
   case 2278:
 
 /* Line 1455 of yacc.c  */
-#line 13544 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13548 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->users_list.push_front ((yyvsp[(3) - (6)].lex_user));
@@ -36467,14 +36475,14 @@
   case 2281:
 
 /* Line 1455 of yacc.c  */
-#line 13558 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13562 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2282:
 
 /* Line 1455 of yacc.c  */
-#line 13560 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13564 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             Lex->all_privileges= 1; 
             Lex->grant= GLOBAL_ACLS;
@@ -36484,259 +36492,259 @@
   case 2287:
 
 /* Line 1455 of yacc.c  */
-#line 13578 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13582 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->which_columns = SELECT_ACL;}
     break;
 
   case 2288:
 
 /* Line 1455 of yacc.c  */
-#line 13579 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13583 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2289:
 
 /* Line 1455 of yacc.c  */
-#line 13581 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13585 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->which_columns = INSERT_ACL;}
     break;
 
   case 2290:
 
 /* Line 1455 of yacc.c  */
-#line 13582 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13586 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2291:
 
 /* Line 1455 of yacc.c  */
-#line 13584 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13588 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->which_columns = UPDATE_ACL; }
     break;
 
   case 2292:
 
 /* Line 1455 of yacc.c  */
-#line 13585 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13589 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2293:
 
 /* Line 1455 of yacc.c  */
-#line 13587 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13591 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->which_columns = REFERENCES_ACL;}
     break;
 
   case 2294:
 
 /* Line 1455 of yacc.c  */
-#line 13588 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13592 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2295:
 
 /* Line 1455 of yacc.c  */
-#line 13589 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13593 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= DELETE_ACL;}
     break;
 
   case 2296:
 
 /* Line 1455 of yacc.c  */
-#line 13590 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13594 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2297:
 
 /* Line 1455 of yacc.c  */
-#line 13591 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13595 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= INDEX_ACL;}
     break;
 
   case 2298:
 
 /* Line 1455 of yacc.c  */
-#line 13592 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13596 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= ALTER_ACL;}
     break;
 
   case 2299:
 
 /* Line 1455 of yacc.c  */
-#line 13593 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13597 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_ACL;}
     break;
 
   case 2300:
 
 /* Line 1455 of yacc.c  */
-#line 13594 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13598 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= DROP_ACL;}
     break;
 
   case 2301:
 
 /* Line 1455 of yacc.c  */
-#line 13595 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13599 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= EXECUTE_ACL;}
     break;
 
   case 2302:
 
 /* Line 1455 of yacc.c  */
-#line 13596 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13600 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= RELOAD_ACL;}
     break;
 
   case 2303:
 
 /* Line 1455 of yacc.c  */
-#line 13597 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13601 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= SHUTDOWN_ACL;}
     break;
 
   case 2304:
 
 /* Line 1455 of yacc.c  */
-#line 13598 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13602 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= PROCESS_ACL;}
     break;
 
   case 2305:
 
 /* Line 1455 of yacc.c  */
-#line 13599 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13603 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= FILE_ACL;}
     break;
 
   case 2306:
 
 /* Line 1455 of yacc.c  */
-#line 13600 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13604 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= GRANT_ACL;}
     break;
 
   case 2307:
 
 /* Line 1455 of yacc.c  */
-#line 13601 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13605 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= SHOW_DB_ACL;}
     break;
 
   case 2308:
 
 /* Line 1455 of yacc.c  */
-#line 13602 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13606 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= SUPER_ACL;}
     break;
 
   case 2309:
 
 /* Line 1455 of yacc.c  */
-#line 13603 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13607 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_TMP_ACL;}
     break;
 
   case 2310:
 
 /* Line 1455 of yacc.c  */
-#line 13604 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13608 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= LOCK_TABLES_ACL; }
     break;
 
   case 2311:
 
 /* Line 1455 of yacc.c  */
-#line 13605 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13609 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= REPL_SLAVE_ACL; }
     break;
 
   case 2312:
 
 /* Line 1455 of yacc.c  */
-#line 13606 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13610 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= REPL_CLIENT_ACL; }
     break;
 
   case 2313:
 
 /* Line 1455 of yacc.c  */
-#line 13607 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13611 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_VIEW_ACL; }
     break;
 
   case 2314:
 
 /* Line 1455 of yacc.c  */
-#line 13608 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13612 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= SHOW_VIEW_ACL; }
     break;
 
   case 2315:
 
 /* Line 1455 of yacc.c  */
-#line 13609 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13613 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_PROC_ACL; }
     break;
 
   case 2316:
 
 /* Line 1455 of yacc.c  */
-#line 13610 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13614 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= ALTER_PROC_ACL; }
     break;
 
   case 2317:
 
 /* Line 1455 of yacc.c  */
-#line 13611 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13615 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_USER_ACL; }
     break;
 
   case 2318:
 
 /* Line 1455 of yacc.c  */
-#line 13612 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13616 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= EVENT_ACL;}
     break;
 
   case 2319:
 
 /* Line 1455 of yacc.c  */
-#line 13613 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13617 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= TRIGGER_ACL; }
     break;
 
   case 2320:
 
 /* Line 1455 of yacc.c  */
-#line 13614 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13618 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= CREATE_TABLESPACE_ACL; }
     break;
 
   case 2321:
 
 /* Line 1455 of yacc.c  */
-#line 13618 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13622 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2322:
 
 /* Line 1455 of yacc.c  */
-#line 13619 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13623 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2325:
 
 /* Line 1455 of yacc.c  */
-#line 13629 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13633 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->x509_subject)
@@ -36751,7 +36759,7 @@
   case 2326:
 
 /* Line 1455 of yacc.c  */
-#line 13639 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13643 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->x509_issuer)
@@ -36766,7 +36774,7 @@
   case 2327:
 
 /* Line 1455 of yacc.c  */
-#line 13649 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13653 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (lex->ssl_cipher)
@@ -36781,7 +36789,7 @@
   case 2328:
 
 /* Line 1455 of yacc.c  */
-#line 13662 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13666 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             size_t dummy;
@@ -36801,7 +36809,7 @@
   case 2329:
 
 /* Line 1455 of yacc.c  */
-#line 13677 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13681 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->current_select->db = (yyvsp[(1) - (3)].lex_str).str;
@@ -36819,7 +36827,7 @@
   case 2330:
 
 /* Line 1455 of yacc.c  */
-#line 13690 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13694 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->current_select->db = NULL;
@@ -36837,7 +36845,7 @@
   case 2331:
 
 /* Line 1455 of yacc.c  */
-#line 13703 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13707 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->current_select->add_table_to_list(lex->thd, (yyvsp[(1) - (1)].table),NULL,
@@ -36851,7 +36859,7 @@
   case 2332:
 
 /* Line 1455 of yacc.c  */
-#line 13715 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13719 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
               MYSQL_YYABORT;
@@ -36861,7 +36869,7 @@
   case 2333:
 
 /* Line 1455 of yacc.c  */
-#line 13720 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13724 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -36871,7 +36879,7 @@
   case 2334:
 
 /* Line 1455 of yacc.c  */
-#line 13728 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13732 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(1) - (1)].lex_user)))
               MYSQL_YYABORT;
@@ -36881,7 +36889,7 @@
   case 2335:
 
 /* Line 1455 of yacc.c  */
-#line 13733 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13737 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->users_list.push_back((yyvsp[(3) - (3)].lex_user)))
               MYSQL_YYABORT;
@@ -36891,7 +36899,7 @@
   case 2336:
 
 /* Line 1455 of yacc.c  */
-#line 13741 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13745 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.lex_user)=(yyvsp[(1) - (4)].lex_user); (yyvsp[(1) - (4)].lex_user)->password=(yyvsp[(4) - (4)].lex_str);
             if (Lex->sql_command == SQLCOM_REVOKE)
@@ -36925,7 +36933,7 @@
   case 2337:
 
 /* Line 1455 of yacc.c  */
-#line 13770 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13774 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             if (Lex->sql_command == SQLCOM_REVOKE)
               MYSQL_YYABORT;
@@ -36937,7 +36945,7 @@
   case 2338:
 
 /* Line 1455 of yacc.c  */
-#line 13777 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13781 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->sql_command == SQLCOM_REVOKE)
               MYSQL_YYABORT;
@@ -36950,7 +36958,7 @@
   case 2339:
 
 /* Line 1455 of yacc.c  */
-#line 13785 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13789 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (Lex->sql_command == SQLCOM_REVOKE)
               MYSQL_YYABORT;
@@ -36963,14 +36971,14 @@
   case 2340:
 
 /* Line 1455 of yacc.c  */
-#line 13793 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13797 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.lex_user)= (yyvsp[(1) - (1)].lex_user); (yyvsp[(1) - (1)].lex_user)->password= null_lex_str; }
     break;
 
   case 2341:
 
 /* Line 1455 of yacc.c  */
-#line 13798 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13802 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->grant |= lex->which_columns;
@@ -36980,7 +36988,7 @@
   case 2345:
 
 /* Line 1455 of yacc.c  */
-#line 13812 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13816 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             String *new_str = new (YYTHD->mem_root) String((const char*) (yyvsp[(1) - (1)].lex_str).str,(yyvsp[(1) - (1)].lex_str).length,system_charset_info);
             if (new_str == NULL)
@@ -37010,7 +37018,7 @@
   case 2347:
 
 /* Line 1455 of yacc.c  */
-#line 13841 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13845 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_SPECIFIED;
           }
@@ -37019,7 +37027,7 @@
   case 2348:
 
 /* Line 1455 of yacc.c  */
-#line 13845 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13849 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_ANY;
           }
@@ -37028,7 +37036,7 @@
   case 2349:
 
 /* Line 1455 of yacc.c  */
-#line 13849 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13853 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_X509;
           }
@@ -37037,7 +37045,7 @@
   case 2350:
 
 /* Line 1455 of yacc.c  */
-#line 13853 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13857 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->ssl_type=SSL_TYPE_NONE;
           }
@@ -37046,49 +37054,49 @@
   case 2351:
 
 /* Line 1455 of yacc.c  */
-#line 13859 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13863 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2353:
 
 /* Line 1455 of yacc.c  */
-#line 13864 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13868 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2354:
 
 /* Line 1455 of yacc.c  */
-#line 13865 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13869 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= GRANT_ACL;}
     break;
 
   case 2355:
 
 /* Line 1455 of yacc.c  */
-#line 13869 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13873 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2356:
 
 /* Line 1455 of yacc.c  */
-#line 13870 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13874 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2357:
 
 /* Line 1455 of yacc.c  */
-#line 13874 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13878 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->grant |= GRANT_ACL;}
     break;
 
   case 2358:
 
 /* Line 1455 of yacc.c  */
-#line 13876 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13880 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.questions=(yyvsp[(2) - (2)].ulong_num);
@@ -37099,7 +37107,7 @@
   case 2359:
 
 /* Line 1455 of yacc.c  */
-#line 13882 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13886 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.updates=(yyvsp[(2) - (2)].ulong_num);
@@ -37110,7 +37118,7 @@
   case 2360:
 
 /* Line 1455 of yacc.c  */
-#line 13888 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13892 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.conn_per_hour= (yyvsp[(2) - (2)].ulong_num);
@@ -37121,7 +37129,7 @@
   case 2361:
 
 /* Line 1455 of yacc.c  */
-#line 13894 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13898 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->mqh.user_conn= (yyvsp[(2) - (2)].ulong_num);
@@ -37132,7 +37140,7 @@
   case 2362:
 
 /* Line 1455 of yacc.c  */
-#line 13903 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13907 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command = SQLCOM_BEGIN;
@@ -37143,84 +37151,84 @@
   case 2363:
 
 /* Line 1455 of yacc.c  */
-#line 13908 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13912 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2364:
 
 /* Line 1455 of yacc.c  */
-#line 13912 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13916 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2365:
 
 /* Line 1455 of yacc.c  */
-#line 13913 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13917 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2366:
 
 /* Line 1455 of yacc.c  */
-#line 13918 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13922 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
     break;
 
   case 2367:
 
 /* Line 1455 of yacc.c  */
-#line 13919 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13923 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_NO; }
     break;
 
   case 2368:
 
 /* Line 1455 of yacc.c  */
-#line 13920 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13924 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_YES; }
     break;
 
   case 2369:
 
 /* Line 1455 of yacc.c  */
-#line 13925 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13929 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_UNKNOWN; }
     break;
 
   case 2370:
 
 /* Line 1455 of yacc.c  */
-#line 13926 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13930 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_YES; }
     break;
 
   case 2371:
 
 /* Line 1455 of yacc.c  */
-#line 13927 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13931 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.m_yes_no_unk)= TVL_NO; }
     break;
 
   case 2372:
 
 /* Line 1455 of yacc.c  */
-#line 13931 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13935 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2373:
 
 /* Line 1455 of yacc.c  */
-#line 13932 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13936 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2374:
 
 /* Line 1455 of yacc.c  */
-#line 13937 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13941 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_COMMIT;
@@ -37234,7 +37242,7 @@
   case 2375:
 
 /* Line 1455 of yacc.c  */
-#line 13949 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13953 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ROLLBACK;
@@ -37248,7 +37256,7 @@
   case 2376:
 
 /* Line 1455 of yacc.c  */
-#line 13959 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13963 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_ROLLBACK_TO_SAVEPOINT;
@@ -37259,7 +37267,7 @@
   case 2377:
 
 /* Line 1455 of yacc.c  */
-#line 13968 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13972 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_SAVEPOINT;
@@ -37270,7 +37278,7 @@
   case 2378:
 
 /* Line 1455 of yacc.c  */
-#line 13977 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13981 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             lex->sql_command= SQLCOM_RELEASE_SAVEPOINT;
@@ -37281,14 +37289,14 @@
   case 2379:
 
 /* Line 1455 of yacc.c  */
-#line 13990 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 13994 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2381:
 
 /* Line 1455 of yacc.c  */
-#line 13996 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14000 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_select_to_union_list(Lex, (bool)(yyvsp[(2) - (2)].num), TRUE))
               MYSQL_YYABORT;
@@ -37298,7 +37306,7 @@
   case 2382:
 
 /* Line 1455 of yacc.c  */
-#line 14001 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14005 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               Remove from the name resolution context stack the context of the
@@ -37311,42 +37319,42 @@
   case 2383:
 
 /* Line 1455 of yacc.c  */
-#line 14011 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14015 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 0; }
     break;
 
   case 2384:
 
 /* Line 1455 of yacc.c  */
-#line 14012 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14016 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 2385:
 
 /* Line 1455 of yacc.c  */
-#line 14013 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14017 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)= 1; }
     break;
 
   case 2386:
 
 /* Line 1455 of yacc.c  */
-#line 14017 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14021 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.is_not_empty)= false; }
     break;
 
   case 2387:
 
 /* Line 1455 of yacc.c  */
-#line 14018 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14022 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.is_not_empty)= true; }
     break;
 
   case 2388:
 
 /* Line 1455 of yacc.c  */
-#line 14022 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14026 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -37367,7 +37375,7 @@
   case 2389:
 
 /* Line 1455 of yacc.c  */
-#line 14038 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14042 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             thd->lex->current_select->no_table_names_allowed= 0;
@@ -37378,28 +37386,28 @@
   case 2392:
 
 /* Line 1455 of yacc.c  */
-#line 14051 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14055 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=1; }
     break;
 
   case 2393:
 
 /* Line 1455 of yacc.c  */
-#line 14052 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14056 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=1; }
     break;
 
   case 2394:
 
 /* Line 1455 of yacc.c  */
-#line 14053 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14057 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { (yyval.num)=0; }
     break;
 
   case 2395:
 
 /* Line 1455 of yacc.c  */
-#line 14058 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14062 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             (yyval.select_lex)= Lex->current_select->master_unit()->first_select();
           }
@@ -37408,7 +37416,7 @@
   case 2396:
 
 /* Line 1455 of yacc.c  */
-#line 14062 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14066 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             (yyval.select_lex)= Lex->current_select->master_unit()->first_select();
           }
@@ -37417,7 +37425,7 @@
   case 2398:
 
 /* Line 1455 of yacc.c  */
-#line 14071 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14075 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (add_select_to_union_list(Lex, (bool)(yyvsp[(3) - (3)].num), FALSE))
               MYSQL_YYABORT;
@@ -37427,7 +37435,7 @@
   case 2399:
 
 /* Line 1455 of yacc.c  */
-#line 14077 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14081 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->pop_context();
             (yyval.select_lex)= (yyvsp[(1) - (6)].select_lex);
@@ -37437,7 +37445,7 @@
   case 2400:
 
 /* Line 1455 of yacc.c  */
-#line 14086 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14090 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { 
             (yyval.select_lex)= (yyvsp[(2) - (3)].select_lex);
           }
@@ -37446,7 +37454,7 @@
   case 2401:
 
 /* Line 1455 of yacc.c  */
-#line 14092 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14096 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
             if (!lex->expr_allows_subselect ||
@@ -37470,7 +37478,7 @@
   case 2402:
 
 /* Line 1455 of yacc.c  */
-#line 14113 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14117 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex=Lex;
 
@@ -37485,20 +37493,27 @@
             */
             lex->current_select->select_n_where_fields+=
             child->select_n_where_fields;
+
+            /*
+              Aggregate functions in having clause may add fields to an outer
+              select. Count them also.
+            */
+            lex->current_select->select_n_having_items+=
+            child->select_n_having_items;
           }
     break;
 
   case 2407:
 
 /* Line 1455 of yacc.c  */
-#line 14141 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14152 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->options|= SELECT_STRAIGHT_JOIN; }
     break;
 
   case 2408:
 
 /* Line 1455 of yacc.c  */
-#line 14143 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14154 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (check_simple_select())
               MYSQL_YYABORT;
@@ -37511,28 +37526,28 @@
   case 2409:
 
 /* Line 1455 of yacc.c  */
-#line 14150 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14161 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->options|= SELECT_DISTINCT; }
     break;
 
   case 2410:
 
 /* Line 1455 of yacc.c  */
-#line 14151 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14162 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->options|= SELECT_SMALL_RESULT; }
     break;
 
   case 2411:
 
 /* Line 1455 of yacc.c  */
-#line 14152 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14163 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->options|= SELECT_BIG_RESULT; }
     break;
 
   case 2412:
 
 /* Line 1455 of yacc.c  */
-#line 14154 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14165 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (check_simple_select())
               MYSQL_YYABORT;
@@ -37543,7 +37558,7 @@
   case 2413:
 
 /* Line 1455 of yacc.c  */
-#line 14160 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14171 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             if (check_simple_select())
               MYSQL_YYABORT;
@@ -37554,35 +37569,35 @@
   case 2414:
 
 /* Line 1455 of yacc.c  */
-#line 14165 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14176 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Select->options|= SELECT_ALL; }
     break;
 
   case 2415:
 
 /* Line 1455 of yacc.c  */
-#line 14176 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14187 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2416:
 
 /* Line 1455 of yacc.c  */
-#line 14178 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14189 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2417:
 
 /* Line 1455 of yacc.c  */
-#line 14180 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14191 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2431:
 
 /* Line 1455 of yacc.c  */
-#line 14213 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14224 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             /*
               We have to distinguish missing DEFINER-clause from case when
@@ -37598,7 +37613,7 @@
   case 2432:
 
 /* Line 1455 of yacc.c  */
-#line 14227 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14238 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             YYTHD->lex->definer= get_current_user(YYTHD, (yyvsp[(3) - (3)].lex_user));
           }
@@ -37607,77 +37622,77 @@
   case 2433:
 
 /* Line 1455 of yacc.c  */
-#line 14240 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14251 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2434:
 
 /* Line 1455 of yacc.c  */
-#line 14242 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14253 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2435:
 
 /* Line 1455 of yacc.c  */
-#line 14244 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14255 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2436:
 
 /* Line 1455 of yacc.c  */
-#line 14249 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14260 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_mode= VIEW_CREATE_OR_REPLACE; }
     break;
 
   case 2437:
 
 /* Line 1455 of yacc.c  */
-#line 14254 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14265 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_algorithm= VIEW_ALGORITHM_UNDEFINED; }
     break;
 
   case 2438:
 
 /* Line 1455 of yacc.c  */
-#line 14256 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14267 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_algorithm= VIEW_ALGORITHM_MERGE; }
     break;
 
   case 2439:
 
 /* Line 1455 of yacc.c  */
-#line 14258 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14269 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_algorithm= VIEW_ALGORITHM_TMPTABLE; }
     break;
 
   case 2440:
 
 /* Line 1455 of yacc.c  */
-#line 14263 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14274 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_suid= VIEW_SUID_DEFAULT; }
     break;
 
   case 2441:
 
 /* Line 1455 of yacc.c  */
-#line 14265 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14276 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_suid= VIEW_SUID_DEFINER; }
     break;
 
   case 2442:
 
 /* Line 1455 of yacc.c  */
-#line 14267 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14278 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_suid= VIEW_SUID_INVOKER; }
     break;
 
   case 2443:
 
 /* Line 1455 of yacc.c  */
-#line 14272 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14283 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -37695,14 +37710,14 @@
   case 2445:
 
 /* Line 1455 of yacc.c  */
-#line 14289 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14300 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2447:
 
 /* Line 1455 of yacc.c  */
-#line 14295 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14306 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
               Lex->view_list.push_back((LEX_STRING*)
               sql_memdup(&(yyvsp[(1) - (1)].lex_str), sizeof(LEX_STRING)));
@@ -37712,7 +37727,7 @@
   case 2448:
 
 /* Line 1455 of yacc.c  */
-#line 14300 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14311 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
               Lex->view_list.push_back((LEX_STRING*)
               sql_memdup(&(yyvsp[(3) - (3)].lex_str), sizeof(LEX_STRING)));
@@ -37722,7 +37737,7 @@
   case 2449:
 
 /* Line 1455 of yacc.c  */
-#line 14307 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14318 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->parsing_options.allows_variable= FALSE;
@@ -37736,7 +37751,7 @@
   case 2450:
 
 /* Line 1455 of yacc.c  */
-#line 14316 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14327 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= Lex;
@@ -37755,35 +37770,35 @@
   case 2453:
 
 /* Line 1455 of yacc.c  */
-#line 14338 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14349 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_NONE; }
     break;
 
   case 2454:
 
 /* Line 1455 of yacc.c  */
-#line 14340 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14351 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_CASCADED; }
     break;
 
   case 2455:
 
 /* Line 1455 of yacc.c  */
-#line 14342 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14353 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_CASCADED; }
     break;
 
   case 2456:
 
 /* Line 1455 of yacc.c  */
-#line 14344 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14355 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->create_view_check= VIEW_CHECK_LOCAL; }
     break;
 
   case 2457:
 
 /* Line 1455 of yacc.c  */
-#line 14361 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14372 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $8 */
             Lex->raw_trg_on_table_name_begin= YYLIP->get_tok_start();
           }
@@ -37792,7 +37807,7 @@
   case 2458:
 
 /* Line 1455 of yacc.c  */
-#line 14367 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14378 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $12 */
             Lex->raw_trg_on_table_name_end= YYLIP->get_tok_start();
           }
@@ -37801,7 +37816,7 @@
   case 2459:
 
 /* Line 1455 of yacc.c  */
-#line 14372 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14383 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $15 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -37836,7 +37851,7 @@
   case 2460:
 
 /* Line 1455 of yacc.c  */
-#line 14402 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14413 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $17 */
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -37865,7 +37880,7 @@
   case 2461:
 
 /* Line 1455 of yacc.c  */
-#line 14436 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14447 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -37887,7 +37902,7 @@
   case 2462:
 
 /* Line 1455 of yacc.c  */
-#line 14454 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14465 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -37909,7 +37924,7 @@
   case 2463:
 
 /* Line 1455 of yacc.c  */
-#line 14477 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14488 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $5 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -37945,7 +37960,7 @@
   case 2464:
 
 /* Line 1455 of yacc.c  */
-#line 14509 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14520 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $8 */
             Lex->sphead->m_param_end= YYLIP->get_cpp_tok_start();
           }
@@ -37954,7 +37969,7 @@
   case 2465:
 
 /* Line 1455 of yacc.c  */
-#line 14513 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14524 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $10 */
             LEX *lex= Lex;
             lex->charset= NULL;
@@ -37967,7 +37982,7 @@
   case 2466:
 
 /* Line 1455 of yacc.c  */
-#line 14521 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14532 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $12 */
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -37995,7 +38010,7 @@
   case 2467:
 
 /* Line 1455 of yacc.c  */
-#line 14544 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14555 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { /* $14 */
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -38009,7 +38024,7 @@
   case 2468:
 
 /* Line 1455 of yacc.c  */
-#line 14553 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14564 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -38067,7 +38082,7 @@
   case 2469:
 
 /* Line 1455 of yacc.c  */
-#line 14609 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14620 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp;
@@ -38096,7 +38111,7 @@
   case 2470:
 
 /* Line 1455 of yacc.c  */
-#line 14633 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14644 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             const char* tmp_param_begin;
 
@@ -38109,7 +38124,7 @@
   case 2471:
 
 /* Line 1455 of yacc.c  */
-#line 14642 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14653 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -38122,7 +38137,7 @@
   case 2472:
 
 /* Line 1455 of yacc.c  */
-#line 14650 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14661 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             THD *thd= YYTHD;
             LEX *lex= thd->lex;
@@ -38135,7 +38150,7 @@
   case 2473:
 
 /* Line 1455 of yacc.c  */
-#line 14658 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14669 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             sp_head *sp= lex->sphead;
@@ -38149,7 +38164,7 @@
   case 2474:
 
 /* Line 1455 of yacc.c  */
-#line 14672 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14683 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_START;
           }
@@ -38158,7 +38173,7 @@
   case 2475:
 
 /* Line 1455 of yacc.c  */
-#line 14676 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14687 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_END;
           }
@@ -38167,7 +38182,7 @@
   case 2476:
 
 /* Line 1455 of yacc.c  */
-#line 14680 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14691 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_PREPARE;
           }
@@ -38176,7 +38191,7 @@
   case 2477:
 
 /* Line 1455 of yacc.c  */
-#line 14684 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14695 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_COMMIT;
           }
@@ -38185,7 +38200,7 @@
   case 2478:
 
 /* Line 1455 of yacc.c  */
-#line 14688 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14699 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_ROLLBACK;
           }
@@ -38194,7 +38209,7 @@
   case 2479:
 
 /* Line 1455 of yacc.c  */
-#line 14692 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14703 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             Lex->sql_command = SQLCOM_XA_RECOVER;
           }
@@ -38203,7 +38218,7 @@
   case 2480:
 
 /* Line 1455 of yacc.c  */
-#line 14699 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14710 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (1)].string)->length() <= MAXGTRIDSIZE);
             if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -38215,7 +38230,7 @@
   case 2481:
 
 /* Line 1455 of yacc.c  */
-#line 14706 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14717 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (3)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (3)].string)->length() <= MAXBQUALSIZE);
             if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -38227,7 +38242,7 @@
   case 2482:
 
 /* Line 1455 of yacc.c  */
-#line 14713 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14724 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             MYSQL_YYABORT_UNLESS((yyvsp[(1) - (5)].string)->length() <= MAXGTRIDSIZE && (yyvsp[(3) - (5)].string)->length() <= MAXBQUALSIZE);
             if (!(Lex->xid=(XID *)YYTHD->alloc(sizeof(XID))))
@@ -38239,84 +38254,84 @@
   case 2483:
 
 /* Line 1455 of yacc.c  */
-#line 14722 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14733 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2484:
 
 /* Line 1455 of yacc.c  */
-#line 14723 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14734 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2485:
 
 /* Line 1455 of yacc.c  */
-#line 14727 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14738 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_NONE;        }
     break;
 
   case 2486:
 
 /* Line 1455 of yacc.c  */
-#line 14728 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14739 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_JOIN;        }
     break;
 
   case 2487:
 
 /* Line 1455 of yacc.c  */
-#line 14729 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14740 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_RESUME;      }
     break;
 
   case 2488:
 
 /* Line 1455 of yacc.c  */
-#line 14733 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14744 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_NONE;        }
     break;
 
   case 2489:
 
 /* Line 1455 of yacc.c  */
-#line 14734 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14745 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_ONE_PHASE;   }
     break;
 
   case 2490:
 
 /* Line 1455 of yacc.c  */
-#line 14739 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14750 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_NONE;        }
     break;
 
   case 2491:
 
 /* Line 1455 of yacc.c  */
-#line 14741 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14752 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_SUSPEND;     }
     break;
 
   case 2493:
 
 /* Line 1455 of yacc.c  */
-#line 14746 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14757 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {}
     break;
 
   case 2494:
 
 /* Line 1455 of yacc.c  */
-#line 14747 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14758 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     { Lex->xa_opt=XA_FOR_MIGRATE; }
     break;
 
   case 2495:
 
 /* Line 1455 of yacc.c  */
-#line 14752 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14763 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_INSTALL_PLUGIN;
@@ -38328,7 +38343,7 @@
   case 2496:
 
 /* Line 1455 of yacc.c  */
-#line 14762 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 14773 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
     {
             LEX *lex= Lex;
             lex->sql_command= SQLCOM_UNINSTALL_PLUGIN;
@@ -38339,7 +38354,7 @@
 
 
 /* Line 1455 of yacc.c  */
-#line 38343 "/export/home/pb2/build/sb_0-10701388-1383635700.2/dist_GPL/sql/sql_yacc.cc"
+#line 38358 "/export/home/pb2/build/sb_0-14562198-1425025410.01/dist_GPL/sql/sql_yacc.cc"
       default: break;
     }
   YY_SYMBOL_PRINT ("-> $$ =", yyr1[yyn], &yyval, &yyloc);
@@ -38374,7 +38389,7 @@
     {
       ++yynerrs;
 #if ! YYERROR_VERBOSE
-      yyerror (YY_("syntax error"));
+      yyerror (YYTHD, YY_("syntax error"));
 #else
       {
 	YYSIZE_T yysize = yysyntax_error (0, yystate, yychar);
@@ -38398,11 +38413,11 @@
 	if (0 < yysize && yysize <= yymsg_alloc)
 	  {
 	    (void) yysyntax_error (yymsg, yystate, yychar);
-	    yyerror (yymsg);
+	    yyerror (YYTHD, yymsg);
 	  }
 	else
 	  {
-	    yyerror (YY_("syntax error"));
+	    yyerror (YYTHD, YY_("syntax error"));
 	    if (yysize != 0)
 	      goto yyexhaustedlab;
 	  }
@@ -38426,7 +38441,7 @@
       else
 	{
 	  yydestruct ("Error: discarding",
-		      yytoken, &yylval);
+		      yytoken, &yylval, YYTHD);
 	  yychar = YYEMPTY;
 	}
     }
@@ -38482,7 +38497,7 @@
 
 
       yydestruct ("Error: popping",
-		  yystos[yystate], yyvsp);
+		  yystos[yystate], yyvsp, YYTHD);
       YYPOPSTACK (1);
       yystate = *yyssp;
       YY_STACK_PRINT (yyss, yyssp);
@@ -38517,7 +38532,7 @@
 | yyexhaustedlab -- memory exhaustion comes here.  |
 `-------------------------------------------------*/
 yyexhaustedlab:
-  yyerror (YY_("memory exhausted"));
+  yyerror (YYTHD, YY_("memory exhausted"));
   yyresult = 2;
   /* Fall through.  */
 #endif
@@ -38525,7 +38540,7 @@
 yyreturn:
   if (yychar != YYEMPTY)
      yydestruct ("Cleanup: discarding lookahead",
-		 yytoken, &yylval);
+		 yytoken, &yylval, YYTHD);
   /* Do not reclaim the symbols of the rule which action triggered
      this YYABORT or YYACCEPT.  */
   YYPOPSTACK (yylen);
@@ -38533,7 +38548,7 @@
   while (yyssp != yyss)
     {
       yydestruct ("Cleanup: popping",
-		  yystos[*yyssp], yyvsp);
+		  yystos[*yyssp], yyvsp, YYTHD);
       YYPOPSTACK (1);
     }
 #ifndef yyoverflow
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_yacc.h mysql-5.5-5.5.43/sql/sql_yacc.h
--- mysql-5.5-5.5.35+dfsg/sql/sql_yacc.h	2013-11-05 07:19:38.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_yacc.h	2015-02-27 08:30:47.000000000 +0000
@@ -1231,7 +1231,7 @@
 {
 
 /* Line 1676 of yacc.c  */
-#line 730 "/export/home/pb2/build/sb_0-10701388-1383635700.2/mysql-5.5.35-release-export-5938259_gpl/sql/sql_yacc.yy"
+#line 731 "/export/home/pb2/build/sb_0-14562198-1425025410.01/mysql-5.5.43-release-export-7658734_gpl/sql/sql_yacc.yy"
 
   int  num;
   ulong ulong_num;
@@ -1283,7 +1283,7 @@
 
 
 /* Line 1676 of yacc.c  */
-#line 1287 "/export/home/pb2/build/sb_0-10701388-1383635700.2/dist_GPL/sql/sql_yacc.h"
+#line 1287 "/export/home/pb2/build/sb_0-14562198-1425025410.01/dist_GPL/sql/sql_yacc.h"
 } YYSTYPE;
 # define YYSTYPE_IS_TRIVIAL 1
 # define yystype YYSTYPE /* obsolescent; will be withdrawn */
diff -Nru mysql-5.5-5.5.35+dfsg/sql/sql_yacc.yy mysql-5.5-5.5.43/sql/sql_yacc.yy
--- mysql-5.5-5.5.35+dfsg/sql/sql_yacc.yy	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sql_yacc.yy	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, 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
@@ -22,13 +22,9 @@
 */
 
 %{
-/* thd is passed as an argument to yyparse(), and subsequently to yylex().
-** The type will be void*, so it must be  cast to (THD*) when used.
-** Use the YYTHD macro for this.
-*/
-#define YYPARSE_PARAM yythd
-#define YYLEX_PARAM yythd
-#define YYTHD ((THD *)yythd)
+/*
+Note: YYTHD is passed as an argument to yyparse(), and subsequently to yylex().
+*/
 #define YYLIP (& YYTHD->m_parser_state->m_lip)
 #define YYPS (& YYTHD->m_parser_state->m_yacc)
 
@@ -76,7 +72,7 @@
     ulong val= *(F);                          \
     if (my_yyoverflow((B), (D), &val))        \
     {                                         \
-      yyerror((char*) (A));                   \
+      yyerror(YYTHD, (char*) (A));            \
       return 2;                               \
     }                                         \
     else                                      \
@@ -174,10 +170,8 @@
   to abort from the parser.
 */
 
-void MYSQLerror(const char *s)
+void MYSQLerror(THD *thd, const char *s)
 {
-  THD *thd= current_thd;
-
   /*
     Restore the original LEX if it was replaced when parsing
     a stored procedure. We must ensure that a parsing error
@@ -444,6 +438,13 @@
   if (lex->spcont && tmp->var == Sys_autocommit_ptr)
     lex->sphead->m_flags|= sp_head::HAS_SET_AUTOCOMMIT_STMT;
 
+  if (val && val->type() == Item::FIELD_ITEM &&
+      ((Item_field*)val)->table_name)
+  {
+    my_error(ER_WRONG_TYPE_FOR_VAR, MYF(0), tmp->var->name.str);
+    return TRUE;
+  }
+
   if (! (var= new set_var(var_type, tmp->var, &tmp->base_name, val)))
     return TRUE;
 
@@ -780,7 +781,9 @@
 bool my_yyoverflow(short **a, YYSTYPE **b, ulong *yystacksize);
 %}
 
-%pure_parser                                    /* We have threads */
+%parse-param { class THD *YYTHD }
+%lex-param { class THD *YYTHD }
+%pure-parser                                    /* We have threads */
 /*
   Currently there are 168 shift/reduce conflicts.
   We should not introduce new conflicts any more.
@@ -5600,7 +5603,8 @@
         | GEOMETRYCOLLECTION  { $$= Field::GEOM_GEOMETRYCOLLECTION; }
         | POINT_SYM
           {
-            Lex->length= (char*)"25";
+            Lex->length= const_cast<char*>(STRINGIFY_ARG
+                                           (MAX_LEN_GEOM_POINT_FIELD));
             $$= Field::GEOM_POINT;
           }
         | MULTIPOINT          { $$= Field::GEOM_MULTIPOINT; }
@@ -14124,6 +14128,13 @@
             */
             lex->current_select->select_n_where_fields+=
             child->select_n_where_fields;
+
+            /*
+              Aggregate functions in having clause may add fields to an outer
+              select. Count them also.
+            */
+            lex->current_select->select_n_having_items+=
+            child->select_n_having_items;
           }
         ;
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/strfunc.cc mysql-5.5-5.5.43/sql/strfunc.cc
--- mysql-5.5-5.5.35+dfsg/sql/strfunc.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/strfunc.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/sys_vars.cc mysql-5.5-5.5.43/sql/sys_vars.cc
--- mysql-5.5-5.5.35+dfsg/sql/sys_vars.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/sys_vars.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2015, 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
@@ -1800,7 +1800,8 @@
        "the desired number of threads that should be run at the same time."
        "This variable has no effect, and is deprecated. "
        "It will be removed in a future release.",
-       READ_ONLY GLOBAL_VAR(concurrency), CMD_LINE(REQUIRED_ARG),
+       READ_ONLY GLOBAL_VAR(concurrency),
+       CMD_LINE(REQUIRED_ARG, OPT_THREAD_CONCURRENCY),
        VALID_RANGE(1, 512), DEFAULT(DEFAULT_CONCURRENCY), BLOCK_SIZE(1),
        NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
        DEPRECATED(""));
@@ -1835,7 +1836,7 @@
        "transaction_alloc_block_size",
        "Allocation block size for transactions to be stored in binary log",
        SESSION_VAR(trans_alloc_block_size), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1024, ULONG_MAX), DEFAULT(QUERY_ALLOC_BLOCK_SIZE),
+       VALID_RANGE(1024, 128 * 1024 * 1024), DEFAULT(QUERY_ALLOC_BLOCK_SIZE),
        BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_trans_mem_root));
 
@@ -1843,7 +1844,7 @@
        "transaction_prealloc_size",
        "Persistent buffer for transactions to be stored in binary log",
        SESSION_VAR(trans_prealloc_size), CMD_LINE(REQUIRED_ARG),
-       VALID_RANGE(1024, ULONG_MAX), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE),
+       VALID_RANGE(1024, 128 * 1024 * 1024), DEFAULT(TRANS_ALLOC_PREALLOC_SIZE),
        BLOCK_SIZE(1024), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
        ON_UPDATE(fix_trans_mem_root));
 
@@ -2241,9 +2242,10 @@
 
 static Sys_var_mybool Sys_timed_mutexes(
        "timed_mutexes",
-       "Specify whether to time mutexes (only InnoDB mutexes are currently "
-       "supported)",
-       GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0));
+       "Specify whether to time mutexes. Deprecated, has no effect.",
+       GLOBAL_VAR(timed_mutexes), CMD_LINE(OPT_ARG), DEFAULT(0),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL), ON_UPDATE(NULL),
+       DEPRECATED(""));
 
 static char *server_version_ptr;
 static Sys_var_charptr Sys_version(
@@ -2445,13 +2447,13 @@
 static bool fix_sql_log_bin_after_update(sys_var *self, THD *thd,
                                          enum_var_type type)
 {
-  if (type == OPT_SESSION)
-  {
-    if (thd->variables.sql_log_bin)
-      thd->variables.option_bits |= OPTION_BIN_LOG;
-    else
-      thd->variables.option_bits &= ~OPTION_BIN_LOG;
-  }
+  DBUG_ASSERT(type == OPT_SESSION);
+
+  if (thd->variables.sql_log_bin)
+    thd->variables.option_bits |= OPTION_BIN_LOG;
+  else
+    thd->variables.option_bits &= ~OPTION_BIN_LOG;
+
   return FALSE;
 }
 
@@ -2473,7 +2475,7 @@
     return TRUE;
 
   if (var->type == OPT_GLOBAL)
-    return FALSE;
+    return TRUE;
 
   /* If in a stored function/trigger, it's too late to change sql_log_bin. */
   if (thd->in_sub_stmt)
@@ -2492,9 +2494,9 @@
 }
 
 static Sys_var_mybool Sys_log_binlog(
-       "sql_log_bin", "sql_log_bin",
-       SESSION_VAR(sql_log_bin), NO_CMD_LINE,
-       DEFAULT(TRUE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_sql_log_bin),
+       "sql_log_bin", "Controls whether logging to the binary log is done",
+       SESSION_VAR(sql_log_bin), NO_CMD_LINE, DEFAULT(TRUE),
+       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_sql_log_bin),
        ON_UPDATE(fix_sql_log_bin_after_update));
 
 static Sys_var_bit Sys_sql_warnings(
diff -Nru mysql-5.5-5.5.35+dfsg/sql/table.cc mysql-5.5-5.5.43/sql/table.cc
--- mysql-5.5-5.5.35+dfsg/sql/table.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/table.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2014, 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
@@ -1525,13 +1525,36 @@
 	primary_key=key;
 	for (i=0 ; i < keyinfo->key_parts ;i++)
 	{
-	  uint fieldnr= key_part[i].fieldnr;
-	  if (!fieldnr ||
-	      share->field[fieldnr-1]->null_ptr ||
-	      share->field[fieldnr-1]->key_length() !=
-	      key_part[i].length)
+          DBUG_ASSERT(key_part[i].fieldnr > 0);
+          // Table field corresponding to the i'th key part.
+          Field *table_field= share->field[key_part[i].fieldnr - 1];
+
+          /*
+            If the key column is of NOT NULL BLOB type, then it
+            will definitly have key prefix. And if key part prefix size
+            is equal to the BLOB column max size, then we can promote
+            it to primary key.
+          */
+          if (!table_field->real_maybe_null() &&
+              table_field->type() == MYSQL_TYPE_BLOB &&
+              table_field->field_length == key_part[i].length)
+            continue;
+          /*
+            If the key column is of NOT NULL GEOMETRY type, specifically POINT
+            type whose length is known internally (which is 25). And key part
+            prefix size is equal to the POINT column max size, then we can
+            promote it to primary key.
+          */
+          if (!table_field->real_maybe_null() &&
+              table_field->type() == MYSQL_TYPE_GEOMETRY &&
+              table_field->get_geometry_type() == Field::GEOM_POINT &&
+              key_part[i].length == MAX_LEN_GEOM_POINT_FIELD)
+            continue;
+
+	  if (table_field->real_maybe_null() ||
+	      table_field->key_length() != key_part[i].length)
 	  {
-	    primary_key=MAX_KEY;		// Can't be used
+	    primary_key= MAX_KEY;		// Can't be used
 	    break;
 	  }
 	}
@@ -2115,7 +2138,9 @@
   outparam->no_replicate= outparam->file &&
                           test(outparam->file->ha_table_flags() &
                                HA_HAS_OWN_BINLOGGING);
-  thd->status_var.opened_tables++;
+  /* Increment the opened_tables counter, only when open flags set. */
+  if (db_stat)
+    thd->status_var.opened_tables++;
 
   DBUG_RETURN (0);
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql/table.h mysql-5.5-5.5.43/sql/table.h
--- mysql-5.5-5.5.35+dfsg/sql/table.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/table.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef TABLE_INCLUDED
 #define TABLE_INCLUDED
 
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/sql/transaction.h mysql-5.5-5.5.43/sql/transaction.h
--- mysql-5.5-5.5.35+dfsg/sql/transaction.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/transaction.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008 MySQL AB, 2009 Sun Microsystems, Inc.
-   Use is subject to license terms.
+/* Copyright (c) 2008, 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 -Nru mysql-5.5-5.5.35+dfsg/sql/udf_example.c mysql-5.5-5.5.43/sql/udf_example.c
--- mysql-5.5-5.5.35+dfsg/sql/udf_example.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql/udf_example.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -295,9 +295,12 @@
 
   if (!word)					/* Null argument */
   {
+    /* The length is expected to be zero when the argument is NULL. */
+    assert(args->lengths[0] == 0);
     *is_null=1;
     return 0;
   }
+
   w_end=word+args->lengths[0];
   org_result=result;
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/graph-compare-results.sh mysql-5.5-5.5.43/sql-bench/graph-compare-results.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/graph-compare-results.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/graph-compare-results.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,3 +1,5 @@
+#! /usr/bin/perl
+
 ####
 #### Hello ... this is a heavily hacked script by Luuk 
 #### instead of printing the result it makes a nice gif
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/innotest1a.sh mysql-5.5-5.5.43/sql-bench/innotest1a.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/innotest1a.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/innotest1a.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,108 +1,108 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 200000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 200000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest1a: MySQL/InnoDB stress test in Perl\n";
-print "-------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on table innotest1 in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest1 > out1\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kh";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 1; $i++) {
-	print "loop $i\n";
-
-	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
-		$dbh->do(
-		"insert into innotest1 (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')");
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 2]."' where A = ".$random[$j + 5]);
-		$dbh->do("update innotest1 SET D = D + 1 where A =".(($j - 1) / 2 - 777));
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 8]."' where A =".(($j - 1) / 2 - 770));
-		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
-
-		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
-		
-		if (0 == ($j % 37)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 533)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 537)) {
-		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		print "\n";
-		}
-
-		if (0 == (($j - 1) % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest1a: MySQL/InnoDB stress test in Perl\n";
+print "-------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on table innotest1 in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest1 > out1\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kh";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 1; $i++) {
+	print "loop $i\n";
+
+	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
+		$dbh->do(
+		"insert into innotest1 (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')");
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 2]."' where A = ".$random[$j + 5]);
+		$dbh->do("update innotest1 SET D = D + 1 where A =".(($j - 1) / 2 - 777));
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 8]."' where A =".(($j - 1) / 2 - 770));
+		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
+
+		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
+		
+		if (0 == ($j % 37)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 533)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 537)) {
+		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		print "\n";
+		}
+
+		if (0 == (($j - 1) % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/innotest1b.sh mysql-5.5-5.5.43/sql-bench/innotest1b.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/innotest1b.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/innotest1b.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,101 +1,101 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 200000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 200000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest1b: MySQL/InnoDB stress test in Perl\n";
-print "-------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on table innotest1 in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest1 > out1\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kh";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 5; $i++) {
-	print "loop $i\n";
-
-	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
-
-		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
-		
-		if (0 == ($j % 37)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 533)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 537)) {
-		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
-		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		print "\n";
-		}
-
-		if (0 == (($j - 1) % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest1b: MySQL/InnoDB stress test in Perl\n";
+print "-------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on table innotest1 in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest1 > out1\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kh";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 5; $i++) {
+	print "loop $i\n";
+
+	for ($j = 1; $j < $opt_loop_count - 10; $j = $j + 2) {
+
+		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
+		
+		if (0 == ($j % 37)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 533)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 537)) {
+		print fetch_all_rows($dbh, "select c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b from innotest1 where b = '".$rnd_str[$j - 688]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where c = '".$rnd_str[$j - 67]."'");
+		print fetch_all_rows($dbh, "select b, c from innotest1 where b = '".$rnd_str[$j - 622]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select a, b, c from innotest1 where b = '".$rnd_str[$j - 644]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		print fetch_all_rows($dbh, "select d, b, c from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		print "\n";
+		}
+
+		if (0 == (($j - 1) % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/innotest1.sh mysql-5.5-5.5.43/sql-bench/innotest1.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/innotest1.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/innotest1.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,142 +1,142 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest1: MySQL/InnoDB stress test in Perl\n";
-print "-------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on table innotest1 in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest1 > out1\n\n";
-     
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kh";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-$n = 0;
-
-for ($i = 0; $i < 1; $i++) {
-
-	print "Dropping table innotest1\n";
-
-	$dbh->do("drop table innotest1");
-
-	print "Creating table innotest1\n";
-
-	$dbh->do(
-	"create table innotest1 (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), E TIMESTAMP, F TIMESTAMP, G DATETIME, PRIMARY KEY (A, D), INDEX
-(B, C), INDEX (C), INDEX (D), INDEX(E), INDEX(G)) TYPE = INNODB")
-	|| die $dbh->errstr;
-
-	for ($j = 2; $j < $opt_loop_count - 10; $j = $j + 2) {
-
-		if ($j % 10 == 0) {
-			$dbh->do(
-		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NULL, NULL)");
-		} else {
-			$dbh->do(
-		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NOW(), NOW())");
-		}
-
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 7]."' where A = ".$random[$j + 5]);
-
-		$dbh->do("update innotest1 SET D = D + 1 where A =".($j / 2 - 500));
-
-		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 1]."' where A =".($j / 2 - 505));
-
-		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
-		
-		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
-		
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 97)) {
-		fetch_all_rows($dbh, "select c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select b, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		fetch_all_rows($dbh, "select b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-		fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
-		fetch_all_rows($dbh, "select d, b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
-
-			$dbh->do("rollback");
-		}		
-
-        	for ($k = 1; $k < 10; $k++) {
-
-                	$n += fetch_all_rows($dbh,
-"SELECT a, d from innotest1 where a = ".(($k * 1764767) % $j));
-
-                	$n += fetch_all_rows($dbh,
-"SELECT * from innotest1 where a = ".(($k * 187567) % $j));
-
-        	}
-
-		if (0 == ($j % 1000)) {
-			print "round $j, $n rows fetched\n";
-		}
-
-		if (0 == ($j % 20000)) {
-			print "Checking table innotest1...\n";
-			$dbh->do("check table innotest1");
-			print "Table checked.\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest1: MySQL/InnoDB stress test in Perl\n";
+print "-------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest1, innotest1a, and innotest1b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on table innotest1 in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest1 > out1\n\n";
+     
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "kjgclgrtfuylfluyfyufyulfulfyyulofuyolfyufyufuyfyufyufyufyufyyufujhfghd";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kh";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+$n = 0;
+
+for ($i = 0; $i < 1; $i++) {
+
+	print "Dropping table innotest1\n";
+
+	$dbh->do("drop table innotest1");
+
+	print "Creating table innotest1\n";
+
+	$dbh->do(
+	"create table innotest1 (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), E TIMESTAMP, F TIMESTAMP, G DATETIME, PRIMARY KEY (A, D), INDEX
+(B, C), INDEX (C), INDEX (D), INDEX(E), INDEX(G)) TYPE = INNODB")
+	|| die $dbh->errstr;
+
+	for ($j = 2; $j < $opt_loop_count - 10; $j = $j + 2) {
+
+		if ($j % 10 == 0) {
+			$dbh->do(
+		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NULL, NULL)");
+		} else {
+			$dbh->do(
+		"insert into innotest1 (D, B, C, F, G) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."', NOW(), NOW())");
+		}
+
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 7]."' where A = ".$random[$j + 5]);
+
+		$dbh->do("update innotest1 SET D = D + 1 where A =".($j / 2 - 500));
+
+		$dbh->do("update innotest1 set B = '".$rnd_str[$j + 1]."' where A =".($j / 2 - 505));
+
+		$dbh->do("delete from innotest1 where A = ".$random[$random[$j]]);
+		
+		fetch_all_rows($dbh, "select b, c from innotest1 where a > ".$random[$j]." and a < ".($random[$j] + 7));
+		
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 97)) {
+		fetch_all_rows($dbh, "select c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select b, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		fetch_all_rows($dbh, "select b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select a, b, c, e, f, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+		fetch_all_rows($dbh, "select d, b, c from innotest1 where c = '".$rnd_str[$j - 68]."'");
+		fetch_all_rows($dbh, "select d, b, c, g from innotest1 where b = '".$rnd_str[$j - 677]."'");
+
+			$dbh->do("rollback");
+		}		
+
+        	for ($k = 1; $k < 10; $k++) {
+
+                	$n += fetch_all_rows($dbh,
+"SELECT a, d from innotest1 where a = ".(($k * 1764767) % $j));
+
+                	$n += fetch_all_rows($dbh,
+"SELECT * from innotest1 where a = ".(($k * 187567) % $j));
+
+        	}
+
+		if (0 == ($j % 1000)) {
+			print "round $j, $n rows fetched\n";
+		}
+
+		if (0 == ($j % 20000)) {
+			print "Checking table innotest1...\n";
+			$dbh->do("check table innotest1");
+			print "Table checked.\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/innotest2a.sh mysql-5.5-5.5.43/sql-bench/innotest2a.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/innotest2a.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/innotest2a.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,94 +1,94 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/Innobase combined database
-#     (c) 2000 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/Innobase combined database
+#     (c) 2000 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest2a: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
-print "------------------------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks with foreign keys with\n";
-print "the ON DELETE ... clause. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest2 > out2\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "khD";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kHd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 5; $i++) {
-	print "loop $i\n";
-
-	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 1) {
-		
-		$dbh->do("update innotest2a set B = '".$rnd_str[$j + 1]."' where A = ".$random[$j + 5])
-		|| print $dbh->errstr;
-
-		$dbh->do("delete from innotest2a where A = ".$random[$random[$j]])
-		|| print $dbh->errstr;
-		
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 39)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest2a: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
+print "------------------------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks with foreign keys with\n";
+print "the ON DELETE ... clause. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest2 > out2\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "khD";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kHd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 20); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 5; $i++) {
+	print "loop $i\n";
+
+	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 1) {
+		
+		$dbh->do("update innotest2a set B = '".$rnd_str[$j + 1]."' where A = ".$random[$j + 5])
+		|| print $dbh->errstr;
+
+		$dbh->do("delete from innotest2a where A = ".$random[$random[$j]])
+		|| print $dbh->errstr;
+		
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 39)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/innotest2b.sh mysql-5.5-5.5.43/sql-bench/innotest2b.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/innotest2b.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/innotest2b.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,104 +1,104 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/Innobase combined database
-#     (c) 2000 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/Innobase combined database
+#     (c) 2000 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest2b: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
-print "------------------------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks with foreign keys with\n";
-print "the ON DELETE ... clause. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest2 > out2\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 98641) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "khD";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kHd";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect();
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 1; $i++) {
-	print "loop $i\n";
-
-	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
-		$dbh->do(
-		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do(
-		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-		
-		$dbh->do(
-		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
-		|| print $dbh->errstr;
-
-		$dbh->do("update innotest2b set A = A + 1 where A = ".$random[$j])
-		|| print $dbh->errstr;
-
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 39)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 1000)) {
-			print "round $j\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest2b: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
+print "------------------------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks with foreign keys with\n";
+print "the ON DELETE ... clause. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest2 > out2\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 98641) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "khD";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kHd";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect();
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 1; $i++) {
+	print "loop $i\n";
+
+	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
+		$dbh->do(
+		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do(
+		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+		
+		$dbh->do(
+		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
+		|| print $dbh->errstr;
+
+		$dbh->do("update innotest2b set A = A + 1 where A = ".$random[$j])
+		|| print $dbh->errstr;
+
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 39)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 1000)) {
+			print "round $j\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru mysql-5.5-5.5.35+dfsg/sql-bench/innotest2.sh mysql-5.5-5.5.43/sql-bench/innotest2.sh
--- mysql-5.5-5.5.35+dfsg/sql-bench/innotest2.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-bench/innotest2.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,150 +1,150 @@
-#!/usr/bin/perl
-############################################################################
-#     Stress test for MySQL/InnoDB combined database
-#     (c) 2002 Innobase Oy & MySQL AB
-#
-############################################################################
-
+#!/usr/bin/perl
+############################################################################
+#     Stress test for MySQL/InnoDB combined database
+#     (c) 2002 Innobase Oy & MySQL AB
+#
+############################################################################
+
 use Cwd;
-use DBI;
-use Benchmark;
-
-$opt_loop_count = 100000;
-
+use DBI;
+use Benchmark;
+
+$opt_loop_count = 100000;
+
 $pwd = cwd(); $pwd = "." if ($pwd eq '');
-require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
-
-print "Innotest2: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
-print "------------------------------------------------------------\n";
-print "This is a randomized stress test for concurrent inserts,\n";
-print "updates, deletes, commits and rollbacks with foreign keys with\n";
-print "the ON DELETE ... clause. The test will generate\n";
-print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
-print "\n";
-print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
-print "The thing to watch is that the server does not crash or does not\n";
-print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
-print "warnings about MySQL lock reservations can appear in the .err log.\n";
-print "The test will run very long, even several hours. You can kill\n";
-print "the perl processes running this test at any time and do CHECK\n";
-print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
-print "\n";
-print "Some of these stress tests will print a lot of SQL errors\n";
-print "to the standard output. That is not to be worried about.\n";
-print "You can direct the output to a file like this:\n";
-print "perl innotest2 > out2\n\n";
-
-print "Generating random keys\n";
-$random[$opt_loop_count] = 0;
-$rnd_str[$opt_loop_count] = "a";
-
-for ($i = 0; $i < $opt_loop_count; $i++) {
-
-	$random[$i] = ($i * 63857) % $opt_loop_count;
-
-  	if (0 == ($random[$i] % 3)) {
-  		$rnd_str[$i] = "khD";
-	} else { if (1 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "khd";
-	} else { if (2 == ($random[$i] % 3)) {
-		$rnd_str[$i] = "kHd";
-	}}}
-
-	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
-		$rnd_str[$i] = $rnd_str[$i]."k";
-	}	
-}
-
-####
-####  Connect
-####
-
-$dbh = $server->connect()
-|| die $dbh->errstr;
-
-$dbh->do("set autocommit = 0");
-
-for ($i = 0; $i < 1; $i++) {
-	print "loop $i\n";
-
-	print "dropping table innotest2a\n";
-	$dbh->do("drop table innotest2a");
-
-	print "dropping table innotest2b\n";
-	$dbh->do("drop table innotest2b");
-
-	print "dropping table innotest2c\n";
-	$dbh->do("drop table innotest2c");
-
-	print "dropping table innotest2d\n";
-	$dbh->do("drop table innotest2d");
-
-	print "creating table innotest2b\n";
-	$dbh->do(
-	"create table innotest2b (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C)) TYPE = INNODB")
-	|| die $dbh->errstr;	
-
-	print "creating table innotest2a\n";
-
-	$dbh->do(
-	"create table innotest2a (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2b (A, D) ON DELETE CASCADE) TYPE = INNODB")
-	|| die $dbh->errstr;
-
-	print "creating table innotest2c\n";
-
-	$dbh->do(
-	"create table innotest2c (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2a (A, D) ON DELETE CASCADE, FOREIGN KEY (B, C) REFERENCES innotest2a (B, C) ON DELETE CASCADE) TYPE = INNODB")
-	|| die $dbh->errstr;	
-
-	print "creating table innotest2d\n";
-
-	$dbh->do(
-	"create table innotest2d (A INT AUTO_INCREMENT, D INT, B VARCHAR(200), C VARCHAR(175), UNIQUE KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (C) REFERENCES innotest2c (C) ON DELETE SET NULL, FOREIGN KEY (B, C) REFERENCES innotest2c (B, C) ON DELETE SET NULL) TYPE = INNODB")
-	|| die $dbh->errstr;	
-	print "created\n";
-
-	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
-		$dbh->do(
-		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do(
-		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-		
-		$dbh->do(
-		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do(
-		"insert into innotest2d (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
-		|| print $dbh->errstr;
-
-		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
-		|| print $dbh->errstr;
-		
-		if (0 == ($j % 10)) {
-			$dbh->do("commit");
-		}
-
-		if (0 == ($j % 39)) {
-			$dbh->do("rollback");
-		}		
-
-		if (0 == ($j % 1000)) {
-			print "round $j\n";
-		}
-		if (0 == ($j % 20000)) {
-			print "Checking tables...\n";
-			$dbh->do("check table innotest2a");
-			$dbh->do("check table innotest2b");
-			$dbh->do("check table innotest2c");
-			$dbh->do("check table innotest2d");
-			print "Tables checked.\n";
-		}
-	}	
-	
-	$dbh->do("commit");
-}				
-
-$dbh->disconnect;				# close connection
+require "$pwd/bench-init.pl" || die "Can't read Configuration file: $!\n";
+
+print "Innotest2: MySQL/InnoDB stress test in Perl for FOREIGN keys\n";
+print "------------------------------------------------------------\n";
+print "This is a randomized stress test for concurrent inserts,\n";
+print "updates, deletes, commits and rollbacks with foreign keys with\n";
+print "the ON DELETE ... clause. The test will generate\n";
+print "also a lot of deadlocks, duplicate key errors, and other SQL errors.\n";
+print "\n";
+print "You should run innotest2, innotest2a, and innotest2b concurrently.\n";
+print "The thing to watch is that the server does not crash or does not\n";
+print "print to the .err log anything. Currently, due to a buglet in MySQL,\n";
+print "warnings about MySQL lock reservations can appear in the .err log.\n";
+print "The test will run very long, even several hours. You can kill\n";
+print "the perl processes running this test at any time and do CHECK\n";
+print "TABLE on tables innotest2a, b, c, d in the 'test' database.\n";
+print "\n";
+print "Some of these stress tests will print a lot of SQL errors\n";
+print "to the standard output. That is not to be worried about.\n";
+print "You can direct the output to a file like this:\n";
+print "perl innotest2 > out2\n\n";
+
+print "Generating random keys\n";
+$random[$opt_loop_count] = 0;
+$rnd_str[$opt_loop_count] = "a";
+
+for ($i = 0; $i < $opt_loop_count; $i++) {
+
+	$random[$i] = ($i * 63857) % $opt_loop_count;
+
+  	if (0 == ($random[$i] % 3)) {
+  		$rnd_str[$i] = "khD";
+	} else { if (1 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "khd";
+	} else { if (2 == ($random[$i] % 3)) {
+		$rnd_str[$i] = "kHd";
+	}}}
+
+	for ($j = 0; $j < (($i * 764877) % 10); $j++) {
+		$rnd_str[$i] = $rnd_str[$i]."k";
+	}	
+}
+
+####
+####  Connect
+####
+
+$dbh = $server->connect()
+|| die $dbh->errstr;
+
+$dbh->do("set autocommit = 0");
+
+for ($i = 0; $i < 1; $i++) {
+	print "loop $i\n";
+
+	print "dropping table innotest2a\n";
+	$dbh->do("drop table innotest2a");
+
+	print "dropping table innotest2b\n";
+	$dbh->do("drop table innotest2b");
+
+	print "dropping table innotest2c\n";
+	$dbh->do("drop table innotest2c");
+
+	print "dropping table innotest2d\n";
+	$dbh->do("drop table innotest2d");
+
+	print "creating table innotest2b\n";
+	$dbh->do(
+	"create table innotest2b (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C)) TYPE = INNODB")
+	|| die $dbh->errstr;	
+
+	print "creating table innotest2a\n";
+
+	$dbh->do(
+	"create table innotest2a (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2b (A, D) ON DELETE CASCADE) TYPE = INNODB")
+	|| die $dbh->errstr;
+
+	print "creating table innotest2c\n";
+
+	$dbh->do(
+	"create table innotest2c (A INT NOT NULL AUTO_INCREMENT, D INT NOT NULL, B VARCHAR(200) NOT NULL, C VARCHAR(175), PRIMARY KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (A, D) REFERENCES innotest2a (A, D) ON DELETE CASCADE, FOREIGN KEY (B, C) REFERENCES innotest2a (B, C) ON DELETE CASCADE) TYPE = INNODB")
+	|| die $dbh->errstr;	
+
+	print "creating table innotest2d\n";
+
+	$dbh->do(
+	"create table innotest2d (A INT AUTO_INCREMENT, D INT, B VARCHAR(200), C VARCHAR(175), UNIQUE KEY (A, D, B), INDEX (B, C), INDEX (C), FOREIGN KEY (C) REFERENCES innotest2c (C) ON DELETE SET NULL, FOREIGN KEY (B, C) REFERENCES innotest2c (B, C) ON DELETE SET NULL) TYPE = INNODB")
+	|| die $dbh->errstr;	
+	print "created\n";
+
+	for ($j = 0; $j < $opt_loop_count - 10; $j = $j + 2) {
+		$dbh->do(
+		"insert into innotest2b (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do(
+		"insert into innotest2a (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+		
+		$dbh->do(
+		"insert into innotest2c (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do(
+		"insert into innotest2d (D, B, C) values (5, '".$rnd_str[$j]."' ,'".$rnd_str[$j]."')")
+		|| print $dbh->errstr;
+
+		$dbh->do("delete from innotest2b where A = ".$random[$random[$j]])
+		|| print $dbh->errstr;
+		
+		if (0 == ($j % 10)) {
+			$dbh->do("commit");
+		}
+
+		if (0 == ($j % 39)) {
+			$dbh->do("rollback");
+		}		
+
+		if (0 == ($j % 1000)) {
+			print "round $j\n";
+		}
+		if (0 == ($j % 20000)) {
+			print "Checking tables...\n";
+			$dbh->do("check table innotest2a");
+			$dbh->do("check table innotest2b");
+			$dbh->do("check table innotest2c");
+			$dbh->do("check table innotest2d");
+			print "Tables checked.\n";
+		}
+	}	
+	
+	$dbh->do("commit");
+}				
+
+$dbh->disconnect;				# close connection
diff -Nru mysql-5.5-5.5.35+dfsg/sql-common/client.c mysql-5.5-5.5.43/sql-common/client.c
--- mysql-5.5-5.5.35+dfsg/sql-common/client.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-common/client.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2014, 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
@@ -1909,6 +1909,12 @@
     DBUG_RETURN(1);
   }
 
+  if (X509_V_OK != SSL_get_verify_result(ssl))
+  {
+    *errptr= "Failed to verify the server certificate";
+    X509_free(server_cert);
+    DBUG_RETURN(1);
+  }
   /*
     We already know that the certificate exchanged was valid; the SSL library
     handled that. Now we need to verify that the contents of the certificate
@@ -3802,8 +3808,8 @@
     {
       free_old_query(mysql);
       mysql->status=MYSQL_STATUS_READY; /* Force command */
-      mysql->reconnect=0;
       simple_command(mysql,COM_QUIT,(uchar*) 0,0,1);
+      mysql->reconnect=0;
       end_server(mysql);			/* Sets mysql->net.vio= 0 */
     }
     mysql_close_free_options(mysql);
@@ -4230,17 +4236,27 @@
 
   RETURN
    Signed number > 323000
+   Zero if there is no connection
 */
 
 ulong STDCALL
 mysql_get_server_version(MYSQL *mysql)
 {
-  uint major, minor, version;
-  char *pos= mysql->server_version, *end_pos;
-  major=   (uint) strtoul(pos, &end_pos, 10);	pos=end_pos+1;
-  minor=   (uint) strtoul(pos, &end_pos, 10);	pos=end_pos+1;
-  version= (uint) strtoul(pos, &end_pos, 10);
-  return (ulong) major*10000L+(ulong) (minor*100+version);
+  ulong major= 0, minor= 0, version= 0;
+
+  if (mysql->server_version)
+  {
+    char *pos= mysql->server_version, *end_pos;
+    major=   strtoul(pos, &end_pos, 10);	pos=end_pos+1;
+    minor=   strtoul(pos, &end_pos, 10);	pos=end_pos+1;
+    version= strtoul(pos, &end_pos, 10);
+  }
+  else
+  {
+    set_mysql_error(mysql, CR_COMMANDS_OUT_OF_SYNC, unknown_sqlstate);
+  }
+
+  return major*10000 + minor*100 + version;
 }
 
 
diff -Nru mysql-5.5-5.5.35+dfsg/sql-common/pack.c mysql-5.5-5.5.43/sql-common/pack.c
--- mysql-5.5-5.5.35+dfsg/sql-common/pack.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/sql-common/pack.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/archive/archive_test.c mysql-5.5-5.5.43/storage/archive/archive_test.c
--- mysql-5.5-5.5.35+dfsg/storage/archive/archive_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/archive/archive_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/archive/ha_archive.cc mysql-5.5-5.5.43/storage/archive/ha_archive.cc
--- mysql-5.5-5.5.35+dfsg/storage/archive/ha_archive.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/archive/ha_archive.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 /*
-   Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2004, 2014, 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
@@ -1078,6 +1079,7 @@
   }
 
   rc= found ? 0 : HA_ERR_END_OF_FILE;
+  table->status= rc ? STATUS_NOT_FOUND : 0;
   MYSQL_INDEX_READ_ROW_DONE(rc);
   DBUG_RETURN(rc);
 }
diff -Nru mysql-5.5-5.5.35+dfsg/storage/example/ha_example.cc mysql-5.5-5.5.43/storage/example/ha_example.cc
--- mysql-5.5-5.5.35+dfsg/storage/example/ha_example.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/example/ha_example.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 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 -Nru mysql-5.5-5.5.35+dfsg/storage/federated/ha_federated.cc mysql-5.5-5.5.43/storage/federated/ha_federated.cc
--- mysql-5.5-5.5.35+dfsg/storage/federated/ha_federated.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/federated/ha_federated.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2015, 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
@@ -1678,9 +1678,17 @@
   DBUG_ENTER("ha_federated::close");
 
   free_result();
-  
+
   delete_dynamic(&results);
-  
+
+  /*
+    Check to verify wheather the connection is still alive or not.
+    FLUSH TABLES will quit the connection and if connection is broken,
+    it will reconnect again and quit silently.
+  */
+  if (mysql && !vio_is_connected(mysql->net.vio))
+     mysql->net.error= 2;
+
   /* Disconnect from mysql */
   mysql_close(mysql);
   mysql= NULL;
@@ -2349,6 +2357,22 @@
   DBUG_RETURN(0);
 }
 
+int ha_federated::index_read_idx_map(uchar *buf, uint index, const uchar *key,
+                                key_part_map keypart_map,
+                                enum ha_rkey_function find_flag)
+{
+  int error= index_init(index, 0);
+  if (error)
+    return error;
+  error= index_read_map(buf, key, keypart_map, find_flag);
+  if(!error && stored_result)
+  {
+    uchar *dummy_arg=NULL;
+    position(dummy_arg);
+  }
+  int error1= index_end();
+  return error ?  error : error1;
+}
 
 /*
   Positions an index cursor to the index specified in the handle. Fetches the
@@ -2920,7 +2944,7 @@
 
   }
 
-  if (flag & HA_STATUS_AUTO)
+  if ((flag & HA_STATUS_AUTO) && mysql)
     stats.auto_increment_value= mysql->insert_id;
 
   mysql_free_result(result);
diff -Nru mysql-5.5-5.5.35+dfsg/storage/federated/ha_federated.h mysql-5.5-5.5.43/storage/federated/ha_federated.h
--- mysql-5.5-5.5.35+dfsg/storage/federated/ha_federated.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/federated/ha_federated.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 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
@@ -217,6 +217,9 @@
   int delete_row(const uchar *buf);
   int index_init(uint keynr, bool sorted);
   ha_rows estimate_rows_upper_bound();
+  int index_read_idx_map(uchar *buf, uint index, const uchar *key,
+                                key_part_map keypart_map,
+                                enum ha_rkey_function find_flag);
   int index_read(uchar *buf, const uchar *key,
                  uint key_len, enum ha_rkey_function find_flag);
   int index_read_idx(uchar *buf, uint idx, const uchar *key,
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/_check.c mysql-5.5-5.5.43/storage/heap/_check.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/_check.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/_check.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2006 MySQL AB
+/* Copyright (c) 2000, 2002-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_block.c mysql-5.5-5.5.43/storage/heap/hp_block.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_block.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_block.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -75,7 +75,8 @@
     This doesn't add much overhead - with current values of sizeof(HP_PTRS) 
     and my_default_record_cache_size we get about 1/128 unused memory.
    */
-  *alloc_length=sizeof(HP_PTRS)*i+block->records_in_block* block->recbuffer;
+  *alloc_length= sizeof(HP_PTRS)* i + (ulonglong) block->records_in_block *
+                                              block->recbuffer;
   if (!(root=(HP_PTRS*) my_malloc(*alloc_length,MYF(MY_WME))))
     return 1;
 
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_create.c mysql-5.5-5.5.43/storage/heap/hp_create.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_create.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_create.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2014, 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
@@ -240,7 +240,7 @@
   records_in_block= max_records / 10;
   if (records_in_block < 10 && max_records)
     records_in_block= 10;
-  if (!records_in_block || records_in_block*recbuffer >
+  if (!records_in_block || (ulonglong) records_in_block * recbuffer >
       (my_default_record_cache_size-sizeof(HP_PTRS)*HP_MAX_LEVELS))
     records_in_block= (my_default_record_cache_size - sizeof(HP_PTRS) *
 		      HP_MAX_LEVELS) / recbuffer + 1;
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_delete.c mysql-5.5-5.5.43/storage/heap/hp_delete.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_delete.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_delete.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2002, 2004-2007 MySQL AB
+/* Copyright (c) 2000, 2012, 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 -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_extra.c mysql-5.5-5.5.43/storage/heap/hp_extra.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_extra.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_extra.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001, 2004 MySQL AB
+/* Copyright (c) 2000, 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_rfirst.c mysql-5.5-5.5.43/storage/heap/hp_rfirst.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_rfirst.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_rfirst.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002, 2004 MySQL AB
+/* Copyright (c) 2000-2002, 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_rlast.c mysql-5.5-5.5.43/storage/heap/hp_rlast.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_rlast.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_rlast.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_rnext.c mysql-5.5-5.5.43/storage/heap/hp_rnext.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_rnext.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_rnext.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000, 2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_rprev.c mysql-5.5-5.5.43/storage/heap/hp_rprev.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_rprev.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_rprev.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_rrnd.c mysql-5.5-5.5.43/storage/heap/hp_rrnd.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_rrnd.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_rrnd.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002, 2004, 2006 MySQL AB
+/* Copyright (c) 2000-2002, 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_rsame.c mysql-5.5-5.5.43/storage/heap/hp_rsame.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_rsame.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_rsame.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_scan.c mysql-5.5-5.5.43/storage/heap/hp_scan.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_scan.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_scan.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/hp_update.c mysql-5.5-5.5.43/storage/heap/hp_update.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/hp_update.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/hp_update.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002, 2004-2005 MySQL AB
+/* Copyright (c) 2000-2002, 2004-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/heap/_rectest.c mysql-5.5-5.5.43/storage/heap/_rectest.c
--- mysql-5.5-5.5.35+dfsg/storage/heap/_rectest.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/heap/_rectest.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/buf/buf0buf.c mysql-5.5-5.5.43/storage/innobase/buf/buf0buf.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/buf/buf0buf.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/buf/buf0buf.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1995, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1995, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, Google Inc.
 
 Portions of this file contain modifications contributed and copyrighted by
@@ -2479,11 +2479,11 @@
 		UNIV_MEM_INVALID(bpage, sizeof *bpage);
 
 		buf_pool->n_pend_unzip++;
+		mutex_exit(&buf_pool->zip_mutex);
 		buf_pool_mutex_exit(buf_pool);
 
 		access_time = buf_page_is_accessed(&block->page);
 		mutex_exit(&block->mutex);
-		mutex_exit(&buf_pool->zip_mutex);
 
 		buf_page_free_descriptor(bpage);
 
@@ -3616,6 +3616,7 @@
 					      " because of"
 					      " a corrupt database page.\n",
 					      stderr);
+
 					ut_error;
 				}
 			}
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/CMakeLists.txt mysql-5.5-5.5.43/storage/innobase/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/storage/innobase/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -247,6 +247,14 @@
 			ut/ut0byte.c ut/ut0dbg.c ut/ut0list.c ut/ut0mem.c ut/ut0rbt.c ut/ut0rnd.c
 			ut/ut0ut.c ut/ut0vec.c ut/ut0wqueue.c ut/ut0bh.c)
 
+# These files have unused result errors, so we skip Werror
+CHECK_C_COMPILER_FLAG("-Werror" HAVE_WERROR)
+IF(HAVE_WERROR)
+  INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compile_flags.cmake)
+  ADD_COMPILE_FLAGS(page/page0zip.c COMPILE_FLAGS "-Wno-error")
+  ADD_COMPILE_FLAGS(ut/ut0ut.c      COMPILE_FLAGS "-Wno-error")
+ENDIF()
+
 IF(WITH_INNODB)
   # Legacy option
   SET(WITH_INNOBASE_STORAGE_ENGINE TRUE)
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0crea.c mysql-5.5-5.5.43/storage/innobase/dict/dict0crea.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0crea.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/dict/dict0crea.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -1441,6 +1441,8 @@
 	ulint		i;
 	pars_info_t*	info;
 
+	ut_ad(mutex_own(&(dict_sys->mutex)));
+
 	if (foreign->id == NULL) {
 		/* Generate a new constraint id */
 		ulint	namelen	= strlen(table->name);
@@ -1519,6 +1521,37 @@
 				      "END;\n"
 				      , table, foreign, trx);
 
+	if (error == DB_SUCCESS) {
+
+
+		if (foreign->foreign_table != NULL) {
+			ib_rbt_t*	rbt
+				= foreign->foreign_table->foreign_rbt;
+
+			if (rbt == NULL) {
+				rbt = dict_table_init_foreign_rbt(
+					foreign->foreign_table);
+			} else {
+				rbt_delete(rbt, foreign->id);
+			}
+
+			rbt_insert(rbt, foreign->id, &foreign);
+		}
+
+		if (foreign->referenced_table != NULL) {
+			ib_rbt_t* rbt
+				= foreign->referenced_table->referenced_rbt;
+
+			if (rbt == NULL) {
+				rbt = dict_table_init_referenced_rbt(
+					foreign->referenced_table);
+			} else {
+				rbt_delete(rbt, foreign->id);
+			}
+			rbt_insert(rbt, foreign->id, &foreign);
+		}
+	}
+
 	return(error);
 }
 
@@ -1543,6 +1576,7 @@
 	dict_foreign_t*	foreign;
 	ulint		number	= start_id + 1;
 	ulint		error;
+	DBUG_ENTER("dict_create_add_foreigns_to_dictionary");
 
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
@@ -1551,7 +1585,7 @@
 			"InnoDB: table SYS_FOREIGN not found"
 			" in internal data dictionary\n");
 
-		return(DB_ERROR);
+		DBUG_RETURN(DB_ERROR);
 	}
 
 	for (foreign = UT_LIST_GET_FIRST(table->foreign_list);
@@ -1563,9 +1597,9 @@
 
 		if (error != DB_SUCCESS) {
 
-			return(error);
+			DBUG_RETURN(error);
 		}
 	}
 
-	return(DB_SUCCESS);
+	DBUG_RETURN(DB_SUCCESS);
 }
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0dict.c mysql-5.5-5.5.43/storage/innobase/dict/dict0dict.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0dict.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/dict/dict0dict.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -26,6 +26,7 @@
 #include <my_sys.h>
 
 #include "dict0dict.h"
+#include "ut0rbt.h"
 
 #ifdef UNIV_NONINL
 #include "dict0dict.ic"
@@ -41,6 +42,12 @@
 UNIV_INTERN uint	ibuf_debug;
 #endif /* UNIV_DEBUG || UNIV_IBUF_DEBUG */
 
+/**********************************************************************
+Issue a warning that the row is too big. */
+void
+ib_warn_row_too_big(const dict_table_t*	table);
+
+
 #ifndef UNIV_HOTBACKUP
 #include "buf0buf.h"
 #include "data0type.h"
@@ -191,6 +198,7 @@
 /* mutex protecting the foreign and unique error buffers */
 UNIV_INTERN mutex_t	dict_foreign_err_mutex;
 #endif /* !UNIV_HOTBACKUP */
+
 /******************************************************************//**
 Makes all characters in a NUL-terminated UTF-8 string lower case. */
 UNIV_INTERN
@@ -1103,6 +1111,10 @@
 
 		UT_LIST_INIT(table->referenced_list);
 
+		if (table->referenced_rbt != NULL) {
+			rbt_clear(table->referenced_rbt);
+		}
+
 		return(TRUE);
 	}
 
@@ -1113,6 +1125,15 @@
 	foreign = UT_LIST_GET_FIRST(table->foreign_list);
 
 	while (foreign != NULL) {
+
+		/* The id will be changed.  So remove old one */
+		rbt_delete(foreign->foreign_table->foreign_rbt, foreign->id);
+
+		if (foreign->referenced_table) {
+			rbt_delete(foreign->referenced_table->referenced_rbt,
+				   foreign->id);
+		}
+
 		if (ut_strlen(foreign->foreign_table_name)
 		    < ut_strlen(table->name)) {
 			/* Allocate a longer name buffer;
@@ -1260,6 +1281,14 @@
 			mem_free(old_id);
 		}
 
+		rbt_insert(foreign->foreign_table->foreign_rbt,
+			   foreign->id, &foreign);
+
+		if (foreign->referenced_table) {
+			rbt_insert(foreign->referenced_table->referenced_rbt,
+				   foreign->id, &foreign);
+		}
+
 		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
 	}
 
@@ -1742,11 +1771,18 @@
 
 	new_index->n_fields = new_index->n_def;
 
-	if (strict && dict_index_too_big_for_tree(table, new_index)) {
+	if (dict_index_too_big_for_tree(table, new_index)) {
+
+		if (strict) {
 too_big:
-		dict_mem_index_free(new_index);
-		dict_mem_index_free(index);
-		return(DB_TOO_BIG_RECORD);
+			dict_mem_index_free(new_index);
+			dict_mem_index_free(index);
+			return(DB_TOO_BIG_RECORD);
+		} else {
+
+			ib_warn_row_too_big(table);
+
+		}
 	}
 
 	if (UNIV_UNLIKELY(index->type & DICT_UNIVERSAL)) {
@@ -2480,22 +2516,53 @@
 /*===========================*/
 	dict_foreign_t*	foreign)	/*!< in, own: foreign constraint */
 {
+	DBUG_ENTER("dict_foreign_remove_from_cache");
+
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 	ut_a(foreign);
 
 	if (foreign->referenced_table) {
+		ib_rbt_t*	rbt;
+
 		UT_LIST_REMOVE(referenced_list,
 			       foreign->referenced_table->referenced_list,
 			       foreign);
+
+		rbt = foreign->referenced_table->referenced_rbt;
+
+		if (rbt != NULL) {
+			const ib_rbt_node_t*	node
+				= rbt_lookup(rbt, foreign->id);
+			dict_foreign_t*	val = *(dict_foreign_t**) node->value;
+
+			if (val == foreign) {
+				rbt_delete(rbt, foreign->id);
+			}
+		}
 	}
 
 	if (foreign->foreign_table) {
+		ib_rbt_t*	rbt;
+
 		UT_LIST_REMOVE(foreign_list,
 			       foreign->foreign_table->foreign_list,
 			       foreign);
+		rbt = foreign->foreign_table->foreign_rbt;
+
+		if (rbt != NULL) {
+			const ib_rbt_node_t*	node
+				= rbt_lookup(rbt, foreign->id);
+			dict_foreign_t*	val = *(dict_foreign_t**) node->value;
+
+			if (val == foreign) {
+				rbt_delete(rbt, foreign->id);
+			}
+		}
 	}
 
 	dict_foreign_free(foreign);
+
+	DBUG_VOID_RETURN;
 }
 
 /**********************************************************************//**
@@ -2509,33 +2576,36 @@
 	dict_table_t*	table,	/*!< in: table object */
 	const char*	id)	/*!< in: foreign constraint id */
 {
-	dict_foreign_t*	foreign;
-
-	ut_ad(mutex_own(&(dict_sys->mutex)));
+	const ib_rbt_node_t*	node;
 
-	foreign = UT_LIST_GET_FIRST(table->foreign_list);
+	DBUG_ENTER("dict_foreign_find");
 
-	while (foreign) {
-		if (ut_strcmp(id, foreign->id) == 0) {
+	ut_ad(mutex_own(&(dict_sys->mutex)));
+	ut_ad(dict_table_check_foreign_keys(table));
 
-			return(foreign);
+	if (table->foreign_rbt != NULL) {
+		ut_a(UT_LIST_GET_LEN(table->foreign_list)
+		     == rbt_size(table->foreign_rbt));
+		node = rbt_lookup(table->foreign_rbt, id);
+		if (node != NULL) {
+			DBUG_RETURN(*(dict_foreign_t**) node->value);
 		}
-
-		foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
+	} else {
+		ut_a(UT_LIST_GET_LEN(table->foreign_list) == 0);
 	}
 
-	foreign = UT_LIST_GET_FIRST(table->referenced_list);
-
-	while (foreign) {
-		if (ut_strcmp(id, foreign->id) == 0) {
-
-			return(foreign);
+	if (table->referenced_rbt != NULL) {
+		ut_a(UT_LIST_GET_LEN(table->referenced_list)
+		     == rbt_size(table->referenced_rbt));
+		node = rbt_lookup(table->referenced_rbt, id);
+		if (node != NULL) {
+			DBUG_RETURN(*(dict_foreign_t**) node->value);
 		}
-
-		foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
+	} else {
+		ut_a(UT_LIST_GET_LEN(table->referenced_list) == 0);
 	}
 
-	return(NULL);
+	DBUG_RETURN(NULL);
 }
 
 /*********************************************************************//**
@@ -2773,6 +2843,8 @@
 	ibool		added_to_referenced_list= FALSE;
 	FILE*		ef			= dict_foreign_err_file;
 
+	DBUG_ENTER("dict_foreign_add_to_cache");
+
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
 	for_table = dict_table_check_if_in_cache_low(
@@ -2782,7 +2854,14 @@
 		foreign->referenced_table_name_lookup);
 	ut_a(for_table || ref_table);
 
+	if (ref_table != NULL && ref_table->referenced_rbt == NULL) {
+		dict_table_init_referenced_rbt(ref_table);
+	}
+
 	if (for_table) {
+		if (for_table->foreign_rbt == NULL) {
+			dict_table_init_foreign_rbt(for_table);
+		}
 		for_in_cache = dict_foreign_find(for_table, foreign->id);
 	}
 
@@ -2819,18 +2898,22 @@
 				mem_heap_free(foreign->heap);
 			}
 
-			return(DB_CANNOT_ADD_CONSTRAINT);
+			DBUG_RETURN(DB_CANNOT_ADD_CONSTRAINT);
 		}
 
 		for_in_cache->referenced_table = ref_table;
 		for_in_cache->referenced_index = index;
+
 		UT_LIST_ADD_LAST(referenced_list,
-				 ref_table->referenced_list,
-				 for_in_cache);
+				 ref_table->referenced_list, for_in_cache);
 		added_to_referenced_list = TRUE;
+
+		rbt_insert(ref_table->referenced_rbt,
+			   for_in_cache->id, &for_in_cache);
 	}
 
 	if (for_in_cache->foreign_table == NULL && for_table) {
+
 		index = dict_foreign_find_index(
 			for_table,
 			for_in_cache->foreign_col_names,
@@ -2859,22 +2942,28 @@
 						referenced_list,
 						ref_table->referenced_list,
 						for_in_cache);
+					rbt_delete(ref_table->referenced_rbt,
+						   for_in_cache->id);
 				}
 
 				mem_heap_free(foreign->heap);
 			}
 
-			return(DB_CANNOT_ADD_CONSTRAINT);
+			DBUG_RETURN(DB_CANNOT_ADD_CONSTRAINT);
 		}
 
 		for_in_cache->foreign_table = for_table;
 		for_in_cache->foreign_index = index;
+
 		UT_LIST_ADD_LAST(foreign_list,
 				 for_table->foreign_list,
 				 for_in_cache);
+
+		rbt_insert(for_table->foreign_rbt, for_in_cache->id,
+			   &for_in_cache);
 	}
 
-	return(DB_SUCCESS);
+	DBUG_RETURN(DB_SUCCESS);
 }
 
 #endif /* !UNIV_HOTBACKUP */
@@ -5311,6 +5400,11 @@
 
 	ut_ad(space_id > 0);
 
+	if (dict_sys == NULL) {
+		/* This could happen when it's in redo processing. */
+		return(NULL);
+	}
+
 	table = UT_LIST_GET_FIRST(dict_sys->table_LRU);
 	num_item =  UT_LIST_GET_LEN(dict_sys->table_LRU);
 
@@ -5417,11 +5511,11 @@
 
 	dict_index_copy_types(tuple, sys_index, 2);
 
-	btr_cur_search_to_nth_level(sys_index, 0, tuple, PAGE_CUR_GE,
+	btr_cur_search_to_nth_level(sys_index, 0, tuple, PAGE_CUR_LE,
 				    BTR_MODIFY_LEAF,
 				    &cursor, 0, __FILE__, __LINE__, &mtr);
 
-	if (cursor.up_match == dtuple_get_n_fields(tuple)) {
+	if (cursor.low_match == dtuple_get_n_fields(tuple)) {
 		/* UPDATE SYS_INDEXES SET TYPE=index->type
 		WHERE TABLE_ID=index->table->id AND INDEX_ID=index->id */
 		ulint	len;
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0load.c mysql-5.5-5.5.43/storage/innobase/dict/dict0load.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0load.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/dict/dict0load.c	2015-02-27 08:30:34.000000000 +0000
@@ -1759,6 +1759,8 @@
 	const char*	err_msg;
 	mtr_t		mtr;
 
+	DBUG_ENTER("dict_load_table");
+
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
 	heap = mem_heap_create(32000);
@@ -1792,7 +1794,7 @@
 		mtr_commit(&mtr);
 		mem_heap_free(heap);
 
-		return(NULL);
+		DBUG_RETURN(NULL);
 	}
 
 	field = rec_get_nth_field_old(rec, 0, &len);
@@ -1954,8 +1956,8 @@
 #endif /* 0 */
 func_exit:
 	mem_heap_free(heap);
-
-	return(table);
+	ut_ad(table == NULL || dict_table_check_foreign_keys(table));
+	DBUG_RETURN(table);
 }
 
 /***********************************************************************//**
@@ -2180,6 +2182,8 @@
 	dict_table_t*	for_table;
 	dict_table_t*	ref_table;
 
+	DBUG_ENTER("dict_load_foreign");
+
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
 	heap2 = mem_heap_create(1000);
@@ -2212,7 +2216,7 @@
 		mtr_commit(&mtr);
 		mem_heap_free(heap2);
 
-		return(DB_ERROR);
+		DBUG_RETURN(DB_ERROR);
 	}
 
 	field = rec_get_nth_field_old(rec, 0, &len);
@@ -2228,7 +2232,7 @@
 		mtr_commit(&mtr);
 		mem_heap_free(heap2);
 
-		return(DB_ERROR);
+		DBUG_RETURN(DB_ERROR);
 	}
 
 	/* Read the table names and the number of columns associated
@@ -2325,7 +2329,7 @@
 	a new foreign key constraint but loading one from the data
 	dictionary. */
 
-	return(dict_foreign_add_to_cache(foreign, check_charsets, ignore_err));
+	DBUG_RETURN(dict_foreign_add_to_cache(foreign, check_charsets, ignore_err));
 }
 
 /***********************************************************************//**
@@ -2360,6 +2364,8 @@
 	ulint		err;
 	mtr_t		mtr;
 
+	DBUG_ENTER("dict_load_foreigns");
+
 	ut_ad(mutex_own(&(dict_sys->mutex)));
 
 	sys_foreign = dict_table_get_low("SYS_FOREIGN", DICT_ERR_IGNORE_NONE);
@@ -2371,7 +2377,7 @@
 			"InnoDB: Error: no foreign key system tables"
 			" in the database\n");
 
-		return(DB_ERROR);
+		DBUG_RETURN(DB_ERROR);
 	}
 
 	ut_a(!dict_table_is_comp(sys_foreign));
@@ -2451,7 +2457,7 @@
 	if (err != DB_SUCCESS) {
 		btr_pcur_close(&pcur);
 
-		return(err);
+		DBUG_RETURN(err);
 	}
 
 	mtr_start(&mtr);
@@ -2480,5 +2486,74 @@
 		goto start_load;
 	}
 
-	return(DB_SUCCESS);
+	DBUG_RETURN(DB_SUCCESS);
+}
+
+/********************************************************************//**
+Check if dict_table_t::foreign_rbt and dict_table::foreign_list
+contain the same set of foreign key objects; and check if
+dict_table_t::referenced_rbt and dict_table::referenced_list contain
+the same set of foreign key objects.
+@return	TRUE if correct, FALSE otherwise. */
+ibool
+dict_table_check_foreign_keys(
+/*==========================*/
+	const dict_table_t* table)	/* in: table object to check */
+{
+	dict_foreign_t*		foreign;
+	const ib_rbt_node_t*	node;
+
+	ut_ad(mutex_own(&(dict_sys->mutex)));
+
+	if (table->foreign_rbt == NULL) {
+
+		if (UT_LIST_GET_LEN(table->foreign_list) > 0) {
+			return(FALSE);
+		}
+
+	} else {
+
+		if (UT_LIST_GET_LEN(table->foreign_list)
+		    != rbt_size(table->foreign_rbt)) {
+			return(FALSE);
+		}
+
+		foreign = UT_LIST_GET_FIRST(table->foreign_list);
+
+		while (foreign != NULL) {
+
+			node = rbt_lookup(table->foreign_rbt, foreign->id);
+			if (node == NULL) {
+				return(FALSE);
+			}
+			foreign = UT_LIST_GET_NEXT(foreign_list, foreign);
+		}
+	}
+
+	if (table->referenced_rbt == NULL ) {
+
+		if (UT_LIST_GET_LEN(table->referenced_list) > 0) {
+			return(FALSE);
+		}
+
+	} else {
+
+		if (UT_LIST_GET_LEN(table->referenced_list)
+		    != rbt_size(table->referenced_rbt)) {
+			return(FALSE);
+		}
+
+		foreign = UT_LIST_GET_FIRST(table->referenced_list);
+
+		while (foreign != NULL) {
+
+			node = rbt_lookup(table->referenced_rbt, foreign->id);
+			if (node == NULL) {
+				return(FALSE);
+			}
+			foreign = UT_LIST_GET_NEXT(referenced_list, foreign);
+		}
+	}
+
+	return(TRUE);
 }
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0mem.c mysql-5.5-5.5.43/storage/innobase/dict/dict0mem.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/dict/dict0mem.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/dict/dict0mem.c	2015-02-27 08:30:34.000000000 +0000
@@ -66,6 +66,7 @@
 {
 	dict_table_t*	table;
 	mem_heap_t*	heap;
+	DBUG_ENTER("dict_mem_table_create");
 
 	ut_ad(name);
 	ut_a(!(flags & (~0 << DICT_TF2_BITS)));
@@ -98,8 +99,11 @@
 	table->n_waiting_or_granted_auto_inc_locks = 0;
 #endif /* !UNIV_HOTBACKUP */
 
+	table->foreign_rbt = NULL;
+	table->referenced_rbt = NULL;
+
 	ut_d(table->magic_n = DICT_TABLE_MAGIC_N);
-	return(table);
+	DBUG_RETURN(table);
 }
 
 /****************************************************************//**
@@ -117,6 +121,15 @@
 #ifndef UNIV_HOTBACKUP
 	mutex_free(&(table->autoinc_mutex));
 #endif /* UNIV_HOTBACKUP */
+
+	if (table->foreign_rbt != NULL) {
+		rbt_free(table->foreign_rbt);
+	}
+
+	if (table->referenced_rbt != NULL) {
+		rbt_free(table->referenced_rbt);
+	}
+
 	ut_free(table->name);
 	mem_heap_free(table->heap);
 }
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/handler/ha_innodb.cc mysql-5.5-5.5.43/storage/innobase/handler/ha_innodb.cc
--- mysql-5.5-5.5.35+dfsg/storage/innobase/handler/ha_innodb.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/handler/ha_innodb.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2014, Oracle and/or its affiliates. All Rights Reserved.
 Copyright (c) 2008, 2009 Google Inc.
 Copyright (c) 2009, Percona Inc.
 
@@ -2251,7 +2251,7 @@
         innobase_hton->start_consistent_snapshot=innobase_start_trx_and_assign_read_view;
         innobase_hton->flush_logs=innobase_flush_logs;
         innobase_hton->show_status=innobase_show_status;
-        innobase_hton->flags=HTON_NO_FLAGS;
+        innobase_hton->flags=HTON_SUPPORTS_FOREIGN_KEYS;
         innobase_hton->release_temporary_latches=innobase_release_temporary_latches;
 	innobase_hton->alter_table_flags = innobase_alter_table_flags;
 
@@ -2343,7 +2343,8 @@
 		internal_innobase_data_file_path);
 	if (ret == FALSE) {
 		sql_print_error(
-			"InnoDB: syntax error in innodb_data_file_path");
+			"InnoDB: syntax error in innodb_data_file_path"
+			" or size specified is less than 1 megabyte");
 mem_free_and_error:
 		srv_free_paths_and_sizes();
 		my_free(internal_innobase_data_file_path);
@@ -7652,16 +7653,6 @@
 	error = row_rename_table_for_mysql(
 		norm_from, norm_to, trx, lock_and_commit);
 
-	if (error != DB_SUCCESS) {
-		FILE* ef = dict_foreign_err_file;
-
-		fputs("InnoDB: Renaming table ", ef);
-		ut_print_name(ef, trx, TRUE, norm_from);
-		fputs(" to ", ef);
-		ut_print_name(ef, trx, TRUE, norm_to);
-		fputs(" failed!\n", ef);
-	}
-
 	if (lock_and_commit) {
 		row_mysql_unlock_data_dictionary(trx);
 
@@ -9182,6 +9173,7 @@
 	thr_lock_type	lock_type)
 {
 	trx_t*		trx;
+	DBUG_ENTER("ha_innobase::start_stmt");
 
 	update_thd(thd);
 
@@ -9204,6 +9196,28 @@
 	prebuilt->hint_need_to_fetch_extra_cols = 0;
 	reset_template(prebuilt);
 
+	if (dict_table_is_temporary(prebuilt->table)
+	    && prebuilt->mysql_has_locked
+	    && prebuilt->select_lock_type == LOCK_NONE) {
+		ulint error;
+
+		switch (thd_sql_command(thd)) {
+		case SQLCOM_INSERT:
+		case SQLCOM_UPDATE:
+		case SQLCOM_DELETE:
+			init_table_handle_for_HANDLER();
+			prebuilt->select_lock_type = LOCK_X;
+			error = row_lock_table_for_mysql(prebuilt, NULL, 1);
+
+			if (error != DB_SUCCESS) {
+				error = convert_error_code_to_mysql(
+					(int) error, 0, thd);
+				DBUG_RETURN((int) error);
+			}
+			break;
+		}
+	}
+
 	if (!prebuilt->mysql_has_locked) {
 		/* This handle is for a temporary table created inside
 		this same LOCK TABLES; since MySQL does NOT call external_lock
@@ -9236,7 +9250,7 @@
 
 	innobase_register_trx(ht, thd, trx);
 
-	return(0);
+	DBUG_RETURN(0);
 }
 
 /******************************************************************//**
@@ -10244,6 +10258,21 @@
 
 		current = *first_value > col_max_value ? autoinc : *first_value;
 
+		/* If the increment step of the auto increment column
+		decreases then it is not affecting the immediate
+		next value in the series. */
+		if (prebuilt->autoinc_increment > increment) {
+
+			current = autoinc - prebuilt->autoinc_increment;
+
+			current = innobase_next_autoinc(
+				current, 1, increment, 1, col_max_value);
+
+			dict_table_autoinc_initialize(prebuilt->table, current);
+
+			*first_value = current;
+		}
+
 		/* Compute the last value in the interval */
 		next_value = innobase_next_autoinc(
 			current, *nb_reserved_values, increment, offset,
@@ -10376,10 +10405,8 @@
 			len1 = innobase_read_from_2_little_endian(ref1);
 			len2 = innobase_read_from_2_little_endian(ref2);
 
-			ref1 += 2;
-			ref2 += 2;
-			result = ((Field_blob*)field)->cmp( ref1, len1,
-                                                            ref2, len2);
+			result = ((Field_blob*)field)->cmp(ref1 + 2, len1,
+							   ref2 + 2, len2);
 		} else {
 			result = field->key_cmp(ref1, ref2);
 		}
@@ -11703,7 +11730,7 @@
 static MYSQL_SYSVAR_ULONG(thread_sleep_delay, srv_thread_sleep_delay,
   PLUGIN_VAR_RQCMDARG,
   "Time of innodb thread sleeping before joining InnoDB queue (usec). Value 0 disable a sleep",
-  NULL, NULL, 10000L, 0L, ~0UL, 0);
+  NULL, NULL, 10000L, 0L, 1000000L, 0);
 
 static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
@@ -12057,3 +12084,34 @@
 
 	return(strconvert(cs_from, from, cs_to, to, len, &errors));
 }
+
+
+/**********************************************************************
+Issue a warning that the row is too big. */
+extern "C"
+void
+ib_warn_row_too_big(const dict_table_t*	table)
+{
+	/* If prefix is true then a 768-byte prefix is stored
+	locally for BLOB fields. Refer to dict_table_get_format() */
+	const bool	prefix = ((table->flags & DICT_TF_FORMAT_MASK)
+				  >> DICT_TF_FORMAT_SHIFT) < UNIV_FORMAT_B;
+
+	const ulint	free_space = page_get_free_space_of_empty(
+		table->flags & DICT_TF_COMPACT) / 2;
+
+	THD*	thd = current_thd;
+
+	if (thd == NULL) {
+		return;
+	}
+
+	push_warning_printf(
+		thd, MYSQL_ERROR::WARN_LEVEL_WARN, HA_ERR_TO_BIG_ROW,
+		"Row size too large (> %lu). Changing some columns to TEXT"
+		" or BLOB %smay help. In current row format, BLOB prefix of"
+		" %d bytes is stored inline.", free_space
+		, prefix ? "or using ROW_FORMAT=DYNAMIC or"
+		" ROW_FORMAT=COMPRESSED ": ""
+		, prefix ? DICT_MAX_FIXED_COL_LEN : 0);
+}
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/handler/ha_innodb.h mysql-5.5-5.5.43/storage/innobase/handler/ha_innodb.h
--- mysql-5.5-5.5.35+dfsg/storage/innobase/handler/ha_innodb.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/handler/ha_innodb.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 /*****************************************************************************
 
 Copyright (c) 2000, 2010, MySQL AB & Innobase Oy. All Rights Reserved.
+   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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/handler/handler0alter.cc mysql-5.5-5.5.43/storage/innobase/handler/handler0alter.cc
--- mysql-5.5-5.5.35+dfsg/storage/innobase/handler/handler0alter.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/handler/handler0alter.cc	2015-02-27 08:30:34.000000000 +0000
@@ -110,16 +110,16 @@
 		/* These column types should never be shipped to MySQL. */
 		ut_ad(0);
 
-	case DATA_FIXBINARY:
 	case DATA_FLOAT:
 	case DATA_DOUBLE:
 	case DATA_DECIMAL:
 		/* Above are the valid column types for MySQL data. */
 		ut_ad(flen == len);
 		/* fall through */
+	case DATA_FIXBINARY:
 	case DATA_CHAR:
 		/* We may have flen > len when there is a shorter
-		prefix on a CHAR column. */
+		prefix on the CHAR and BINARY column. */
 		ut_ad(flen >= len);
 #else /* UNIV_DEBUG */
 	default:
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/handler/i_s.cc mysql-5.5-5.5.43/storage/innobase/handler/i_s.cc
--- mysql-5.5-5.5.35+dfsg/storage/innobase/handler/i_s.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/handler/i_s.cc	2015-02-27 08:30:34.000000000 +0000
@@ -2692,6 +2692,19 @@
 				table_name = mem_heap_strdup(heap,
 							     index->table_name);
 
+                                DBUG_EXECUTE_IF("mysql_test_print_index_type",
+                                  {
+                                    char idx_type[3];
+
+                                    ut_snprintf(idx_type,
+                                                sizeof(idx_type),
+                                                "%d",
+                                                index->type);
+
+                                    index_name=mem_heap_strcat(heap,
+                                                               index_name,
+                                                               idx_type);
+                                  };);
 			}
 
 			mutex_exit(&dict_sys->mutex);
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/include/btr0cur.ic mysql-5.5-5.5.43/storage/innobase/include/btr0cur.ic
--- mysql-5.5-5.5.35+dfsg/storage/innobase/include/btr0cur.ic	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/include/btr0cur.ic	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1994, 2012, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1994, 2014, 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
@@ -28,7 +28,7 @@
 
 #ifdef UNIV_DEBUG
 # define LIMIT_OPTIMISTIC_INSERT_DEBUG(NREC, CODE)\
-if (btr_cur_limit_optimistic_insert_debug\
+if (btr_cur_limit_optimistic_insert_debug > 1\
     && (NREC) >= (ulint)btr_cur_limit_optimistic_insert_debug) {\
         CODE;\
 }
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0dict.h mysql-5.5-5.5.43/storage/innobase/include/dict0dict.h
--- mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0dict.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/include/dict0dict.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -39,6 +39,7 @@
 #include "ut0rnd.h"
 #include "ut0byte.h"
 #include "trx0types.h"
+#include "ut0rbt.h"
 
 #ifndef UNIV_HOTBACKUP
 # include "sync0sync.h"
@@ -1331,6 +1332,50 @@
 /*========================*/
 	ulint		space_id);	/*!< in: space ID */
 
+/**********************************************************************//**
+Compares the given foreign key identifier (the key in rb-tree) and the
+foreign key identifier in the given fk object (value in rb-tree).
+@return	negative, 0, or positive if foreign_id is smaller, equal,
+or greater than foreign_obj->id, respectively. */
+UNIV_INLINE
+int
+dict_foreign_rbt_cmp(
+/*=================*/
+	const void*	foreign_id,	/*!< in: the foreign key identifier
+					which is used as a key in rb-tree.  */
+	const void*	foreign_obj);	/*!< in: the foreign object itself
+					which is used as value in rb-tree. */
+
+/**********************************************************************//**
+Allocate the table->foreign_rbt, which stores all the foreign objects
+that is available in table->foreign_list.
+@return the allocated rbt object */
+UNIV_INLINE
+ib_rbt_t*
+dict_table_init_foreign_rbt(
+/*========================*/
+	dict_table_t*	table);	/*!< in: the table object whose
+				table->foreign_rbt will be initialized */
+
+/**********************************************************************//**
+Allocate the table->referened_rbt, which stores all the foreign objects
+that is available in table->referenced_list.
+@return the allocated rbt object */
+UNIV_INLINE
+ib_rbt_t*
+dict_table_init_referenced_rbt(
+/*===========================*/
+	dict_table_t*	table);	/*!< in: the table object whose
+				table->referenced_rbt will be initialized */
+/********************************************************************//**
+Check if it is a temporary table.
+@return        true if temporary table flag is set. */
+UNIV_INLINE
+ibool
+dict_table_is_temporary(
+/*====================*/
+	const dict_table_t*     table);  /*!< in: table to check */
+
 #ifndef UNIV_NONINL
 #include "dict0dict.ic"
 #endif
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0dict.ic mysql-5.5-5.5.43/storage/innobase/include/dict0dict.ic
--- mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0dict.ic	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/include/dict0dict.ic	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -945,3 +945,74 @@
 }
 
 #endif /* !UNIV_HOTBACKUP */
+/**********************************************************************//**
+Compares the given foreign key identifier (the key in rb-tree) and the
+foreign key identifier in the given fk object (value in rb-tree).
+@return	negative, 0, or positive if foreign_id is smaller, equal,
+or greater than foreign_obj->id, respectively. */
+UNIV_INLINE
+int
+dict_foreign_rbt_cmp(
+/*=================*/
+	const void*	foreign_id,	/*!< in: the foreign key identifier
+					which is used as a key in rb-tree.  */
+	const void*	foreign_obj)	/*!< in: the foreign object itself
+					which is used as value in rb-tree. */
+{
+	return(ut_strcmp((const char*) foreign_id,
+			 (*(dict_foreign_t**) foreign_obj)->id));
+}
+
+/**********************************************************************//**
+Allocate the table->foreign_rbt, which stores all the foreign objects
+that is available in table->foreign_list.  The caller must hold the
+dict_sys->mutex.
+@return the allocated rbt object */
+UNIV_INLINE
+ib_rbt_t*
+dict_table_init_foreign_rbt(
+/*========================*/
+	dict_table_t*	table) /*!< in: the table object whose
+				table->foreign_rbt will be initialized */
+{
+	ut_a(table->foreign_rbt == NULL);
+	ut_ad(mutex_own(&(dict_sys->mutex)));
+
+	table->foreign_rbt = rbt_create(sizeof(dict_foreign_t*),
+					dict_foreign_rbt_cmp);
+	ut_a(table->foreign_rbt != NULL);
+	return(table->foreign_rbt);
+}
+
+/**********************************************************************//**
+Allocate the table->referened_rbt, which stores all the foreign objects
+that is available in table->referenced_list.  The caller must hold the
+dict_sys->mutex.
+@return the allocated rbt object */
+UNIV_INLINE
+ib_rbt_t*
+dict_table_init_referenced_rbt(
+/*===========================*/
+	dict_table_t*	table) /*!< in: the table object whose
+				table->referenced_rbt will be initialized */
+{
+	ut_a(table->referenced_rbt == NULL);
+	ut_ad(mutex_own(&(dict_sys->mutex)));
+
+	table->referenced_rbt = rbt_create(sizeof(dict_foreign_t*),
+					   dict_foreign_rbt_cmp);
+	ut_a(table->referenced_rbt != NULL);
+	return(table->referenced_rbt);
+}
+
+/********************************************************************//**
+Check if it is a temporary table.
+@return        true if temporary table flag is set. */
+UNIV_INLINE
+ibool
+dict_table_is_temporary(
+/*====================*/
+	const dict_table_t*     table)  /*!< in: table to check */
+{
+	return(table->flags & (DICT_TF2_TEMPORARY << DICT_TF2_SHIFT));
+}
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0load.h mysql-5.5-5.5.43/storage/innobase/include/dict0load.h
--- mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0load.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/include/dict0load.h	2015-02-27 08:30:34.000000000 +0000
@@ -32,6 +32,7 @@
 #include "ut0byte.h"
 #include "mem0mem.h"
 #include "btr0types.h"
+#include "ut0rbt.h"
 
 /** enum that defines all 6 system table IDs */
 enum dict_system_table_id {
@@ -329,6 +330,17 @@
 	const char**	ref_col_name,	/*!< out: referenced column name
 					in referenced table */
 	ulint*		pos);		/*!< out: column position */
+/********************************************************************//**
+Check if dict_table_t::foreign_rbt and dict_table::foreign_list
+contains the same set of foreign key objects; and check if
+dict_table_t::referenced_rbt and dict_table::referenced_list contains
+the same set of foreign key objects.
+@return	TRUE if correct, FALSE otherwise. */
+ibool
+dict_table_check_foreign_keys(
+/*==========================*/
+	const dict_table_t*	table);	/* in: table object to check */
+
 #ifndef UNIV_NONINL
 #include "dict0load.ic"
 #endif
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0mem.h mysql-5.5-5.5.43/storage/innobase/include/dict0mem.h
--- mysql-5.5-5.5.35+dfsg/storage/innobase/include/dict0mem.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/include/dict0mem.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -43,6 +43,7 @@
 #include "ut0byte.h"
 #include "hash0hash.h"
 #include "trx0types.h"
+#include "ut0rbt.h"
 
 /** Type flags of an index: OR'ing of the flags is allowed to define a
 combination of types */
@@ -506,7 +507,6 @@
 #define DICT_FOREIGN_ON_UPDATE_NO_ACTION 32	/*!< ON UPDATE NO ACTION */
 /* @} */
 
-
 /** Data structure for a database table.  Most fields will be
 initialized to 0, NULL or FALSE in dict_mem_table_create(). */
 struct dict_table_struct{
@@ -558,6 +558,14 @@
 	UT_LIST_BASE_NODE_T(dict_foreign_t)
 			referenced_list;/*!< list of foreign key constraints
 				which refer to this table */
+
+	ib_rbt_t*	foreign_rbt;	/*!< a rb-tree of all foreign keys
+					listed in foreign_list, sorted by
+					foreign->id */
+	ib_rbt_t*	referenced_rbt;	/*!< a rb-tree of all foreign keys
+					listed in referenced_list, sorted by
+					foreign->id */
+
 	UT_LIST_NODE_T(dict_table_t)
 			table_LRU; /*!< node of the LRU list of tables */
 	ulint		n_mysql_handles_opened;
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/row/row0ins.c mysql-5.5-5.5.43/storage/innobase/row/row0ins.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/row/row0ins.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/row/row0ins.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -143,6 +143,7 @@
 	const dict_col_t*	col;
 	dfield_t*		dfield;
 	byte*			ptr;
+	uint			len;
 
 	row = node->row;
 	table = node->table;
@@ -151,35 +152,37 @@
 	ut_ad(row && table && heap);
 	ut_ad(dtuple_get_n_fields(row) == dict_table_get_n_cols(table));
 
-	/* 1. Allocate buffer for row id */
+	/* allocate buffer to hold the needed system created hidden columns. */
+	len = DATA_ROW_ID_LEN + DATA_TRX_ID_LEN + DATA_ROLL_PTR_LEN;
+	ptr = mem_heap_zalloc(heap, len);
 
+	/* 1. Populate row-id */
 	col = dict_table_get_sys_col(table, DATA_ROW_ID);
 
 	dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
 
-	ptr = mem_heap_zalloc(heap, DATA_ROW_ID_LEN);
-
 	dfield_set_data(dfield, ptr, DATA_ROW_ID_LEN);
 
 	node->row_id_buf = ptr;
 
-	/* 3. Allocate buffer for trx id */
+	ptr += DATA_ROW_ID_LEN;
 
+	/* 2. Populate trx id */
 	col = dict_table_get_sys_col(table, DATA_TRX_ID);
 
 	dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
-	ptr = mem_heap_zalloc(heap, DATA_TRX_ID_LEN);
 
 	dfield_set_data(dfield, ptr, DATA_TRX_ID_LEN);
 
 	node->trx_id_buf = ptr;
 
-	/* 4. Allocate buffer for roll ptr */
+	ptr += DATA_TRX_ID_LEN;
+
+	/* 3. Populate roll ptr */
 
 	col = dict_table_get_sys_col(table, DATA_ROLL_PTR);
 
 	dfield = dtuple_get_nth_field(row, dict_col_get_no(col));
-	ptr = mem_heap_zalloc(heap, DATA_ROLL_PTR_LEN);
 
 	dfield_set_data(dfield, ptr, DATA_ROLL_PTR_LEN);
 }
@@ -1699,7 +1702,7 @@
 	do {
 		const rec_t*		rec	= btr_pcur_get_rec(&pcur);
 		const buf_block_t*	block	= btr_pcur_get_block(&pcur);
-		ulint			lock_type;
+		const ulint		lock_type = LOCK_ORDINARY;
 
 		if (page_rec_is_infimum(rec)) {
 
@@ -1709,16 +1712,6 @@
 		offsets = rec_get_offsets(rec, index, offsets,
 					  ULINT_UNDEFINED, &heap);
 
-		/* If the transaction isolation level is no stronger than
-		READ COMMITTED, then avoid gap locks. */
-		if (!page_rec_is_supremum(rec)
-		    && thr_get_trx(thr)->isolation_level
-					<= TRX_ISO_READ_COMMITTED) {
-			lock_type = LOCK_REC_NOT_GAP;
-		} else {
-			lock_type = LOCK_ORDINARY;
-		}
-
 		if (allow_duplicates) {
 
 			/* If the SQL-query will update or replace
@@ -2250,6 +2243,10 @@
 {
 	ulint	err;
 
+	DBUG_EXECUTE_IF("row_ins_index_entry_timeout", {
+			DBUG_SET("-d,row_ins_index_entry_timeout");
+			return(DB_LOCK_WAIT);});
+
 	if (foreign && UT_LIST_GET_FIRST(index->table->foreign_list)) {
 		err = row_ins_check_foreign_constraints(index->table, index,
 							entry, thr);
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/row/row0mysql.c mysql-5.5-5.5.43/storage/innobase/row/row0mysql.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/row/row0mysql.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/row/row0mysql.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 2000, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 2000, 2014, 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
@@ -3089,6 +3089,9 @@
 	ulint		namelen;
 	ibool		locked_dictionary	= FALSE;
 	pars_info_t*    info			= NULL;
+	DBUG_ENTER("row_drop_table_for_mysql");
+
+	DBUG_PRINT("row_drop_table_for_mysql", ("table: %s", name));
 
 	ut_a(name != NULL);
 
@@ -3099,7 +3102,7 @@
 		      "InnoDB: Shut down mysqld and edit my.cnf so that newraw"
 		      " is replaced with raw.\n", stderr);
 
-		return(DB_ERROR);
+		DBUG_RETURN(DB_ERROR);
 	}
 
 	trx->op_info = "dropping table";
@@ -3504,7 +3507,7 @@
 
 	srv_wake_master_thread();
 
-	return((int) err);
+	DBUG_RETURN((int) err);
 }
 
 /*********************************************************************//**
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/row/row0upd.c mysql-5.5-5.5.43/storage/innobase/row/row0upd.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/row/row0upd.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/row/row0upd.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,6 @@
 /*****************************************************************************
 
-Copyright (c) 1996, 2013, Oracle and/or its affiliates. All Rights Reserved.
+Copyright (c) 1996, 2014, 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
@@ -1769,9 +1769,7 @@
 		data += len - BTR_EXTERN_FIELD_REF_SIZE;
 		/* The pointer must not be zero. */
 		ut_a(memcmp(data, field_ref_zero, BTR_EXTERN_FIELD_REF_SIZE));
-		/* The BLOB must be owned. */
-		ut_a(!(data[BTR_EXTERN_LEN] & BTR_EXTERN_OWNER_FLAG));
-
+		data[BTR_EXTERN_LEN] &= ~BTR_EXTERN_OWNER_FLAG;
 		data[BTR_EXTERN_LEN] |= BTR_EXTERN_INHERITED_FLAG;
 		/* The BTR_EXTERN_INHERITED_FLAG only matters in
 		rollback. Purge will always free the extern fields of
@@ -1873,7 +1871,13 @@
 				rec, offsets, entry, node->update);
 
 			if (change_ownership) {
-				btr_pcur_store_position(pcur, mtr);
+				/* The blobs are disowned here, expecting the
+				insert down below to inherit them.  But if the
+				insert fails, then this disown will be undone
+				when the operation is rolled back. */
+				btr_cur_disown_inherited_fields(
+					btr_cur_get_page_zip(btr_cur),
+					rec, index, offsets, node->update, mtr);
 			}
 		}
 
@@ -1899,35 +1903,6 @@
 		? UPD_NODE_INSERT_BLOB
 		: UPD_NODE_INSERT_CLUSTERED;
 
-	if (err == DB_SUCCESS && change_ownership) {
-		/* Mark the non-updated fields disowned by the old record. */
-
-		/* NOTE: this transaction has an x-lock on the record
-		and therefore other transactions cannot modify the
-		record when we have no latch on the page. In addition,
-		we assume that other query threads of the same
-		transaction do not modify the record in the meantime.
-		Therefore we can assert that the restoration of the
-		cursor succeeds. */
-
-		mtr_start(mtr);
-
-		if (!btr_pcur_restore_position(BTR_MODIFY_LEAF, pcur, mtr)) {
-			ut_error;
-		}
-
-		rec = btr_cur_get_rec(btr_cur);
-		offsets = rec_get_offsets(rec, index, offsets,
-					  ULINT_UNDEFINED, &heap);
-		ut_ad(page_rec_is_user_rec(rec));
-
-		btr_cur_disown_inherited_fields(
-			btr_cur_get_page_zip(btr_cur),
-			rec, index, offsets, node->update, mtr);
-
-		mtr_commit(mtr);
-	}
-
 	mem_heap_free(heap);
 
 	return(err);
diff -Nru mysql-5.5-5.5.35+dfsg/storage/innobase/srv/srv0start.c mysql-5.5-5.5.43/storage/innobase/srv/srv0start.c
--- mysql-5.5-5.5.35+dfsg/storage/innobase/srv/srv0start.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/innobase/srv/srv0start.c	2015-02-27 08:30:34.000000000 +0000
@@ -147,7 +147,7 @@
 #endif /* UNIV_PFS_THREAD */
 
 /*********************************************************************//**
-Convert a numeric string that optionally ends in G or M, to a number
+Convert a numeric string that optionally ends in G or M or K, to a number
 containing megabytes.
 @return	next character in string */
 static
@@ -171,6 +171,10 @@
 	case 'M': case 'm':
 		str++;
 		break;
+	case 'K': case 'k':
+		size /= 1024;
+		str++;
+		break;
 	default:
 		size /= 1024 * 1024;
 		break;
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/Ecompare.pl mysql-5.5-5.5.43/storage/myisam/ftbench/Ecompare.pl
--- mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/Ecompare.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/ftbench/Ecompare.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2003 MySQL AB
+# Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/Ecreate.pl mysql-5.5-5.5.43/storage/myisam/ftbench/Ecreate.pl
--- mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/Ecreate.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/ftbench/Ecreate.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2003 MySQL AB
+# Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/Ereport.pl mysql-5.5-5.5.43/storage/myisam/ftbench/Ereport.pl
--- mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/Ereport.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/ftbench/Ereport.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
-# Copyright (C) 2003 MySQL AB
+# Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/ft-test-run.sh mysql-5.5-5.5.43/storage/myisam/ftbench/ft-test-run.sh
--- mysql-5.5-5.5.35+dfsg/storage/myisam/ftbench/ft-test-run.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/ftbench/ft-test-run.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-# Copyright (C) 2003 MySQL AB
-#
+# Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/ft_stopwords.c mysql-5.5-5.5.43/storage/myisam/ft_stopwords.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/ft_stopwords.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/ft_stopwords.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/ha_myisam.cc mysql-5.5-5.5.43/storage/myisam/ha_myisam.cc
--- mysql-5.5-5.5.35+dfsg/storage/myisam/ha_myisam.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/ha_myisam.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1041,7 +1041,6 @@
 
   param.db_name=    table->s->db.str;
   param.table_name= table->alias;
-  param.tmpfile_createflag = O_RDWR | O_TRUNC;
   param.using_global_keycache = 1;
   param.thd= thd;
   param.tmpdir= &mysql_tmpdir_list;
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_check.c mysql-5.5-5.5.43/storage/myisam/mi_check.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_check.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_check.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+   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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_checksum.c mysql-5.5-5.5.43/storage/myisam/mi_checksum.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_checksum.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_checksum.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2000-2001, 2003-2004 MySQL AB
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rfirst.c mysql-5.5-5.5.43/storage/myisam/mi_rfirst.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rfirst.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_rfirst.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rlast.c mysql-5.5-5.5.43/storage/myisam/mi_rlast.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rlast.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_rlast.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rrnd.c mysql-5.5-5.5.43/storage/myisam/mi_rrnd.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rrnd.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_rrnd.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002, 2004 MySQL AB
+/* Copyright (c) 2000-2002, 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rsamepos.c mysql-5.5-5.5.43/storage/myisam/mi_rsamepos.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_rsamepos.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_rsamepos.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001, 2005 MySQL AB
+/* Copyright (c) 2000, 2001, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_scan.c mysql-5.5-5.5.43/storage/myisam/mi_scan.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_scan.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_scan.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_test_all.sh mysql-5.5-5.5.43/storage/myisam/mi_test_all.sh
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_test_all.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_test_all.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/mi_write.c mysql-5.5-5.5.43/storage/myisam/mi_write.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/mi_write.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/mi_write.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+   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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/myisampack.c mysql-5.5-5.5.43/storage/myisam/myisampack.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/myisampack.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/myisampack.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/rt_index.h mysql-5.5-5.5.43/storage/myisam/rt_index.h
--- mysql-5.5-5.5.35+dfsg/storage/myisam/rt_index.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/rt_index.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002, 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/rt_key.c mysql-5.5-5.5.43/storage/myisam/rt_key.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/rt_key.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/rt_key.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2000, 2002-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/rt_key.h mysql-5.5-5.5.43/storage/myisam/rt_key.h
--- mysql-5.5-5.5.35+dfsg/storage/myisam/rt_key.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/rt_key.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002, 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/rt_mbr.c mysql-5.5-5.5.43/storage/myisam/rt_mbr.c
--- mysql-5.5-5.5.35+dfsg/storage/myisam/rt_mbr.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/rt_mbr.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002-2004, 2006 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/rt_mbr.h mysql-5.5-5.5.43/storage/myisam/rt_mbr.h
--- mysql-5.5-5.5.35+dfsg/storage/myisam/rt_mbr.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/rt_mbr.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002, 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisam/sp_defs.h mysql-5.5-5.5.43/storage/myisam/sp_defs.h
--- mysql-5.5-5.5.35+dfsg/storage/myisam/sp_defs.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisam/sp_defs.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2004 MySQL AB & Ramil Kalimullin
+/* Copyright (c) 2002, 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_delete.c mysql-5.5-5.5.43/storage/myisammrg/myrg_delete.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_delete.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_delete.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_locking.c mysql-5.5-5.5.43/storage/myisammrg/myrg_locking.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_locking.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_locking.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_panic.c mysql-5.5-5.5.43/storage/myisammrg/myrg_panic.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_panic.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_panic.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001 MySQL AB
+/* Copyright (c) 2000, 2001, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_range.c mysql-5.5-5.5.43/storage/myisammrg/myrg_range.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_range.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_range.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2004 MySQL AB
+/* Copyright (c) 2002, 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_records.c mysql-5.5-5.5.43/storage/myisammrg/myrg_records.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_records.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_records.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rfirst.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rfirst.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rfirst.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rfirst.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001, 2003 MySQL AB
+/* Copyright (c) 2000, 2001, 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rlast.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rlast.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rlast.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rlast.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2001, 2003 MySQL AB
+/* Copyright (c) 2000, 2001, 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rnext.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rnext.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rnext.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rnext.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rnext_same.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rnext_same.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rnext_same.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rnext_same.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2002, 2004 MySQL AB
+/* Copyright (c) 2002, 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rprev.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rprev.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rprev.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rprev.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2003 MySQL AB
+/* Copyright (c) 2000-2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rrnd.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rrnd.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rrnd.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rrnd.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rsame.c mysql-5.5-5.5.43/storage/myisammrg/myrg_rsame.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_rsame.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_rsame.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_update.c mysql-5.5-5.5.43/storage/myisammrg/myrg_update.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_update.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_update.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000-2002 MySQL AB
+/* Copyright (c) 2000-2002, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_write.c mysql-5.5-5.5.43/storage/myisammrg/myrg_write.c
--- mysql-5.5-5.5.35+dfsg/storage/myisammrg/myrg_write.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/myisammrg/myrg_write.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2001-2002, 2004 MySQL AB
+/* Copyright (c) 2001, 2002, 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/common.mk.am mysql-5.5-5.5.43/storage/ndb/config/common.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/common.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/common.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/make-win-dsw.sh mysql-5.5-5.5.43/storage/ndb/config/make-win-dsw.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/make-win-dsw.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/make-win-dsw.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_kernel.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_kernel.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_kernel.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_kernel.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_mgmapiclient.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_mgmapiclient.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_mgmapiclient.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_mgmapiclient.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapiclient.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_ndbapiclient.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapiclient.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_ndbapiclient.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapi.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_ndbapi.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapi.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_ndbapi.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapitest.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_ndbapitest.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapitest.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_ndbapitest.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapitools.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_ndbapitools.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_ndbapitools.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_ndbapitools.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_util.mk.am mysql-5.5-5.5.43/storage/ndb/config/type_util.mk.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/type_util.mk.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/type_util.mk.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-includes mysql-5.5-5.5.43/storage/ndb/config/win-includes
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-includes	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/win-includes	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-libraries mysql-5.5-5.5.43/storage/ndb/config/win-libraries
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-libraries	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/win-libraries	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-name mysql-5.5-5.5.43/storage/ndb/config/win-name
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-name	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/win-name	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-sources mysql-5.5-5.5.43/storage/ndb/config/win-sources
--- mysql-5.5-5.5.35+dfsg/storage/ndb/config/win-sources	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/config/win-sources	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.mgmapi mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.mgmapi
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.mgmapi	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.mgmapi	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.ndb mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.ndb
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.ndb	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.ndb	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.ndbapi mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.ndbapi
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.ndbapi	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.ndbapi	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.odbc mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.odbc
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/Doxyfile.odbc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/doxygen/Doxyfile.odbc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/postdoxy.pl mysql-5.5-5.5.43/storage/ndb/docs/doxygen/postdoxy.pl
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/postdoxy.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/doxygen/postdoxy.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/predoxy.pl mysql-5.5-5.5.43/storage/ndb/docs/doxygen/predoxy.pl
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/doxygen/predoxy.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/doxygen/predoxy.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/docs/Makefile.am mysql-5.5-5.5.43/storage/ndb/docs/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/docs/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/docs/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/DebuggerNames.hpp mysql-5.5-5.5.43/storage/ndb/include/debugger/DebuggerNames.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/DebuggerNames.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/debugger/DebuggerNames.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/EventLogger.hpp mysql-5.5-5.5.43/storage/ndb/include/debugger/EventLogger.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/EventLogger.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/debugger/EventLogger.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/GrepError.hpp mysql-5.5-5.5.43/storage/ndb/include/debugger/GrepError.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/GrepError.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/debugger/GrepError.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/SignalLoggerManager.hpp mysql-5.5-5.5.43/storage/ndb/include/debugger/SignalLoggerManager.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/debugger/SignalLoggerManager.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/debugger/SignalLoggerManager.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/editline/editline.h mysql-5.5-5.5.43/storage/ndb/include/editline/editline.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/editline/editline.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/editline/editline.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/AttributeDescriptor.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/AttributeDescriptor.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/AttributeDescriptor.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/AttributeDescriptor.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/AttributeHeader.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/AttributeHeader.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/AttributeHeader.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/AttributeHeader.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/AttributeList.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/AttributeList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/AttributeList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/AttributeList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/BlockNumbers.h mysql-5.5-5.5.43/storage/ndb/include/kernel/BlockNumbers.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/BlockNumbers.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/BlockNumbers.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/GlobalSignalNumbers.h mysql-5.5-5.5.43/storage/ndb/include/kernel/GlobalSignalNumbers.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/GlobalSignalNumbers.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/GlobalSignalNumbers.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/GrepEvent.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/GrepEvent.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/GrepEvent.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/GrepEvent.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/Interpreter.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/Interpreter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/Interpreter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/Interpreter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/kernel_config_parameters.h mysql-5.5-5.5.43/storage/ndb/include/kernel/kernel_config_parameters.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/kernel_config_parameters.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/kernel_config_parameters.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/kernel_types.h mysql-5.5-5.5.43/storage/ndb/include/kernel/kernel_types.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/kernel_types.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/kernel_types.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/LogLevel.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/LogLevel.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/LogLevel.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/LogLevel.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/ndb_limits.h mysql-5.5-5.5.43/storage/ndb/include/kernel/ndb_limits.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/ndb_limits.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/ndb_limits.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/NodeBitmask.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/NodeBitmask.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/NodeBitmask.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/NodeBitmask.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/NodeInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/NodeInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/NodeInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/NodeInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/NodeState.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/NodeState.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/NodeState.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/NodeState.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/RefConvert.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/RefConvert.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/RefConvert.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/RefConvert.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AbortAll.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AbortAll.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AbortAll.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AbortAll.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccLock.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccLock.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccLock.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccLock.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccScan.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccScan.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccScan.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccScan.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AccSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AllocNodeId.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterIndx.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterIndx.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterIndx.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterIndx.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
-
+/* Copyright (c) 2003, 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 General Public License as published by
    the Free Software Foundation; version 2 of the License.
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterTable.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterTable.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterTable.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterTable.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterTrig.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterTrig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AlterTrig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AlterTrig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ApiBroadcast.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ApiRegSignalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ApiVersion.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ApiVersion.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ApiVersion.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ApiVersion.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ArbitSignalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AttrInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AttrInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/AttrInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/AttrInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BackupContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
-
+/* Copyright (c) 2003, 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 General Public License as published by
    the Free Software Foundation; version 2 of the License.
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BackupImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BackupImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BackupImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BackupImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BackupSignalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BlockCommitOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BuildIndx.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BuildIndx.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/BuildIndx.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/BuildIndx.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CheckNodeGroups.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CloseComReqConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CmInit.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CmInit.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CmInit.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CmInit.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CmRegSignalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CmvmiCfgConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CntrMasterConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CntrMasterReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CntrStart.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CntrStart.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CntrStart.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CntrStart.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ConfigParamId.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ContinueFragmented.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CopyActive.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CopyActive.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CopyActive.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CopyActive.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CopyFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CopyFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CopyFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CopyFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CopyGCIReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateEvnt.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFilegroup.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFilegroupImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateFragmentation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateIndx.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateIndx.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateIndx.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateIndx.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateObj.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateObj.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateObj.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateObj.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateTable.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateTable.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateTable.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateTable.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateTrig.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateTrig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/CreateTrig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/CreateTrig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DiAddTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DiAddTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DiAddTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DiAddTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictLock.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictLock.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictLock.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictLock.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictObjOp.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictObjOp.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictObjOp.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictObjOp.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictSchemaInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictStart.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictStart.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictStart.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictStart.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DictTabInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DiGetNodes.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihAddFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihFragCount.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihFragCount.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihFragCount.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihFragCount.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihStartTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihStartTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihStartTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihStartTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DihSwitchReplica.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DisconnectRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropFilegroup.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropFilegroupImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropIndx.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropIndx.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropIndx.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropIndx.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropObj.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropObj.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropObj.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropObj.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTabFile.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTabFile.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTabFile.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTabFile.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTable.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTable.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTable.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTable.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTrig.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTrig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DropTrig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DropTrig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/DumpStateOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EmptyLcp.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EndTo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EndTo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EndTo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EndTo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EventReport.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EventReport.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EventReport.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EventReport.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/EventSubscribeReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ExecFragReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/Extent.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/Extent.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/Extent.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/Extent.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FailRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FailRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FailRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FailRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FireTrigOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsAppendReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsCloseReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsOpenReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsReadWriteReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsRef.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsRef.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsRef.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsRef.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/FsRemoveReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GCPSave.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GCPSave.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GCPSave.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GCPSave.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GetTabInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GetTableId.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GetTableId.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GetTableId.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GetTableId.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GrepImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GrepImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/GrepImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/GrepImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/HotSpareRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/IndxAttrInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/IndxKeyInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/InvalidateNodeLCPReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/KeyInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/KeyInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/KeyInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/KeyInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LCP.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LCP.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LCP.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LCP.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LgmanContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ListTables.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ListTables.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ListTables.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ListTables.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhKey.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhKey.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhKey.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhKey.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/LqhTransConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ManagementServer.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ManagementServer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ManagementServer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ManagementServer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/MasterGCP.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/MasterGCP.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/MasterGCP.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/MasterGCP.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/MasterLCP.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/MasterLCP.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/MasterLCP.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/MasterLCP.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NdbfsContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NdbSttor.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NdbSttor.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NdbSttor.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NdbSttor.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NextScan.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NextScan.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NextScan.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NextScan.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NFCompleteRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NodeFailRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/NodeStateSignalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PackedSignal.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PackedSignal.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PackedSignal.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PackedSignal.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PgmanContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PrepDropTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/PrepFailReqRef.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ReadConfig.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ReadConfig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ReadConfig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ReadConfig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ReadNodesConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RelTabMem.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RelTabMem.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RelTabMem.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RelTabMem.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RepImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RepImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RepImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RepImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RestoreContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RestoreImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ResumeReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ResumeReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ResumeReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ResumeReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RouteOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RouteOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/RouteOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/RouteOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ScanFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ScanFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ScanFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ScanFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ScanTab.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ScanTab.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/ScanTab.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/ScanTab.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SetLogLevelOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SetVarReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SetVarReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SetVarReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SetVarReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SignalData.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SignalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SignalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SignalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SignalDataPrint.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SignalDroppedRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SrFragidConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartFragReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartFragReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartFragReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartFragReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartMe.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartMe.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartMe.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartMe.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartPerm.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartPerm.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartPerm.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartPerm.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartRec.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartRec.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartRec.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartRec.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartTo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartTo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StartTo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StartTo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StopMe.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StopMe.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StopMe.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StopMe.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StopPerm.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StopPerm.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StopPerm.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StopPerm.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StopReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StopReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/StopReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/StopReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SumaImpl.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SumaImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SumaImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SumaImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SystemError.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SystemError.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/SystemError.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/SystemError.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TamperOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TamperOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TamperOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TamperOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcCommit.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcCommit.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcCommit.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcCommit.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcHbRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcHbRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcHbRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcHbRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcIndx.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcIndx.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcIndx.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcIndx.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyFailConf.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyRef.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcKeyReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcRollbackRep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TcSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TestOrd.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TestOrd.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TestOrd.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TestOrd.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TransIdAI.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TransIdAI.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TransIdAI.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TransIdAI.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TrigAttrInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TsmanContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupCommit.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupCommit.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupCommit.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupCommit.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupFrag.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupFrag.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupFrag.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupFrag.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupKey.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupKey.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupKey.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupKey.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TupSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxBound.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxBound.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxBound.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxBound.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxContinueB.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxMaint.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxMaint.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxMaint.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxMaint.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/TuxSizeAltReq.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UpdateTo.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UpdateTo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UpdateTo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UpdateTo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UpgradeStartup.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilDelete.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilDelete.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilDelete.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilDelete.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilExecute.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilExecute.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilExecute.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilExecute.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilLock.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilLock.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilLock.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilLock.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilPrepare.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilRelease.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilRelease.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilRelease.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilRelease.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilSequence.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilSequence.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/UtilSequence.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/UtilSequence.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/WaitGCP.hpp mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/WaitGCP.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/signaldata/WaitGCP.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/signaldata/WaitGCP.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/trigger_definitions.h mysql-5.5-5.5.43/storage/ndb/include/kernel/trigger_definitions.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/kernel/trigger_definitions.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/kernel/trigger_definitions.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/ConsoleLogHandler.hpp mysql-5.5-5.5.43/storage/ndb/include/logger/ConsoleLogHandler.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/ConsoleLogHandler.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/logger/ConsoleLogHandler.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/FileLogHandler.hpp mysql-5.5-5.5.43/storage/ndb/include/logger/FileLogHandler.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/FileLogHandler.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/logger/FileLogHandler.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/Logger.hpp mysql-5.5-5.5.43/storage/ndb/include/logger/Logger.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/Logger.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/logger/Logger.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/LogHandler.hpp mysql-5.5-5.5.43/storage/ndb/include/logger/LogHandler.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/LogHandler.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/logger/LogHandler.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/SysLogHandler.hpp mysql-5.5-5.5.43/storage/ndb/include/logger/SysLogHandler.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/logger/SysLogHandler.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/logger/SysLogHandler.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/Makefile.am mysql-5.5-5.5.43/storage/ndb/include/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_config_parameters_debug.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_config_parameters.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_config_parameters.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_config_parameters.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_debug.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_debug.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_debug.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_debug.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_error.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_error.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi_error.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi_error.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/mgmapi.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/mgmapi.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/ndbd_exit_codes.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/ndbd_exit_codes.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/ndbd_exit_codes.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/ndb_logevent.h mysql-5.5-5.5.43/storage/ndb/include/mgmapi/ndb_logevent.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmapi/ndb_logevent.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmapi/ndb_logevent.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-2007 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmcommon/ConfigRetriever.hpp mysql-5.5-5.5.43/storage/ndb/include/mgmcommon/ConfigRetriever.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmcommon/ConfigRetriever.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmcommon/ConfigRetriever.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmcommon/IPCConfig.hpp mysql-5.5-5.5.43/storage/ndb/include/mgmcommon/IPCConfig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmcommon/IPCConfig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmcommon/IPCConfig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp mysql-5.5-5.5.43/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/mgmcommon/MgmtErrorReporter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbApi.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbApi.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbApi.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbApi.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndbapi_limits.h mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndbapi_limits.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndbapi_limits.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndbapi_limits.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 2007, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbBlob.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbBlob.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbBlob.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbBlob.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndb_cluster_connection.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbDictionary.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbDictionary.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbDictionary.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbDictionary.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndberror.h mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndberror.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndberror.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndberror.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbError.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbError.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbError.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbError.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbEventOperation.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbEventOperation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbEventOperation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2007 MySQL AB, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/Ndb.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/Ndb.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/Ndb.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/Ndb.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbIndexOperation.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbIndexOperation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbIndexOperation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbIndexOperation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbIndexScanOperation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbIndexStat.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbIndexStat.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbIndexStat.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbIndexStat.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbOperation.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbOperation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbOperation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbOperation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2007 MySQL AB, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndb_opt_defaults.h mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndb_opt_defaults.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/ndb_opt_defaults.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/ndb_opt_defaults.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbPool.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbRecAttr.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbRecAttr.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbRecAttr.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbRecAttr.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbReceiver.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbReceiver.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbReceiver.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbReceiver.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbScanFilter.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbScanFilter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbScanFilter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbScanOperation.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbScanOperation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbScanOperation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbScanOperation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbTransaction.hpp mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbTransaction.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndbapi/NdbTransaction.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndbapi/NdbTransaction.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_constants.h mysql-5.5-5.5.43/storage/ndb/include/ndb_constants.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_constants.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndb_constants.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_global.h.in mysql-5.5-5.5.43/storage/ndb/include/ndb_global.h.in
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_global.h.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndb_global.h.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_init.h mysql-5.5-5.5.43/storage/ndb/include/ndb_init.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_init.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndb_init.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_net.h mysql-5.5-5.5.43/storage/ndb/include/ndb_net.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_net.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndb_net.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_types.h.in mysql-5.5-5.5.43/storage/ndb/include/ndb_types.h.in
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_types.h.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndb_types.h.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_version.h.in mysql-5.5-5.5.43/storage/ndb/include/ndb_version.h.in
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/ndb_version.h.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/ndb_version.h.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/newtonapi/dba.h mysql-5.5-5.5.43/storage/ndb/include/newtonapi/dba.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/newtonapi/dba.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/newtonapi/dba.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/newtonapi/defs/pcn_types.h mysql-5.5-5.5.43/storage/ndb/include/newtonapi/defs/pcn_types.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/newtonapi/defs/pcn_types.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/newtonapi/defs/pcn_types.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbCondition.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbCondition.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbCondition.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbCondition.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbConfig.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbConfig.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbConfig.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbConfig.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbDaemon.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbDaemon.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbDaemon.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbDaemon.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbEnv.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbEnv.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbEnv.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbEnv.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbHost.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbHost.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbHost.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbHost.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbMain.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbMain.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbMain.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbMain.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbMem.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbMem.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbMem.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbMem.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbMutex.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbMutex.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbMutex.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbMutex.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbSleep.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbSleep.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbSleep.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbSleep.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbTCP.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbTCP.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbTCP.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbTCP.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbThread.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbThread.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbThread.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbThread.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbTick.h mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbTick.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/NdbTick.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/NdbTick.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/PortDefs.h mysql-5.5-5.5.43/storage/ndb/include/portlib/PortDefs.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/PortDefs.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/PortDefs.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/prefetch.h mysql-5.5-5.5.43/storage/ndb/include/portlib/prefetch.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/portlib/prefetch.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/portlib/prefetch.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/transporter/TransporterCallback.hpp mysql-5.5-5.5.43/storage/ndb/include/transporter/TransporterCallback.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/transporter/TransporterCallback.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/transporter/TransporterCallback.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/transporter/TransporterDefinitions.hpp mysql-5.5-5.5.43/storage/ndb/include/transporter/TransporterDefinitions.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/transporter/TransporterDefinitions.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/transporter/TransporterDefinitions.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/transporter/TransporterRegistry.hpp mysql-5.5-5.5.43/storage/ndb/include/transporter/TransporterRegistry.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/transporter/TransporterRegistry.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/transporter/TransporterRegistry.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/BaseString.hpp mysql-5.5-5.5.43/storage/ndb/include/util/BaseString.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/BaseString.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/BaseString.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/basestring_vsnprintf.h mysql-5.5-5.5.43/storage/ndb/include/util/basestring_vsnprintf.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/basestring_vsnprintf.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/basestring_vsnprintf.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Bitmask.hpp mysql-5.5-5.5.43/storage/ndb/include/util/Bitmask.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Bitmask.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/Bitmask.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/ConfigValues.hpp mysql-5.5-5.5.43/storage/ndb/include/util/ConfigValues.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/ConfigValues.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/ConfigValues.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/File.hpp mysql-5.5-5.5.43/storage/ndb/include/util/File.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/File.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/File.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/InputStream.hpp mysql-5.5-5.5.43/storage/ndb/include/util/InputStream.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/InputStream.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/InputStream.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/md5_hash.hpp mysql-5.5-5.5.43/storage/ndb/include/util/md5_hash.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/md5_hash.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/md5_hash.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/NdbAutoPtr.hpp mysql-5.5-5.5.43/storage/ndb/include/util/NdbAutoPtr.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/NdbAutoPtr.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/NdbAutoPtr.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/ndb_opts.h mysql-5.5-5.5.43/storage/ndb/include/util/ndb_opts.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/ndb_opts.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/ndb_opts.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/NdbOut.hpp mysql-5.5-5.5.43/storage/ndb/include/util/NdbOut.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/NdbOut.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/NdbOut.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/ndb_rand.h mysql-5.5-5.5.43/storage/ndb/include/util/ndb_rand.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/ndb_rand.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/ndb_rand.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/NdbSqlUtil.hpp mysql-5.5-5.5.43/storage/ndb/include/util/NdbSqlUtil.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/NdbSqlUtil.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/NdbSqlUtil.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/OutputStream.hpp mysql-5.5-5.5.43/storage/ndb/include/util/OutputStream.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/OutputStream.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/OutputStream.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Parser.hpp mysql-5.5-5.5.43/storage/ndb/include/util/Parser.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Parser.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/Parser.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Properties.hpp mysql-5.5-5.5.43/storage/ndb/include/util/Properties.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Properties.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/Properties.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/random.h mysql-5.5-5.5.43/storage/ndb/include/util/random.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/random.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/random.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SimpleProperties.hpp mysql-5.5-5.5.43/storage/ndb/include/util/SimpleProperties.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SimpleProperties.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/SimpleProperties.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SocketAuthenticator.hpp mysql-5.5-5.5.43/storage/ndb/include/util/SocketAuthenticator.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SocketAuthenticator.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/SocketAuthenticator.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SocketClient.hpp mysql-5.5-5.5.43/storage/ndb/include/util/SocketClient.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SocketClient.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/SocketClient.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/socket_io.h mysql-5.5-5.5.43/storage/ndb/include/util/socket_io.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/socket_io.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/socket_io.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SocketServer.hpp mysql-5.5-5.5.43/storage/ndb/include/util/SocketServer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/SocketServer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/SocketServer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/UtilBuffer.hpp mysql-5.5-5.5.43/storage/ndb/include/util/UtilBuffer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/UtilBuffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/UtilBuffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/uucode.h mysql-5.5-5.5.43/storage/ndb/include/util/uucode.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/uucode.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/uucode.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Vector.hpp mysql-5.5-5.5.43/storage/ndb/include/util/Vector.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/Vector.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/Vector.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/version.h mysql-5.5-5.5.43/storage/ndb/include/util/version.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/include/util/version.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/include/util/version.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/Makefile.am mysql-5.5-5.5.43/storage/ndb/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/mgmapi_logevent/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/mgmapi_logevent2/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_async/ndbapi_async.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 
 
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_async1/ndbapi_async1.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_event/ndbapi_event.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_retries/ndbapi_retries.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_scan/ndbapi_scan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,6 @@
 
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_simple/ndbapi_simple.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_simple_dual/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/ndbapi-examples/ndbapi_simple_index/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/BlockNames.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/BlockNames.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/BlockNames.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/BlockNames.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/DebuggerNames.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/DebuggerNames.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/DebuggerNames.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/DebuggerNames.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/EventLogger.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/EventLogger.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/EventLogger.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/EventLogger.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/GrepError.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/GrepError.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/GrepError.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/GrepError.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/debugger/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AccLock.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AccLock.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AccLock.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AccLock.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterIndx.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterTab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterTable.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/AlterTrig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/BackupImpl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/BackupSignalData.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CloseComReqConf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CntrStart.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ContinueB.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CopyGCI.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateEvnt.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateFragmentation.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateIndx.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/CreateTrig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DictTabInfo.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DihContinueB.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DihSwitchReplicaReq.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DisconnectRep.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DropIndx.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DropTab.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DropTab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DropTab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DropTab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/DropTrig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FailRep.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FailRep.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FailRep.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FailRep.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FireTrigOrd.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsAppendReq.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsCloseReq.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsConf.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsConf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsConf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsConf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsOpenReq.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsReadWriteReq.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsRef.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsRef.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/FsRef.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/FsRef.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/GCPSave.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/IndxAttrInfo.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/IndxKeyInfo.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LCP.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LCP.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LCP.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LCP.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LqhFrag.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LqhKey.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/LqhTrans.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/MasterLCP.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/NdbfsContinueB.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/NdbSttor.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/NFCompleteRep.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/PackedSignal.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/PrepDropTab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/PrepFailReqRef.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/print.awk mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/print.awk
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/print.awk	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/print.awk	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ReadNodesConf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ScanFrag.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/ScanTab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SignalDroppedRep.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SignalNames.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/StartRec.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/StartRec.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/StartRec.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/StartRec.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SumaImpl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SystemError.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SystemError.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/SystemError.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/SystemError.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcIndx.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcKeyConf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcKeyRef.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcKeyReq.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TcRollbackRep.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TrigAttrInfo.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TupCommit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TupKey.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TupKey.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TupKey.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TupKey.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/TuxMaint.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilDelete.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilExecute.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilLock.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilPrepare.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/signaldata/UtilSequence.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/SignalLoggerManager.cpp mysql-5.5-5.5.43/storage/ndb/src/common/debugger/SignalLoggerManager.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/debugger/SignalLoggerManager.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/debugger/SignalLoggerManager.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/ConsoleLogHandler.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/ConsoleLogHandler.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/ConsoleLogHandler.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/ConsoleLogHandler.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/FileLogHandler.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/FileLogHandler.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/FileLogHandler.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/FileLogHandler.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/listtest/LogHandlerListUnitTest.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/Logger.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/Logger.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/Logger.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/Logger.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/loggertest/LoggerUnitTest.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/LogHandler.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/LogHandler.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/LogHandler.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/LogHandler.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/LogHandlerList.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/LogHandlerList.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/LogHandlerList.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/LogHandlerList.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/LogHandlerList.hpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/LogHandlerList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/LogHandlerList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/LogHandlerList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/logger/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/SysLogHandler.cpp mysql-5.5-5.5.43/storage/ndb/src/common/logger/SysLogHandler.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/logger/SysLogHandler.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/logger/SysLogHandler.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/ConfigRetriever.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/IPCConfig.cpp mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/IPCConfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/IPCConfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/IPCConfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/mgmcommon/printConfig/printConfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/portlib/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/memtest.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/memtest.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/memtest.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/memtest.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/mmstest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/portlib/mmstest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/mmstest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/mmstest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/munmaptest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/portlib/munmaptest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/munmaptest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/munmaptest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbCondition.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbCondition.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbCondition.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbCondition.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbConfig.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbConfig.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbConfig.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbConfig.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbDaemon.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbDaemon.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbDaemon.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbDaemon.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbEnv.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbEnv.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbEnv.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbEnv.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbHost.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbHost.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbHost.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbHost.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbMem.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbMem.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbMem.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbMem.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbMutex.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbMutex.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbMutex.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbMutex.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbPortLibTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbPortLibTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbPortLibTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbPortLibTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbSleep.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbSleep.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbSleep.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbSleep.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbTCP.cpp mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbTCP.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbTCP.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbTCP.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbThread.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbThread.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbThread.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbThread.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbTick.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbTick.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/NdbTick.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/NdbTick.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbCondition.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbCondition.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbCondition.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbCondition.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbDaemon.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbDaemon.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbDaemon.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbDaemon.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbEnv.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbEnv.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbEnv.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbEnv.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbHost.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbHost.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbHost.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbHost.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbMem.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbMem.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbMem.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbMem.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbMutex.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbMutex.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbMutex.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbMutex.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbSleep.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbSleep.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbSleep.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbSleep.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbTCP.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbTCP.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbTCP.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbTCP.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbThread.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbThread.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbThread.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbThread.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbTick.c mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbTick.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/portlib/win32/NdbTick.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/portlib/win32/NdbTick.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/basictest/basicTransporterTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/buddy.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/buddy.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/buddy.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/buddy.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/buddy.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/buddy.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/buddy.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/buddy.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/failoverSCI/failoverSCI.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Packer.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Packer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Packer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Packer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Packer.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Packer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Packer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Packer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/perftest/perfTransporterTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioSCI/prioSCI.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioSHM/prioSHM.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioTCP/prioTCP.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioTransporterTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/priotest/prioTransporterTest.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SCI_Transporter.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SCI_Transporter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SCI_Transporter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SCI_Transporter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SCI_Transporter.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SCI_Transporter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SCI_Transporter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SCI_Transporter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SendBuffer.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SendBuffer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SendBuffer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SendBuffer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SendBuffer.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SendBuffer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SendBuffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SendBuffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Buffer.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Buffer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Buffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Buffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.unix.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/SHM_Transporter.win32.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TCP_Transporter.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TCP_Transporter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TCP_Transporter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TCP_Transporter.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TCP_Transporter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TCP_Transporter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TCP_Transporter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Transporter.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Transporter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Transporter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Transporter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Transporter.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Transporter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/Transporter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/Transporter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TransporterInternalDefinitions.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TransporterRegistry.cpp mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TransporterRegistry.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/transporter/TransporterRegistry.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/BaseString.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/BaseString.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/BaseString.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/BaseString.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/basestring_vsnprintf.c mysql-5.5-5.5.43/storage/ndb/src/common/util/basestring_vsnprintf.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/basestring_vsnprintf.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/basestring_vsnprintf.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Bitmask.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/Bitmask.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Bitmask.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/Bitmask.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/ConfigValues.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/ConfigValues.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/ConfigValues.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/ConfigValues.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/File.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/File.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/File.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/File.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/filetest/FileUnitTest.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/filetest/FileUnitTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/filetest/FileUnitTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/filetest/FileUnitTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/filetest/FileUnitTest.hpp mysql-5.5-5.5.43/storage/ndb/src/common/util/filetest/FileUnitTest.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/filetest/FileUnitTest.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/filetest/FileUnitTest.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/InputStream.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/InputStream.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/InputStream.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/InputStream.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/common/util/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/md5_hash.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/md5_hash.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/md5_hash.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/md5_hash.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/ndb_init.c mysql-5.5-5.5.43/storage/ndb/src/common/util/ndb_init.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/ndb_init.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/ndb_init.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/NdbOut.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/NdbOut.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/NdbOut.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/NdbOut.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/ndb_rand.c mysql-5.5-5.5.43/storage/ndb/src/common/util/ndb_rand.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/ndb_rand.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/ndb_rand.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/NdbSqlUtil.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/NdbSqlUtil.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/NdbSqlUtil.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/NdbSqlUtil.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/new.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/new.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/new.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/new.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/OutputStream.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/OutputStream.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/OutputStream.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/OutputStream.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Parser.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/Parser.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Parser.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/Parser.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Properties.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/Properties.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/Properties.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/Properties.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/random.c mysql-5.5-5.5.43/storage/ndb/src/common/util/random.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/random.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/random.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SimpleProperties.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/SimpleProperties.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SimpleProperties.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/SimpleProperties.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SocketAuthenticator.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/SocketAuthenticator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SocketAuthenticator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/SocketAuthenticator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SocketClient.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/SocketClient.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SocketClient.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/SocketClient.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/socket_io.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/socket_io.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/socket_io.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/socket_io.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SocketServer.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/SocketServer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/SocketServer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/SocketServer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/strdup.c mysql-5.5-5.5.43/storage/ndb/src/common/util/strdup.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/strdup.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/strdup.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/testConfigValues/testConfigValues.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/testProperties/testProperties.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/testProperties/testProperties.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/testProperties/testProperties.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/testProperties/testProperties.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp mysql-5.5-5.5.43/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/testSimpleProperties/sp_test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/uucode.c mysql-5.5-5.5.43/storage/ndb/src/common/util/uucode.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/uucode.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/uucode.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/version.c mysql-5.5-5.5.43/storage/ndb/src/common/util/version.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/common/util/version.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/common/util/version.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 2007 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/CPC_GUI.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/NdbControls.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/resource.h mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/resource.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/resource.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/resource.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/StdAfx.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/TreeView.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/C++/TreeView.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/ComputerAddDialog.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/Computer.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/ComputerRemoveDialog.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/CPC_Form.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/Database.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/fileaccess/FileMgmt.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/PanelWizard.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/Process.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/ProcessDefineDialog.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/simpleparser/SimpleCPCParser.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/myTcpClient.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/socketcomm/SocketComm.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/startDatabaseDlg.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcc-win32/csharp/telnetclient/telnetClient.cs	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/APIService.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/APIService.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/APIService.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/APIService.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/APIService.hpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/APIService.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/APIService.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/APIService.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/common.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/common.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/common.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/common.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/common.hpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/common.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/common.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/common.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/CPCD.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/CPCD.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/CPCD.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/CPCD.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/CPCD.hpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/CPCD.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/CPCD.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/CPCD.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/main.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/Monitor.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/Monitor.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/Monitor.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/Monitor.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/Process.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/Process.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/cpcd/Process.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/cpcd/Process.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/cw/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/test/socketclient/socketClientTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/ClientInterface.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/util/ClientInterface.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/ClientInterface.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/util/ClientInterface.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/ClientInterface.hpp mysql-5.5-5.5.43/storage/ndb/src/cw/util/ClientInterface.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/ClientInterface.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/util/ClientInterface.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketRegistry.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketRegistry.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketRegistry.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketRegistry.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketRegistry.hpp mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketRegistry.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketRegistry.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketRegistry.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketService.cpp mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketService.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketService.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketService.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketService.hpp mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketService.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/cw/util/SocketService.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/cw/util/SocketService.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/Backup.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/Backup.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/Backup.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/BackupFormat.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/Backup.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/Backup.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/Backup.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/BackupInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/FsBuffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/read.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/read.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/backup/read.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/backup/read.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/cmvmi/Cmvmi.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Dbdict.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Dbdict.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Master_AddTable.sfl	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 // 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/printSchemaFile.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/SchemaFile.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdict/Slave_AddTable.sfl	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 // 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/Dbdih.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/DbdihInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/DbdihMain.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/printSysfile/printSysfile.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/printSysfile.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbdih/Sysfile.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/reader.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtc/Dbtc.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/AttributeOffset.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupAbort.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupBuffer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupCommit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupDebug.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupExecQuery.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupFixAlloc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupGen.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Dbtup.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupIndex.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupMeta.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupPageMap.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupPagMan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupRoutines.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupScan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupStoredProcDef.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 2007, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupTabDesMan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupTrigger.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/DbtupVarAlloc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2004 MySQL AB
+/* Copyright (c) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/test_varpage.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/tuppage.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/tuppage.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtup/Undo_buffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxCmp.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxDebug.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxGen.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/Dbtux.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxMaint.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxMeta.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxNode.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxSearch.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbtux/DbtuxTree.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbutil/DbUtil.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/dbutil/DbUtil.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/diskpage.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/diskpage.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/diskpage.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/diskpage.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/diskpage.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/diskpage.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/diskpage.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/diskpage.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/lgman.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/lgman.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/lgman.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/lgman.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/mutexes.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/mutexes.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/mutexes.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/mutexes.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/Ndbcntr.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrMain.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbcntr/NdbcntrSysTable.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2007 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/AsyncFile.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/AsyncFileTest/AsyncFileTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/CircularIndex.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Filename.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Filename.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannel.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/MemoryChannelTest/MemoryChannelTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Ndbfs.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/OpenFiles.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/Pool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/ndbfs/VoidFs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/pgman.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/pgman.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/pgman.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/pgman.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/pgman.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/pgman.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/pgman.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/pgman.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/print_file.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/print_file.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/print_file.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/print_file.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/Qmgr.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/QmgrInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/QmgrMain.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/timer.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/timer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/qmgr/timer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/qmgr/timer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/record_types.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/record_types.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/record_types.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/record_types.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/restore.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/restore.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/restore.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/restore.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/restore.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/restore.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/restore.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/restore.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/suma/Suma.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/suma/Suma.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/suma/Suma.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/suma/Suma.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/suma/Suma.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/suma/Suma.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/suma/SumaInit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/trix/Trix.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/trix/Trix.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/trix/Trix.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/trix/Trix.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/trix/Trix.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/trix/Trix.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/trix/Trix.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/trix/Trix.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/tsman.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/tsman.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/tsman.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/tsman.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/tsman.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/tsman.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/blocks/tsman.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/blocks/tsman.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ErrorHandlingMacros.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ErrorReporter.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ErrorReporter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ErrorReporter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ErrorReporter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ErrorReporter.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ErrorReporter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ErrorReporter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ErrorReporter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/error/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ndbd_exit_codes.c mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ndbd_exit_codes.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/ndbd_exit_codes.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/TimeModule.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/error/TimeModule.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/TimeModule.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/TimeModule.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/TimeModule.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/error/TimeModule.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/error/TimeModule.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/error/TimeModule.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/main.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/SimBlockList.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/SimBlockList.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/SimBlockList.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/SimBlockList.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/al_test/arrayListTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/al_test/arrayPoolTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/al_test/main.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/al_test/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/al_test/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/al_test/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Array.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Array.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Array.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Array.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ArrayPool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ArrayPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ArrayPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ArrayPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/bench_pool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/bench_pool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/bench_pool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/bench_pool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Callback.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Callback.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Callback.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Callback.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/CArray.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/CArray.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/CArray.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/CArray.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ClusterConfiguration.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ClusterConfiguration.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Configuration.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Configuration.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Configuration.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Configuration.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Configuration.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Configuration.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Configuration.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Configuration.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DataBuffer.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DataBuffer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DataBuffer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DataBuffer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLCFifoList.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLCFifoList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLCFifoList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLCFifoList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLCHashTable.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLCHashTable.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLCHashTable.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLCHashTable.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLFifoList.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLFifoList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLFifoList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLFifoList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLHashTable2.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLHashTable2.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLHashTable2.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLHashTable2.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLHashTable.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLHashTable.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLHashTable.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLHashTable.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLList.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DLList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DLList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DynArr256.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DynArr256.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DynArr256.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DynArr256.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DynArr256.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DynArr256.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/DynArr256.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/DynArr256.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Emulator.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Emulator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Emulator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Emulator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Emulator.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Emulator.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Emulator.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Emulator.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/FastScheduler.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/FastScheduler.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/FastScheduler.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/FastScheduler.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/FastScheduler.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/FastScheduler.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/FastScheduler.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/FastScheduler.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/GlobalData.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/GlobalData.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/GlobalData.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/GlobalData.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyDescriptor.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyDescriptor.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyDescriptor.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyDescriptor.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyTable2.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyTable2.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyTable2.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyTable2.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyTable2Ref.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyTable.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyTable.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/KeyTable.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/KeyTable.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/LinearPool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/LinearPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/LinearPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/LinearPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/LongSignal.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/LongSignal.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/LongSignal.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/LongSignal.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Mutex.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Mutex.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Mutex.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Mutex.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Mutex.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Mutex.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Mutex.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Mutex.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc_impl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ndbd_malloc_impl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/NdbdSuperPool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/NdbdSuperPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/pc.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/pc.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/pc.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/pc.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Pool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Pool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Pool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Pool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Pool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Pool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Pool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Pool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Prio.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Prio.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Prio.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Prio.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/RequestTracker.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/RequestTracker.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/RequestTracker.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/RequestTracker.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Rope.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Rope.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Rope.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Rope.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Rope.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Rope.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/Rope.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/Rope.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/RWPool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/RWPool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/RWPool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/RWPool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/RWPool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/RWPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/RWPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/RWPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SafeCounter.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SafeCounter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SafeCounter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SafeCounter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SafeCounter.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SafeCounter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SafeCounter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SafeCounter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SectionReader.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SectionReader.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SectionReader.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SectionReader.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SectionReader.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SectionReader.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SectionReader.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SectionReader.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SignalCounter.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SignalCounter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SignalCounter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SignalCounter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimBlockList.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimBlockList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimBlockList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimBlockList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimplePropertiesSection.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimulatedBlock.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimulatedBlock.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimulatedBlock.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimulatedBlock.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimulatedBlock.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SLFifoList.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SLFifoList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SLFifoList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SLFifoList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SLList.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SLList.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SLList.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SLList.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SuperPool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SuperPool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SuperPool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SuperPool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SuperPool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SuperPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/SuperPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/SuperPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testCopy/rr.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testCopy/rr.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testCopy/rr.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testCopy/rr.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testCopy/testCopy.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testDataBuffer/testDataBuffer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testLongSig/testLongSig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testSimplePropertiesSection/test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testSuperPool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testSuperPool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/testSuperPool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/testSuperPool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -6,7 +6,8 @@
 exit $?
 #endif
 
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ThreadConfig.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ThreadConfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ThreadConfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ThreadConfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ThreadConfig.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ThreadConfig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/ThreadConfig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/ThreadConfig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/TimeQueue.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/TimeQueue.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/TimeQueue.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/TimeQueue.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/TimeQueue.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/TimeQueue.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/TimeQueue.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/TimeQueue.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/TransporterCallback.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/TransporterCallback.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/TransporterCallback.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/TransporterCallback.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/VMSignal.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/VMSignal.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/VMSignal.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/VMSignal.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/VMSignal.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/VMSignal.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/VMSignal.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/VMSignal.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WaitQueue.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WaitQueue.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WaitQueue.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WaitQueue.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WatchDog.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WatchDog.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WatchDog.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WatchDog.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WatchDog.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WatchDog.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WatchDog.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WatchDog.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WOPool.cpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WOPool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WOPool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WOPool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WOPool.hpp mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WOPool.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/kernel/vm/WOPool.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/kernel/vm/WOPool.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2006, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/libndb.ver.in mysql-5.5-5.5.43/storage/ndb/src/libndb.ver.in
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/libndb.ver.in	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/libndb.ver.in	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/LocalConfig.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/LocalConfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/LocalConfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/LocalConfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/LocalConfig.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/LocalConfig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/LocalConfig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/LocalConfig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/mgmapi/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi_configuration.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi_configuration.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi_configuration.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi_configuration.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi_configuration.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi_configuration.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi_configuration.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi_configuration.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
- /* Copyright (C) 2003 MySQL AB
+ /* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi_internal.h mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi_internal.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/mgmapi_internal.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/mgmapi_internal.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/ndb_logevent.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/ndb_logevent.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/ndb_logevent.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/ndb_logevent.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/ndb_logevent.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/ndb_logevent.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/ndb_logevent.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/ndb_logevent.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/test/keso.c mysql-5.5-5.5.43/storage/ndb/src/mgmapi/test/keso.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/test/keso.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/test/keso.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmapi/test/mgmSrvApi.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/CommandInterpreter.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmclient/CommandInterpreter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmclient/CommandInterpreter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/main.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmclient/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmclient/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/mgmclient/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmclient/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/ndb_mgmclient.h mysql-5.5-5.5.43/storage/ndb/src/mgmclient/ndb_mgmclient.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/ndb_mgmclient.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmclient/ndb_mgmclient.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/ndb_mgmclient.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmclient/ndb_mgmclient.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/ndb_mgmclient.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmclient/ndb_mgmclient.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmclient/test_cpcd/test_cpcd.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Config.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Config.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Config.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Config.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Config.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Config.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Config.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Config.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/ConfigInfo.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/ConfigInfo.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/ConfigInfo.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/ConfigInfo.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/ConfigInfo.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/ConfigInfo.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/convertStrToInt.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/convertStrToInt.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/convertStrToInt.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/convertStrToInt.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/convertStrToInt.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/convertStrToInt.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/convertStrToInt.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/convertStrToInt.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/InitConfigFileParser.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/InitConfigFileParser.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/main.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvrConfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvr.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvr.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvrGeneralSignalHandling.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvr.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvr.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/MgmtSrvr.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/mkconfig/mkconfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/ndb_mgmd_error.h mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/ndb_mgmd_error.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/ndb_mgmd_error.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/ndb_mgmd_error.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Services.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Services.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Services.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Services.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Services.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Services.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/Services.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/Services.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/SignalQueue.cpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/SignalQueue.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/SignalQueue.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/SignalQueue.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/SignalQueue.hpp mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/SignalQueue.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/mgmsrv/SignalQueue.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/mgmsrv/SignalQueue.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/API.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/API.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/API.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/API.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ClusterMgr.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ClusterMgr.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ClusterMgr.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ClusterMgr.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ClusterMgr.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ClusterMgr.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ClusterMgr.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ClusterMgr.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/DictCache.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/DictCache.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/DictCache.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/DictCache.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/DictCache.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/DictCache.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/DictCache.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/DictCache.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Makefile.am mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbApiSignal.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbApiSignal.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbApiSignal.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbApiSignal.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbApiSignal.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbApiSignal.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbApiSignal.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbApiSignal.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbBlob.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbBlob.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbBlob.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbBlob.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbBlobImpl.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbBlobImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbBlobImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbBlobImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndb_cluster_connection.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndb_cluster_connection_impl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndb.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndb.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndb.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndb.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbDictionary.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbDictionary.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbDictionary.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbDictionary.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbDictionaryImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndberr.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndberr.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndberr.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndberr.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndberror.c mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndberror.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndberror.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndberror.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndberror_check.c mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndberror_check.c
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndberror_check.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndberror_check.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbErrorOut.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbErrorOut.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbErrorOut.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbErrorOut.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbEventOperation.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbEventOperation.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbEventOperation.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbEventOperation.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2007 MySQL AB, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbEventOperationImpl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2007 MySQL AB, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbEventOperationImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2007 MySQL AB, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndbif.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndbif.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndbif.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndbif.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbImpl.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbIndexOperation.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbIndexOperation.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbIndexOperation.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbIndexOperation.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbIndexStat.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbIndexStat.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbIndexStat.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbIndexStat.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndbinit.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndbinit.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndbinit.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndbinit.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndb_internal.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndb_internal.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ndb_internal.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ndb_internal.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbLinHash.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbLinHash.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbLinHash.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbLinHash.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndblist.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndblist.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/Ndblist.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/Ndblist.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperation.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperation.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperation.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperation.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationDefine.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationDefine.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationDefine.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationDefine.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationExec.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationExec.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationExec.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationInt.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationInt.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationInt.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationInt.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationScan.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationScan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationScan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationScan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationSearch.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationSearch.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbOperationSearch.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbOperationSearch.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbPool.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbPool.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbPool.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbPool.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbPoolImpl.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbPoolImpl.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbPoolImpl.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbPoolImpl.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbPoolImpl.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbPoolImpl.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbPoolImpl.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbPoolImpl.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbRecAttr.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbRecAttr.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbRecAttr.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbReceiver.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbReceiver.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbReceiver.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbReceiver.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbScanFilter.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbScanFilter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbScanFilter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbScanOperation.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbScanOperation.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbScanOperation.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbTransaction.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbTransaction.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbTransaction.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbTransaction.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbTransactionScan.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbTransactionScan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbTransactionScan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbTransactionScan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbUtil.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbUtil.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbUtil.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbUtil.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbUtil.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbUtil.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbUtil.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbUtil.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbWaiter.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbWaiter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/NdbWaiter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/NdbWaiter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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.
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ObjectMap.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ObjectMap.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ObjectMap.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ObjectMap.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ObjectMap.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ObjectMap.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/ObjectMap.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/ObjectMap.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/signal-sender/SignalSender.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/signal-sender/SignalSender.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/SignalSender.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/SignalSender.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/SignalSender.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/SignalSender.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/SignalSender.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/SignalSender.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/SignalSender.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/SignalSender.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/TransporterFacade.cpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/TransporterFacade.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/TransporterFacade.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/TransporterFacade.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/TransporterFacade.hpp mysql-5.5-5.5.43/storage/ndb/src/ndbapi/TransporterFacade.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/src/ndbapi/TransporterFacade.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/src/ndbapi/TransporterFacade.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/AtrtClient.hpp mysql-5.5-5.5.43/storage/ndb/test/include/AtrtClient.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/AtrtClient.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/AtrtClient.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/CpcClient.hpp mysql-5.5-5.5.43/storage/ndb/test/include/CpcClient.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/CpcClient.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/CpcClient.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/DbUtil.hpp mysql-5.5-5.5.43/storage/ndb/test/include/DbUtil.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/DbUtil.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/DbUtil.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2007 MySQL AB
+/* Copyright (c) 2007, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/getarg.h mysql-5.5-5.5.43/storage/ndb/test/include/getarg.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/getarg.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/getarg.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoAsynchTransactions.hpp mysql-5.5-5.5.43/storage/ndb/test/include/HugoAsynchTransactions.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoAsynchTransactions.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/HugoAsynchTransactions.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoCalculator.hpp mysql-5.5-5.5.43/storage/ndb/test/include/HugoCalculator.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoCalculator.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/HugoCalculator.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoOperations.hpp mysql-5.5-5.5.43/storage/ndb/test/include/HugoOperations.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoOperations.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/HugoOperations.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoTransactions.hpp mysql-5.5-5.5.43/storage/ndb/test/include/HugoTransactions.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/HugoTransactions.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/HugoTransactions.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbBackup.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbBackup.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbBackup.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbBackup.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbConfig.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbConfig.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbConfig.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbConfig.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbGrep.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbGrep.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbGrep.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbGrep.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbMixRestarter.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbMixRestarter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbMixRestarter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbMixRestarter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbRestarter.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbRestarter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbRestarter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbRestarter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbRestarts.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbRestarts.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbRestarts.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbRestarts.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbSchemaCon.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbSchemaCon.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbSchemaCon.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbSchemaCon.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbSchemaOp.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbSchemaOp.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbSchemaOp.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbSchemaOp.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_DataSet.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_DataSet.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_DataSet.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_DataSet.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_DataSetTransaction.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_DataSetTransaction.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_DataSetTransaction.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_DataSetTransaction.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Error.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Error.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Error.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Error.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbTest.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbTest.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbTest.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbTest.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbTimer.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NdbTimer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NdbTimer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NdbTimer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Output.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Output.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Output.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Output.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_ResultRow.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_ResultRow.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_ResultRow.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_ResultRow.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_ReturnCodes.h mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_ReturnCodes.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_ReturnCodes.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_ReturnCodes.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Stats.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Stats.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Stats.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Stats.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Table.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Table.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Table.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Table.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Tables.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Tables.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Tables.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Tables.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Test.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Test.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Test.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Test.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Thread.hpp mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Thread.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/NDBT_Thread.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/NDBT_Thread.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/TestNdbEventOperation.hpp mysql-5.5-5.5.43/storage/ndb/test/include/TestNdbEventOperation.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/TestNdbEventOperation.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/TestNdbEventOperation.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/UtilTransactions.hpp mysql-5.5-5.5.43/storage/ndb/test/include/UtilTransactions.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/include/UtilTransactions.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/include/UtilTransactions.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/Makefile.am mysql-5.5-5.5.43/storage/ndb/test/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/acid2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/acid2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/acid2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/acid2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/acid.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/acid.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/acid.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/acid.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/acrt/NdbRepStress.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/adoInsertRecs.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/adoInsertRecs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/adoInsertRecs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/adoInsertRecs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/asyncGenerator.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/asyncGenerator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/asyncGenerator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/asyncGenerator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/Bank.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/Bank.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/Bank.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/Bank.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankCreator.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankCreator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankCreator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankCreator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/Bank.hpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/Bank.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/Bank.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/Bank.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/BankLoad.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/BankLoad.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/BankLoad.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/BankLoad.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankMakeGL.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankSumAccounts.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankTimer.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankTimer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankTimer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankTimer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankTransactionMaker.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/bankValidateAllGLs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/Makefile.am mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/testBank.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/testBank.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bank/testBank.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bank/testBank.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/asyncGenerator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/dbGenerator.h mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/dbGenerator.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/dbGenerator.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/dbGenerator.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/dbPopulate.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/dbPopulate.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/dbPopulate.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/dbPopulate.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/dbPopulate.h mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/dbPopulate.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/dbPopulate.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/dbPopulate.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/macros.h mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/macros.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/macros.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/macros.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/mainPopulate.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/mainPopulate.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/mainPopulate.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/mainPopulate.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_async1.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_async1.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_async1.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_async1.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_async2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_async2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_async2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_async2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_error.hpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_error.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_error.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_error.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_schema.hpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_schema.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_schema.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_schema.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction3.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction4.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction5.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction6.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/ndb_user_transaction.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/testData.h mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/testData.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/testData.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/testData.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/testDefinitions.h mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/testDefinitions.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/testDefinitions.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/testDefinitions.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/userInterface.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/userInterface.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/userInterface.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/userInterface.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/userInterface.h mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/userInterface.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bench/userInterface.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bench/userInterface.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/benchronja.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/benchronja.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/benchronja.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/benchronja.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bulk_copy.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bulk_copy.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/bulk_copy.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/bulk_copy.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/cdrserver.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/cdrserver.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/cdrserver.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/cdrserver.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/celloDb.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/celloDb.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/celloDb.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/celloDb.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/create_all_tabs.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/create_all_tabs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/create_all_tabs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/create_all_tabs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/create_tab.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/create_tab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/create_tab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/create_tab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/drop_all_tabs.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/drop_all_tabs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/drop_all_tabs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/drop_all_tabs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexAsynch.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexAsynch.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexAsynch.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexAsynch.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexBench.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexBench.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexBench.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexBench.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flex_bench_mysql.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flex_bench_mysql.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flex_bench_mysql.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flex_bench_mysql.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexHammer.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexHammer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexHammer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexHammer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexScan.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexScan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexScan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexScan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexTimedAsynch.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexTimedAsynch.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexTimedAsynch.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexTimedAsynch.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexTT.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexTT.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/flexTT.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/flexTT.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/index2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/index2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/index2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/index2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/index.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/index.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/index.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/index.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/initronja.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/initronja.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/initronja.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/initronja.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/InsertRecs.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/InsertRecs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/InsertRecs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/InsertRecs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/interpreterInTup.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/interpreterInTup.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/interpreterInTup.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/interpreterInTup.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/mainAsyncGenerator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/Makefile.am mysql-5.5-5.5.43/storage/ndb/test/ndbapi/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/msa.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/msa.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/msa.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/msa.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_async1.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_async1.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_async1.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_async1.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_async2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_async2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_async2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_async2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_populate.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_populate.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_populate.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_populate.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction3.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction4.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction5.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction6.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ndb_user_transaction.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ndb_user_transaction.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/restarter2.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/restarter2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/restarter2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/restarter2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/restarter.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/restarter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/restarter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/restarter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/restarts.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/restarts.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/restarts.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/restarts.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ScanFilter.hpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ScanFilter.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ScanFilter.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ScanFilter.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ScanFunctions.hpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ScanFunctions.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ScanFunctions.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ScanFunctions.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ScanInterpretTest.hpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ScanInterpretTest.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/ScanInterpretTest.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/ScanInterpretTest.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/size.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/size.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/size.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/size.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/slow_select.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/slow_select.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/slow_select.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/slow_select.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBackup.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBackup.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBackup.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBackup.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBasicAsynch.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBasicAsynch.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBasicAsynch.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBasicAsynch.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBasic.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBasic.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBasic.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBasic.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBitfield.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBitfield.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBitfield.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBitfield.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBlobs.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBlobs.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testBlobs.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testBlobs.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testDataBuffers.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testDataBuffers.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testDataBuffers.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testDataBuffers.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testDeadlock.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testDeadlock.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testDeadlock.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testDeadlock.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testDict.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testDict.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testDict.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testDict.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/test_event.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/test_event.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/test_event.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/test_event.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/test_event_merge.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/test_event_merge.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/test_event_merge.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/test_event_merge.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/test_event_multi_table.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/test_event_multi_table.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/test_event_multi_table.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/test_event_multi_table.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testGrepVerify.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testGrepVerify.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testGrepVerify.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testGrepVerify.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testIndex.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testIndex.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testIndex.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testIndex.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testIndexStat.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testIndexStat.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testIndexStat.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testIndexStat.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2005 MySQL AB
+/* Copyright (c) 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testInterpreter.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testInterpreter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testInterpreter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testInterpreter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testLcp.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testLcp.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testLcp.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testLcp.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testMgm.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testMgm.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testMgm.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testMgm.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testNdbApi.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testNdbApi.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testNdbApi.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testNdbApi.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testNDBT.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testNDBT.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testNDBT.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testNDBT.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testNodeRestart.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testNodeRestart.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testNodeRestart.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testNodeRestart.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testOIBasic.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testOIBasic.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testOIBasic.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testOIBasic.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testOperations.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testOperations.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testOperations.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testOperations.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testOrderedIndex.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testOrderedIndex.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testOrderedIndex.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testOrderedIndex.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testPartitioning.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testPartitioning.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testPartitioning.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testPartitioning.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testReadPerf.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testReadPerf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testReadPerf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testReadPerf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testRestartGci.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testRestartGci.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testRestartGci.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testRestartGci.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScan.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScan.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScan.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScan.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScanFilter.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScanFilter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScanFilter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScanFilter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScanInterpreter.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScanInterpreter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScanInterpreter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScanInterpreter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScanPerf.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScanPerf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testScanPerf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testScanPerf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testSRBank.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testSRBank.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testSRBank.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testSRBank.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testSystemRestart.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testSystemRestart.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testSystemRestart.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testSystemRestart.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testTimeout.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testTimeout.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testTimeout.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testTimeout.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testTransactions.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testTransactions.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/testTransactions.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/testTransactions.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/TraceNdbApi.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/TraceNdbApi.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/TraceNdbApi.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/TraceNdbApi.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/userInterface.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/userInterface.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/userInterface.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/userInterface.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/VerifyNdbApi.cpp mysql-5.5-5.5.43/storage/ndb/test/ndbapi/VerifyNdbApi.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbapi/VerifyNdbApi.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbapi/VerifyNdbApi.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testError.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testError.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testError.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testError.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testMNF.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testMNF.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testMNF.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testMNF.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testNR1.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testNR1.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testNR1.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testNR1.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testNR4.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testNR4.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testNR4.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testNR4.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testNR.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testNR.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testNR.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testNR.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/test.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/test.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/test.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/test.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testSRhang.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testSRhang.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testSRhang.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testSRhang.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testTR295.run mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testTR295.run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/ndbnet/testTR295.run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/ndbnet/testTR295.run	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/basic/basic.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/bulk_read/br_test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/common.cpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/common.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/common.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/common.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/common.hpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/common.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/common.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/common.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/ptr_binding/ptr_binding_test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/too_basic.cpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/too_basic.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/basic_test/too_basic.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/basic_test/too_basic.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/perf_test/perf.cpp mysql-5.5-5.5.43/storage/ndb/test/newtonapi/perf_test/perf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/newtonapi/perf_test/perf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/newtonapi/perf_test/perf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/common.hpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/common.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/common.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/common.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/main.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_ALLOCHANDLE_HDBC.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_SQLConnect.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/NDBT_SQLPrepare.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLAllocEnvTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLAllocHandleTest_bf.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLAllocHandleTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLBindColTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLBindColTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLBindColTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLBindColTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLBindParameterTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLCancelTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLCancelTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLCancelTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLCancelTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLCloseCursorTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest1.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest2.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest3.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLColAttributeTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLConnectTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLConnectTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLConnectTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLConnectTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLCopyDescTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLDescribeColTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLDisconnectTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLDriverConnectTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLEndTranTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLEndTranTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLEndTranTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLEndTranTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLErrorTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLErrorTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLErrorTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLErrorTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLExecDirectTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLExecuteTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLExecuteTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLExecuteTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLExecuteTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFetchScrollTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFetchTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFetchTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFetchTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFetchTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFreeHandleTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLFreeStmtTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetConnectAttrTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetCursorNameTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDataTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDataTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDataTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDataTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDescFieldTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDescRecTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDiagFieldTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDiagRecSimpleTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetDiagRecTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetEnvAttrTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetFunctionsTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetInfoTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetStmtAttrTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLGetTypeInfoTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLMoreResultsTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLNumResultColsTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLParamDataTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLParamDataTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLParamDataTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLParamDataTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLPrepareTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLPrepareTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLPrepareTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLPrepareTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLPutDataTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLPutDataTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLPutDataTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLPutDataTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLRowCountTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLRowCountTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLRowCountTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLRowCountTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetConnectAttrTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetCursorNameTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetDescFieldTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetDescRecTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetEnvAttrTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLSetStmtAttrTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLTablesTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLTablesTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLTablesTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLTablesTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLTransactTest.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLTransactTest.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/client/SQLTransactTest.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/client/SQLTransactTest.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/driver/testOdbcDriver.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/driver/testOdbcDriver.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/driver/testOdbcDriver.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/driver/testOdbcDriver.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/SQL99_test/SQL99_test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/SQL99_test/SQL99_test.h mysql-5.5-5.5.43/storage/ndb/test/odbc/SQL99_test/SQL99_test.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/SQL99_test/SQL99_test.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/SQL99_test/SQL99_test.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/test_compiler/test_compiler.cpp mysql-5.5-5.5.43/storage/ndb/test/odbc/test_compiler/test_compiler.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/odbc/test_compiler/test_compiler.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/odbc/test_compiler/test_compiler.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/16node-tests.txt mysql-5.5-5.5.43/storage/ndb/test/run-test/16node-tests.txt
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/16node-tests.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/16node-tests.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-analyze-result.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-analyze-result.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-analyze-result.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-analyze-result.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-clear-result.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-clear-result.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-clear-result.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-clear-result.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-gather-result.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-gather-result.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-gather-result.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-gather-result.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt.hpp mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-mysql-test-run mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-mysql-test-run
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-mysql-test-run	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-mysql-test-run	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-setup.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-setup.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-setup.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-setup.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-testBackup mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-testBackup
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/atrt-testBackup	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/atrt-testBackup	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/basic.txt mysql-5.5-5.5.43/storage/ndb/test/run-test/basic.txt
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/basic.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/basic.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/daily-basic-tests.txt mysql-5.5-5.5.43/storage/ndb/test/run-test/daily-basic-tests.txt
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/daily-basic-tests.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/daily-basic-tests.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/daily-devel-tests.txt mysql-5.5-5.5.43/storage/ndb/test/run-test/daily-devel-tests.txt
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/daily-devel-tests.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/daily-devel-tests.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/main.cpp mysql-5.5-5.5.43/storage/ndb/test/run-test/main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/make-config.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/make-config.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/make-config.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/make-config.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/Makefile.am mysql-5.5-5.5.43/storage/ndb/test/run-test/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/make-html-reports.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/make-html-reports.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/make-html-reports.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/make-html-reports.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/make-index.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/make-index.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/make-index.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/make-index.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/ndb-autotest.sh mysql-5.5-5.5.43/storage/ndb/test/run-test/ndb-autotest.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/run-test/ndb-autotest.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/run-test/ndb-autotest.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/AtrtClient.cpp mysql-5.5-5.5.43/storage/ndb/test/src/AtrtClient.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/AtrtClient.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/AtrtClient.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/CpcClient.cpp mysql-5.5-5.5.43/storage/ndb/test/src/CpcClient.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/CpcClient.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/CpcClient.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/DbUtil.cpp mysql-5.5-5.5.43/storage/ndb/test/src/DbUtil.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/DbUtil.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/DbUtil.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2008 MySQL AB
+/* Copyright (c) 2007, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoAsynchTransactions.cpp mysql-5.5-5.5.43/storage/ndb/test/src/HugoAsynchTransactions.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoAsynchTransactions.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/HugoAsynchTransactions.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoCalculator.cpp mysql-5.5-5.5.43/storage/ndb/test/src/HugoCalculator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoCalculator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/HugoCalculator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoOperations.cpp mysql-5.5-5.5.43/storage/ndb/test/src/HugoOperations.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoOperations.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/HugoOperations.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoTransactions.cpp mysql-5.5-5.5.43/storage/ndb/test/src/HugoTransactions.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/HugoTransactions.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/HugoTransactions.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/Makefile.am mysql-5.5-5.5.43/storage/ndb/test/src/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbBackup.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbBackup.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbBackup.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbBackup.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbConfig.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbConfig.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbConfig.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbConfig.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbGrep.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbGrep.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbGrep.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbGrep.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbMixRestarter.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbMixRestarter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbMixRestarter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbMixRestarter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbRestarter.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbRestarter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbRestarter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbRestarter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbRestarts.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbRestarts.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbRestarts.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbRestarts.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbSchemaCon.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbSchemaCon.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbSchemaCon.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbSchemaCon.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbSchemaOp.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NdbSchemaOp.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NdbSchemaOp.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NdbSchemaOp.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Error.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Error.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Error.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Error.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Output.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Output.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Output.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Output.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_ResultRow.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_ResultRow.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_ResultRow.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_ResultRow.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_ReturnCodes.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_ReturnCodes.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_ReturnCodes.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_ReturnCodes.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Table.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Table.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Table.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Table.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Tables.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Tables.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Tables.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Tables.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Test.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Test.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Test.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Test.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Thread.cpp mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Thread.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/NDBT_Thread.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/NDBT_Thread.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/UtilTransactions.cpp mysql-5.5-5.5.43/storage/ndb/test/src/UtilTransactions.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/src/UtilTransactions.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/src/UtilTransactions.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/connect.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/connect.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/connect.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/connect.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/copy_tab.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/copy_tab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/copy_tab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/copy_tab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/cpcc.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/cpcc.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/cpcc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/cpcc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/create_index.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/create_index.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/create_index.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/create_index.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoCalculator.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoCalculator.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoCalculator.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoCalculator.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoFill.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoFill.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoFill.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoFill.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoLoad.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoLoad.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoLoad.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoLoad.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoLockRecords.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoLockRecords.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoLockRecords.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoLockRecords.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkDelete.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkDelete.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkDelete.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkDelete.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkRead.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkRead.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkRead.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkRead.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2005, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkReadRecord.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkReadRecord.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkReadRecord.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkReadRecord.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkUpdate.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkUpdate.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoPkUpdate.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoPkUpdate.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoScanRead.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoScanRead.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoScanRead.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoScanRead.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoScanUpdate.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/hugoScanUpdate.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/hugoScanUpdate.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/hugoScanUpdate.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/listen.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/listen.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/listen.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/listen.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/Makefile.am mysql-5.5-5.5.43/storage/ndb/test/tools/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/rep_latency.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/rep_latency.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/rep_latency.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/rep_latency.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/restart.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/restart.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/restart.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/restart.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/transproxy.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/transproxy.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/transproxy.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/transproxy.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/verify_index.cpp mysql-5.5-5.5.43/storage/ndb/test/tools/verify_index.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/test/tools/verify_index.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/test/tools/verify_index.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/clean-links.sh mysql-5.5-5.5.43/storage/ndb/tools/clean-links.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/clean-links.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/clean-links.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/delete_all.cpp mysql-5.5-5.5.43/storage/ndb/tools/delete_all.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/delete_all.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/delete_all.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/desc.cpp mysql-5.5-5.5.43/storage/ndb/tools/desc.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/desc.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/desc.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/drop_index.cpp mysql-5.5-5.5.43/storage/ndb/tools/drop_index.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/drop_index.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/drop_index.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/drop_tab.cpp mysql-5.5-5.5.43/storage/ndb/tools/drop_tab.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/drop_tab.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/drop_tab.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/listTables.cpp mysql-5.5-5.5.43/storage/ndb/tools/listTables.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/listTables.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/listTables.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/make-errors.pl mysql-5.5-5.5.43/storage/ndb/tools/make-errors.pl
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/make-errors.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/make-errors.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #! /usr/local/bin/perl
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/Makefile.am mysql-5.5-5.5.43/storage/ndb/tools/Makefile.am
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/Makefile.am	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/Makefile.am	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (C) 2004-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/make-links.sh mysql-5.5-5.5.43/storage/ndb/tools/make-links.sh
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/make-links.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/make-links.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #! /bin/sh
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_config.cpp mysql-5.5-5.5.43/storage/ndb/tools/ndb_config.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_config.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/ndb_config.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_error_reporter mysql-5.5-5.5.43/storage/ndb/tools/ndb_error_reporter
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_error_reporter	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/ndb_error_reporter	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2005 MySQL AB
+# Copyright (c) 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_size.pl mysql-5.5-5.5.43/storage/ndb/tools/ndb_size.pl
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_size.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/ndb_size.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 2005-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndbsql.cpp mysql-5.5-5.5.43/storage/ndb/tools/ndbsql.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndbsql.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/ndbsql.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_test_platform.cpp mysql-5.5-5.5.43/storage/ndb/tools/ndb_test_platform.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/ndb_test_platform.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/ndb_test_platform.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer.cpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer.hpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_printer.cpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_printer.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_printer.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_printer.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_printer.hpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_printer.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_printer.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_printer.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_restore.cpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_restore.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_restore.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_restore.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_restore.hpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_restore.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_restore.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_restore.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_restorem.cpp mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_restorem.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/consumer_restorem.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/consumer_restorem.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-2006 MySQL AB, 2009 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 -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/ndb_nodegroup_map.h mysql-5.5-5.5.43/storage/ndb/tools/restore/ndb_nodegroup_map.h
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/ndb_nodegroup_map.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/ndb_nodegroup_map.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/Restore.cpp mysql-5.5-5.5.43/storage/ndb/tools/restore/Restore.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/Restore.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/Restore.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/Restore.hpp mysql-5.5-5.5.43/storage/ndb/tools/restore/Restore.hpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/Restore.hpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/Restore.hpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003-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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/restore_main.cpp mysql-5.5-5.5.43/storage/ndb/tools/restore/restore_main.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/restore/restore_main.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/restore/restore_main.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/rgrep mysql-5.5-5.5.43/storage/ndb/tools/rgrep
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/rgrep	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/rgrep	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/vobs/wds/swt/bin/perl
 
-# Copyright (C) 2004 MySQL AB
+# Copyright (c) 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/select_all.cpp mysql-5.5-5.5.43/storage/ndb/tools/select_all.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/select_all.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/select_all.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/select_count.cpp mysql-5.5-5.5.43/storage/ndb/tools/select_count.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/select_count.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/select_count.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/ndb/tools/waiter.cpp mysql-5.5-5.5.43/storage/ndb/tools/waiter.cpp
--- mysql-5.5-5.5.35+dfsg/storage/ndb/tools/waiter.cpp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/ndb/tools/waiter.cpp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (C) 2003 MySQL AB
+/* Copyright (c) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/storage/perfschema/ha_perfschema.cc mysql-5.5-5.5.43/storage/perfschema/ha_perfschema.cc
--- mysql-5.5-5.5.35+dfsg/storage/perfschema/ha_perfschema.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/perfschema/ha_perfschema.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2014, 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
@@ -250,6 +250,9 @@
 {
   DBUG_ENTER("ha_perfschema::update_row");
 
+  if (is_executed_by_slave())
+    DBUG_RETURN(0);
+
   DBUG_ASSERT(m_table);
   int result= m_table->update_row(table, old_data, new_data, table->field);
   DBUG_RETURN(result);
@@ -334,6 +337,9 @@
 
   DBUG_ENTER("ha_perfschema::delete_all_rows");
 
+  if (is_executed_by_slave())
+    DBUG_RETURN(0);
+
   DBUG_ASSERT(m_table_share);
   if (m_table_share->m_delete_all_rows)
     result= m_table_share->m_delete_all_rows();
diff -Nru mysql-5.5-5.5.35+dfsg/storage/perfschema/ha_perfschema.h mysql-5.5-5.5.43/storage/perfschema/ha_perfschema.h
--- mysql-5.5-5.5.35+dfsg/storage/perfschema/ha_perfschema.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/perfschema/ha_perfschema.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 2014, 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
@@ -17,6 +17,8 @@
 #define HA_PERFSCHEMA_H
 
 #include "handler.h"                            /* class handler */
+#include "table.h"
+#include "sql_class.h"
 
 #ifdef USE_PRAGMA_INTERFACE
 #pragma interface /* gcc class implementation */
@@ -149,6 +151,39 @@
   virtual void print_error(int error, myf errflags);
 
 private:
+  /**
+     Check if the caller is a replication thread or the caller is called
+     by a client thread executing base64 encoded BINLOG'... statement.
+
+     In theory, performance schema tables are not supposed to be replicated.
+     This is true and enforced starting with MySQL 5.6.10.
+     In practice, in previous versions such as MySQL 5.5 (GA) or earlier 5.6
+     (non GA) DML on performance schema tables could end up written in the binlog,
+     both in STATEMENT and ROW format.
+     While these records are not supposed to be there, they are found when:
+     - performing replication from a 5.5 master to a 5.6 slave during
+       upgrades
+     - performing replication from 5.5 (performance_schema enabled)
+       to a 5.6 slave
+     - performing point in time recovery in 5.6 with old archived logs.
+
+     This API detects when the code calling the performance schema storage
+     engine is a slave thread or whether the code calling isthe client thread
+     executing a BINLOG'.. statement.
+
+     This API acts as a late filter for the above mentioned cases.
+
+     For ROW format, @see Rows_log_event::do_apply_event
+
+  */
+  bool is_executed_by_slave() const
+  {
+    DBUG_ASSERT(table != NULL);
+    DBUG_ASSERT(table->in_use != NULL);
+    return table->in_use->slave_thread;
+
+  }
+
   /** MySQL lock */
   THR_LOCK_DATA m_thr_lock;
   /** Performance schema table share for this table handler. */
diff -Nru mysql-5.5-5.5.35+dfsg/storage/perfschema/pfs_check.cc mysql-5.5-5.5.43/storage/perfschema/pfs_check.cc
--- mysql-5.5-5.5.35+dfsg/storage/perfschema/pfs_check.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/perfschema/pfs_check.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2009, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2009, 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
@@ -55,6 +55,7 @@
 
   PFS_engine_table_share::check_all_tables(thd);
 
+  thd->restore_globals();
   delete thd;
   DBUG_VOID_RETURN;
 }
diff -Nru mysql-5.5-5.5.35+dfsg/storage/perfschema/pfs_events_waits.cc mysql-5.5-5.5.43/storage/perfschema/pfs_events_waits.cc
--- mysql-5.5-5.5.35+dfsg/storage/perfschema/pfs_events_waits.cc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/perfschema/pfs_events_waits.cc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2008, 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 -Nru mysql-5.5-5.5.35+dfsg/storage/perfschema/unittest/conf.txt mysql-5.5-5.5.43/storage/perfschema/unittest/conf.txt
--- mysql-5.5-5.5.35+dfsg/storage/perfschema/unittest/conf.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/storage/perfschema/unittest/conf.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # Copyright (c) 2009, 2010 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 -Nru mysql-5.5-5.5.35+dfsg/strings/CMakeLists.txt mysql-5.5-5.5.43/strings/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/strings/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -32,7 +32,6 @@
 ADD_DEFINITIONS(-DDISABLE_MYSQL_THREAD_H)
 ADD_CONVENIENCE_LIBRARY(strings ${STRINGS_SOURCES})
 
-INSTALL_DEBUG_SYMBOLS(strings)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(strings DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-bin.c mysql-5.5-5.5.43/strings/ctype-bin.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-bin.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-bin.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2002, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@valley.ne.jp.
+/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
+   Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype.c mysql-5.5-5.5.43/strings/ctype.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,5 +1,4 @@
-/* Copyright (c) 2000-2007 MySQL AB, 2008, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-eucjpms.c mysql-5.5-5.5.43/strings/ctype-eucjpms.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-eucjpms.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-eucjpms.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2005, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@valley.ne.jp.
+/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
+   Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-mb.c mysql-5.5-5.5.43/strings/ctype-mb.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-mb.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-mb.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 2014, 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
@@ -697,7 +697,7 @@
   char *max_end= max_str + res_length;
   size_t maxcharlen= res_length / cs->mbmaxlen;
   const char *contraction_flags= cs->contractions ? 
-              ((const char*) cs->contractions) + 0x40*0x40 : NULL;
+              (const char *) (cs->contractions + 0x40*0x40) : NULL;
 
   for (; ptr != end && min_str != min_end && maxcharlen ; maxcharlen--)
   {
@@ -1044,7 +1044,7 @@
     }
     if (*wildstr == w_many)
     {						/* Found w_many */
-      uchar cmp;
+      int cmp;
       const char* mb = wildstr;
       int mb_len=0;
       
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-simple.c mysql-5.5-5.5.43/strings/ctype-simple.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-simple.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-simple.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-uca.c mysql-5.5-5.5.43/strings/ctype-uca.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-uca.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-uca.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -8046,7 +8046,7 @@
     if (!(cs->contractions= (uint16*) (*alloc)(size)))
         return 1;
     bzero((void*)cs->contractions, size);
-    contraction_flags= ((char*) cs->contractions) + 0x40*0x40;
+    contraction_flags= (char *) (cs->contractions + 0x40*0x40);
     for (i=0; i < rc; i++)
     {
       if (rule[i].curr[1])
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-ucs2.c mysql-5.5-5.5.43/strings/ctype-ucs2.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-ucs2.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-ucs2.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
@@ -1664,7 +1664,7 @@
 CHARSET_INFO my_charset_utf16_bin=
 {
   55,0,0,              /* number       */
-  MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_NONASCII,
+  MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_STRNXFRM|MY_CS_UNICODE|MY_CS_NONASCII,
   "utf16",             /* cs name      */
   "utf16_bin",         /* name         */
   "UTF-16 Unicode",    /* comment      */
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-ujis.c mysql-5.5-5.5.43/strings/ctype-ujis.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-ujis.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-ujis.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. & tommy@valley.ne.jp.
+/* Copyright (c) 2002 MySQL AB & tommy@valley.ne.jp
+   Copyright (c) 2002, 2014, Oracle and/or its affiliates. All rights reserved.
    
    This library is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-utf8.c mysql-5.5-5.5.43/strings/ctype-utf8.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-utf8.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-utf8.c	2015-02-27 08:30:34.000000000 +0000
@@ -27,6 +27,7 @@
 #define EILSEQ ENOENT
 #endif
 
+#define IS_CONTINUATION_BYTE(c) (((c) ^ 0x80) < 0x40)
 
 #define MY_UTF8MB3_GENERAL_CI MY_UTF8MB3 "_general_ci"
 #define MY_UTF8MB3_GENERAL_CS MY_UTF8MB3 "_general_cs"
@@ -57,6 +58,46 @@
 #define HAVE_UNIDATA
 #endif
 
+
+#if defined(HAVE_CHARSET_utf8) || defined(HAVE_CHARSET_utf8mb4)
+
+static inline
+int my_valid_mbcharlen_utf8mb3(const uchar *s, const uchar *e)
+{
+  uchar c;
+
+  DBUG_ASSERT(s < e);
+  c= s[0];
+  if (c < 0x80)
+    return 1;
+
+  if (c < 0xc2)
+    return MY_CS_ILSEQ;
+
+  if (c < 0xe0)
+  {
+    if (s+2 > e) /* We need 2 characters */
+      return MY_CS_TOOSMALL2;
+
+    if (!(IS_CONTINUATION_BYTE(s[1])))
+      return MY_CS_ILSEQ;
+
+    return 2;
+  }
+
+  DBUG_ASSERT(c < 0xf0);
+  if (s+3 > e) /* We need 3 characters */
+    return MY_CS_TOOSMALL3;
+
+  if (!(IS_CONTINUATION_BYTE(s[1]) && IS_CONTINUATION_BYTE(s[2]) &&
+          (c >= 0xe1 || s[1] >= 0xa0)))
+    return MY_CS_ILSEQ;
+
+  return 3;
+}
+
+#endif  /*HAVE_CHARSET_utf8 || HAVE_CHARSET_utf8mb4*/
+
 #ifdef HAVE_UNIDATA
 
 #include "my_uctype.h"
@@ -2287,7 +2328,7 @@
     if (s+2 > e) /* We need 2 characters */
       return MY_CS_TOOSMALL2;
 
-    if (!((s[1] ^ 0x80) < 0x40))
+    if (!(IS_CONTINUATION_BYTE(s[1])))
       return MY_CS_ILSEQ;
 
     *pwc = ((my_wc_t) (c & 0x1f) << 6) | (my_wc_t) (s[1] ^ 0x80);
@@ -2298,7 +2339,7 @@
     if (s+3 > e) /* We need 3 characters */
       return MY_CS_TOOSMALL3;
 
-    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) && IS_CONTINUATION_BYTE(s[2]) &&
           (c >= 0xe1 || s[1] >= 0xa0)))
       return MY_CS_ILSEQ;
 
@@ -2314,9 +2355,9 @@
     if (s+4 > e) /* We need 4 characters */
       return MY_CS_TOOSMALL4;
 
-    if (!((s[1] ^ 0x80) < 0x40 &&
-          (s[2] ^ 0x80) < 0x40 &&
-          (s[3] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
           (c >= 0xf1 || s[1] >= 0x90)))
       return MY_CS_ILSEQ;
 
@@ -2332,10 +2373,10 @@
     if (s+5 >e) /* We need 5 characters */
       return MY_CS_TOOSMALL5;
 
-    if (!((s[1] ^ 0x80) < 0x40 &&
-          (s[2] ^ 0x80) < 0x40 &&
-          (s[3] ^ 0x80) < 0x40 &&
-          (s[4] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
+          IS_CONTINUATION_BYTE(s[4]) &&
           (c >= 0xf9 || s[1] >= 0x88)))
       return MY_CS_ILSEQ;
 
@@ -2351,11 +2392,11 @@
     if ( s+6 >e ) /* We need 6 characters */
       return MY_CS_TOOSMALL6;
 
-    if (!((s[1] ^ 0x80) < 0x40   &&
-          (s[2] ^ 0x80) < 0x40   &&
-          (s[3] ^ 0x80) < 0x40   &&
-          (s[4] ^ 0x80) < 0x40   &&
-          (s[5] ^ 0x80) < 0x40   &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
+          IS_CONTINUATION_BYTE(s[4]) &&
+          IS_CONTINUATION_BYTE(s[5]) &&
           (c >= 0xfd || s[1] >= 0x84)))
       return MY_CS_ILSEQ;
 
@@ -2399,11 +2440,11 @@
     *pwc = ((my_wc_t) (c & 0x1f) << 6) | (my_wc_t) (s[1] ^ 0x80);
     return 2;
   }
-  
+
   if (c < 0xf0)
   {
-    if (!((s[1] ^ 0x80) < 0x40 &&
-          (s[2] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
           (c >= 0xe1 || s[1] >= 0xa0)))
       return MY_CS_ILSEQ;
 
@@ -2892,10 +2933,90 @@
 }
 
 
+static
+int my_valid_mbcharlen_utf8(CHARSET_INFO *cs __attribute__((unused)),
+                            const uchar *s, const uchar *e)
+{
+  uchar c;
+
+  if (s >= e)
+    return MY_CS_TOOSMALL;
+
+  c= s[0];
+  if (c < 0xf0)
+    return my_valid_mbcharlen_utf8mb3(s, e);
+
+#ifdef UNICODE_32BIT
+  if (c < 0xf8 && sizeof(my_wc_t)*8 >= 32)
+  {
+    if (s+4 > e) /* We need 4 characters */
+      return MY_CS_TOOSMALL4;
+
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
+          (c >= 0xf1 || s[1] >= 0x90)))
+      return MY_CS_ILSEQ;
+
+    return 4;
+  }
+  if (c < 0xfc && sizeof(my_wc_t)*8 >= 32)
+  {
+    if (s+5 >e) /* We need 5 characters */
+      return MY_CS_TOOSMALL5;
+
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
+          IS_CONTINUATION_BYTE(s[4]) &&
+          (c >= 0xf9 || s[1] >= 0x88)))
+      return MY_CS_ILSEQ;
+
+    return 5;
+  }
+  if (c < 0xfe && sizeof(my_wc_t)*8 >= 32)
+  {
+    if ( s+6 >e ) /* We need 6 characters */
+      return MY_CS_TOOSMALL6;
+
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
+          IS_CONTINUATION_BYTE(s[4]) &&
+          IS_CONTINUATION_BYTE(s[5]) &&
+          (c >= 0xfd || s[1] >= 0x84)))
+      return MY_CS_ILSEQ;
+
+    return 6;
+  }
+#endif
+  return MY_CS_ILSEQ;
+}
+
+static size_t
+my_well_formed_len_utf8(CHARSET_INFO *cs, const char *b, const char *e,
+                        size_t pos, int *error)
+{
+  const char *b_start= b;
+  *error= 0;
+  while (pos)
+  {
+    int mb_len;
+
+    if ((mb_len= my_valid_mbcharlen_utf8(cs, (uchar*) b, (uchar*) e)) <= 0)
+    {
+      *error= b < e ? 1 : 0;
+      break;
+    }
+    b+= mb_len;
+    pos--;
+  }
+  return (size_t) (b - b_start);
+}
+
 static uint my_ismbchar_utf8(CHARSET_INFO *cs,const char *b, const char *e)
 {
-  my_wc_t wc;
-  int  res= my_utf8_uni(cs,&wc, (const uchar*)b, (const uchar*)e);
+  int  res= my_valid_mbcharlen_utf8(cs, (const uchar*)b, (const uchar*)e);
   return (res>1) ? res : 0;
 }
 
@@ -2944,7 +3065,7 @@
     my_mbcharlen_utf8,
     my_numchars_mb,
     my_charpos_mb,
-    my_well_formed_len_mb,
+    my_well_formed_len_utf8,
     my_lengthsp_8bit,
     my_numcells_mb,
     my_utf8_uni,
@@ -4714,7 +4835,7 @@
     if (s + 2 > e) /* We need 2 characters */
       return MY_CS_TOOSMALL2;
 
-    if (!((s[1] ^ 0x80) < 0x40))
+    if (!(IS_CONTINUATION_BYTE(s[1])))
       return MY_CS_ILSEQ;
 
     *pwc= ((my_wc_t) (c & 0x1f) << 6) | (my_wc_t) (s[1] ^ 0x80);
@@ -4725,7 +4846,7 @@
     if (s + 3 > e) /* We need 3 characters */
       return MY_CS_TOOSMALL3;
 
-    if (!((s[1] ^ 0x80) < 0x40 && (s[2] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) && IS_CONTINUATION_BYTE(s[2]) &&
           (c >= 0xe1 || s[1] >= 0xa0)))
       return MY_CS_ILSEQ;
 
@@ -4758,9 +4879,9 @@
       [F4][80..8F][80..BF][80..BF]
     */
 
-    if (!((s[1] ^ 0x80) < 0x40 &&
-          (s[2] ^ 0x80) < 0x40 &&
-          (s[3] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
           (c >= 0xf1 || s[1] >= 0x90) &&
           (c <= 0xf3 || s[1] <= 0x8F)))
       return MY_CS_ILSEQ;
@@ -4796,17 +4917,17 @@
 
   if (c < 0xe0)
   {
-    if (!((s[1] ^ 0x80) < 0x40))
+    if (!IS_CONTINUATION_BYTE(s[1]))
       return MY_CS_ILSEQ;
 
     *pwc = ((my_wc_t) (c & 0x1f) << 6) | (my_wc_t) (s[1] ^ 0x80);
     return 2;
   }
-  
+
   if (c < 0xf0)
   {
-    if (!((s[1] ^ 0x80) < 0x40 &&
-          (s[2] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
           (c >= 0xe1 || s[1] >= 0xa0)))
       return MY_CS_ILSEQ;
     *pwc= ((my_wc_t) (c & 0x0f) << 12)   |
@@ -4817,9 +4938,9 @@
   }
   else if (c < 0xf5)
   {
-    if (!((s[1] ^ 0x80) < 0x40 &&
-          (s[2] ^ 0x80) < 0x40 &&
-          (s[3] ^ 0x80) < 0x40 &&
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
           (c >= 0xf1 || s[1] >= 0x90) &&
           (c <= 0xf3 || s[1] <= 0x8F)))
       return MY_CS_ILSEQ;
@@ -5308,11 +5429,84 @@
 }
 
 
+static int
+my_valid_mbcharlen_utf8mb4(CHARSET_INFO *cs __attribute__((unused)),
+                           const uchar *s, const uchar *e)
+{
+  uchar c;
+
+  if (s >= e)
+    return MY_CS_TOOSMALL;
+
+  c= s[0];
+  if (c < 0xf0)
+    return my_valid_mbcharlen_utf8mb3(s, e);
+
+  if (c < 0xf5)
+  {
+    if (s + 4 > e) /* We need 4 characters */
+      return MY_CS_TOOSMALL4;
+
+    /*
+      UTF-8 quick four-byte mask:
+      11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
+      Encoding allows to encode U+00010000..U+001FFFFF
+
+      The maximum character defined in the Unicode standard is U+0010FFFF.
+      Higher characters U+00110000..U+001FFFFF are not used.
+
+      11110000.10010000.10xxxxxx.10xxxxxx == F0.90.80.80 == U+00010000 (min)
+      11110100.10001111.10111111.10111111 == F4.8F.BF.BF == U+0010FFFF (max)
+
+      Valid codes:
+      [F0][90..BF][80..BF][80..BF]
+      [F1][80..BF][80..BF][80..BF]
+      [F2][80..BF][80..BF][80..BF]
+      [F3][80..BF][80..BF][80..BF]
+      [F4][80..8F][80..BF][80..BF]
+    */
+
+    if (!(IS_CONTINUATION_BYTE(s[1]) &&
+          IS_CONTINUATION_BYTE(s[2]) &&
+          IS_CONTINUATION_BYTE(s[3]) &&
+          (c >= 0xf1 || s[1] >= 0x90) &&
+          (c <= 0xf3 || s[1] <= 0x8F)))
+      return MY_CS_ILSEQ;
+
+    return 4;
+  }
+
+  return MY_CS_ILSEQ;
+}
+
+
+static
+size_t my_well_formed_len_utf8mb4(CHARSET_INFO *cs,
+                                  const char *b, const char *e,
+                                  size_t pos, int *error)
+{
+  const char *b_start= b;
+  *error= 0;
+  while (pos)
+  {
+    int mb_len;
+
+    if ((mb_len= my_valid_mbcharlen_utf8mb4(cs, (uchar*) b, (uchar*) e)) <= 0)
+    {
+      *error= b < e ? 1 : 0;
+      break;
+    }
+    b+= mb_len;
+    pos--;
+  }
+  return (size_t) (b - b_start);
+}
+
+
 static uint
 my_ismbchar_utf8mb4(CHARSET_INFO *cs, const char *b, const char *e)
 {
-  my_wc_t wc;
-  int res= my_mb_wc_utf8mb4(cs,&wc, (const uchar*)b, (const uchar*)e);
+  int res= my_valid_mbcharlen_utf8mb4(cs, (const uchar*)b, (const uchar*)e);
   return (res > 1) ? res : 0;
 }
 
@@ -5373,7 +5567,7 @@
   my_mbcharlen_utf8mb4,
   my_numchars_mb,
   my_charpos_mb,
-  my_well_formed_len_mb,
+  my_well_formed_len_utf8mb4,
   my_lengthsp_8bit,
   my_numcells_mb,
   my_mb_wc_utf8mb4,
@@ -5435,7 +5629,8 @@
 CHARSET_INFO my_charset_utf8mb4_bin=
 {
   46,0,0,             /* number       */
-  MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_UNICODE|MY_CS_UNICODE_SUPPLEMENT, /* state  */
+  MY_CS_COMPILED|MY_CS_BINSORT|MY_CS_STRNXFRM|MY_CS_UNICODE|
+  MY_CS_UNICODE_SUPPLEMENT, /* state  */
   MY_UTF8MB4,         /* cs name      */
   MY_UTF8MB4_BIN,     /* name         */
   "UTF-8 Unicode",    /* comment      */
diff -Nru mysql-5.5-5.5.35+dfsg/strings/ctype-win1250ch.c mysql-5.5-5.5.43/strings/ctype-win1250ch.c
--- mysql-5.5-5.5.35+dfsg/strings/ctype-win1250ch.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/ctype-win1250ch.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2002, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2002, 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 -Nru mysql-5.5-5.5.35+dfsg/strings/decimal.c mysql-5.5-5.5.43/strings/decimal.c
--- mysql-5.5-5.5.35+dfsg/strings/decimal.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/decimal.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2004, 2013, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2004, 2014, 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
@@ -2322,7 +2322,7 @@
         error=E_DEC_TRUNCATED;
         goto done;
       }
-      stop1=start1+frac0;
+      stop1= start1 + frac0 + intg0;
       frac0+=intg0;
       to->intg=0;
       while (intg0++ < 0)
diff -Nru mysql-5.5-5.5.35+dfsg/strings/my_strtoll10.c mysql-5.5-5.5.43/strings/my_strtoll10.c
--- mysql-5.5-5.5.35+dfsg/strings/my_strtoll10.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/my_strtoll10.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2003, 2010, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2003, 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 -Nru mysql-5.5-5.5.35+dfsg/strings/t_ctype.h mysql-5.5-5.5.43/strings/t_ctype.h
--- mysql-5.5-5.5.35+dfsg/strings/t_ctype.h	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/strings/t_ctype.h	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2001, 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/build-tags mysql-5.5-5.5.43/support-files/build-tags
--- mysql-5.5-5.5.35+dfsg/support-files/build-tags	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/build-tags	2015-02-27 08:30:34.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 
 rm -f TAGS
-filter='\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$'
+filter='\.cpp$\|\.cc$\|\.c$\|\.h$\|sql_yacc\.yy$\|\.hpp$\|\.ic$'
 
 list="find . -type f"
-bzr root >/dev/null 2>/dev/null && list="bzr ls --from-root -R --kind=file --versioned"
+git rev-parse >/dev/null 2>/dev/null && list="git ls-files"
 
 $list |grep $filter |while read f; 
 do
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/CMakeLists.txt mysql-5.5-5.5.43/support-files/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/support-files/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -56,12 +56,14 @@
 
     IF(script MATCHES ".ini")
       SET(comp IniFiles)
+      SET(permissions OWNER_READ OWNER_WRITE GROUP_READ WORLD_READ)
     ELSE()
       SET(comp Server_Scripts)
+      SET(permissions OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
     ENDIF()
     INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${script} 
        DESTINATION ${inst_location} COMPONENT ${comp}
-       PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+       PERMISSIONS ${permissions})
   ENDFOREACH()
   IF(INSTALL_SUPPORTFILESDIR)
     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/compiler_warnings.supp mysql-5.5-5.5.43/support-files/compiler_warnings.supp
--- mysql-5.5-5.5.35+dfsg/support-files/compiler_warnings.supp	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/compiler_warnings.supp	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/Description.plist.sh mysql-5.5-5.5.43/support-files/MacOSX/Description.plist.sh
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/Description.plist.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/Description.plist.sh	2015-02-27 08:30:34.000000000 +0000
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/Info.plist.sh mysql-5.5-5.5.43/support-files/MacOSX/Info.plist.sh
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/Info.plist.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/Info.plist.sh	2015-02-27 08:30:34.000000000 +0000
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003, 2008 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/mwar-wrapper mysql-5.5-5.5.43/support-files/MacOSX/mwar-wrapper
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/mwar-wrapper	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/mwar-wrapper	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/mwcc-wrapper mysql-5.5-5.5.43/support-files/MacOSX/mwcc-wrapper
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/mwcc-wrapper	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/mwcc-wrapper	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/MySQLCOM mysql-5.5-5.5.43/support-files/MacOSX/MySQLCOM
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/MySQLCOM	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/MySQLCOM	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/postflight.sh mysql-5.5-5.5.43/support-files/MacOSX/postflight.sh
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/postflight.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/postflight.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/preflight.sh mysql-5.5-5.5.43/support-files/MacOSX/preflight.sh
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/preflight.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/preflight.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/bin/sh
 
 # Copyright (C) 2003, 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 Library General Public
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/ReadMe.txt mysql-5.5-5.5.43/support-files/MacOSX/ReadMe.txt
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/ReadMe.txt	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/ReadMe.txt	2015-02-27 08:30:42.000000000 +0000
@@ -1,169 +1,147 @@
+2.4 Installing MySQL on OS X
 
-2.4. Installing MySQL on Mac OS X
+   For a list of supported OS X versions that the MySQL server
+   supports, see
+   http://www.mysql.com/support/supportedplatforms/database.html
+   .
+
+   MySQL for OS X is available in a number of different forms:
+
+     * Native Package Installer format, which uses the native OS
+       X installer (DMG) to walk you through the installation of
+       MySQL. For more information, see Section 2.4.2,
+       "Installing MySQL on OS X Using Native Packages." You can
+       use the package installer with OS X. The user you use to
+       perform the installation must have administrator
+       privileges.
+
+     * Tar package format, which uses a file packaged using the
+       Unix tar and gzip commands. To use this method, you will
+       need to open a Terminal window. You do not need
+       administrator privileges using this method, as you can
+       install the MySQL server anywhere using this method. For
+       more information on using this method, you can use the
+       generic instructions for using a tarball, Section 2.2,
+       "Installing MySQL on Unix/Linux Using Generic Binaries."
+       In addition to the core installation, the Package
+       Installer also includes Section 2.4.4, "Installing the
+       MySQL Startup Item" and Section 2.4.5, "Installing and
+       Using the MySQL Preference Pane," both of which simplify
+       the management of your installation.
 
-   MySQL for Mac OS X is available in a number of different forms:
+   For additional information on using MySQL on OS X, see
+   Section 2.4.1, "General Notes on Installing MySQL on OS X."
 
-     * Native Package Installer format, which uses the native Mac OS
-       X installer to walk you through the installation of MySQL. For
-       more information, see Section 2.4.2, "Installing MySQL on Mac
-       OS X Using Native Packages." You can use the package installer
-       with Mac OS X 10.3 and later, and the package is available for
-       both PowerPC and Intel architectures, and 32-bit and 64-bit
-       architectures. There is no Universal Binary available using
-       the package installation method. The user you use to perform
-       the installation must have administrator privileges.
-
-     * Tar package format, which uses a file packaged using the Unix
-       tar and gzip commands. To use this method, you will need to
-       open a Terminal window. You do not need administrator
-       privileges using this method, as you can install the MySQL
-       server anywhere using this method. For more information on
-       using this method, you can use the generic instructions for
-       using a tarball, Section 2.2, "Installing MySQL on Unix/Linux
-       Using Generic Binaries."You can use the package installer with
-       Mac OS X 10.3 and later, and available for both PowerPC and
-       Intel architectures, and both 32-bit and 64-bit architectures.
-       A Universal Binary, incorporating both Power PC and Intel
-       architectures and 32-bit and 64-bit binaries is available.
-       In addition to the core installation, the Package Installer
-       also includes Section 2.4.3, "Installing the MySQL Startup
-       Item" and Section 2.4.4, "Installing and Using the MySQL
-       Preference Pane," both of which simplify the management of
-       your installation.
-
-     * Mac OS X server includes a version of MySQL as standard. If
-       you want to use a more recent version than that supplied with
-       the Mac OS X server release, you can make use of the package
-       or tar formats. For more information on using the MySQL
-       bundled with Mac OS X, see Section 2.4.5, "Using the Bundled
-       MySQL on Mac OS X Server."
-
-   For additional information on using MySQL on Mac OS X, see Section
-   2.4.1, "General Notes on Installing MySQL on Mac OS X."
-
-2.4.1. General Notes on Installing MySQL on Mac OS X
+2.4.1 General Notes on Installing MySQL on OS X
 
    You should keep the following issues and notes in mind:
 
-     * The default location for the MySQL Unix socket is different on
-       Mac OS X and Mac OS X Server depending on the installation
-       type you chose. The following table shows the default
-       locations by installation type.
-       Table 2.8. MySQL Unix Socket Locations on Mac OS X by
-       Installation Type
-
-               Installation Type             Socket Location
-       Package Installer from MySQL       /tmp/mysql.sock
-       Tarball from MySQL                 /tmp/mysql.sock
-       MySQL Bundled with Mac OS X Server /var/mysql/mysql.sock
-       To prevent issues, you should either change the configuration
-       of the socket used within your application (for example,
-       changing php.ini), or you should configure the socket location
-       using a MySQL configuration file and the socket option. For
-       more information, see Section 5.1.3, "Server Command Options."
-
-     * You may need (or want) to create a specific mysql user to own
-       the MySQL directory and data. On Mac OS X 10.4 and lower you
-       can do this by using the Netinfo Manager application, located
-       within the Utilities folder within the Applications folder. On
-       Mac OS X 10.5 and later you can do this through the Directory
-       Utility. From Mac OS X 10.5 and later (including Mac OS X
-       Server 10.5) the mysql should already exist. For use in single
-       user mode, an entry for _mysql (note the underscore prefix)
-       should already exist within the system /etc/passwd file.
-
-     * Due to a bug in the Mac OS X package installer, you may see
-       this error message in the destination disk selection dialog:
-You cannot install this software on this disk. (null)
-       If this error occurs, click the Go Back button once to return
-       to the previous screen. Then click Continue to advance to the
-       destination disk selection again, and you should be able to
-       choose the destination disk correctly. We have reported this
-       bug to Apple and it is investigating this problem.
+     * OS X 10.4 deprecated startup items in favor of launchd
+       daemons, and as of OS X 10.10 (Yosemite), startup items
+       do not function. For these reasons, using launchd daemons
+       is preferred over startup items.
+
+     * You may need (or want) to create a specific mysql user to
+       own the MySQL directory and data. You can do this through
+       the Directory Utility, and the mysql user should already
+       exist. For use in single user mode, an entry for _mysql
+       (note the underscore prefix) should already exist within
+       the system /etc/passwd file.
 
      * If you get an "insecure startup item disabled" error when
        MySQL launches, use the following procedure. Adjust the
        pathnames appropriately for your system.
 
-         1. Modify the mysql.script using this command (enter it on a
-            single line):
+         1. Modify the mysql.script using this command (enter it
+            on a single line):
 shell> sudo /Applications/TextEdit.app/Contents/MacOS/TextEdit
   /usr/local/mysql/support-files/mysql.server
 
-         2. Locate the option file that defines the basedir value and
-            modify it to contain these lines:
+
+         2. Locate the option file that defines the basedir
+            value and modify it to contain these lines:
 basedir=/usr/local/mysql
 datadir=/usr/local/mysql/data
-            In the /Library/StartupItems/MySQLCOM/ directory, make
-            the following group ID changes from staff to wheel:
+
+            In the /Library/StartupItems/MySQLCOM/ directory,
+            make the following group ID changes from staff to
+            wheel:
 shell> sudo chgrp wheel MySQLCOM StartupParameters.plist
 
-         3. Start the server from System Preferences or Terminal.app.
+
+         3. Start the server from System Preferences or
+            Terminal.app.
 
      * Because the MySQL package installer installs the MySQL
-       contents into a version and platform specific directory, you
-       can use this to upgrade and migrate your database between
-       versions. You will need to either copy the data directory from
-       the old version to the new version, or alternatively specify
-       an alternative datadir value to set location of the data
-       directory.
-
-     * You might want to add aliases to your shell's resource file to
-       make it easier to access commonly used programs such as mysql
-       and mysqladmin from the command line. The syntax for bash is:
+       contents into a version and platform specific directory,
+       you can use this to upgrade and migrate your database
+       between versions. You will need to either copy the data
+       directory from the old version to the new version, or
+       alternatively specify an alternative datadir value to set
+       location of the data directory. By default, the MySQL
+       directories are installed under /usr/local/.
+
+     * You might want to add aliases to your shell's resource
+       file to make it easier to access commonly used programs
+       such as mysql and mysqladmin from the command line. The
+       syntax for bash is:
 alias mysql=/usr/local/mysql/bin/mysql
 alias mysqladmin=/usr/local/mysql/bin/mysqladmin
+
        For tcsh, use:
 alias mysql /usr/local/mysql/bin/mysql
 alias mysqladmin /usr/local/mysql/bin/mysqladmin
-       Even better, add /usr/local/mysql/bin to your PATH environment
-       variable. You can do this by modifying the appropriate startup
-       file for your shell. For more information, see Section 4.2.1,
-       "Invoking MySQL Programs."
-
-     * After you have copied over the MySQL database files from the
-       previous installation and have successfully started the new
-       server, you should consider removing the old installation
-       files to save disk space. Additionally, you should also remove
-       older versions of the Package Receipt directories located in
+
+       Even better, add /usr/local/mysql/bin to your PATH
+       environment variable. You can do this by modifying the
+       appropriate startup file for your shell. For more
+       information, see Section 4.2.1, "Invoking MySQL
+       Programs."
+
+     * After you have copied over the MySQL database files from
+       the previous installation and have successfully started
+       the new server, you should consider removing the old
+       installation files to save disk space. Additionally, you
+       should also remove older versions of the Package Receipt
+       directories located in
        /Library/Receipts/mysql-VERSION.pkg.
 
-2.4.2. Installing MySQL on Mac OS X Using Native Packages
+     * Prior to OS X 10.7, MySQL server was bundled with OS X
+       Server.
+
+2.4.2 Installing MySQL on OS X Using Native Packages
 
-   You can install MySQL on Mac OS X 10.3.x ("Panther") or newer
-   using a Mac OS X binary package in DMG format instead of the
-   binary tarball distribution. Please note that older versions of
-   Mac OS X (for example, 10.1.x or 10.2.x) are not supported by this
-   package.
-
-   The package is located inside a disk image (.dmg) file that you
-   first need to mount by double-clicking its icon in the Finder. It
-   should then mount the image and display its contents.
+   The package is located inside a disk image (.dmg) file that
+   you first need to mount by double-clicking its icon in the
+   Finder. It should then mount the image and display its
+   contents.
    Note
 
    Before proceeding with the installation, be sure to stop all
-   running MySQL server instances by using either the MySQL Manager
-   Application (on Mac OS X Server) or mysqladmin shutdown on the
-   command line.
-
-   When installing from the package version, you should also install
-   the MySQL Preference Pane, which will enable you to control the
-   startup and execution of your MySQL server from System
-   Preferences. For more information, see Section 2.4.4, "Installing
-   and Using the MySQL Preference Pane."
+   running MySQL server instances by using either the MySQL
+   Manager Application (on OS X Server) or mysqladmin shutdown
+   on the command line.
+
+   When installing from the package version, you can also
+   install the MySQL Preference Pane, which will enable you to
+   control the startup and execution of your MySQL server from
+   System Preferences. For more information, see Section 2.4.5,
+   "Installing and Using the MySQL Preference Pane."
 
    When installing using the package installer, the files are
-   installed into a directory within /usr/local matching the name of
-   the installation version and platform. For example, the installer
-   file mysql-5.1.39-osx10.5-x86_64.pkg installs MySQL into
-   /usr/local/mysql-5.1.39-osx10.5-x86_64 . The following table shows
-   the layout of the installation directory.
+   installed into a directory within /usr/local matching the
+   name of the installation version and platform. For example,
+   the installer file mysql-5.5-osx10.8-x86_64.dmg installs
+   MySQL into /usr/local/mysql-5.5-osx10.8-x86_64/ . The
+   following table shows the layout of the installation
+   directory.
 
-   Table 2.9. MySQL Installation Layout on Mac OS X
+   Table 2.8 MySQL Installation Layout on OS X
    Directory Contents of Directory
    bin Client programs and the mysqld server
    data Log files, databases
-   docs Manual in Info format
+   docs Helper documents, like the Release Notes and build
+   information
    include Include (header) files
    lib Libraries
    man Unix manual pages
@@ -180,229 +158,243 @@
    created during installation will be created automatically.
 
     1. Download and open the MySQL package installer, which is
-       provided on a disk image (.dmg) that includes the main MySQL
-       installation package, the MySQLStartupItem.pkg installation
-       package, and the MySQL.prefPane. Double-click the disk image
-       to open it.
-
-    2. Double-click the MySQL installer package. It will be named
-       according to the version of MySQL you have downloaded. For
-       example, if you have downloaded MySQL 5.1.39, double-click
-       mysql-5.1.39-osx10.5-x86.pkg.
-
-    3. You will be presented with the opening installer dialog. Click
-       Continue to begin installation.
-       MySQL Package Installer: Step 1
-
-    4. A copy of the installation instructions and other important
-       information relevant to this installation are displayed. Click
-       Continue .
-
-    5. If you have downloaded the community version of MySQL, you
-       will be shown a copy of the relevant GNU General Public
-       License. Click Continue .
-
-    6. Select the drive you want to use to install the MySQL Startup
-       Item. The drive must have a valid, bootable, Mac OS X
-       operating system installed. Click Continue.
-       MySQL Package Installer: Step 4
-
-    7. You will be asked to confirm the details of the installation,
-       including the space required for the installation. To change
-       the drive on which the startup item is installed, click either
-       Go Back or Change Install Location.... To install the startup
-       item, click Install.
-
-    8. Once the installation has been completed successfully, you
-       will be shown an Install Succeeded message.
-
-   For convenience, you may also want to install the startup item and
-   preference pane. See Section 2.4.3, "Installing the MySQL Startup
-   Item," and Section 2.4.4, "Installing and Using the MySQL
-   Preference Pane."
-
-2.4.3. Installing the MySQL Startup Item
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package file. Double-click the disk
+       image to open it.
+       Figure 2.41 MySQL Package Installer: DMG Contents
+       MySQL Package Installer: DMG Contents
+
+    2. Double-click the MySQL installer package. It will be
+       named according to the version of MySQL you have
+       downloaded. For example, if you have downloaded MySQL
+       server 5.5.44, double-click
+       mysql-5.5.44-osx-10.8-x86_64.pkg.
+
+    3. You will be presented with the opening installer dialog.
+       Click Continue to begin installation.
+       Figure 2.42 MySQL Package Installer: Introduction
+       MySQL Package Installer: Introduction
+
+    4. If you have downloaded the community version of MySQL,
+       you will be shown a copy of the relevant GNU General
+       Public License. Click Continue and then Agree to
+       continue.
+
+    5. From the Installation Type page you can either click
+       Install to execute the installation wizard using all
+       defaults, click Customize to alter which components to
+       install (MySQL server, Startup Item, Preference Pane --
+       all enabled by default), or click Change Installation
+       Location to change the type of installation for either
+       all users, only the user executing the Installer, or
+       define a custom location.
+       Figure 2.43 MySQL Package Installer: Installation Type
+       MySQL Package Installer: Installation Type
+       Figure 2.44 MySQL Package Installer: Destination Select
+       (Change Installation Location)
+       MySQL Package Installer: Destination Select (Change
+       Installation Location)
+       Figure 2.45 MySQL Package Installer: Customize
+       MySQL Package Installer: Customize
+
+    6. Click Install to begin the installation process.
+
+    7. Once the installation has been completed successfully,
+       you will be shown an Install Succeeded message with a
+       short summary. Now, Close the wizard and begin using the
+       MySQL server.
+       Figure 2.46 MySQL Package Installer: Summary
+       MySQL Package Installer: Summary
+
+   For convenience, you may also want to install a launch daemon
+   and preference pane. See Section 2.4.3, "Installing a MySQL
+   Launch Daemon," and Section 2.4.5, "Installing and Using the
+   MySQL Preference Pane."
+
+2.4.3 Installing a MySQL Launch Daemon
+
+   OS X uses launch daemons to automatically start, stop, and
+   manage processes and applications such as MySQL. Using launch
+   daemons is recommended over startup items on OS X.
+   Note
 
-   The MySQL Installation Package includes a startup item that can be
-   used to automatically start and stop MySQL.
+   OS X 10.4 deprecated startup items in favor of launchd
+   daemons, and as of OS X 10.10 (Yosemite), startup items do
+   not function. For these reasons, using launchd daemons is
+   preferred over startup items.
+
+   Here is an example launchd file that starts MySQL:
+
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN"
+"http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+  <dict>
+    <key>KeepAlive</key>
+    <true/>
+    <key>Label</key>
+    <string>com.mysql.mysqld</string>
+    <key>ProgramArguments</key>
+    <array>
+    <string>/usr/local/mysql/bin/mysqld_safe</string>
+    <string>--user=mysql</string>
+    </array>
+  </dict>
+</plist>
+
+
+   Adjust the ProgramArguments array according to your system,
+   as for example your path to mysqld_safe might be different.
+   After making the proper adjustments, do the following:
+
+     * Save the XML as a file named
+       /Library/LaunchDaemons/com.mysql.mysql.plist
+
+     * Adjust the file permissions using the Apple recommended
+       owner "root", owning group "wheel", and file permissions
+       "644"
+shell> sudo chown root:wheel /Library/LaunchDaemons/com.mysql.mysql.pl
+ist
+shell> sudo chmod 644 /Library/LaunchDaemons/com.mysql.mysql.plist
+
+
+     * Enable this new MySQL service
+shell> sudo launchctl load -w /Library/LaunchDaemons/com.mysql.mysql.p
+list
+
+   The MySQL daemon is now running, and automatically starts
+   when your system is rebooted.
+
+2.4.4 Installing the MySQL Startup Item
+
+   The MySQL Installation Package includes a startup item that
+   can be used to automatically start and stop MySQL.
+   Important
+
+   Startup items are deprecated in favor of launchd daemons. For
+   additional information, see Section 2.4.3, "Installing a
+   MySQL Launch Daemon."
 
    To install the MySQL Startup Item:
 
     1. Download and open the MySQL package installer, which is
-       provided on a disk image (.dmg) that includes the main MySQL
-       installation package, the MySQLStartupItem.pkg installation
-       package, and the MySQL.prefPane. Double-click the disk image
-       to open it.
-
-    2. Double-click the MySQLStartItem.pkg file to start the
-       installation process.
-
-    3. You will be presented with the Install MySQL Startup Item
-       dialog.
-       MySQL Startup Item Installer: Step 1
-       Click Continue to continue the installation process.
-
-    4. A copy of the installation instructions and other important
-       information relevant to this installation are displayed. Click
-       Continue .
-
-    5. Select the drive you want to use to install the MySQL Startup
-       Item. The drive must have a valid, bootable, Mac OS X
-       operating system installed. Click Continue.
-       MySQL Startup Item Installer: Step 3
-
-    6. You will be asked to confirm the details of the installation.
-       To change the drive on which the startup item is installed,
-       click either Go Back or Change Install Location.... To install
-       the startup item, click Install.
-
-    7. Once the installation has been completed successfully, you
-       will be shown an Install Succeeded message.
-       MySQL Startup Item Installer: Step 5
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package.
+       Note
+       Previously, the OS X packages included separate
+       MySQLStartupItem.pkg and MySQL.prefPane files. They have
+       since been merged into the main package file.
+       Figure 2.47 MySQL Package Installer: DMG Contents
+       MySQL Package Installer: DMG Contents
+
+    2. Go through the process of installing the MySQL server as
+       described in the documentation at Section 2.4.2,
+       "Installing MySQL on OS X Using Native Packages."
+
+    3. Click Customize at the Installation Type step. The
+       "Startup Item" option is listed there and enabled by
+       default.
+       Figure 2.48 MySQL Installer on OS X: Customize
+       MySQL Installer on OS X: Customize
+
+    4. Complete the MySQL server installation process.
 
    The Startup Item for MySQL is installed into
-   /Library/StartupItems/MySQLCOM. The Startup Item installation adds
-   a variable MYSQLCOM=-YES- to the system configuration file
-   /etc/hostconfig. If you want to disable the automatic startup of
-   MySQL, change this variable to MYSQLCOM=-NO-.
-
-   After the installation, you can start and stop MySQL by running
-   the following commands in a terminal window. You must have
-   administrator privileges to perform these tasks, and you may be
-   prompted for your password.
+   /Library/StartupItems/MySQLCOM. The Startup Item installation
+   adds a variable MYSQLCOM=-YES- to the system configuration
+   file /etc/hostconfig. If you want to disable the automatic
+   startup of MySQL, change this variable to MYSQLCOM=-NO-.
+   Note
 
-   If you have installed the Startup Item, use this command to start
-   the server:
+   Deselecting Automatically Start MySQL Server on Startup from
+   the MySQL Preference Pane sets the MYSQLCOM variable to -NO-.
+
+   After the installation, you can start and stop the MySQL
+   server from the MySQL Preference Pane (preferred), or by
+   running the following commands in a terminal window. You must
+   have administrator privileges to perform these tasks, and you
+   may be prompted for your password.
+
+   If you have installed the Startup Item, use this command to
+   start the server:
 shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM start
 
-   If you have installed the Startup Item, use this command to stop
-   the server:
+   If you have installed the Startup Item, use this command to
+   stop the server:
 shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM stop
 
-2.4.4. Installing and Using the MySQL Preference Pane
+2.4.5 Installing and Using the MySQL Preference Pane
 
-   The MySQL Package installer disk image also includes a custom
-   MySQL Preference Pane that enables you to start, stop, and control
-   automated startup during boot of your MySQL installation.
+   The MySQL Installation Package includes a MySQL preference
+   Pane that enables you to start, stop, and control automated
+   startup during boot of your MySQL installation.
 
    To install the MySQL Preference Pane:
 
-    1. Download and open the MySQL package installer package, which
-       is provided on a disk image (.dmg) that includes the main
-       MySQL installation package, the MySQLStartupItem.pkg
-       installation package, and the MySQL.prefPane. Double-click the
-       disk image to open it.
-
-    2. Double-click the MySQL.prefPane. The MySQL System Preferences
-       will open.
-
-    3. If this is the first time you have installed the preference
-       pane, you will be asked to confirm installation and whether
-       you want to install the preference pane for all users, or only
-       the current user. To install the preference pane for all users
-       you will need administrator privileges. If necessary, you will
-       be prompted for the username and password for a user with
-       administrator privileges.
-
-    4. If you already have the MySQL Preference Pane installed, you
-       will be asked to confirm whether you want to overwrite the
-       existing MySQL Preference Pane.
+    1. Download and open the MySQL package installer, which is
+       provided on a disk image (.dmg) that includes the main
+       MySQL installation package.
+       Note
+       Previously, the OS X packages included separate
+       MySQLStartupItem.pkg and MySQL.prefPane files. They have
+       since been merged into the main package file.
+       Figure 2.49 MySQL Package Installer: DMG Contents
+       MySQL Package Installer: DMG Contents
+
+    2. Go through the process of installing the MySQL server, as
+       described in the documentation at Section 2.4.2,
+       "Installing MySQL on OS X Using Native Packages."
+
+    3. Click Customize at the Installation Type step. The
+       "Preference Pane" option is listed there and enabled by
+       default.
+       Figure 2.50 MySQL Installer on OS X: Customize
+       MySQL Installer on OS X: Customize
+
+    4. Complete the MySQL server installation process.
 
    Note
 
-   The MySQL Preference Pane only starts and stops MySQL installation
-   installed from the MySQL package installation that have been
-   installed in the default location.
-
-   Once the MySQL Preference Pane has been installed, you can control
-   your MySQL server instance using the preference pane. To use the
-   preference pane, open the System Preferences... from the Apple
-   menu. Select the MySQL preference pane by clicking the MySQL logo
-   within the Other section of the preference panes list.
-   MySQL Preference Pane
-
-   The MySQL Preference Pane shows the current status of the MySQL
-   server, showing stopped (in red) if the server is not running and
-   running (in green) if the server has already been started. The
-   preference pane also shows the current setting for whether the
-   MySQL server has been set to start automatically.
-
-     * To start MySQL using the preference pane: 
-       Click Start MySQL Server. You may be prompted for the username
-       and password of a user with administrator privileges to start
-       the MySQL server.
-
-     * To stop MySQL using the preference pane: 
-       Click Stop MySQL Server. You may be prompted for the username
-       and password of a user with administrator privileges to stop
-       the MySQL server.
-
-     * To automatically start the MySQL server when the system boots:
-       Check the check box next to Automatically Start MySQL Server
-       on Startup.
+   The MySQL Preference Pane only starts and stops MySQL
+   installation installed from the MySQL package installation
+   that have been installed in the default location.
+
+   Once the MySQL Preference Pane has been installed, you can
+   control your MySQL server instance using the preference pane.
+   To use the preference pane, open the System Preferences...
+   from the Apple menu. Select the MySQL preference pane by
+   clicking the MySQL logo within the bottom section of the
+   preference panes list.
+
+   Figure 2.51 MySQL Preference Pane: Location
+   MySQL Preference Pane: Location
+
+   The MySQL Preference Pane shows the current status of the
+   MySQL server, showing stopped (in red) if the server is not
+   running and running (in green) if the server has already been
+   started. The preference pane also shows the current setting
+   for whether the MySQL server has been set to start
+   automatically.
+
+     * To start the MySQL server using the preference pane:
+       Click Start MySQL Server. You may be prompted for the
+       username and password of a user with administrator
+       privileges to start the MySQL server.
+
+     * To stop the MySQL server using the preference pane:
+       Click Stop MySQL Server. You may be prompted for the
+       username and password of a user with administrator
+       privileges to stop the MySQL server.
+
+     * To automatically start the MySQL server when the system
+       boots:
+       Check the check box next to Automatically Start MySQL
+       Server on Startup.
 
      * To disable automatic MySQL server startup when the system
        boots:
-       Uncheck the check box next to Automatically Start MySQL Server
-       on Startup.
+       Uncheck the check box next to Automatically Start MySQL
+       Server on Startup.
 
    You can close the System Preferences... window once you have
    completed your settings.
-
-2.4.5. Using the Bundled MySQL on Mac OS X Server
-
-   If you are running Mac OS X Server, a version of MySQL should
-   already be installed. The following table shows the versions of
-   MySQL that ship with Mac OS X Server versions.
-
-   Table 2.10. MySQL Versions Preinstalled with Mac OS X Server
-   Mac OS X Server Version MySQL Version
-   10.2-10.2.2             3.23.51
-   10.2.3-10.2.6           3.23.53
-   10.3                    4.0.14
-   10.3.2                  4.0.16
-   10.4.0                  4.1.10a
-   10.5.0                  5.0.45
-   10.6.0                  5.0.82
-
-   The following table shows the installation layout of MySQL on Mac
-   OS X Server.
-
-   Table 2.11. MySQL Directory Layout for Preinstalled MySQL
-   Installations on Mac OS X Server
-   Directory Contents of Directory
-   /usr/bin Client programs
-   /var/mysql Log files, databases
-   /usr/libexec The mysqld server
-   /usr/share/man Unix manual pages
-   /usr/share/mysql/mysql-test MySQL test suite
-   /usr/share/mysql Miscellaneous support files, including error
-   messages, character set files, sample configuration files, SQL for
-   database installation
-   /var/mysql/mysql.sock Location of the MySQL Unix socket
-
-Additional Resources
-
-
-     * For more information on managing the bundled MySQL instance in
-       Mac OS X Server 10.5, see Mac OS X Server: Web Technologies
-       Administration For Version 10.5 Leopard
-       (http://images.apple.com/server/macosx/docs/Web_Technologies_A
-       dmin_v10.5.pdf).
-
-     * For more information on managing the bundled MySQL instance in
-       Mac OS X Server 10.6, see Mac OS X Server: Web Technologies
-       Administration Version 10.6 Snow Leopard
-       (http://manuals.info.apple.com/en_US/WebTech_v10.6.pdf).
-
-     * The MySQL server bundled with Mac OS X Server does not include
-       the MySQL client libraries and header files required to access
-       and use MySQL from a third-party driver, such as Perl DBI or
-       PHP. For more information on obtaining and installing MySQL
-       libraries, see Mac OS X Server version 10.5: MySQL libraries
-       available for download (http://support.apple.com/kb/TA25017).
-       Alternatively, you can ignore the bundled MySQL server and
-       install MySQL from the package or tarball installation.
-
-   Copyright (c) 1997, 2013, Oracle and/or its affiliates. All rights
-   reserved. Legal Notices
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupItem.Description.plist mysql-5.5-5.5.43/support-files/MacOSX/StartupItem.Description.plist
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupItem.Description.plist	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/StartupItem.Description.plist	2015-02-27 08:30:34.000000000 +0000
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    Copyright (C) 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupItem.Info.plist mysql-5.5-5.5.43/support-files/MacOSX/StartupItem.Info.plist
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupItem.Info.plist	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/StartupItem.Info.plist	2015-02-27 08:30:34.000000000 +0000
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupItem.postinstall mysql-5.5-5.5.43/support-files/MacOSX/StartupItem.postinstall
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupItem.postinstall	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/StartupItem.postinstall	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupParameters.plist.sh mysql-5.5-5.5.43/support-files/MacOSX/StartupParameters.plist.sh
--- mysql-5.5-5.5.35+dfsg/support-files/MacOSX/StartupParameters.plist.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MacOSX/StartupParameters.plist.sh	2015-02-27 08:30:34.000000000 +0000
@@ -2,6 +2,7 @@
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <!--
    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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/mysql.5.5.35.spec mysql-5.5-5.5.43/support-files/mysql.5.5.35.spec
--- mysql-5.5-5.5.35+dfsg/support-files/mysql.5.5.35.spec	2013-11-05 07:19:32.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/mysql.5.5.35.spec	1970-01-01 00:00:00.000000000 +0000
@@ -1,2052 +0,0 @@
-# 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 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; see the file COPYING. If not, write to the
-# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
-# MA  02110-1301  USA.
-
-##############################################################################
-# Some common macro definitions
-##############################################################################
-
-# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
-# change these, has to be exactly as is.
-%global mysql_old_vendor        MySQL AB
-%global mysql_vendor_2          Sun Microsystems, Inc.
-%global mysql_vendor            Oracle and/or its affiliates
-
-%global mysql_version   5.5.35
-
-%global mysqld_user     mysql
-%global mysqld_group    mysql
-%global mysqldatadir    /var/lib/mysql
-
-%global release         1  
-
-
-#
-# Macros we use which are not available in all supported versions of RPM
-#
-# - defined/undefined are missing on RHEL4
-#
-%if %{expand:%{?defined:0}%{!?defined:1}}
-%define defined()       %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
-%endif
-%if %{expand:%{?undefined:0}%{!?undefined:1}}
-%define undefined()     %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
-%endif
-
-# ----------------------------------------------------------------------------
-# RPM build tools now automatically detect Perl module dependencies.  This
-# detection causes problems as it is broken in some versions, and it also
-# provides unwanted dependencies from mandatory scripts in our package.
-# It might not be possible to disable this in all versions of RPM, but here we
-# try anyway.  We keep the "AutoReqProv: no" for the "test" sub package, as
-# disabling here might fail, and that package has the most problems.
-# See:
-#  http://fedoraproject.org/wiki/Packaging/Perl#Filtering_Requires:_and_Provides
-#  http://www.wideopen.com/archives/rpm-list/2002-October/msg00343.html
-# ----------------------------------------------------------------------------
-%undefine __perl_provides
-%undefine __perl_requires
-
-##############################################################################
-# Command line handling
-##############################################################################
-#
-# To set options:
-#
-#   $ rpmbuild --define="option <x>" ...
-#
-
-# ----------------------------------------------------------------------------
-# Commercial builds
-# ----------------------------------------------------------------------------
-%if %{undefined commercial}
-%define commercial 0
-%endif
-
-# ----------------------------------------------------------------------------
-# Source name
-# ----------------------------------------------------------------------------
-%if %{undefined src_base}
-%define src_base mysql
-%endif
-%define src_dir %{src_base}-%{mysql_version}
-
-# ----------------------------------------------------------------------------
-# Feature set (storage engines, options).  Default to community (everything)
-# ----------------------------------------------------------------------------
-%if %{undefined feature_set}
-%define feature_set community
-%endif
-
-# ----------------------------------------------------------------------------
-# Server comment strings
-# ----------------------------------------------------------------------------
-%if %{undefined compilation_comment_debug}
-%define compilation_comment_debug       MySQL Community Server - Debug (GPL)
-%endif
-%if %{undefined compilation_comment_release}
-%define compilation_comment_release     MySQL Community Server (GPL)
-%endif
-
-# ----------------------------------------------------------------------------
-# Product and server suffixes
-# ----------------------------------------------------------------------------
-%if %{undefined product_suffix}
-  %if %{defined short_product_tag}
-    %define product_suffix      -%{short_product_tag}
-  %else
-    %define product_suffix      %{nil}
-  %endif
-%endif
-
-%if %{undefined server_suffix}
-%define server_suffix   %{nil}
-%endif
-
-# ----------------------------------------------------------------------------
-# Distribution support
-# ----------------------------------------------------------------------------
-%if %{undefined distro_specific}
-%define distro_specific 0
-%endif
-%if %{distro_specific}
-  %if %(test -f /etc/enterprise-release && echo 1 || echo 0)
-    %define oelver %(rpm -qf --qf '%%{version}\\n' /etc/enterprise-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-    %if "%oelver" == "4"
-      %define distro_description        Oracle Enterprise Linux 4
-      %define distro_releasetag         oel4
-      %define distro_buildreq           gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
-      %define distro_requires           chkconfig coreutils grep procps shadow-utils net-tools
-    %else
-      %if "%oelver" == "5"
-        %define distro_description      Oracle Enterprise Linux 5
-        %define distro_releasetag       oel5
-        %define distro_buildreq         gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
-        %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
-      %else
-        %{error:Oracle Enterprise Linux %{oelver} is unsupported}
-      %endif
-    %endif
-  %else
-    %if %(test -f /etc/oracle-release && echo 1 || echo 0)
-      %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-      %if "%elver" == "6"
-        %define distro_description      Oracle Linux 6
-        %define distro_releasetag       el6
-        %define distro_buildreq         gcc-c++ ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
-        %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
-      %else
-        %{error:Oracle Linux %{elver} is unsupported}
-      %endif
-    %else
-      %if %(test -f /etc/redhat-release && echo 1 || echo 0)
-        %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-        %if "%rhelver" == "4"
-          %define distro_description      Red Hat Enterprise Linux 4
-          %define distro_releasetag       rhel4
-          %define distro_buildreq         gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
-          %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
-        %else
-          %if "%rhelver" == "5"
-            %define distro_description    Red Hat Enterprise Linux 5
-            %define distro_releasetag     rhel5
-            %define distro_buildreq       gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
-            %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
-          %else
-            %if "%rhelver" == "6"
-              %define distro_description    Red Hat Enterprise Linux 6
-              %define distro_releasetag     rhel6
-              %define distro_buildreq       gcc-c++ ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
-              %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
-            %else
-              %{error:Red Hat Enterprise Linux %{rhelver} is unsupported}
-            %endif
-          %endif
-        %endif
-      %else
-        %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
-          %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1)
-          %if "%susever" == "10"
-            %define distro_description    SUSE Linux Enterprise Server 10
-            %define distro_releasetag     sles10
-            %define distro_buildreq       gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel cmake libaio-devel
-            %define distro_requires       aaa_base coreutils grep procps pwdutils
-          %else
-            %if "%susever" == "11"
-              %define distro_description  SUSE Linux Enterprise Server 11
-              %define distro_releasetag   sles11
-              %define distro_buildreq     gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel cmake libaio-devel
-              %define distro_requires     aaa_base coreutils grep procps pwdutils
-            %else
-              %{error:SuSE %{susever} is unsupported}
-            %endif
-          %endif
-        %else
-          %{error:Unsupported distribution}
-        %endif
-      %endif
-    %endif
-  %endif
-%else
-  %define generic_kernel %(uname -r | cut -d. -f1-2)
-  %define distro_description            Generic Linux (kernel %{generic_kernel})
-  %define distro_releasetag             linux%{generic_kernel}
-  %define distro_buildreq               gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
-  %define distro_requires               coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
-%endif
-
-# Avoid debuginfo RPMs, leaves binaries unstripped
-%define debug_package   %{nil}
-
-# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted
-# test for __debug_package
-%define __strip         /bin/true
-
-# ----------------------------------------------------------------------------
-# Support optional "tcmalloc" library (experimental)
-# ----------------------------------------------------------------------------
-%if %{defined malloc_lib_target}
-%define WITH_TCMALLOC 1
-%else
-%define WITH_TCMALLOC 0
-%endif
-
-##############################################################################
-# Configuration based upon above user input, not to be set directly
-##############################################################################
-
-%if 0%{?commercial}
-%define license_files_server    %{src_dir}/LICENSE.mysql
-%define license_type            Commercial
-%else
-%define license_files_server    %{src_dir}/COPYING %{src_dir}/README
-%define license_type            GPL
-%endif
-
-##############################################################################
-# Main spec file section
-##############################################################################
-
-Name:           MySQL%{product_suffix}
-Summary:        MySQL: a very fast and reliable SQL database server
-Group:          Applications/Databases
-Version:        5.5.35
-Release:        %{release}%{?distro_releasetag:.%{distro_releasetag}}
-Distribution:   %{distro_description}
-License:        Copyright (c) 2000, 2013, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
-Source:         http://www.mysql.com/Downloads/MySQL-5.5/%{src_dir}.tar.gz
-URL:            http://www.mysql.com/
-Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com> 
-Vendor:         %{mysql_vendor}
-BuildRequires:  %{distro_buildreq}
-
-# Regression tests may take a long time, override the default to skip them 
-%{!?runselftest:%global runselftest 1}
-
-# Think about what you use here since the first step is to
-# run a rm -rf
-BuildRoot:    %{_tmppath}/%{name}-%{version}-build
-
-# From the manual
-%description
-The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
-and robust SQL (Structured Query Language) database server. MySQL Server
-is intended for mission-critical, heavy-load production systems as well
-as for embedding into mass-deployed software. MySQL is a trademark of
-%{mysql_vendor}
-
-The MySQL software has Dual Licensing, which means you can use the MySQL
-software free of charge under the GNU General Public License
-(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
-licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
-the GPL. See the chapter "Licensing and Support" in the manual for
-further info.
-
-The MySQL web site (http://www.mysql.com/) provides the latest
-news and information about the MySQL software. Also please see the
-documentation and the manual for more information.
-
-##############################################################################
-# Sub package definition
-##############################################################################
-
-%package -n MySQL-server%{product_suffix}
-Summary:        MySQL: a very fast and reliable SQL database server
-Group:          Applications/Databases
-Requires:       %{distro_requires}
-%if 0%{?commercial}
-Obsoletes:      MySQL-server
-%else
-Obsoletes:      MySQL-server-advanced
-%endif
-Obsoletes:      mysql-server < %{version}-%{release}
-Obsoletes:      mysql-server-advanced
-Obsoletes:      MySQL-server-classic MySQL-server-community MySQL-server-enterprise
-Obsoletes:      MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
-Provides:       mysql-server = %{version}-%{release}
-Provides:       mysql-server%{?_isa} = %{version}-%{release}
-
-%description -n MySQL-server%{product_suffix}
-The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
-and robust SQL (Structured Query Language) database server. MySQL Server
-is intended for mission-critical, heavy-load production systems as well
-as for embedding into mass-deployed software. MySQL is a trademark of
-%{mysql_vendor}
-
-The MySQL software has Dual Licensing, which means you can use the MySQL
-software free of charge under the GNU General Public License
-(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
-licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
-the GPL. See the chapter "Licensing and Support" in the manual for
-further info.
-
-The MySQL web site (http://www.mysql.com/) provides the latest news and 
-information about the MySQL software.  Also please see the documentation
-and the manual for more information.
-
-This package includes the MySQL server binary as well as related utilities
-to run and administer a MySQL server.
-
-If you want to access and work with the database, you have to install
-package "MySQL-client%{product_suffix}" as well!
-
-# ----------------------------------------------------------------------------
-%package -n MySQL-client%{product_suffix}
-Summary:        MySQL - Client
-Group:          Applications/Databases
-%if 0%{?commercial}
-Obsoletes:      MySQL-client
-%else
-Obsoletes:      MySQL-client-advanced
-%endif
-Obsoletes:      mysql < %{version}-%{release}
-Obsoletes:      mysql-advanced < %{version}-%{release}
-Obsoletes:      MySQL-client-classic MySQL-client-community MySQL-client-enterprise
-Obsoletes:      MySQL-client-advanced-gpl MySQL-client-enterprise-gpl
-Provides:       mysql = %{version}-%{release} 
-Provides:       mysql%{?_isa} = %{version}-%{release}
-
-%description -n MySQL-client%{product_suffix}
-This package contains the standard MySQL clients and administration tools.
-
-For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
-
-# ----------------------------------------------------------------------------
-%package -n MySQL-test%{product_suffix}
-Summary:        MySQL - Test suite
-Group:          Applications/Databases
-%if 0%{?commercial}
-Requires:       MySQL-client-advanced perl
-Obsoletes:      MySQL-test
-%else
-Requires:       MySQL-client perl
-Obsoletes:      MySQL-test-advanced
-%endif
-Obsoletes:      mysql-test < %{version}-%{release}
-Obsoletes:      mysql-test-advanced
-Obsoletes:      mysql-bench MySQL-bench
-Obsoletes:      MySQL-test-classic MySQL-test-community MySQL-test-enterprise
-Obsoletes:      MySQL-test-advanced-gpl MySQL-test-enterprise-gpl
-Provides:       mysql-test = %{version}-%{release}
-Provides:       mysql-test%{?_isa} = %{version}-%{release}
-AutoReqProv:    no
-
-%description -n MySQL-test%{product_suffix}
-This package contains the MySQL regression test suite.
-
-For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
-
-# ----------------------------------------------------------------------------
-%package -n MySQL-devel%{product_suffix}
-Summary:        MySQL - Development header files and libraries
-Group:          Applications/Databases
-%if 0%{?commercial}
-Obsoletes:      MySQL-devel
-%else
-Obsoletes:      MySQL-devel-advanced
-%endif
-Obsoletes:      mysql-devel < %{version}-%{release}
-Obsoletes:      mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced
-Obsoletes:      MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise
-Obsoletes:      MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl
-Provides:       mysql-devel = %{version}-%{release}
-Provides:       mysql-devel%{?_isa} = %{version}-%{release}
-
-%description -n MySQL-devel%{product_suffix}
-This package contains the development header files and libraries necessary
-to develop MySQL client applications.
-
-For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
-
-# ----------------------------------------------------------------------------
-%package -n MySQL-shared%{product_suffix}
-Summary:        MySQL - Shared libraries
-Group:          Applications/Databases
-%if 0%{?commercial}
-Obsoletes:      MySQL-shared
-%else
-Obsoletes:      MySQL-shared-advanced
-%endif
-Obsoletes:      MySQL-shared-standard MySQL-shared-pro
-Obsoletes:      MySQL-shared-pro-cert MySQL-shared-pro-gpl
-Obsoletes:      MySQL-shared-pro-gpl-cert
-Obsoletes:      MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise
-Obsoletes:      MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl
-
-%description -n MySQL-shared%{product_suffix}
-This package contains the shared libraries (*.so*) which certain languages
-and applications need to dynamically load and use MySQL.
-
-# ----------------------------------------------------------------------------
-%package -n MySQL-embedded%{product_suffix}
-Summary:        MySQL - Embedded library
-Group:          Applications/Databases
-%if 0%{?commercial}
-Requires:       MySQL-devel-advanced
-Obsoletes:      MySQL-embedded
-%else
-Requires:       MySQL-devel
-Obsoletes:      MySQL-embedded-advanced
-%endif
-Obsoletes:      mysql-embedded < %{version}-%{release}
-Obsoletes:      mysql-embedded-advanced
-Obsoletes:      MySQL-embedded-pro
-Obsoletes:      MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
-Obsoletes:      MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
-Provides:       mysql-embedded = %{version}-%{release}
-Provides:       mysql-emdedded%{?_isa} = %{version}-%{release}
-
-%description -n MySQL-embedded%{product_suffix}
-This package contains the MySQL server as an embedded library.
-
-The embedded MySQL server library makes it possible to run a full-featured
-MySQL server inside the client application. The main benefits are increased
-speed and more simple management for embedded applications.
-
-The API is identical for the embedded MySQL version and the
-client/server version.
-
-For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
-
-##############################################################################
-%prep
-%setup -T -a 0 -c -n %{src_dir}
-
-##############################################################################
-%build
-
-# Fail quickly and obviously if user tries to build as root
-%if %runselftest
-    if [ x"`id -u`" = x0 ]; then
-        echo "The MySQL regression tests may fail if run as root."
-        echo "If you really need to build the RPM as root, use"
-        echo "--define='runselftest 0' to skip the regression tests."
-        exit 1
-    fi
-%endif
-
-# Be strict about variables, bail at earliest opportunity, etc.
-set -eu
-
-# Optional package files
-touch optional-files-devel
-
-#
-# Set environment in order of preference, MYSQL_BUILD_* first, then variable
-# name, finally a default.  RPM_OPT_FLAGS is assumed to be a part of the
-# default RPM build environment.
-#
-# We set CXX=gcc by default to support so-called 'generic' binaries, where we
-# do not have a dependancy on libgcc/libstdc++.  This only works while we do
-# not require C++ features such as exceptions, and may need to be removed at
-# a later date.
-#
-
-# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break
-# the compile in cmd-line-utils/readline - needs investigation, but for now
-# we simply unset it and use those specified directly in cmake.
-%if "%{_arch}" == "ia64"
-RPM_OPT_FLAGS=
-%endif
-
-export PATH=${MYSQL_BUILD_PATH:-$PATH}
-export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
-export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
-export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
-export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
-export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-}
-
-# Build debug mysqld and libmysqld.a
-mkdir debug
-(
-  cd debug
-  # Attempt to remove any optimisation flags from the debug build
-  CFLAGS=`echo " ${CFLAGS} " | \
-            sed -e 's/ -O[0-9]* / /' \
-                -e 's/ -unroll2 / /' \
-                -e 's/ -ip / /' \
-                -e 's/^ //' \
-                -e 's/ $//'`
-  CXXFLAGS=`echo " ${CXXFLAGS} " | \
-              sed -e 's/ -O[0-9]* / /' \
-                  -e 's/ -unroll2 / /' \
-                  -e 's/ -ip / /' \
-                  -e 's/^ //' \
-                  -e 's/ $//'`
-  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
-  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-           -DCMAKE_BUILD_TYPE=Debug \
-           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-           -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
-  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
-  make ${MAKE_JFLAG} VERBOSE=1
-)
-# Build full release
-mkdir release
-(
-  cd release
-  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
-  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
-  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
-           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
-           -DFEATURE_SET="%{feature_set}" \
-           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
-           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
-  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
-  make ${MAKE_JFLAG} VERBOSE=1
-)
-
-%if %runselftest
-  MTR_BUILD_THREAD=auto
-  export MTR_BUILD_THREAD
-
-  (cd release && make test-bt-fast || true)
-%endif
-
-##############################################################################
-%install
-
-RBR=$RPM_BUILD_ROOT
-MBD=$RPM_BUILD_DIR/%{src_dir}
-
-# Ensure that needed directories exists
-install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
-install -d $RBR%{mysqldatadir}/mysql
-install -d $RBR%{_datadir}/mysql-test
-install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
-install -d $RBR%{_includedir}
-install -d $RBR%{_libdir}
-install -d $RBR%{_mandir}
-install -d $RBR%{_sbindir}
-
-# Install all binaries
-(
-  cd $MBD/release
-  make DESTDIR=$RBR install
-)
-
-# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  Do
-# this in a sub-shell to ensure we don't pollute the install environment
-# with compiler bits.
-(
-  PATH=${MYSQL_BUILD_PATH:-$PATH}
-  CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
-  CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
-  if "${CC}" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1; then
-    libgcc=`${CC} ${CFLAGS} --print-libgcc-file`
-    if [ -f ${libgcc} ]; then
-      mkdir -p $RBR%{_libdir}/mysql
-      install -m 644 ${libgcc} $RBR%{_libdir}/mysql/libmygcc.a
-      echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
-    fi
-  fi
-)
-
-# FIXME: at some point we should stop doing this and just install everything
-# FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming
-# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax
-mv -v $RBR/%{_libdir}/*.a $RBR/%{_libdir}/mysql/
-
-# Install logrotate and autostart
-install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
-install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
-
-# Create a symlink "rcmysql", pointing to the init.script. SuSE users
-# will appreciate that, as all services usually offer this.
-ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql
-
-# Touch the place where the my.cnf config file might be located
-# Just to make sure it's in the file list and marked as a config file
-touch $RBR%{_sysconfdir}/my.cnf
-
-# Install SELinux files in datadir
-install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
-  $RBR%{_datadir}/mysql/SELinux/RHEL4
-
-%if %{WITH_TCMALLOC}
-# Even though this is a shared library, put it under /usr/lib*/mysql, so it
-# doesn't conflict with possible shared lib by the same name in /usr/lib*.  See
-# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used.
-install -m 644 "%{malloc_lib_source}" \
-  "$RBR%{_libdir}/mysql/%{malloc_lib_target}"
-%endif
-
-# Remove man pages we explicitly do not want to package, avoids 'unpackaged
-# files' warning.
-# This has become obsolete:  rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
-
-##############################################################################
-#  Post processing actions, i.e. when installed
-##############################################################################
-
-%pre -n MySQL-server%{product_suffix}
-# This is the code running at the beginning of a RPM upgrade action,
-# before replacing the old files with the new ones.
-
-# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
-
-# There are users who deviate from the default file system layout.
-# Check local settings to support them.
-if [ -x %{_bindir}/my_print_defaults ]
-then
-  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
-  PID_FILE_PATT=`%{_bindir}/my_print_defaults server mysqld | grep '^--pid-file=' | sed -n 's/--pid-file=//p'`
-fi
-if [ -z "$mysql_datadir" ]
-then
-  mysql_datadir=%{mysqldatadir}
-fi
-if [ -z "$PID_FILE_PATT" ]
-then
-  PID_FILE_PATT="$mysql_datadir/*.pid"
-fi
-
-# Check if we can safely upgrade.  An upgrade is only safe if it's from one
-# of our RPMs in the same version family.
-
-# Handle both ways of spelling the capability.
-installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
-if [ $? -ne 0 -o -z "$installed" ]; then
-  installed=`rpm -q --whatprovides MySQL-server 2> /dev/null`
-fi
-if [ $? -eq 0 -a -n "$installed" ]; then
-  installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names
-  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
-  version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
-  myoldvendor='%{mysql_old_vendor}'
-  myvendor_2='%{mysql_vendor_2}'
-  myvendor='%{mysql_vendor}'
-  myversion='%{mysql_version}'
-
-  old_family=`echo $version \
-    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
-  new_family=`echo $myversion \
-    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
-
-  [ -z "$vendor" ] && vendor='<unknown>'
-  [ -z "$old_family" ] && old_family="<unrecognized version $version>"
-  [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
-
-  error_text=
-  if [ "$vendor" != "$myoldvendor" \
-    -a "$vendor" != "$myvendor_2" \
-    -a "$vendor" != "$myvendor" ]; then
-    error_text="$error_text
-The current MySQL server package is provided by a different
-vendor ($vendor) than $myoldvendor, $myvendor_2, or $myvendor.
-Some files may be installed to different locations, including log
-files and the service startup script in %{_sysconfdir}/init.d/.
-"
-  fi
-
-  if [ "$old_family" != "$new_family" ]; then
-    error_text="$error_text
-Upgrading directly from MySQL $old_family to MySQL $new_family may not
-be safe in all cases.  A manual dump and restore using mysqldump is
-recommended.  It is important to review the MySQL manual's Upgrading
-section for version-specific incompatibilities.
-"
-  fi
-
-  if [ -n "$error_text" ]; then
-    cat <<HERE >&2
-
-******************************************************************
-A MySQL server package ($installed) is installed.
-$error_text
-A manual upgrade is required.
-
-- Ensure that you have a complete, working backup of your data and my.cnf
-  files
-- Shut down the MySQL server cleanly
-- Remove the existing MySQL packages.  Usually this command will
-  list the packages you should remove:
-  rpm -qa | grep -i '^mysql-'
-
-  You may choose to use 'rpm --nodeps -ev <package-name>' to remove
-  the package which contains the mysqlclient shared library.  The
-  library will be reinstalled by the MySQL-shared-compat package.
-- Install the new MySQL packages supplied by $myvendor
-- Ensure that the MySQL server is started
-- Run the 'mysql_upgrade' program
-
-This is a brief description of the upgrade process.  Important details
-can be found in the MySQL manual, in the Upgrading section.
-******************************************************************
-HERE
-    exit 1
-  fi
-fi
-
-# We assume that if there is exactly one ".pid" file,
-# it contains the valid PID of a running MySQL server.
-NR_PID_FILES=`ls -1 $PID_FILE_PATT 2>/dev/null | wc -l`
-case $NR_PID_FILES in
-	0 ) SERVER_TO_START=''  ;;  # No "*.pid" file == no running server
-	1 ) SERVER_TO_START='true' ;;
-	* ) SERVER_TO_START=''      # Situation not clear
-	    SEVERAL_PID_FILES=true ;;
-esac
-# That logic may be debated: We might check whether it is non-empty,
-# contains exactly one number (possibly a PID), and whether "ps" finds it.
-# OTOH, if there is no such process, it means a crash without a cleanup -
-# is that a reason not to start a new server after upgrade?
-
-STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
-
-if [ -f $STATUS_FILE ]; then
-	echo "Some previous upgrade was not finished:"
-	ls -ld $STATUS_FILE
-	echo "Please check its status, then do"
-	echo "    rm $STATUS_FILE"
-	echo "before repeating the MySQL upgrade."
-	exit 1
-elif [ -n "$SEVERAL_PID_FILES" ] ; then
-	echo "You have more than one PID file:"
-	ls -ld $PID_FILE_PATT
-	echo "Please check which one (if any) corresponds to a running server"
-	echo "and delete all others before repeating the MySQL upgrade."
-	exit 1
-fi
-
-NEW_VERSION=%{mysql_version}-%{release}
-
-# The "pre" section code is also run on a first installation,
-# when there  is no data directory yet. Protect against error messages.
-if [ -d $mysql_datadir ] ; then
-	echo "MySQL RPM upgrade to version $NEW_VERSION"  > $STATUS_FILE
-	echo "'pre' step running at `date`"          >> $STATUS_FILE
-	echo                                         >> $STATUS_FILE
-	fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l`       
-        if [ $fcount -gt 0 ] ; then
-             echo "ERR file(s):"                          >> $STATUS_FILE
-	     ls -ltr $mysql_datadir/*.err                 >> $STATUS_FILE
-	     echo                                         >> $STATUS_FILE
-	     echo "Latest 'Version' line in latest file:" >> $STATUS_FILE
-	     grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \
-		tail -1                              >> $STATUS_FILE
-	     echo                                         >> $STATUS_FILE
-        fi
-
-	if [ -n "$SERVER_TO_START" ] ; then
-		# There is only one PID file, race possibility ignored
-		echo "PID file:"                           >> $STATUS_FILE
-		ls -l   $PID_FILE_PATT                     >> $STATUS_FILE
-		cat     $PID_FILE_PATT                     >> $STATUS_FILE
-		echo                                       >> $STATUS_FILE
-		echo "Server process:"                     >> $STATUS_FILE
-		ps -fp `cat $PID_FILE_PATT`                >> $STATUS_FILE
-		echo                                       >> $STATUS_FILE
-		echo "SERVER_TO_START=$SERVER_TO_START"    >> $STATUS_FILE
-	else
-		# Take a note we checked it ...
-		echo "PID file:"                           >> $STATUS_FILE
-		ls -l   $PID_FILE_PATT                     >> $STATUS_FILE 2>&1
-	fi
-fi
-
-# Shut down a previously installed server first
-# Note we *could* make that depend on $SERVER_TO_START, but we rather don't,
-# so a "stop" is attempted even if there is no PID file.
-# (Maybe the "stop" doesn't work then, but we might fix that in itself.)
-if [ -x %{_sysconfdir}/init.d/mysql ] ; then
-        %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1
-        echo "Giving mysqld 5 seconds to exit nicely"
-        sleep 5
-fi
-
-%post -n MySQL-server%{product_suffix}
-# This is the code running at the end of a RPM install or upgrade action,
-# after the (new) files have been written.
-
-# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
-
-# There are users who deviate from the default file system layout.
-# Check local settings to support them.
-if [ -x %{_bindir}/my_print_defaults ]
-then
-  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
-fi
-if [ -z "$mysql_datadir" ]
-then
-  mysql_datadir=%{mysqldatadir}
-fi
-
-NEW_VERSION=%{mysql_version}-%{release}
-STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
-
-# ----------------------------------------------------------------------
-# Create data directory if needed, check whether upgrade or install
-# ----------------------------------------------------------------------
-if [ ! -d $mysql_datadir ] ; then mkdir -m 755 $mysql_datadir; fi
-if [ -f $STATUS_FILE ] ; then
-	SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
-else
-	SERVER_TO_START=''
-fi
-# echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
-if [ ! -d $mysql_datadir/mysql ] ; then
-	mkdir $mysql_datadir/mysql $mysql_datadir/test
-	echo "MySQL RPM installation of version $NEW_VERSION" >> $STATUS_FILE
-else
-	# If the directory exists, we may assume it is an upgrade.
-	echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE
-fi
-
-# ----------------------------------------------------------------------
-# Make MySQL start/shutdown automatically when the machine does it.
-# ----------------------------------------------------------------------
-# NOTE: This still needs to be debated. Should we check whether these links
-# for the other run levels exist(ed) before the upgrade?
-# use chkconfig on Enterprise Linux and newer SuSE releases
-if [ -x /sbin/chkconfig ] ; then
-        /sbin/chkconfig --add mysql
-# use insserv for older SuSE Linux versions
-elif [ -x /sbin/insserv ] ; then
-        /sbin/insserv %{_sysconfdir}/init.d/mysql
-fi
-
-# ----------------------------------------------------------------------
-# Create a MySQL user and group. Do not report any problems if it already
-# exists.
-# ----------------------------------------------------------------------
-groupadd -r %{mysqld_group} 2> /dev/null || true
-useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" \
-  -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
-# The user may already exist, make sure it has the proper group nevertheless
-# (BUG#12823)
-usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
-
-# ----------------------------------------------------------------------
-# Change permissions so that the user that will run the MySQL daemon
-# owns all database files.
-# ----------------------------------------------------------------------
-chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
-
-# ----------------------------------------------------------------------
-# Initiate databases if needed
-# ----------------------------------------------------------------------
-if ! grep '^MySQL RPM upgrade' $STATUS_FILE >/dev/null 2>&1 ; then
-	# Fix bug#45415: no "mysql_install_db" on an upgrade
-	# Do this as a negative to err towards more "install" runs
-	# rather than to miss one.
-	%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
-fi
-
-# ----------------------------------------------------------------------
-# Upgrade databases if needed would go here - but it cannot be automated yet
-# ----------------------------------------------------------------------
-
-# ----------------------------------------------------------------------
-# Change permissions again to fix any new files.
-# ----------------------------------------------------------------------
-chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
-
-# ----------------------------------------------------------------------
-# Fix permissions for the permission database so that only the user
-# can read them.
-# ----------------------------------------------------------------------
-chmod -R og-rw $mysql_datadir/mysql
-
-# ----------------------------------------------------------------------
-# install SELinux files - but don't override existing ones
-# ----------------------------------------------------------------------
-SETARGETDIR=/etc/selinux/targeted/src/policy
-SEDOMPROG=$SETARGETDIR/domains/program
-SECONPROG=$SETARGETDIR/file_contexts/program
-if [ -f /etc/redhat-release ] \
- && (grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \
- || grep -q "CentOS release 4" /etc/redhat-release) ; then
-  echo
-  echo
-  echo 'Notes regarding SELinux on this platform:'
-  echo '========================================='
-  echo
-  echo 'The default policy might cause server startup to fail because it is'
-  echo 'not allowed to access critical files.  In this case, please update'
-  echo 'your installation.'
-  echo
-  echo 'The default policy might also cause inavailability of SSL related'
-  echo 'features because the server is not allowed to access /dev/random'
-  echo 'and /dev/urandom. If this is a problem, please do the following:'
-  echo
-  echo '  1) install selinux-policy-targeted-sources from your OS vendor'
-  echo '  2) add the following two lines to '$SEDOMPROG/mysqld.te':'
-  echo '       allow mysqld_t random_device_t:chr_file read;'
-  echo '       allow mysqld_t urandom_device_t:chr_file read;'
-  echo '  3) cd to '$SETARGETDIR' and issue the following command:'
-  echo '       make load'
-  echo
-  echo
-fi
-
-if [ -x sbin/restorecon ] ; then
-  sbin/restorecon -R var/lib/mysql
-fi
-
-# Was the server running before the upgrade? If so, restart the new one.
-if [ "$SERVER_TO_START" = "true" ] ; then
-	# Restart in the same way that mysqld will be started normally.
-	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
-		%{_sysconfdir}/init.d/mysql start
-		echo "Giving mysqld 5 seconds to start"
-		sleep 5
-	fi
-fi
-
-# Collect an upgrade history ...
-echo "Upgrade/install finished at `date`"        >> $STATUS_FILE
-echo                                             >> $STATUS_FILE
-echo "====="                                     >> $STATUS_FILE
-STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
-cat $STATUS_FILE >> $STATUS_HISTORY
-mv -f  $STATUS_FILE ${STATUS_FILE}-LAST  # for "triggerpostun"
-
-
-#echo "Thank you for installing the MySQL Community Server! For Production
-#systems, we recommend MySQL Enterprise, which contains enterprise-ready
-#software, intelligent advisory services, and full production support with
-#scheduled service packs and more.  Visit www.mysql.com/enterprise for more
-#information."
-
-%preun -n MySQL-server%{product_suffix}
-
-# Which '$1' does this refer to?  Fedora docs have info:
-# " ... a count of the number of versions of the package that are installed.
-#   Action                           Count
-#   Install the first time           1
-#   Upgrade                          2 or higher (depending on the number of versions installed)
-#   Remove last version of package   0 "
-#
-#  http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s04s05.html
- 
-if [ $1 = 0 ] ; then
-        # Stop MySQL before uninstalling it
-        if [ -x %{_sysconfdir}/init.d/mysql ] ; then
-                %{_sysconfdir}/init.d/mysql stop > /dev/null
-                # Remove autostart of MySQL
-                # use chkconfig on Enterprise Linux and newer SuSE releases
-                if [ -x /sbin/chkconfig ] ; then
-                        /sbin/chkconfig --del mysql
-                # For older SuSE Linux versions
-                elif [ -x /sbin/insserv ] ; then
-                        /sbin/insserv -r %{_sysconfdir}/init.d/mysql
-                fi
-        fi
-fi
-
-# We do not remove the mysql user since it may still own a lot of
-# database files.
-
-%triggerpostun -n MySQL-server%{product_suffix} --MySQL-server-community
-
-# Setup: We renamed this package, so any existing "server-community"
-#   package will be removed when this "server" is installed.
-# Problem: RPM will first run the "pre" and "post" sections of this script,
-#   and only then the "preun" of that old community server.
-#   But this "preun" includes stopping the server and uninstalling the service,
-#   "chkconfig --del mysql" which removes the symlinks to the start script.
-# Solution: *After* the community server got removed, restart this server
-#   and re-install the service.
-#
-# For information about triggers in spec files, see the Fedora docs:
-#   http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html
-# For all details of this code, see the "pre" and "post" sections.
-
-# There are users who deviate from the default file system layout.
-# Check local settings to support them.
-if [ -x %{_bindir}/my_print_defaults ]
-then
-  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
-fi
-if [ -z "$mysql_datadir" ]
-then
-  mysql_datadir=%{mysqldatadir}
-fi
-
-NEW_VERSION=%{mysql_version}-%{release}
-STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST  # Note the difference!
-STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
-
-if [ -f $STATUS_FILE ] ; then
-	SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
-else
-	# This should never happen, but let's be prepared
-	SERVER_TO_START=''
-fi
-echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
-
-if [ -x /sbin/chkconfig ] ; then
-        /sbin/chkconfig --add mysql
-# use insserv for older SuSE Linux versions
-elif [ -x /sbin/insserv ] ; then
-        /sbin/insserv %{_sysconfdir}/init.d/mysql
-fi
-
-# Was the server running before the upgrade? If so, restart the new one.
-if [ "$SERVER_TO_START" = "true" ] ; then
-	# Restart in the same way that mysqld will be started normally.
-	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
-		%{_sysconfdir}/init.d/mysql start
-		echo "Giving mysqld 5 seconds to start"
-		sleep 5
-	fi
-fi
-
-echo "Trigger 'postun --community' finished at `date`"        >> $STATUS_HISTORY
-echo                                             >> $STATUS_HISTORY
-echo "====="                                     >> $STATUS_HISTORY
-
-
-# ----------------------------------------------------------------------
-# Clean up the BuildRoot after build is done
-# ----------------------------------------------------------------------
-%clean
-[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \
-  && rm -rf $RPM_BUILD_ROOT;
-
-##############################################################################
-#  Files section
-##############################################################################
-
-%files -n MySQL-server%{product_suffix} -f release/support-files/plugins.files
-%defattr(-,root,root,0755)
-
-%if %{defined license_files_server}
-%doc %{license_files_server}
-%endif
-%doc %{src_dir}/Docs/ChangeLog
-%doc %{src_dir}/Docs/INFO_SRC*
-%doc release/Docs/INFO_BIN*
-%doc release/support-files/my-*.cnf
-
-%if 0%{?commercial}
-%doc %attr(644, root, root) %{_infodir}/mysql.info*
-%endif
-
-%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
-%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
-%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
-%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
-%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
-%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1*
-%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
-%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
-%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
-%doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
-%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
-
-%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
-
-%attr(755, root, root) %{_bindir}/innochecksum
-%attr(755, root, root) %{_bindir}/my_print_defaults
-%attr(755, root, root) %{_bindir}/myisam_ftdump
-%attr(755, root, root) %{_bindir}/myisamchk
-%attr(755, root, root) %{_bindir}/myisamlog
-%attr(755, root, root) %{_bindir}/myisampack
-%attr(755, root, root) %{_bindir}/mysql_convert_table_format
-%attr(755, root, root) %{_bindir}/mysql_fix_extensions
-%attr(755, root, root) %{_bindir}/mysql_install_db
-%attr(755, root, root) %{_bindir}/mysql_plugin
-%attr(755, root, root) %{_bindir}/mysql_secure_installation
-%attr(755, root, root) %{_bindir}/mysql_setpermission
-%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
-%attr(755, root, root) %{_bindir}/mysql_upgrade
-%attr(755, root, root) %{_bindir}/mysql_zap
-%attr(755, root, root) %{_bindir}/mysqlbug
-%attr(755, root, root) %{_bindir}/mysqld_multi
-%attr(755, root, root) %{_bindir}/mysqld_safe
-%attr(755, root, root) %{_bindir}/mysqldumpslow
-%attr(755, root, root) %{_bindir}/mysqlhotcopy
-%attr(755, root, root) %{_bindir}/mysqltest
-%attr(755, root, root) %{_bindir}/perror
-%attr(755, root, root) %{_bindir}/replace
-%attr(755, root, root) %{_bindir}/resolve_stack_dump
-%attr(755, root, root) %{_bindir}/resolveip
-
-%attr(755, root, root) %{_sbindir}/mysqld
-%attr(755, root, root) %{_sbindir}/mysqld-debug
-%attr(755, root, root) %{_sbindir}/rcmysql
-%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
-
-%if %{WITH_TCMALLOC}
-%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}
-%endif
-
-%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
-%attr(755, root, root) %{_sysconfdir}/init.d/mysql
-
-%attr(755, root, root) %{_datadir}/mysql/
-
-# ----------------------------------------------------------------------------
-%files -n MySQL-client%{product_suffix}
-
-%defattr(-, root, root, 0755)
-%attr(755, root, root) %{_bindir}/msql2mysql
-%attr(755, root, root) %{_bindir}/mysql
-%attr(755, root, root) %{_bindir}/mysql_find_rows
-%attr(755, root, root) %{_bindir}/mysql_waitpid
-%attr(755, root, root) %{_bindir}/mysqlaccess
-# XXX: This should be moved to %{_sysconfdir}
-%attr(644, root, root) %{_bindir}/mysqlaccess.conf
-%attr(755, root, root) %{_bindir}/mysqladmin
-%attr(755, root, root) %{_bindir}/mysqlbinlog
-%attr(755, root, root) %{_bindir}/mysqlcheck
-%attr(755, root, root) %{_bindir}/mysqldump
-%attr(755, root, root) %{_bindir}/mysqlimport
-%attr(755, root, root) %{_bindir}/mysqlshow
-%attr(755, root, root) %{_bindir}/mysqlslap
-
-%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlcheck.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1*
-
-# ----------------------------------------------------------------------------
-%files -n MySQL-devel%{product_suffix} -f optional-files-devel
-%defattr(-, root, root, 0755)
-%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
-%attr(755, root, root) %{_bindir}/mysql_config
-%dir %attr(755, root, root) %{_includedir}/mysql
-%dir %attr(755, root, root) %{_libdir}/mysql
-%{_includedir}/mysql/*
-%{_datadir}/aclocal/mysql.m4
-%{_libdir}/mysql/libmysqlclient.a
-%{_libdir}/mysql/libmysqlclient_r.a
-%{_libdir}/mysql/libmysqlservices.a
-
-# ----------------------------------------------------------------------------
-%files -n MySQL-shared%{product_suffix}
-%defattr(-, root, root, 0755)
-# Shared libraries (omit for architectures that don't support them)
-%{_libdir}/libmysql*.so*
-
-%post -n MySQL-shared%{product_suffix}
-/sbin/ldconfig
-
-%postun -n MySQL-shared%{product_suffix}
-/sbin/ldconfig
-
-# ----------------------------------------------------------------------------
-%files -n MySQL-test%{product_suffix}
-%defattr(-, root, root, 0755)
-%attr(-, root, root) %{_datadir}/mysql-test
-%attr(755, root, root) %{_bindir}/mysql_client_test
-%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
-%attr(755, root, root) %{_bindir}/mysqltest_embedded
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
-%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
-
-# ----------------------------------------------------------------------------
-%files -n MySQL-embedded%{product_suffix}
-%defattr(-, root, root, 0755)
-%attr(755, root, root) %{_bindir}/mysql_embedded
-%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
-%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
-
-##############################################################################
-# The spec file changelog only includes changes made to the spec file
-# itself - note that they must be ordered by date (important when
-# merging BK trees)
-##############################################################################
-%changelog
-* Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Removed non gpl file docs/mysql.info from community packages
-
-* Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Updated logic to get the correct count of PID files 
-
-* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Added provides lowercase mysql tags  
-
-* Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
-- Cleaned up spec file to resolve rpm dependencies.
-
-* Tue Jul 24 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Add a macro "runselftest":
-  if set to 1 (default), the test suite will be run during the RPM build;
-  this can be oveeridden via the command line by adding
-      --define "runselftest 0"
-  Failures of the test suite will NOT make the RPM build fail!
-
-* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
-  
-* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Fix duplicate mentioning of "mysql_plugin" and its manual page,
-  it is better to keep alphabetic order in the files list (merging!).
-  
-* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
-  the RPMs of any configuration (of the current or the preceding release series)
-  by the new ones. This is done by not using the implicitly generated capabilities
-  (which include the configuration name) and relying on more generic ones which
-  just list the function ("server", "client", ...).
-  The implicit generation cannot be prevented, so all these capabilities must be
-  explicitly listed in "Obsoletes:"
-
-* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
-
-- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to
-  changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
-  this necessitated a move of the libmygcc.a installation to the install
-  phase, which is probably where it belonged in the first place.
-
-* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- "make_win_bin_dist" and its manual are dropped, cmake does it different.
-
-* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
-
-- Add mysql_plugin man page.
-
-* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Add the manual page for "mysql_plugin" to the server package.
-
-* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Null-upmerge the fix of bug#37165: This spec file is not affected.
-- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}".
-
-* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
-
-- Source plugin library files list from cmake-generated file.
-
-* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
-
-- Added the mysql_plugin client - enables or disables plugins.
-
-* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
-
-- Fix bug#12561297: Added the MySQL embedded binary
-
-* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Fix bug#45415: "rpm upgrade recreates test database"
-  Let the creation of the "test" database happen only during a new installation,
-  not in an RPM upgrade.
-  This affects both the "mkdir" and the call of "mysql_install_db".
-
-* Thu Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Fix bug#56581: If an installation deviates from the default file locations
-  ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
-  should still work, and use these locations.
-  The problem was that the fix for bug#27072 did not check for local settings.
-  
-* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
-
-* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
-
-- EXCEPTIONS-CLIENT has been deleted, remove it from here too
-- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
-  a '-j' argument to make.
-
-* Mon Nov 1 2010 Georgi Kodinov <georgi.godinov@oracle.com>
-
-- Added test authentication (WL#1054) plugin binaries
-
-* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
-
-- Added example external authentication (WL#1054) plugin binaries
-
-* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
-
-- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
-  Reflect that in the "Obsoletes" specifications.
-- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
-- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
-
-* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Change the behaviour on installation and upgrade:
-  On installation, do not autostart the server.
-  *Iff* the server was stopped before the upgrade is started, this is taken as a
-  sign the administrator is handling that manually, and so the new server will
-  not be started automatically at the end of the upgrade.
-  The start/stop scripts will still be installed, so the server will be started
-  on the next machine boot.
-  This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
-
-* Tue Jun 1 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
-
-- Implement SELinux checks from distribution-specific spec file.
-
-* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
-
-- Large number of changes to build using CMake
-- Introduce distribution-specific RPMs
-- Drop debuginfo, build all binaries with debug/symbols
-- Remove __os_install_post, use native macro
-- Remove _unpackaged_files_terminate_build, make it an error to have
-  unpackaged files
-- Remove cluster RPMs
-
-* Wed Mar 24 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Add "--with-perfschema" to the configure options.
-
-* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64",
-  mask "rmdir" return code 1.
-- Remove "ha_example.*" files from the list, they aren't built.
-
-* Wed Mar 17 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Fix a wrong path name in handling the debug plugins.
-
-* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Take the result of the debug plugin build and put it into the optimized tree,
-  so that it becomes part of the final installation;
-  include the files in the packlist. Part of the fixes for bug#49022.
-
-* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
-  accept upgrading from packages showing MySQL or Sun as vendor.
-
-* Fri Feb 12 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Formatting changes:
-  Have a consistent structure of separator lines and of indentation
-  (8 leading blanks => tab).
-- Introduce the variable "src_dir".
-- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence
-  over "CC" ("CXX").
-- Drop the old "with_static" argument analysis, this is not supported
-  in 5.1 since ages.
-- Introduce variables to control the handlers individually, as well
-  as other options.
-- Use the new "--with-plugin" notation for the table handlers.
-- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql"
-  was done back in 2002 already.
-- Make "--with-zlib-dir=bundled" the default, add an option to disable it.
-- Add missing manual pages to the file list.
-- Improve the runtime check for "libgcc.a", protect it against being tried
-  with the Intel compiler "icc".
-
-* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Change RPM file naming:
-  - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
-  - Release counts from 1, not 0.
-
-* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- The "semisync" plugin file name has lost its introductory "lib",
-  adapt the file lists for the subpackages.
-  This is a part missing from the fix for bug#48351.
-- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
-  (and likely, the whole script will go, too).
-
-* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Fix some problems with the directives around "tcmalloc" (experimental),
-  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
-
-* Fri Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
-
-- Removed mysql_fix_privilege_tables
-
-* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
-
-- "mysqlmanager" got removed from version 5.4, all references deleted.
-
-* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
-
-* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
-
-- This version does not contain the "Instance manager", "mysqlmanager":
-  Remove it from the spec file so that packaging succeeds.
-
-* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
-
-- Add conditionals for bundled zlib and innodb plugin
-
-* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
-
-- Install plugin libraries in appropriate packages.
-- Disable libdaemon_example and ftexample plugins.
-
-* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
-
-- Update variable used for mysql-test suite location to match source.
-
-* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
-
-- Correct yesterday's fix, so that it also works for the last flag,
-  and fix a wrong quoting: un-quoted quote marks must not be escaped.
-
-* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
-
-- Removed "mysql_upgrade_shell"
-- Removed some copy/paste between debug and normal build
-
-* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
-
-- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
-  This should cover both gcc and icc flags.  Fixes bug#40546.
-
-* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
-
-- Removed the "Federated" storage engine option, and enabled in all
-
-* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
-
-- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
-  Some generated files aren't needed in RPMs:
-  - the "sql-bench/" subdirectory
-  Some files were missing:
-  - /usr/share/aclocal/mysql.m4  ("devel" subpackage)
-  - Manual "mysqlbug" ("server" subpackage)
-  - Program "innochecksum" and its manual ("server" subpackage)
-  - Manual "mysql_find_rows" ("client" subpackage)
-  - Script "mysql_upgrade_shell" ("client" subpackage)
-  - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
-  - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
-
-* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
-
-- Made the "Federated" storage engine an option
-- Made the "Cluster" storage engine and sub packages an option
-
-* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
-
-- Add the man pages for "ndbd" and "ndb_mgmd".
-
-* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
-
-- Require a manual upgrade if the alread-installed mysql-server is
-  from another vendor, or is of a different major version.
-
-* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
-
-- "ndb_size.tmpl" is not needed any more,
-  "man1/mysql_install_db.1" lacked the trailing '*'.
-
-* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
-
-- Removed man page for "mysql_create_system_tables"
-
-* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
-
-- Add debug server.
-
-* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
-
-- Remove Max RPMs; the server RPMs contain a mysqld compiled with all
-  features that previously only were built into Max.
-
-* Fri Mar 02 2007 Joerg Bruehe <joerg@mysql.com>
-
-- Add several man pages for NDB which are now created.
-
-* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
-
-- Put back "libmygcc.a", found no real reason it was removed.
-
-- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
-  correct "libgcc.a" path is returned for the 32/64 bit architecture.
-
-* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
-
-* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
-  in the server RPM.
-- The "mysqlmanager" man page got moved from section 1 to 8.
-
-* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Call "make install" using "benchdir_root=%{_datadir}",
-  because that is affecting the regression test suite as well.
-
-* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
-  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
-  (bug#22081).
-
-* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Add "--with-partition" to all server builds.
-
-- Use "--report-features" in one test run per server build.
-
-* Tue Aug 15 2006 Joerg Bruehe <joerg@mysql.com>
-
-- The "max" server is removed from packages, effective from 5.1.12-beta.
-  Delete all steps to build, package, or install it.
-
-* Mon Jul 10 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Fix a typing error in the "make" target for the Perl script to run the tests.
-
-* Tue Jul 04 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Use the Perl script to run the tests, because it will automatically check
-  whether the server is configured with SSL.
-
-* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
-
-- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
-
-- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
-  there are some more aspects which need to be solved before this is possible.
-  For now, just ensure the binary "mysql_upgrade" is delivered and installed.
-
-* Thu Jun 22 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Close a gap of the previous version by explicitly using
-  a newly created temporary directory for the socket to be used
-  in the "mysql_upgrade" operation, overriding any local setting.
-
-* Tue Jun 20 2006 Joerg Bruehe <joerg@mysql.com>
-
-- To run "mysql_upgrade", we need a running server;
-  start it in isolation and skip password checks.
-
-* Sat May 20 2006 Kent Boortz <kent@mysql.com>
-
-- Always compile for PIC, position independent code.
-
-* Wed May 10 2006 Kent Boortz <kent@mysql.com>
-
-- Use character set "all" when compiling with Cluster, to make Cluster
-  nodes independent on the character set directory, and the problem
-  that two RPM sub packages both wants to install this directory.
-
-* Mon May 01 2006 Kent Boortz <kent@mysql.com>
-
-- Use "./libtool --mode=execute" instead of searching for the
-  executable in current directory and ".libs".
-
-* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
-
-- Install and run "mysql_upgrade"
-
-* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
-
-- Remove sql-bench, and MySQL-bench RPM (will be built as an independent
-  project from the mysql-bench repository)
-
-* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com>
-
-- Remove old mysqltestmanager and related programs
-* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
-
-- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
-
-* Wed Mar 07 2006 Kent Boortz <kent@mysql.com>
-
-- Changed product name from "Community Edition" to "Community Server"
-
-* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
-
-- Fast mutexes is now disabled by default, but should be
-  used in Linux builds.
-
-* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
-
-- Reintroduced a max build
-- Limited testing of 'debug' and 'max' servers
-- Berkeley DB only in 'max'
-
-* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
-
-- Use "-i" on "make test-force";
-  this is essential for later evaluation of this log file.
-
-* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
-
-- Pass '-static' to libtool, link static with our own libraries, dynamic
-  with system libraries.  Link with the bundled zlib.
-
-* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>
-
-- Modified RPM spec to match new 5.1 debug+max combined community packaging.
-
-* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
-
-- Added "client/mysqlslap"
-
-* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
-
-- Added zlib to the list of (static) libraries installed
-- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
-- Compile MySQL with bundled zlib
-- Fixed %packager name to "MySQL Production Engineering Team"
-
-* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
-
-- Avoid using the "bundled" zlib on "shared" builds:
-  As it is not installed (on the build system), this gives dependency
-  problems with "libtool" causing the build to fail.
-  (Change was done on Nov 11, but left uncommented.)
-
-* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
-
-- Extend the file existence check for "init.d/mysql" on un-install
-  to also guard the call to "insserv"/"chkconfig".
-
-* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
-
-- added more man pages
-
-* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
-
-- Made yaSSL support an option (off by default)
-
-* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
-
-- Enabled yaSSL support
-
-* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
-
-- Give mode arguments the same way in all places
-- Moved copy of mysqld.a to "standard" build, but
-  disabled it as we don't do embedded yet in 5.0
-
-* Fri Oct 14 2005 Kent Boortz <kent@mysql.com>
-
-- For 5.x, always compile with --with-big-tables
-- Copy the config.log file to location outside
-  the build tree
-
-* Fri Oct 14 2005 Kent Boortz <kent@mysql.com>
-
-- Removed unneeded/obsolete configure options
-- Added archive engine to standard server
-- Removed the embedded server from experimental server
-- Changed suffix "-Max" => "-max"
-- Changed comment string "Max" => "Experimental"
-
-* Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
-
-- added a usermod call to assign a potential existing mysql user to the
-  correct user group (BUG#12823)
-- Save the perror binary built during Max build so it supports the NDB
-  error codes (BUG#13740)
-- added a separate macro "mysqld_group" to be able to define the
-  user group of the mysql user seperately, if desired.
-
-* Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
-
-- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
-  $RBR variable did not get expanded, thus leaving old build roots behind)
-
-* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Fixed the creation of the mysql user group account in the postinstall
-  section (BUG 12348)
-- Fixed enabling the Archive storage engine in the Max binary
-
-* Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Fixed the Requires: tag for the server RPM (BUG 12233)
-
-* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
-
-- create a "mysql" user group and assign the mysql user account to that group
-  in the server postinstall section. (BUG 10984)
-
-* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Do not build statically on i386 by default, only when adding either "--with
-  static" or "--define '_with_static 1'" to the RPM build options. Static
-  linking really only makes sense when linking against the specially patched
-  glibc 2.2.5.
-
-* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
-
-- added mysql_client_test to the "bench" subpackage (BUG 10676)
-- added the libndbclient static and shared libraries (BUG 10676)
-
-* Wed Jun 01 2005 Lenz Grimmer <lenz@mysql.com>
-
-- use "mysqldatadir" variable instead of hard-coding the path multiple times
-- use the "mysqld_user" variable on all occasions a user name is referenced
-- removed (incomplete) Brazilian translations
-- removed redundant release tags from the subpackage descriptions
-
-* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
-
-- Added a "make clean" between separate calls to "BuildMySQL".
-
-* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
-
-- Removed the mysql_tableinfo script made obsolete by the information schema
-
-* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Enabled the "blackhole" storage engine for the Max RPM
-
-* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
-
-- removed the MySQL manual files (html/ps/texi) - they have been removed
-  from the MySQL sources and are now available seperately.
-
-* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
-
-- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into
-  mysqltestmanager, mysqltestmanager and mysqltestmanager-pwgen respectively
-
-* Fri Mar 18 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Disabled RAID in the Max binaries once and for all (it has finally been
-  removed from the source tree)
-
-* Sun Feb 20 2005 Petr Chardin <petr@mysql.com>
-
-- Install MySQL Instance Manager together with mysqld, touch mysqlmanager
-  password file
-
-* Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>
-
-- Fixed the compilation comments and moved them into the separate build sections
-  for Max and Standard
-
-* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
-
-- enabled the "Ndbcluster" storage engine for the max binary
-- added extra make install in ndb subdir after Max build to get ndb binaries
-- added packages for ndbcluster storage engine
-
-* Fri Jan 14 2005 Lenz Grimmer <lenz@mysql.com>
-
-- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
-
-* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
-
-- enabled the "Federated" storage engine for the max binary
-
-* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
-
-- ISAM and merge storage engines were purged. As well as appropriate
-  tools and manpages (isamchk and isamlog)
-
-* Thu Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
-
-- enabled the "Archive" storage engine for the max binary
-- enabled the "CSV" storage engine for the max binary
-- enabled the "Example" storage engine for the max binary
-
-* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
-
-- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
-
-* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
-
-- do not link statically on IA64/AMD64 as these systems do not have
-  a patched glibc installed
-
-* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
-
-- Added libmygcc.a to the devel subpackage (required to link applications
-  against the the embedded server libmysqld.a) (BUG 4921)
-
-* Mon Aug 09 2004 Lenz Grimmer <lenz@mysql.com>
-
-- Added EXCEPTIONS-CLIENT to the "devel" package
-
-* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
-
-- disabled OpenSSL in the Max binaries again (the RPM packages were the
-  only exception to this anyway) (BUG 1043)
-
-* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
-
-- fixed server postinstall (mysql_install_db was called with the wrong
-  parameter)
-
-* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added mysql_tzinfo_to_sql to the server subpackage
-- run "make clean" instead of "make distclean"
-
-* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added ncurses-devel to the build prerequisites (BUG 3377)
-
-* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
-
-- when using gcc, _always_ use CXX=gcc
-- replaced Copyright with License field (Copyright is obsolete)
-
-* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
-
-- added myisam_ftdump to the Server package
-
-* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
-
-- link the mysql client against libreadline instead of libedit (BUG 2289)
-
-* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
-
-- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
-
-* Fri Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
-
-- fixed file permissions (BUG 1672)
-
-* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
-
-- made testing for gcc3 a bit more robust
-
-* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
-
-- added missing file mysql_create_system_tables to the server subpackage
-
-* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
-
-- removed dependency on MySQL-client from the MySQL-devel subpackage
-  as it is not really required. (BUG 1610)
-
-* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
-
-- Fixed BUG 1162 (removed macro names from the changelog)
-- Really fixed BUG 998 (disable the checking for installed but
-  unpackaged files)
-
-* Tue Aug 05 2003 Lenz Grimmer <lenz@mysql.com>
-
-- Fixed BUG 959 (libmysqld not being compiled properly)
-- Fixed BUG 998 (RPM build errors): added missing files to the
-  distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
-  mysql_fix_privilege_tables.1), removed "-n" from install section.
-
-* Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com>
-
-- removed the GIF Icon (file was not included in the sources anyway)
-- removed unused variable shared_lib_version
-- do not run automake before building the standard binary
-  (should not be necessary)
-- add server suffix '-standard' to standard binary (to be in line
-  with the binary tarball distributions)
-- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
-  _datadir, _includedir) throughout the spec file.
-- allow overriding CC and CXX (required when building with other compilers)
-
-* Fri May 16 2003 Lenz Grimmer <lenz@mysql.com>
-
-- re-enabled RAID again
-
-* Wed Apr 30 2003 Lenz Grimmer <lenz@mysql.com>
-
-- disabled MyISAM RAID (--with-raid) - it throws an assertion which
-  needs to be investigated first.
-
-* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
-
-- added missing file mysql_secure_installation to server subpackage
-  (BUG 141)
-
-* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
-
-- re-added missing pre- and post(un)install scripts to server subpackage
-- added config file /etc/my.cnf to the file list (just for completeness)
-- make sure to create the datadir with 755 permissions
-
-* Mon Jan 27 2003 Lenz Grimmer <lenz@mysql.com>
-
-- removed unused CC and CXX variables
-- CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS
-
-* Fri Jan 24 2003 Lenz Grimmer <lenz@mysql.com>
-
-- renamed package "MySQL" to "MySQL-server"
-- fixed Copyright tag
-- added mysql_waitpid to client subpackage (required for mysql-test-run)
-
-* Wed Nov 27 2002 Lenz Grimmer <lenz@mysql.com>
-
-- moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of
-  Linux distributions now support this scheme as proposed by the LSB either
-  directly or via a compatibility symlink)
-- Use new "restart" init script action instead of starting and stopping
-  separately
-- Be more flexible in activating the automatic bootup - use insserv (on
-  older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and
-  others) to create the respective symlinks
-
-* Wed Sep 25 2002 Lenz Grimmer <lenz@mysql.com>
-
-- MySQL-Max now requires MySQL >= 4.0 to avoid version mismatches
-  (mixing 3.23 and 4.0 packages)
-
-* Fri Aug 09 2002 Lenz Grimmer <lenz@mysql.com>
-
-- Turn off OpenSSL in MySQL-Max for now until it works properly again
-- enable RAID for the Max binary instead
-- added compatibility link: safe_mysqld -> mysqld_safe to ease the
-  transition from 3.23
-
-* Thu Jul 18 2002 Lenz Grimmer <lenz@mysql.com>
-
-- Reworked the build steps a little bit: the Max binary is supposed
-  to include OpenSSL, which cannot be linked statically, thus trying
-  to statically link against a special glibc is futile anyway
-- because of this, it is not required to make yet another build run
-  just to compile the shared libs (saves a lot of time)
-- updated package description of the Max subpackage
-- clean up the BuildRoot directory afterwards
-
-* Mon Jul 15 2002 Lenz Grimmer <lenz@mysql.com>
-
-- Updated Packager information
-- Fixed the build options: the regular package is supposed to
-  include InnoDB and linked statically, while the Max package
-  should include BDB and SSL support
-
-* Fri May 03 2002 Lenz Grimmer <lenz@mysql.com>
-
-- Use more RPM macros (e.g. infodir, mandir) to make the spec
-  file more portable
-- reorganized the installation of documentation files: let RPM
-  take care of this
-- reorganized the file list: actually install man pages along
-  with the binaries of the respective subpackage
-- do not include libmysqld.a in the devel subpackage as well, if we
-  have a special "embedded" subpackage
-- reworked the package descriptions
-
-* Mon Oct  8 2001 Monty
-
-- Added embedded server as a separate RPM
-
-* Fri Apr 13 2001 Monty
-
-- Added mysqld-max to the distribution
-
-* Tue Jan 2  2001  Monty
-
-- Added mysql-test to the bench package
-
-* Fri Aug 18 2000 Tim Smith <tim@mysql.com>
-
-- Added separate libmysql_r directory; now both a threaded
-  and non-threaded library is shipped.
-
-* Wed Sep 28 1999 David Axmark <davida@mysql.com>
-
-- Added the support-files/my-example.cnf to the docs directory.
-
-- Removed devel dependency on base since it is about client
-  development.
-
-* Wed Sep 8 1999 David Axmark <davida@mysql.com>
-
-- Cleaned up some for 3.23.
-
-* Thu Jul 1 1999 David Axmark <davida@mysql.com>
-
-- Added support for shared libraries in a separate sub
-  package. Original fix by David Fox (dsfox@cogsci.ucsd.edu)
-
-- The --enable-assembler switch is now automatically disables on
-  platforms there assembler code is unavailable. This should allow
-  building this RPM on non i386 systems.
-
-* Mon Feb 22 1999 David Axmark <david@detron.se>
-
-- Removed unportable cc switches from the spec file. The defaults can
-  now be overridden with environment variables. This feature is used
-  to compile the official RPM with optimal (but compiler version
-  specific) switches.
-
-- Removed the repetitive description parts for the sub rpms. Maybe add
-  again if RPM gets a multiline macro capability.
-
-- Added support for a pt_BR translation. Translation contributed by
-  Jorge Godoy <jorge@bestway.com.br>.
-
-* Wed Nov 4 1998 David Axmark <david@detron.se>
-
-- A lot of changes in all the rpm and install scripts. This may even
-  be a working RPM :-)
-
-* Sun Aug 16 1998 David Axmark <david@detron.se>
-
-- A developers changelog for MySQL is available in the source RPM. And
-  there is a history of major user visible changed in the Reference
-  Manual.  Only RPM specific changes will be documented here.
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/mysql.5.5.43.spec mysql-5.5-5.5.43/support-files/mysql.5.5.43.spec
--- mysql-5.5-5.5.35+dfsg/support-files/mysql.5.5.43.spec	1970-01-01 00:00:00.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/mysql.5.5.43.spec	2015-02-27 08:30:42.000000000 +0000
@@ -0,0 +1,2064 @@
+# 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 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; see the file COPYING. If not, write to the
+# Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston
+# MA  02110-1301  USA.
+
+##############################################################################
+# Some common macro definitions
+##############################################################################
+
+# NOTE: "vendor" is used in upgrade/downgrade check, so you can't
+# change these, has to be exactly as is.
+%global mysql_old_vendor        MySQL AB
+%global mysql_vendor_2          Sun Microsystems, Inc.
+%global mysql_vendor            Oracle and/or its affiliates
+
+%global mysql_version   5.5.43
+
+%global mysqld_user     mysql
+%global mysqld_group    mysql
+%global mysqldatadir    /var/lib/mysql
+
+%global release         1 
+
+
+#
+# Macros we use which are not available in all supported versions of RPM
+#
+# - defined/undefined are missing on RHEL4
+#
+%if %{expand:%{?defined:0}%{!?defined:1}}
+%define defined()       %{expand:%%{?%{1}:1}%%{!?%{1}:0}}
+%endif
+%if %{expand:%{?undefined:0}%{!?undefined:1}}
+%define undefined()     %{expand:%%{?%{1}:0}%%{!?%{1}:1}}
+%endif
+
+# ----------------------------------------------------------------------------
+# RPM build tools now automatically detect Perl module dependencies.  This
+# detection causes problems as it is broken in some versions, and it also
+# provides unwanted dependencies from mandatory scripts in our package.
+# It might not be possible to disable this in all versions of RPM, but here we
+# try anyway.  We keep the "AutoReqProv: no" for the "test" sub package, as
+# disabling here might fail, and that package has the most problems.
+# See:
+#  http://fedoraproject.org/wiki/Packaging/Perl#Filtering_Requires:_and_Provides
+#  http://www.wideopen.com/archives/rpm-list/2002-October/msg00343.html
+# ----------------------------------------------------------------------------
+%undefine __perl_provides
+%undefine __perl_requires
+
+##############################################################################
+# Command line handling
+##############################################################################
+#
+# To set options:
+#
+#   $ rpmbuild --define="option <x>" ...
+#
+
+# ----------------------------------------------------------------------------
+# Commercial builds
+# ----------------------------------------------------------------------------
+%if %{undefined commercial}
+%define commercial 0
+%endif
+
+# ----------------------------------------------------------------------------
+# Source name
+# ----------------------------------------------------------------------------
+%if %{undefined src_base}
+%define src_base mysql
+%endif
+%define src_dir %{src_base}-%{mysql_version}
+
+# ----------------------------------------------------------------------------
+# Feature set (storage engines, options).  Default to community (everything)
+# ----------------------------------------------------------------------------
+%if %{undefined feature_set}
+%define feature_set community
+%endif
+
+# ----------------------------------------------------------------------------
+# Server comment strings
+# ----------------------------------------------------------------------------
+%if %{undefined compilation_comment_debug}
+%define compilation_comment_debug       MySQL Community Server - Debug (GPL)
+%endif
+%if %{undefined compilation_comment_release}
+%define compilation_comment_release     MySQL Community Server (GPL)
+%endif
+
+# ----------------------------------------------------------------------------
+# Product and server suffixes
+# ----------------------------------------------------------------------------
+%if %{undefined product_suffix}
+  %if %{defined short_product_tag}
+    %define product_suffix      -%{short_product_tag}
+  %else
+    %define product_suffix      %{nil}
+  %endif
+%endif
+
+%if %{undefined server_suffix}
+%define server_suffix   %{nil}
+%endif
+
+# ----------------------------------------------------------------------------
+# Distribution support
+# ----------------------------------------------------------------------------
+%if %{undefined distro_specific}
+%define distro_specific 0
+%endif
+%if %{distro_specific}
+  %if %(test -f /etc/enterprise-release && echo 1 || echo 0)
+    %define oelver %(rpm -qf --qf '%%{version}\\n' /etc/enterprise-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
+    %if "%oelver" == "4"
+      %define distro_description        Oracle Enterprise Linux 4
+      %define distro_releasetag         oel4
+      %define distro_buildreq           gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
+      %define distro_requires           chkconfig coreutils grep procps shadow-utils net-tools
+    %else
+      %if "%oelver" == "5"
+        %define distro_description      Oracle Enterprise Linux 5
+        %define distro_releasetag       oel5
+        %define distro_buildreq         gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
+        %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
+      %else
+        %{error:Oracle Enterprise Linux %{oelver} is unsupported}
+      %endif
+    %endif
+  %else
+    %if %(test -f /etc/oracle-release && echo 1 || echo 0)
+      %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
+      %if "%elver" == "6" || "%elver" == "7"
+        %define distro_description      Oracle Linux %elver
+        %define distro_releasetag       el%elver
+        %define distro_buildreq         gcc-c++ ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
+        %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
+      %else
+        %{error:Oracle Linux %{elver} is unsupported}
+      %endif
+    %else
+      %if %(test -f /etc/redhat-release && echo 1 || echo 0)
+        %define rhelver %(rpm -qf --qf '%%{version}\\n' /etc/redhat-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
+        %if "%rhelver" == "4"
+          %define distro_description      Red Hat Enterprise Linux 4
+          %define distro_releasetag       rhel4
+          %define distro_buildreq         gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
+          %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
+        %else
+          %if "%rhelver" == "5"
+            %define distro_description    Red Hat Enterprise Linux 5
+            %define distro_releasetag     rhel5
+            %define distro_buildreq       gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
+            %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
+          %else
+            %if "%rhelver" == "6"
+              %define distro_description    Red Hat Enterprise Linux 6
+              %define distro_releasetag     rhel6
+              %define distro_buildreq       gcc-c++ ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
+              %define distro_requires       chkconfig coreutils grep procps shadow-utils net-tools
+            %else
+              %{error:Red Hat Enterprise Linux %{rhelver} is unsupported}
+            %endif
+          %endif
+        %endif
+      %else
+        %if %(test -f /etc/SuSE-release && echo 1 || echo 0)
+          %define susever %(rpm -qf --qf '%%{version}\\n' /etc/SuSE-release | cut -d. -f1)
+          %if "%susever" == "10"
+            %define distro_description    SUSE Linux Enterprise Server 10
+            %define distro_releasetag     sles10
+            %define distro_buildreq       gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client readline-devel zlib-devel cmake libaio-devel
+            %define distro_requires       aaa_base coreutils grep procps pwdutils
+          %else
+            %if "%susever" == "11"
+              %define distro_description  SUSE Linux Enterprise Server 11
+              %define distro_releasetag   sles11
+              %define distro_buildreq     gcc-c++ gdbm-devel gperf ncurses-devel openldap2-client procps pwdutils readline-devel zlib-devel cmake libaio-devel
+              %define distro_requires     aaa_base coreutils grep procps pwdutils
+            %else
+              %{error:SuSE %{susever} is unsupported}
+            %endif
+          %endif
+        %else
+          %{error:Unsupported distribution}
+        %endif
+      %endif
+    %endif
+  %endif
+%else
+  %define generic_kernel %(uname -r | cut -d. -f1-2)
+  %define distro_description            Generic Linux (kernel %{generic_kernel})
+  %define distro_releasetag             linux%{generic_kernel}
+  %define distro_buildreq               gcc-c++ gperf ncurses-devel perl readline-devel time zlib-devel
+  %define distro_requires               coreutils grep procps /sbin/chkconfig /usr/sbin/useradd /usr/sbin/groupadd
+%endif
+
+# Avoid debuginfo RPMs, leaves binaries unstripped
+%define debug_package   %{nil}
+
+# Hack to work around bug in RHEL5 __os_install_post macro, wrong inverted
+# test for __debug_package
+%define __strip         /bin/true
+
+# ----------------------------------------------------------------------------
+# Support optional "tcmalloc" library (experimental)
+# ----------------------------------------------------------------------------
+%if %{defined malloc_lib_target}
+%define WITH_TCMALLOC 1
+%else
+%define WITH_TCMALLOC 0
+%endif
+
+##############################################################################
+# Configuration based upon above user input, not to be set directly
+##############################################################################
+
+%if 0%{?commercial}
+%define license_files_server    %{src_dir}/LICENSE.mysql
+%define license_type            Commercial
+%else
+%define license_files_server    %{src_dir}/COPYING %{src_dir}/README
+%define license_type            GPL
+%endif
+
+##############################################################################
+# Main spec file section
+##############################################################################
+
+Name:           MySQL%{product_suffix}
+Summary:        MySQL: a very fast and reliable SQL database server
+Group:          Applications/Databases
+Version:        5.5.43
+Release:        %{release}%{?distro_releasetag:.%{distro_releasetag}}
+Distribution:   %{distro_description}
+License:        Copyright (c) 2000, 2015, %{mysql_vendor}. All rights reserved. Under %{license_type} license as shown in the Description field.
+Source:         http://www.mysql.com/Downloads/MySQL-5.5/%{src_dir}.tar.gz
+URL:            http://www.mysql.com/
+Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com> 
+Vendor:         %{mysql_vendor}
+BuildRequires:  %{distro_buildreq}
+%{?el7:Patch0:         mysql-5.5-libmysqlclient-symbols.patch}
+
+# Regression tests may take a long time, override the default to skip them 
+%{!?runselftest:%global runselftest 1}
+
+# Think about what you use here since the first step is to
+# run a rm -rf
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+
+# From the manual
+%description
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest
+news and information about the MySQL software. Also please see the
+documentation and the manual for more information.
+
+##############################################################################
+# Sub package definition
+##############################################################################
+
+%package -n MySQL-server%{product_suffix}
+Summary:        MySQL: a very fast and reliable SQL database server
+Group:          Applications/Databases
+Requires:       %{distro_requires}
+%if 0%{?commercial}
+Obsoletes:      MySQL-server
+%else
+Obsoletes:      MySQL-server-advanced
+%endif
+Obsoletes:      mysql-server < %{version}-%{release}
+Obsoletes:      mysql-server-advanced
+Obsoletes:      MySQL-server-classic MySQL-server-community MySQL-server-enterprise
+Obsoletes:      MySQL-server-advanced-gpl MySQL-server-enterprise-gpl
+Provides:       mysql-server = %{version}-%{release}
+Provides:       mysql-server%{?_isa} = %{version}-%{release}
+
+%description -n MySQL-server%{product_suffix}
+The MySQL(TM) software delivers a very fast, multi-threaded, multi-user,
+and robust SQL (Structured Query Language) database server. MySQL Server
+is intended for mission-critical, heavy-load production systems as well
+as for embedding into mass-deployed software. MySQL is a trademark of
+%{mysql_vendor}
+
+The MySQL software has Dual Licensing, which means you can use the MySQL
+software free of charge under the GNU General Public License
+(http://www.gnu.org/licenses/). You can also purchase commercial MySQL
+licenses from %{mysql_vendor} if you do not wish to be bound by the terms of
+the GPL. See the chapter "Licensing and Support" in the manual for
+further info.
+
+The MySQL web site (http://www.mysql.com/) provides the latest news and 
+information about the MySQL software.  Also please see the documentation
+and the manual for more information.
+
+This package includes the MySQL server binary as well as related utilities
+to run and administer a MySQL server.
+
+If you want to access and work with the database, you have to install
+package "MySQL-client%{product_suffix}" as well!
+
+# ----------------------------------------------------------------------------
+%package -n MySQL-client%{product_suffix}
+Summary:        MySQL - Client
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      MySQL-client
+%else
+Obsoletes:      MySQL-client-advanced
+%endif
+Obsoletes:      mysql < %{version}-%{release}
+Obsoletes:      mysql-advanced < %{version}-%{release}
+Obsoletes:      MySQL-client-classic MySQL-client-community MySQL-client-enterprise
+Obsoletes:      MySQL-client-advanced-gpl MySQL-client-enterprise-gpl
+Provides:       mysql = %{version}-%{release} 
+Provides:       mysql%{?_isa} = %{version}-%{release}
+
+%description -n MySQL-client%{product_suffix}
+This package contains the standard MySQL clients and administration tools.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+# ----------------------------------------------------------------------------
+%package -n MySQL-test%{product_suffix}
+Summary:        MySQL - Test suite
+Group:          Applications/Databases
+%if 0%{?commercial}
+Requires:       MySQL-client-advanced perl
+Obsoletes:      MySQL-test
+%else
+Requires:       MySQL-client perl
+Obsoletes:      MySQL-test-advanced
+%endif
+Obsoletes:      mysql-test < %{version}-%{release}
+Obsoletes:      mysql-test-advanced
+Obsoletes:      mysql-bench MySQL-bench
+Obsoletes:      MySQL-test-classic MySQL-test-community MySQL-test-enterprise
+Obsoletes:      MySQL-test-advanced-gpl MySQL-test-enterprise-gpl
+Provides:       mysql-test = %{version}-%{release}
+Provides:       mysql-test%{?_isa} = %{version}-%{release}
+AutoReqProv:    no
+
+%description -n MySQL-test%{product_suffix}
+This package contains the MySQL regression test suite.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+# ----------------------------------------------------------------------------
+%package -n MySQL-devel%{product_suffix}
+Summary:        MySQL - Development header files and libraries
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      MySQL-devel
+%else
+Obsoletes:      MySQL-devel-advanced
+%endif
+Obsoletes:      mysql-devel < %{version}-%{release}
+Obsoletes:      mysql-embedded-devel mysql-devel-advanced mysql-embedded-devel-advanced
+Obsoletes:      MySQL-devel-classic MySQL-devel-community MySQL-devel-enterprise
+Obsoletes:      MySQL-devel-advanced-gpl MySQL-devel-enterprise-gpl
+Provides:       mysql-devel = %{version}-%{release}
+Provides:       mysql-devel%{?_isa} = %{version}-%{release}
+
+%description -n MySQL-devel%{product_suffix}
+This package contains the development header files and libraries necessary
+to develop MySQL client applications.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+# ----------------------------------------------------------------------------
+%package -n MySQL-shared%{product_suffix}
+Summary:        MySQL - Shared libraries
+Group:          Applications/Databases
+%if 0%{?commercial}
+Obsoletes:      MySQL-shared
+%else
+Obsoletes:      MySQL-shared-advanced
+%endif
+Obsoletes:      MySQL-shared-standard MySQL-shared-pro
+Obsoletes:      MySQL-shared-pro-cert MySQL-shared-pro-gpl
+Obsoletes:      MySQL-shared-pro-gpl-cert
+Obsoletes:      MySQL-shared-classic MySQL-shared-community MySQL-shared-enterprise
+Obsoletes:      MySQL-shared-advanced-gpl MySQL-shared-enterprise-gpl
+
+%description -n MySQL-shared%{product_suffix}
+This package contains the shared libraries (*.so*) which certain languages
+and applications need to dynamically load and use MySQL.
+
+# ----------------------------------------------------------------------------
+%package -n MySQL-embedded%{product_suffix}
+Summary:        MySQL - Embedded library
+Group:          Applications/Databases
+%if 0%{?commercial}
+Requires:       MySQL-devel-advanced
+Obsoletes:      MySQL-embedded
+%else
+Requires:       MySQL-devel
+Obsoletes:      MySQL-embedded-advanced
+%endif
+Obsoletes:      mysql-embedded < %{version}-%{release}
+Obsoletes:      mysql-embedded-advanced
+Obsoletes:      MySQL-embedded-pro
+Obsoletes:      MySQL-embedded-classic MySQL-embedded-community MySQL-embedded-enterprise
+Obsoletes:      MySQL-embedded-advanced-gpl MySQL-embedded-enterprise-gpl
+Provides:       mysql-embedded = %{version}-%{release}
+Provides:       mysql-emdedded%{?_isa} = %{version}-%{release}
+
+%description -n MySQL-embedded%{product_suffix}
+This package contains the MySQL server as an embedded library.
+
+The embedded MySQL server library makes it possible to run a full-featured
+MySQL server inside the client application. The main benefits are increased
+speed and more simple management for embedded applications.
+
+The API is identical for the embedded MySQL version and the
+client/server version.
+
+For a description of MySQL see the base MySQL RPM or http://www.mysql.com/
+
+##############################################################################
+%prep
+%setup -T -a 0 -c -n %{src_dir}
+pushd %{src_dir}
+%{?el7:%patch0 -p1}
+##############################################################################
+%build
+
+# Fail quickly and obviously if user tries to build as root
+%if %runselftest
+    if [ x"`id -u`" = x0 ]; then
+        echo "The MySQL regression tests may fail if run as root."
+        echo "If you really need to build the RPM as root, use"
+        echo "--define='runselftest 0' to skip the regression tests."
+        exit 1
+    fi
+%endif
+
+# Be strict about variables, bail at earliest opportunity, etc.
+set -eu
+
+# Optional package files
+touch optional-files-devel
+
+#
+# Set environment in order of preference, MYSQL_BUILD_* first, then variable
+# name, finally a default.  RPM_OPT_FLAGS is assumed to be a part of the
+# default RPM build environment.
+#
+# We set CXX=gcc by default to support so-called 'generic' binaries, where we
+# do not have a dependancy on libgcc/libstdc++.  This only works while we do
+# not require C++ features such as exceptions, and may need to be removed at
+# a later date.
+#
+
+# This is a hack, $RPM_OPT_FLAGS on ia64 hosts contains flags which break
+# the compile in cmd-line-utils/readline - needs investigation, but for now
+# we simply unset it and use those specified directly in cmake.
+%if "%{_arch}" == "ia64"
+RPM_OPT_FLAGS=
+%endif
+
+export PATH=${MYSQL_BUILD_PATH:-$PATH}
+export CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
+export CXX=${MYSQL_BUILD_CXX:-${CXX:-gcc}}
+export CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
+export CXXFLAGS=${MYSQL_BUILD_CXXFLAGS:-${CXXFLAGS:-$RPM_OPT_FLAGS -felide-constructors -fno-exceptions -fno-rtti}}
+export LDFLAGS=${MYSQL_BUILD_LDFLAGS:-${LDFLAGS:-}}
+export CMAKE=${MYSQL_BUILD_CMAKE:-${CMAKE:-cmake}}
+export MAKE_JFLAG=${MYSQL_BUILD_MAKE_JFLAG:-}
+
+# Build debug mysqld and libmysqld.a
+mkdir debug
+(
+  cd debug
+  # Attempt to remove any optimisation flags from the debug build
+  CFLAGS=`echo " ${CFLAGS} " | \
+            sed -e 's/ -O[0-9]* / /' \
+                -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
+                -e 's/ -unroll2 / /' \
+                -e 's/ -ip / /' \
+                -e 's/^ //' \
+                -e 's/ $//'`
+  CXXFLAGS=`echo " ${CXXFLAGS} " | \
+              sed -e 's/ -O[0-9]* / /' \
+                  -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
+                  -e 's/ -unroll2 / /' \
+                  -e 's/ -ip / /' \
+                  -e 's/^ //' \
+                  -e 's/ $//'`
+  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
+  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
+  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=Debug \
+           -DENABLE_DTRACE=OFF \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
+           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
+  echo BEGIN_DEBUG_CONFIG ; egrep '^#define' include/config.h ; echo END_DEBUG_CONFIG
+  make ${MAKE_JFLAG} VERBOSE=1
+)
+# Build full release
+mkdir release
+(
+  cd release
+  # XXX: MYSQL_UNIX_ADDR should be in cmake/* but mysql_version is included before
+  # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
+  ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
+           -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DENABLE_DTRACE=OFF \
+           -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
+           -DFEATURE_SET="%{feature_set}" \
+           -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
+           -DMYSQL_SERVER_SUFFIX="%{server_suffix}"
+  echo BEGIN_NORMAL_CONFIG ; egrep '^#define' include/config.h ; echo END_NORMAL_CONFIG
+  make ${MAKE_JFLAG} VERBOSE=1
+)
+
+%if %runselftest
+  MTR_BUILD_THREAD=auto
+  export MTR_BUILD_THREAD
+
+  (cd release && make test-bt-fast || true)
+%endif
+
+##############################################################################
+%install
+
+RBR=$RPM_BUILD_ROOT
+MBD=$RPM_BUILD_DIR/%{src_dir}
+
+# Ensure that needed directories exists
+install -d $RBR%{_sysconfdir}/{logrotate.d,init.d}
+install -d $RBR%{mysqldatadir}/mysql
+install -d $RBR%{_datadir}/mysql-test
+install -d $RBR%{_datadir}/mysql/SELinux/RHEL4
+install -d $RBR%{_includedir}
+install -d $RBR%{_libdir}
+install -d $RBR%{_mandir}
+install -d $RBR%{_sbindir}
+
+mkdir -p $RBR%{_sysconfdir}/my.cnf.d
+
+# Install all binaries
+(
+  cd $MBD/release
+  make DESTDIR=$RBR install
+)
+
+# For gcc builds, include libgcc.a in the devel subpackage (BUG 4921).  Do
+# this in a sub-shell to ensure we don't pollute the install environment
+# with compiler bits.
+(
+  PATH=${MYSQL_BUILD_PATH:-$PATH}
+  CC=${MYSQL_BUILD_CC:-${CC:-gcc}}
+  CFLAGS=${MYSQL_BUILD_CFLAGS:-${CFLAGS:-$RPM_OPT_FLAGS}}
+  if "${CC}" -v 2>&1 | grep '^gcc.version' >/dev/null 2>&1; then
+    libgcc=`${CC} ${CFLAGS} --print-libgcc-file`
+    if [ -f ${libgcc} ]; then
+      mkdir -p $RBR%{_libdir}/mysql
+      install -m 644 ${libgcc} $RBR%{_libdir}/mysql/libmygcc.a
+      echo "%{_libdir}/mysql/libmygcc.a" >>optional-files-devel
+    fi
+  fi
+)
+
+# FIXME: at some point we should stop doing this and just install everything
+# FIXME: directly into %{_libdir}/mysql - perhaps at the same time as renaming
+# FIXME: the shared libraries to use libmysql*-$major.$minor.so syntax
+mv -v $RBR/%{_libdir}/*.a $RBR/%{_libdir}/mysql/
+
+# Install logrotate and autostart
+install -m 644 $MBD/release/support-files/mysql-log-rotate $RBR%{_sysconfdir}/logrotate.d/mysql
+install -m 755 $MBD/release/support-files/mysql.server $RBR%{_sysconfdir}/init.d/mysql
+
+# Create a symlink "rcmysql", pointing to the init.script. SuSE users
+# will appreciate that, as all services usually offer this.
+ln -s %{_sysconfdir}/init.d/mysql $RBR%{_sbindir}/rcmysql
+
+# Touch the place where the my.cnf config file might be located
+# Just to make sure it's in the file list and marked as a config file
+touch $RBR%{_sysconfdir}/my.cnf
+
+# Install SELinux files in datadir
+install -m 600 $MBD/%{src_dir}/support-files/RHEL4-SElinux/mysql.{fc,te} \
+  $RBR%{_datadir}/mysql/SELinux/RHEL4
+
+%if %{WITH_TCMALLOC}
+# Even though this is a shared library, put it under /usr/lib*/mysql, so it
+# doesn't conflict with possible shared lib by the same name in /usr/lib*.  See
+# `mysql_config --variable=pkglibdir` and mysqld_safe for how this is used.
+install -m 644 "%{malloc_lib_source}" \
+  "$RBR%{_libdir}/mysql/%{malloc_lib_target}"
+%endif
+
+# Remove man pages we explicitly do not want to package, avoids 'unpackaged
+# files' warning.
+# This has become obsolete:  rm -f $RBR%{_mandir}/man1/make_win_bin_dist.1*
+
+##############################################################################
+#  Post processing actions, i.e. when installed
+##############################################################################
+
+%pre -n MySQL-server%{product_suffix}
+# This is the code running at the beginning of a RPM upgrade action,
+# before replacing the old files with the new ones.
+
+# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
+
+# There are users who deviate from the default file system layout.
+# Check local settings to support them.
+if [ -x %{_bindir}/my_print_defaults ]
+then
+  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
+  PID_FILE_PATT=`%{_bindir}/my_print_defaults server mysqld | grep '^--pid-file=' | sed -n 's/--pid-file=//p'`
+fi
+if [ -z "$mysql_datadir" ]
+then
+  mysql_datadir=%{mysqldatadir}
+fi
+if [ -z "$PID_FILE_PATT" ]
+then
+  PID_FILE_PATT="$mysql_datadir/*.pid"
+fi
+
+# Check if we can safely upgrade.  An upgrade is only safe if it's from one
+# of our RPMs in the same version family.
+
+# Handle both ways of spelling the capability.
+installed=`rpm -q --whatprovides mysql-server 2> /dev/null`
+if [ $? -ne 0 -o -z "$installed" ]; then
+  installed=`rpm -q --whatprovides MySQL-server 2> /dev/null`
+fi
+if [ $? -eq 0 -a -n "$installed" ]; then
+  installed=`echo $installed | sed 's/\([^ ]*\) .*/\1/'` # Tests have shown duplicated package names
+  vendor=`rpm -q --queryformat='%{VENDOR}' "$installed" 2>&1`
+  version=`rpm -q --queryformat='%{VERSION}' "$installed" 2>&1`
+  myoldvendor='%{mysql_old_vendor}'
+  myvendor_2='%{mysql_vendor_2}'
+  myvendor='%{mysql_vendor}'
+  myversion='%{mysql_version}'
+
+  old_family=`echo $version \
+    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
+  new_family=`echo $myversion \
+    | sed -n -e 's,^\([1-9][0-9]*\.[0-9][0-9]*\)\..*$,\1,p'`
+
+  [ -z "$vendor" ] && vendor='<unknown>'
+  [ -z "$old_family" ] && old_family="<unrecognized version $version>"
+  [ -z "$new_family" ] && new_family="<bad package specification: version $myversion>"
+
+  error_text=
+  if [ "$vendor" != "$myoldvendor" \
+    -a "$vendor" != "$myvendor_2" \
+    -a "$vendor" != "$myvendor" ]; then
+    error_text="$error_text
+The current MySQL server package is provided by a different
+vendor ($vendor) than $myoldvendor, $myvendor_2, or $myvendor.
+Some files may be installed to different locations, including log
+files and the service startup script in %{_sysconfdir}/init.d/.
+"
+  fi
+
+  if [ "$old_family" != "$new_family" ]; then
+    error_text="$error_text
+Upgrading directly from MySQL $old_family to MySQL $new_family may not
+be safe in all cases.  A manual dump and restore using mysqldump is
+recommended.  It is important to review the MySQL manual's Upgrading
+section for version-specific incompatibilities.
+"
+  fi
+
+  if [ -n "$error_text" ]; then
+    cat <<HERE >&2
+
+******************************************************************
+A MySQL server package ($installed) is installed.
+$error_text
+A manual upgrade is required.
+
+- Ensure that you have a complete, working backup of your data and my.cnf
+  files
+- Shut down the MySQL server cleanly
+- Remove the existing MySQL packages.  Usually this command will
+  list the packages you should remove:
+  rpm -qa | grep -i '^mysql-'
+
+  You may choose to use 'rpm --nodeps -ev <package-name>' to remove
+  the package which contains the mysqlclient shared library.  The
+  library will be reinstalled by the MySQL-shared-compat package.
+- Install the new MySQL packages supplied by $myvendor
+- Ensure that the MySQL server is started
+- Run the 'mysql_upgrade' program
+
+This is a brief description of the upgrade process.  Important details
+can be found in the MySQL manual, in the Upgrading section.
+******************************************************************
+HERE
+    exit 1
+  fi
+fi
+
+# We assume that if there is exactly one ".pid" file,
+# it contains the valid PID of a running MySQL server.
+NR_PID_FILES=`ls -1 $PID_FILE_PATT 2>/dev/null | wc -l`
+case $NR_PID_FILES in
+	0 ) SERVER_TO_START=''  ;;  # No "*.pid" file == no running server
+	1 ) SERVER_TO_START='true' ;;
+	* ) SERVER_TO_START=''      # Situation not clear
+	    SEVERAL_PID_FILES=true ;;
+esac
+# That logic may be debated: We might check whether it is non-empty,
+# contains exactly one number (possibly a PID), and whether "ps" finds it.
+# OTOH, if there is no such process, it means a crash without a cleanup -
+# is that a reason not to start a new server after upgrade?
+
+STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
+
+if [ -f $STATUS_FILE ]; then
+	echo "Some previous upgrade was not finished:"
+	ls -ld $STATUS_FILE
+	echo "Please check its status, then do"
+	echo "    rm $STATUS_FILE"
+	echo "before repeating the MySQL upgrade."
+	exit 1
+elif [ -n "$SEVERAL_PID_FILES" ] ; then
+	echo "You have more than one PID file:"
+	ls -ld $PID_FILE_PATT
+	echo "Please check which one (if any) corresponds to a running server"
+	echo "and delete all others before repeating the MySQL upgrade."
+	exit 1
+fi
+
+NEW_VERSION=%{mysql_version}-%{release}
+
+# The "pre" section code is also run on a first installation,
+# when there  is no data directory yet. Protect against error messages.
+if [ -d $mysql_datadir ] ; then
+	echo "MySQL RPM upgrade to version $NEW_VERSION"  > $STATUS_FILE
+	echo "'pre' step running at `date`"          >> $STATUS_FILE
+	echo                                         >> $STATUS_FILE
+	fcount=`ls -ltr $mysql_datadir/*.err 2>/dev/null | wc -l`       
+        if [ $fcount -gt 0 ] ; then
+             echo "ERR file(s):"                          >> $STATUS_FILE
+	     ls -ltr $mysql_datadir/*.err                 >> $STATUS_FILE
+	     echo                                         >> $STATUS_FILE
+	     echo "Latest 'Version' line in latest file:" >> $STATUS_FILE
+	     grep '^Version' `ls -tr $mysql_datadir/*.err | tail -1` | \
+		tail -1                              >> $STATUS_FILE
+	     echo                                         >> $STATUS_FILE
+        fi
+
+	if [ -n "$SERVER_TO_START" ] ; then
+		# There is only one PID file, race possibility ignored
+		echo "PID file:"                           >> $STATUS_FILE
+		ls -l   $PID_FILE_PATT                     >> $STATUS_FILE
+		cat     $PID_FILE_PATT                     >> $STATUS_FILE
+		echo                                       >> $STATUS_FILE
+		echo "Server process:"                     >> $STATUS_FILE
+		ps -fp `cat $PID_FILE_PATT`                >> $STATUS_FILE
+		echo                                       >> $STATUS_FILE
+		echo "SERVER_TO_START=$SERVER_TO_START"    >> $STATUS_FILE
+	else
+		# Take a note we checked it ...
+		echo "PID file:"                           >> $STATUS_FILE
+		ls -l   $PID_FILE_PATT                     >> $STATUS_FILE 2>&1
+	fi
+fi
+
+# Shut down a previously installed server first
+# Note we *could* make that depend on $SERVER_TO_START, but we rather don't,
+# so a "stop" is attempted even if there is no PID file.
+# (Maybe the "stop" doesn't work then, but we might fix that in itself.)
+if [ -x %{_sysconfdir}/init.d/mysql ] ; then
+        %{_sysconfdir}/init.d/mysql stop > /dev/null 2>&1
+        echo "Giving mysqld 5 seconds to exit nicely"
+        sleep 5
+fi
+
+%post -n MySQL-server%{product_suffix}
+# This is the code running at the end of a RPM install or upgrade action,
+# after the (new) files have been written.
+
+# ATTENTION: Parts of this are duplicated in the "triggerpostun" !
+
+# There are users who deviate from the default file system layout.
+# Check local settings to support them.
+if [ -x %{_bindir}/my_print_defaults ]
+then
+  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
+fi
+if [ -z "$mysql_datadir" ]
+then
+  mysql_datadir=%{mysqldatadir}
+fi
+
+NEW_VERSION=%{mysql_version}-%{release}
+STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER
+
+# ----------------------------------------------------------------------
+# Create data directory if needed, check whether upgrade or install
+# ----------------------------------------------------------------------
+if [ ! -d $mysql_datadir ] ; then mkdir -m 755 $mysql_datadir; fi
+if [ -f $STATUS_FILE ] ; then
+	SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
+else
+	SERVER_TO_START=''
+fi
+# echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
+if [ ! -d $mysql_datadir/mysql ] ; then
+	mkdir $mysql_datadir/mysql $mysql_datadir/test
+	echo "MySQL RPM installation of version $NEW_VERSION" >> $STATUS_FILE
+else
+	# If the directory exists, we may assume it is an upgrade.
+	echo "MySQL RPM upgrade to version $NEW_VERSION" >> $STATUS_FILE
+fi
+
+# ----------------------------------------------------------------------
+# Make MySQL start/shutdown automatically when the machine does it.
+# ----------------------------------------------------------------------
+# NOTE: This still needs to be debated. Should we check whether these links
+# for the other run levels exist(ed) before the upgrade?
+# use chkconfig on Enterprise Linux and newer SuSE releases
+if [ -x /sbin/chkconfig ] ; then
+        /sbin/chkconfig --add mysql
+# use insserv for older SuSE Linux versions
+elif [ -x /sbin/insserv ] ; then
+        /sbin/insserv %{_sysconfdir}/init.d/mysql
+fi
+
+# ----------------------------------------------------------------------
+# Create a MySQL user and group. Do not report any problems if it already
+# exists.
+# ----------------------------------------------------------------------
+groupadd -r %{mysqld_group} 2> /dev/null || true
+useradd -M -r -d $mysql_datadir -s /bin/bash -c "MySQL server" \
+  -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
+# The user may already exist, make sure it has the proper group nevertheless
+# (BUG#12823)
+usermod -g %{mysqld_group} %{mysqld_user} 2> /dev/null || true
+
+# ----------------------------------------------------------------------
+# Change permissions so that the user that will run the MySQL daemon
+# owns all database files.
+# ----------------------------------------------------------------------
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
+
+# ----------------------------------------------------------------------
+# Initiate databases if needed
+# ----------------------------------------------------------------------
+if ! grep '^MySQL RPM upgrade' $STATUS_FILE >/dev/null 2>&1 ; then
+	# Fix bug#45415: no "mysql_install_db" on an upgrade
+	# Do this as a negative to err towards more "install" runs
+	# rather than to miss one.
+	%{_bindir}/mysql_install_db --rpm --user=%{mysqld_user}
+fi
+
+# ----------------------------------------------------------------------
+# Upgrade databases if needed would go here - but it cannot be automated yet
+# ----------------------------------------------------------------------
+
+# ----------------------------------------------------------------------
+# Change permissions again to fix any new files.
+# ----------------------------------------------------------------------
+chown -R %{mysqld_user}:%{mysqld_group} $mysql_datadir
+
+# ----------------------------------------------------------------------
+# Fix permissions for the permission database so that only the user
+# can read them.
+# ----------------------------------------------------------------------
+chmod -R og-rw $mysql_datadir/mysql
+
+# ----------------------------------------------------------------------
+# install SELinux files - but don't override existing ones
+# ----------------------------------------------------------------------
+SETARGETDIR=/etc/selinux/targeted/src/policy
+SEDOMPROG=$SETARGETDIR/domains/program
+SECONPROG=$SETARGETDIR/file_contexts/program
+if [ -f /etc/redhat-release ] \
+ && (grep -q "Red Hat Enterprise Linux .. release 4" /etc/redhat-release \
+ || grep -q "CentOS release 4" /etc/redhat-release) ; then
+  echo
+  echo
+  echo 'Notes regarding SELinux on this platform:'
+  echo '========================================='
+  echo
+  echo 'The default policy might cause server startup to fail because it is'
+  echo 'not allowed to access critical files.  In this case, please update'
+  echo 'your installation.'
+  echo
+  echo 'The default policy might also cause inavailability of SSL related'
+  echo 'features because the server is not allowed to access /dev/random'
+  echo 'and /dev/urandom. If this is a problem, please do the following:'
+  echo
+  echo '  1) install selinux-policy-targeted-sources from your OS vendor'
+  echo '  2) add the following two lines to '$SEDOMPROG/mysqld.te':'
+  echo '       allow mysqld_t random_device_t:chr_file read;'
+  echo '       allow mysqld_t urandom_device_t:chr_file read;'
+  echo '  3) cd to '$SETARGETDIR' and issue the following command:'
+  echo '       make load'
+  echo
+  echo
+fi
+
+if [ -x sbin/restorecon ] ; then
+  sbin/restorecon -R var/lib/mysql
+fi
+
+# Was the server running before the upgrade? If so, restart the new one.
+if [ "$SERVER_TO_START" = "true" ] ; then
+	# Restart in the same way that mysqld will be started normally.
+	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
+		%{_sysconfdir}/init.d/mysql start
+		echo "Giving mysqld 5 seconds to start"
+		sleep 5
+	fi
+fi
+
+# Collect an upgrade history ...
+echo "Upgrade/install finished at `date`"        >> $STATUS_FILE
+echo                                             >> $STATUS_FILE
+echo "====="                                     >> $STATUS_FILE
+STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
+cat $STATUS_FILE >> $STATUS_HISTORY
+mv -f  $STATUS_FILE ${STATUS_FILE}-LAST  # for "triggerpostun"
+
+
+#echo "Thank you for installing the MySQL Community Server! For Production
+#systems, we recommend MySQL Enterprise, which contains enterprise-ready
+#software, intelligent advisory services, and full production support with
+#scheduled service packs and more.  Visit www.mysql.com/enterprise for more
+#information."
+
+%preun -n MySQL-server%{product_suffix}
+
+# Which '$1' does this refer to?  Fedora docs have info:
+# " ... a count of the number of versions of the package that are installed.
+#   Action                           Count
+#   Install the first time           1
+#   Upgrade                          2 or higher (depending on the number of versions installed)
+#   Remove last version of package   0 "
+#
+#  http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch09s04s05.html
+ 
+if [ $1 = 0 ] ; then
+        # Stop MySQL before uninstalling it
+        if [ -x %{_sysconfdir}/init.d/mysql ] ; then
+                %{_sysconfdir}/init.d/mysql stop > /dev/null
+                # Remove autostart of MySQL
+                # use chkconfig on Enterprise Linux and newer SuSE releases
+                if [ -x /sbin/chkconfig ] ; then
+                        /sbin/chkconfig --del mysql
+                # For older SuSE Linux versions
+                elif [ -x /sbin/insserv ] ; then
+                        /sbin/insserv -r %{_sysconfdir}/init.d/mysql
+                fi
+        fi
+fi
+
+# We do not remove the mysql user since it may still own a lot of
+# database files.
+
+%triggerpostun -n MySQL-server%{product_suffix} --MySQL-server-community
+
+# Setup: We renamed this package, so any existing "server-community"
+#   package will be removed when this "server" is installed.
+# Problem: RPM will first run the "pre" and "post" sections of this script,
+#   and only then the "preun" of that old community server.
+#   But this "preun" includes stopping the server and uninstalling the service,
+#   "chkconfig --del mysql" which removes the symlinks to the start script.
+# Solution: *After* the community server got removed, restart this server
+#   and re-install the service.
+#
+# For information about triggers in spec files, see the Fedora docs:
+#   http://docs.fedoraproject.org/en-US/Fedora_Draft_Documentation/0.1/html/RPM_Guide/ch10s02.html
+# For all details of this code, see the "pre" and "post" sections.
+
+# There are users who deviate from the default file system layout.
+# Check local settings to support them.
+if [ -x %{_bindir}/my_print_defaults ]
+then
+  mysql_datadir=`%{_bindir}/my_print_defaults server mysqld | grep '^--datadir=' | sed -n 's/--datadir=//p'`
+fi
+if [ -z "$mysql_datadir" ]
+then
+  mysql_datadir=%{mysqldatadir}
+fi
+
+NEW_VERSION=%{mysql_version}-%{release}
+STATUS_FILE=$mysql_datadir/RPM_UPGRADE_MARKER-LAST  # Note the difference!
+STATUS_HISTORY=$mysql_datadir/RPM_UPGRADE_HISTORY
+
+if [ -f $STATUS_FILE ] ; then
+	SERVER_TO_START=`grep '^SERVER_TO_START=' $STATUS_FILE | cut -c17-`
+else
+	# This should never happen, but let's be prepared
+	SERVER_TO_START=''
+fi
+echo "Analyzed: SERVER_TO_START=$SERVER_TO_START"
+
+if [ -x /sbin/chkconfig ] ; then
+        /sbin/chkconfig --add mysql
+# use insserv for older SuSE Linux versions
+elif [ -x /sbin/insserv ] ; then
+        /sbin/insserv %{_sysconfdir}/init.d/mysql
+fi
+
+# Was the server running before the upgrade? If so, restart the new one.
+if [ "$SERVER_TO_START" = "true" ] ; then
+	# Restart in the same way that mysqld will be started normally.
+	if [ -x %{_sysconfdir}/init.d/mysql ] ; then
+		%{_sysconfdir}/init.d/mysql start
+		echo "Giving mysqld 5 seconds to start"
+		sleep 5
+	fi
+fi
+
+echo "Trigger 'postun --community' finished at `date`"        >> $STATUS_HISTORY
+echo                                             >> $STATUS_HISTORY
+echo "====="                                     >> $STATUS_HISTORY
+
+
+# ----------------------------------------------------------------------
+# Clean up the BuildRoot after build is done
+# ----------------------------------------------------------------------
+%clean
+[ "$RPM_BUILD_ROOT" != "/" ] && [ -d $RPM_BUILD_ROOT ] \
+  && rm -rf $RPM_BUILD_ROOT;
+
+##############################################################################
+#  Files section
+##############################################################################
+
+%files -n MySQL-server%{product_suffix} -f release/support-files/plugins.files
+%defattr(-,root,root,0755)
+
+%if %{defined license_files_server}
+%doc %{license_files_server}
+%endif
+%doc %{src_dir}/Docs/ChangeLog
+%doc %{src_dir}/Docs/INFO_SRC*
+%doc release/Docs/INFO_BIN*
+%doc release/support-files/my-*.cnf
+
+%if 0%{?commercial}
+%doc %attr(644, root, root) %{_infodir}/mysql.info*
+%endif
+
+%doc %attr(644, root, man) %{_mandir}/man1/innochecksum.1*
+%doc %attr(644, root, man) %{_mandir}/man1/my_print_defaults.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisam_ftdump.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisamchk.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisamlog.1*
+%doc %attr(644, root, man) %{_mandir}/man1/myisampack.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_convert_table_format.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_fix_extensions.1*
+%doc %attr(644, root, man) %{_mandir}/man8/mysqld.8*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqld_multi.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqld_safe.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqldumpslow.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_install_db.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_plugin.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_secure_installation.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_setpermission.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_upgrade.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlhotcopy.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlman.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql.server.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqltest.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_tzinfo_to_sql.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_zap.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlbug.1*
+%doc %attr(644, root, man) %{_mandir}/man1/perror.1*
+%doc %attr(644, root, man) %{_mandir}/man1/replace.1*
+%doc %attr(644, root, man) %{_mandir}/man1/resolve_stack_dump.1*
+%doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
+
+%ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
+
+%attr(755, root, root) %{_bindir}/innochecksum
+%attr(755, root, root) %{_bindir}/my_print_defaults
+%attr(755, root, root) %{_bindir}/myisam_ftdump
+%attr(755, root, root) %{_bindir}/myisamchk
+%attr(755, root, root) %{_bindir}/myisamlog
+%attr(755, root, root) %{_bindir}/myisampack
+%attr(755, root, root) %{_bindir}/mysql_convert_table_format
+%attr(755, root, root) %{_bindir}/mysql_fix_extensions
+%attr(755, root, root) %{_bindir}/mysql_install_db
+%attr(755, root, root) %{_bindir}/mysql_plugin
+%attr(755, root, root) %{_bindir}/mysql_secure_installation
+%attr(755, root, root) %{_bindir}/mysql_setpermission
+%attr(755, root, root) %{_bindir}/mysql_tzinfo_to_sql
+%attr(755, root, root) %{_bindir}/mysql_upgrade
+%attr(755, root, root) %{_bindir}/mysql_zap
+%attr(755, root, root) %{_bindir}/mysqlbug
+%attr(755, root, root) %{_bindir}/mysqld_multi
+%attr(755, root, root) %{_bindir}/mysqld_safe
+%attr(755, root, root) %{_bindir}/mysqldumpslow
+%attr(755, root, root) %{_bindir}/mysqlhotcopy
+%attr(755, root, root) %{_bindir}/mysqltest
+%attr(755, root, root) %{_bindir}/perror
+%attr(755, root, root) %{_bindir}/replace
+%attr(755, root, root) %{_bindir}/resolve_stack_dump
+%attr(755, root, root) %{_bindir}/resolveip
+
+%attr(755, root, root) %{_sbindir}/mysqld
+%attr(755, root, root) %{_sbindir}/mysqld-debug
+%attr(755, root, root) %{_sbindir}/rcmysql
+%attr(755, root, root) %{_libdir}/mysql/plugin/daemon_example.ini
+
+%if %{WITH_TCMALLOC}
+%attr(755, root, root) %{_libdir}/mysql/%{malloc_lib_target}
+%endif
+
+%attr(644, root, root) %config(noreplace,missingok) %{_sysconfdir}/logrotate.d/mysql
+%attr(755, root, root) %{_sysconfdir}/init.d/mysql
+
+%attr(755, root, root) %{_datadir}/mysql/
+
+# ----------------------------------------------------------------------------
+%files -n MySQL-client%{product_suffix}
+
+%defattr(-, root, root, 0755)
+%attr(755, root, root) %{_bindir}/msql2mysql
+%attr(755, root, root) %{_bindir}/mysql
+%attr(755, root, root) %{_bindir}/mysql_find_rows
+%attr(755, root, root) %{_bindir}/mysql_waitpid
+%attr(755, root, root) %{_bindir}/mysqlaccess
+# XXX: This should be moved to %{_sysconfdir}
+%attr(644, root, root) %{_bindir}/mysqlaccess.conf
+%attr(755, root, root) %{_bindir}/mysqladmin
+%attr(755, root, root) %{_bindir}/mysqlbinlog
+%attr(755, root, root) %{_bindir}/mysqlcheck
+%attr(755, root, root) %{_bindir}/mysqldump
+%attr(755, root, root) %{_bindir}/mysqlimport
+%attr(755, root, root) %{_bindir}/mysqlshow
+%attr(755, root, root) %{_bindir}/mysqlslap
+
+%doc %attr(644, root, man) %{_mandir}/man1/msql2mysql.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_find_rows.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_waitpid.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlaccess.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqladmin.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlbinlog.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlcheck.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqldump.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlimport.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlshow.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqlslap.1*
+
+# ----------------------------------------------------------------------------
+%files -n MySQL-devel%{product_suffix} -f optional-files-devel
+%defattr(-, root, root, 0755)
+%doc %attr(644, root, man) %{_mandir}/man1/comp_err.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_config.1*
+%attr(755, root, root) %{_bindir}/mysql_config
+%dir %attr(755, root, root) %{_includedir}/mysql
+%dir %attr(755, root, root) %{_libdir}/mysql
+%{_includedir}/mysql/*
+%{_datadir}/aclocal/mysql.m4
+%{_libdir}/mysql/libmysqlclient.a
+%{_libdir}/mysql/libmysqlclient_r.a
+%{_libdir}/mysql/libmysqlservices.a
+
+# ----------------------------------------------------------------------------
+%files -n MySQL-shared%{product_suffix}
+%defattr(-, root, root, 0755)
+# Shared libraries (omit for architectures that don't support them)
+%{_libdir}/libmysql*.so*
+
+%post -n MySQL-shared%{product_suffix}
+/sbin/ldconfig
+
+%postun -n MySQL-shared%{product_suffix}
+/sbin/ldconfig
+
+# ----------------------------------------------------------------------------
+%files -n MySQL-test%{product_suffix}
+%defattr(-, root, root, 0755)
+%attr(-, root, root) %{_datadir}/mysql-test
+%attr(755, root, root) %{_bindir}/mysql_client_test
+%attr(755, root, root) %{_bindir}/mysql_client_test_embedded
+%attr(755, root, root) %{_bindir}/mysqltest_embedded
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql-stress-test.pl.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql-test-run.pl.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysql_client_test_embedded.1*
+%doc %attr(644, root, man) %{_mandir}/man1/mysqltest_embedded.1*
+
+# ----------------------------------------------------------------------------
+%files -n MySQL-embedded%{product_suffix}
+%defattr(-, root, root, 0755)
+%attr(755, root, root) %{_bindir}/mysql_embedded
+%attr(644, root, root) %{_libdir}/mysql/libmysqld.a
+%attr(644, root, root) %{_libdir}/mysql/libmysqld-debug.a
+
+##############################################################################
+# The spec file changelog only includes changes made to the spec file
+# itself - note that they must be ordered by date (important when
+# merging BK trees)
+##############################################################################
+%changelog
+* Wed Jul 02 2014 Bjorn Munch <bjorn.munch@oracle.com>
+- Disable dtrace unconditionally, breaks after we install Oracle dtrace
+
+* Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
+- Removed non gpl file docs/mysql.info from community packages
+
+* Mon Sep 09 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
+- Updated logic to get the correct count of PID files 
+
+* Fri Aug 16 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
+- Added provides lowercase mysql tags  
+
+* Wed Jun 26 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
+- Cleaned up spec file to resolve rpm dependencies.
+
+* Tue Jul 24 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add a macro "runselftest":
+  if set to 1 (default), the test suite will be run during the RPM build;
+  this can be oveeridden via the command line by adding
+      --define "runselftest 0"
+  Failures of the test suite will NOT make the RPM build fail!
+
+* Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
+
+* Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix duplicate mentioning of "mysql_plugin" and its manual page,
+  it is better to keep alphabetic order in the files list (merging!).
+
+* Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
+  the RPMs of any configuration (of the current or the preceding release series)
+  by the new ones. This is done by not using the implicitly generated capabilities
+  (which include the configuration name) and relying on more generic ones which
+  just list the function ("server", "client", ...).
+  The implicit generation cannot be prevented, so all these capabilities must be
+  explicitly listed in "Obsoletes:"
+
+* Tue Sep 13 2011 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Add support for Oracle Linux 6 and Red Hat Enterprise Linux 6.  Due to
+  changes in RPM behaviour ($RPM_BUILD_ROOT is removed prior to install)
+  this necessitated a move of the libmygcc.a installation to the install
+  phase, which is probably where it belonged in the first place.
+
+* Tue Sep 13 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- "make_win_bin_dist" and its manual are dropped, cmake does it different.
+
+* Thu Sep 08 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Add mysql_plugin man page.
+
+* Tue Aug 30 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Add the manual page for "mysql_plugin" to the server package.
+
+* Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Null-upmerge the fix of bug#37165: This spec file is not affected.
+- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}".
+
+* Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
+
+- Source plugin library files list from cmake-generated file.
+
+* Mon Jul 25 2011 Chuck Bell <chuck.bell@oracle.com>
+
+- Added the mysql_plugin client - enables or disables plugins.
+
+* Thu Jul 21 2011 Sunanda Menon <sunanda.menon@oracle.com>
+
+- Fix bug#12561297: Added the MySQL embedded binary
+
+* Thu Jul 07 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#45415: "rpm upgrade recreates test database"
+  Let the creation of the "test" database happen only during a new installation,
+  not in an RPM upgrade.
+  This affects both the "mkdir" and the call of "mysql_install_db".
+
+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Fix bug#56581: If an installation deviates from the default file locations
+  ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
+  should still work, and use these locations.
+  The problem was that the fix for bug#27072 did not check for local settings.
+
+* Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
+
+* Tue Nov 23 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- EXCEPTIONS-CLIENT has been deleted, remove it from here too
+- Support MYSQL_BUILD_MAKE_JFLAG environment variable for passing
+  a '-j' argument to make.
+
+* Mon Nov 1 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added test authentication (WL#1054) plugin binaries
+
+* Wed Oct 6 2010 Georgi Kodinov <georgi.godinov@oracle.com>
+
+- Added example external authentication (WL#1054) plugin binaries
+
+* Wed Aug 11 2010 Joerg Bruehe <joerg.bruehe@oracle.com>
+
+- With a recent spec file cleanup, names have changed: A "-community" part was dropped.
+  Reflect that in the "Obsoletes" specifications.
+- Add a "triggerpostun" to handle the uninstall of the "-community" server RPM.
+- This fixes bug#55015 "MySQL server is not restarted properly after RPM upgrade".
+
+* Tue Jun 15 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change the behaviour on installation and upgrade:
+  On installation, do not autostart the server.
+  *Iff* the server was stopped before the upgrade is started, this is taken as a
+  sign the administrator is handling that manually, and so the new server will
+  not be started automatically at the end of the upgrade.
+  The start/stop scripts will still be installed, so the server will be started
+  on the next machine boot.
+  This is the 5.5 version of fixing bug#27072 (RPM autostarting the server).
+
+* Tue Jun 1 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Implement SELinux checks from distribution-specific spec file.
+
+* Wed May 12 2010 Jonathan Perkin <jonathan.perkin@oracle.com>
+
+- Large number of changes to build using CMake
+- Introduce distribution-specific RPMs
+- Drop debuginfo, build all binaries with debug/symbols
+- Remove __os_install_post, use native macro
+- Remove _unpackaged_files_terminate_build, make it an error to have
+  unpackaged files
+- Remove cluster RPMs
+
+* Wed Mar 24 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Add "--with-perfschema" to the configure options.
+
+* Mon Mar 22 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- User "usr/lib*" to allow for both "usr/lib" and "usr/lib64",
+  mask "rmdir" return code 1.
+- Remove "ha_example.*" files from the list, they aren't built.
+
+* Wed Mar 17 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix a wrong path name in handling the debug plugins.
+
+* Wed Mar 10 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Take the result of the debug plugin build and put it into the optimized tree,
+  so that it becomes part of the final installation;
+  include the files in the packlist. Part of the fixes for bug#49022.
+
+* Mon Mar 01 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Set "Oracle and/or its affiliates" as the vendor and copyright owner,
+  accept upgrading from packages showing MySQL or Sun as vendor.
+
+* Fri Feb 12 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Formatting changes:
+  Have a consistent structure of separator lines and of indentation
+  (8 leading blanks => tab).
+- Introduce the variable "src_dir".
+- Give the environment variables "MYSQL_BUILD_CC(CXX)" precedence
+  over "CC" ("CXX").
+- Drop the old "with_static" argument analysis, this is not supported
+  in 5.1 since ages.
+- Introduce variables to control the handlers individually, as well
+  as other options.
+- Use the new "--with-plugin" notation for the table handlers.
+- Drop handling "/etc/rc.d/init.d/mysql", the switch to "/etc/init.d/mysql"
+  was done back in 2002 already.
+- Make "--with-zlib-dir=bundled" the default, add an option to disable it.
+- Add missing manual pages to the file list.
+- Improve the runtime check for "libgcc.a", protect it against being tried
+  with the Intel compiler "icc".
+
+* Mon Jan 11 2010 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Change RPM file naming:
+  - Suffix like "-m2", "-rc" becomes part of version as "_m2", "_rc".
+  - Release counts from 1, not 0.
+
+* Wed Dec 23 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- The "semisync" plugin file name has lost its introductory "lib",
+  adapt the file lists for the subpackages.
+  This is a part missing from the fix for bug#48351.
+- Remove the "fix_privilege_tables" manual, it does not exist in 5.5
+  (and likely, the whole script will go, too).
+
+* Mon Nov 16 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Fix some problems with the directives around "tcmalloc" (experimental),
+  remove erroneous traces of the InnoDB plugin (that is 5.1 only).
+
+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
+
+- Removed mysql_fix_privilege_tables
+
+* Fri Oct 02 2009 Alexander Nozdrin <alexander.nozdrin@sun.com>
+
+- "mysqlmanager" got removed from version 5.4, all references deleted.
+
+* Fri Aug 28 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- Merge up from 5.1 to 5.4: Remove handling for the InnoDB plugin.
+
+* Thu Aug 27 2009 Joerg Bruehe <joerg.bruehe@sun.com>
+
+- This version does not contain the "Instance manager", "mysqlmanager":
+  Remove it from the spec file so that packaging succeeds.
+
+* Mon Aug 24 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Add conditionals for bundled zlib and innodb plugin
+
+* Fri Aug 21 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Install plugin libraries in appropriate packages.
+- Disable libdaemon_example and ftexample plugins.
+
+* Thu Aug 20 2009 Jonathan Perkin <jperkin@sun.com>
+
+- Update variable used for mysql-test suite location to match source.
+
+* Fri Nov 07 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Correct yesterday's fix, so that it also works for the last flag,
+  and fix a wrong quoting: un-quoted quote marks must not be escaped.
+
+* Thu Nov 06 2008 Kent Boortz <kent.boortz@sun.com>
+
+- Removed "mysql_upgrade_shell"
+- Removed some copy/paste between debug and normal build
+
+* Thu Nov 06 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Modify CFLAGS and CXXFLAGS such that a debug build is not optimized.
+  This should cover both gcc and icc flags.  Fixes bug#40546.
+
+* Fri Aug 29 2008 Kent Boortz <kent@mysql.com>
+
+- Removed the "Federated" storage engine option, and enabled in all
+
+* Tue Aug 26 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Get rid of the "warning: Installed (but unpackaged) file(s) found:"
+  Some generated files aren't needed in RPMs:
+  - the "sql-bench/" subdirectory
+  Some files were missing:
+  - /usr/share/aclocal/mysql.m4  ("devel" subpackage)
+  - Manual "mysqlbug" ("server" subpackage)
+  - Program "innochecksum" and its manual ("server" subpackage)
+  - Manual "mysql_find_rows" ("client" subpackage)
+  - Script "mysql_upgrade_shell" ("client" subpackage)
+  - Program "ndb_cpcd" and its manual ("ndb-extra" subpackage)
+  - Manuals "ndb_mgm" + "ndb_restore" ("ndb-tools" subpackage)
+
+* Mon Mar 31 2008 Kent Boortz <kent@mysql.com>
+
+- Made the "Federated" storage engine an option
+- Made the "Cluster" storage engine and sub packages an option
+
+* Wed Mar 19 2008 Joerg Bruehe <joerg@mysql.com>
+
+- Add the man pages for "ndbd" and "ndb_mgmd".
+
+* Mon Feb 18 2008 Timothy Smith <tim@mysql.com>
+
+- Require a manual upgrade if the alread-installed mysql-server is
+  from another vendor, or is of a different major version.
+
+* Wed May 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- "ndb_size.tmpl" is not needed any more,
+  "man1/mysql_install_db.1" lacked the trailing '*'.
+
+* Sat Apr 07 2007 Kent Boortz <kent@mysql.com>
+
+- Removed man page for "mysql_create_system_tables"
+
+* Wed Mar 21 2007 Daniel Fischer <df@mysql.com>
+
+- Add debug server.
+
+* Mon Mar 19 2007 Daniel Fischer <df@mysql.com>
+
+- Remove Max RPMs; the server RPMs contain a mysqld compiled with all
+  features that previously only were built into Max.
+
+* Fri Mar 02 2007 Joerg Bruehe <joerg@mysql.com>
+
+- Add several man pages for NDB which are now created.
+
+* Fri Jan 05 2007 Kent Boortz <kent@mysql.com>
+
+- Put back "libmygcc.a", found no real reason it was removed.
+
+- Add CFLAGS to gcc call with --print-libgcc-file, to make sure the
+  correct "libgcc.a" path is returned for the 32/64 bit architecture.
+
+* Mon Dec 18 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Fix the move of "mysqlmanager" to section 8: Directory name was wrong.
+
+* Thu Dec 14 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Include the new man pages for "my_print_defaults" and "mysql_tzinfo_to_sql"
+  in the server RPM.
+- The "mysqlmanager" man page got moved from section 1 to 8.
+
+* Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Call "make install" using "benchdir_root=%%{_datadir}",
+  because that is affecting the regression test suite as well.
+
+* Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Explicitly note that the "MySQL-shared" RPMs (as built by MySQL AB)
+  replace "mysql-shared" (as distributed by SuSE) to allow easy upgrading
+  (bug#22081).
+
+* Mon Nov 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Add "--with-partition" to all server builds.
+
+- Use "--report-features" in one test run per server build.
+
+* Tue Aug 15 2006 Joerg Bruehe <joerg@mysql.com>
+
+- The "max" server is removed from packages, effective from 5.1.12-beta.
+  Delete all steps to build, package, or install it.
+
+* Mon Jul 10 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Fix a typing error in the "make" target for the Perl script to run the tests.
+
+* Tue Jul 04 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use the Perl script to run the tests, because it will automatically check
+  whether the server is configured with SSL.
+
+* Tue Jun 27 2006 Joerg Bruehe <joerg@mysql.com>
+
+- move "mysqldumpslow" from the client RPM to the server RPM (bug#20216)
+
+- Revert all previous attempts to call "mysql_upgrade" during RPM upgrade,
+  there are some more aspects which need to be solved before this is possible.
+  For now, just ensure the binary "mysql_upgrade" is delivered and installed.
+
+* Thu Jun 22 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Close a gap of the previous version by explicitly using
+  a newly created temporary directory for the socket to be used
+  in the "mysql_upgrade" operation, overriding any local setting.
+
+* Tue Jun 20 2006 Joerg Bruehe <joerg@mysql.com>
+
+- To run "mysql_upgrade", we need a running server;
+  start it in isolation and skip password checks.
+
+* Sat May 20 2006 Kent Boortz <kent@mysql.com>
+
+- Always compile for PIC, position independent code.
+
+* Wed May 10 2006 Kent Boortz <kent@mysql.com>
+
+- Use character set "all" when compiling with Cluster, to make Cluster
+  nodes independent on the character set directory, and the problem
+  that two RPM sub packages both wants to install this directory.
+
+* Mon May 01 2006 Kent Boortz <kent@mysql.com>
+
+- Use "./libtool --mode=execute" instead of searching for the
+  executable in current directory and ".libs".
+
+* Fri Apr 28 2006 Kent Boortz <kent@mysql.com>
+
+- Install and run "mysql_upgrade"
+
+* Wed Apr 12 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove sql-bench, and MySQL-bench RPM (will be built as an independent
+  project from the mysql-bench repository)
+
+* Tue Apr 11 2006 Jim Winstead <jimw@mysql.com>
+
+- Remove old mysqltestmanager and related programs
+* Sat Apr 01 2006 Kent Boortz <kent@mysql.com>
+
+- Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
+
+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
+
+- Changed product name from "Community Edition" to "Community Server"
+
+* Mon Mar 06 2006 Kent Boortz <kent@mysql.com>
+
+- Fast mutexes is now disabled by default, but should be
+  used in Linux builds.
+
+* Mon Feb 20 2006 Kent Boortz <kent@mysql.com>
+
+- Reintroduced a max build
+- Limited testing of 'debug' and 'max' servers
+- Berkeley DB only in 'max'
+
+* Mon Feb 13 2006 Joerg Bruehe <joerg@mysql.com>
+
+- Use "-i" on "make test-force";
+  this is essential for later evaluation of this log file.
+
+* Thu Feb 09 2006 Kent Boortz <kent@mysql.com>
+
+- Pass '-static' to libtool, link static with our own libraries, dynamic
+  with system libraries.  Link with the bundled zlib.
+
+* Wed Feb 08 2006 Kristian Nielsen <knielsen@mysql.com>
+
+- Modified RPM spec to match new 5.1 debug+max combined community packaging.
+
+* Sun Dec 18 2005 Kent Boortz <kent@mysql.com>
+
+- Added "client/mysqlslap"
+
+* Mon Dec 12 2005 Rodrigo Novo <rodrigo@mysql.com>
+
+- Added zlib to the list of (static) libraries installed
+- Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
+- Compile MySQL with bundled zlib
+- Fixed %%packager name to "MySQL Production Engineering Team"
+
+* Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Avoid using the "bundled" zlib on "shared" builds:
+  As it is not installed (on the build system), this gives dependency
+  problems with "libtool" causing the build to fail.
+  (Change was done on Nov 11, but left uncommented.)
+
+* Tue Nov 22 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Extend the file existence check for "init.d/mysql" on un-install
+  to also guard the call to "insserv"/"chkconfig".
+
+* Thu Oct 27 2005 Lenz Grimmer <lenz@grimmer.com>
+
+- added more man pages
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Made yaSSL support an option (off by default)
+
+* Wed Oct 19 2005 Kent Boortz <kent@mysql.com>
+
+- Enabled yaSSL support
+
+* Sat Oct 15 2005 Kent Boortz <kent@mysql.com>
+
+- Give mode arguments the same way in all places
+- Moved copy of mysqld.a to "standard" build, but
+  disabled it as we don't do embedded yet in 5.0
+
+* Fri Oct 14 2005 Kent Boortz <kent@mysql.com>
+
+- For 5.x, always compile with --with-big-tables
+- Copy the config.log file to location outside
+  the build tree
+
+* Fri Oct 14 2005 Kent Boortz <kent@mysql.com>
+
+- Removed unneeded/obsolete configure options
+- Added archive engine to standard server
+- Removed the embedded server from experimental server
+- Changed suffix "-Max" => "-max"
+- Changed comment string "Max" => "Experimental"
+
+* Thu Oct 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added a usermod call to assign a potential existing mysql user to the
+  correct user group (BUG#12823)
+- Save the perror binary built during Max build so it supports the NDB
+  error codes (BUG#13740)
+- added a separate macro "mysqld_group" to be able to define the
+  user group of the mysql user seperately, if desired.
+
+* Thu Sep 29 2005 Lenz Grimmer <lenz@mysql.com>
+
+- fixed the removing of the RPM_BUILD_ROOT in the %clean section (the
+  $RBR variable did not get expanded, thus leaving old build roots behind)
+
+* Thu Aug 04 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the creation of the mysql user group account in the postinstall
+  section (BUG 12348)
+- Fixed enabling the Archive storage engine in the Max binary
+
+* Tue Aug 02 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the Requires: tag for the server RPM (BUG 12233)
+
+* Fri Jul 15 2005 Lenz Grimmer <lenz@mysql.com>
+
+- create a "mysql" user group and assign the mysql user account to that group
+  in the server postinstall section. (BUG 10984)
+
+* Tue Jun 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Do not build statically on i386 by default, only when adding either "--with
+  static" or "--define '_with_static 1'" to the RPM build options. Static
+  linking really only makes sense when linking against the specially patched
+  glibc 2.2.5.
+
+* Mon Jun 06 2005 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_client_test to the "bench" subpackage (BUG 10676)
+- added the libndbclient static and shared libraries (BUG 10676)
+
+* Wed Jun 01 2005 Lenz Grimmer <lenz@mysql.com>
+
+- use "mysqldatadir" variable instead of hard-coding the path multiple times
+- use the "mysqld_user" variable on all occasions a user name is referenced
+- removed (incomplete) Brazilian translations
+- removed redundant release tags from the subpackage descriptions
+
+* Wed May 25 2005 Joerg Bruehe <joerg@mysql.com>
+
+- Added a "make clean" between separate calls to "BuildMySQL".
+
+* Thu May 12 2005 Guilhem Bichot <guilhem@mysql.com>
+
+- Removed the mysql_tableinfo script made obsolete by the information schema
+
+* Wed Apr 20 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Enabled the "blackhole" storage engine for the Max RPM
+
+* Wed Apr 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- removed the MySQL manual files (html/ps/texi) - they have been removed
+  from the MySQL sources and are now available seperately.
+
+* Mon Apr 4 2005 Petr Chardin <petr@mysql.com>
+
+- old mysqlmanager, mysqlmanagerc and mysqlmanager-pwger renamed into
+  mysqltestmanager, mysqltestmanager and mysqltestmanager-pwgen respectively
+
+* Fri Mar 18 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Disabled RAID in the Max binaries once and for all (it has finally been
+  removed from the source tree)
+
+* Sun Feb 20 2005 Petr Chardin <petr@mysql.com>
+
+- Install MySQL Instance Manager together with mysqld, touch mysqlmanager
+  password file
+
+* Mon Feb 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed the compilation comments and moved them into the separate build sections
+  for Max and Standard
+
+* Mon Feb 7 2005 Tomas Ulin <tomas@mysql.com>
+
+- enabled the "Ndbcluster" storage engine for the max binary
+- added extra make install in ndb subdir after Max build to get ndb binaries
+- added packages for ndbcluster storage engine
+
+* Fri Jan 14 2005 Lenz Grimmer <lenz@mysql.com>
+
+- replaced obsoleted "BuildPrereq" with "BuildRequires" instead
+
+* Thu Jan 13 2005 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Federated" storage engine for the max binary
+
+* Tue Jan 04 2005 Petr Chardin <petr@mysql.com>
+
+- ISAM and merge storage engines were purged. As well as appropriate
+  tools and manpages (isamchk and isamlog)
+
+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
+
+- enabled the "Archive" storage engine for the max binary
+- enabled the "CSV" storage engine for the max binary
+- enabled the "Example" storage engine for the max binary
+
+* Thu Aug 26 2004 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL-server instead of MySQL (BUG 3860)
+
+* Fri Aug 20 2004 Lenz Grimmer <lenz@mysql.com>
+
+- do not link statically on IA64/AMD64 as these systems do not have
+  a patched glibc installed
+
+* Tue Aug 10 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added libmygcc.a to the devel subpackage (required to link applications
+  against the the embedded server libmysqld.a) (BUG 4921)
+
+* Mon Aug 09 2004 Lenz Grimmer <lenz@mysql.com>
+
+- Added EXCEPTIONS-CLIENT to the "devel" package
+
+* Thu Jul 29 2004 Lenz Grimmer <lenz@mysql.com>
+
+- disabled OpenSSL in the Max binaries again (the RPM packages were the
+  only exception to this anyway) (BUG 1043)
+
+* Wed Jun 30 2004 Lenz Grimmer <lenz@mysql.com>
+
+- fixed server postinstall (mysql_install_db was called with the wrong
+  parameter)
+
+* Thu Jun 24 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added mysql_tzinfo_to_sql to the server subpackage
+- run "make clean" instead of "make distclean"
+
+* Mon Apr 05 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added ncurses-devel to the build prerequisites (BUG 3377)
+
+* Thu Feb 12 2004 Lenz Grimmer <lenz@mysql.com>
+
+- when using gcc, _always_ use CXX=gcc
+- replaced Copyright with License field (Copyright is obsolete)
+
+* Tue Feb 03 2004 Lenz Grimmer <lenz@mysql.com>
+
+- added myisam_ftdump to the Server package
+
+* Tue Jan 13 2004 Lenz Grimmer <lenz@mysql.com>
+
+- link the mysql client against libreadline instead of libedit (BUG 2289)
+
+* Mon Dec 22 2003 Lenz Grimmer <lenz@mysql.com>
+
+- marked /etc/logrotate.d/mysql as a config file (BUG 2156)
+
+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
+
+- fixed file permissions (BUG 1672)
+
+* Thu Dec 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- made testing for gcc3 a bit more robust
+
+* Fri Dec 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_create_system_tables to the server subpackage
+
+* Fri Nov 21 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed dependency on MySQL-client from the MySQL-devel subpackage
+  as it is not really required. (BUG 1610)
+
+* Fri Aug 29 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 1162 (removed macro names from the changelog)
+- Really fixed BUG 998 (disable the checking for installed but
+  unpackaged files)
+
+* Tue Aug 05 2003 Lenz Grimmer <lenz@mysql.com>
+
+- Fixed BUG 959 (libmysqld not being compiled properly)
+- Fixed BUG 998 (RPM build errors): added missing files to the
+  distribution (mysql_fix_extensions, mysql_tableinfo, mysqldumpslow,
+  mysql_fix_privilege_tables.1), removed "-n" from install section.
+
+* Wed Jul 09 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed the GIF Icon (file was not included in the sources anyway)
+- removed unused variable shared_lib_version
+- do not run automake before building the standard binary
+  (should not be necessary)
+- add server suffix '-standard' to standard binary (to be in line
+  with the binary tarball distributions)
+- Use more RPM macros (_exec_prefix, _sbindir, _libdir, _sysconfdir,
+  _datadir, _includedir) throughout the spec file.
+- allow overriding CC and CXX (required when building with other compilers)
+
+* Fri May 16 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-enabled RAID again
+
+* Wed Apr 30 2003 Lenz Grimmer <lenz@mysql.com>
+
+- disabled MyISAM RAID (--with-raid) - it throws an assertion which
+  needs to be investigated first.
+
+* Mon Mar 10 2003 Lenz Grimmer <lenz@mysql.com>
+
+- added missing file mysql_secure_installation to server subpackage
+  (BUG 141)
+
+* Tue Feb 11 2003 Lenz Grimmer <lenz@mysql.com>
+
+- re-added missing pre- and post(un)install scripts to server subpackage
+- added config file /etc/my.cnf to the file list (just for completeness)
+- make sure to create the datadir with 755 permissions
+
+* Mon Jan 27 2003 Lenz Grimmer <lenz@mysql.com>
+
+- removed unused CC and CXX variables
+- CFLAGS and CXXFLAGS should honor RPM_OPT_FLAGS
+
+* Fri Jan 24 2003 Lenz Grimmer <lenz@mysql.com>
+
+- renamed package "MySQL" to "MySQL-server"
+- fixed Copyright tag
+- added mysql_waitpid to client subpackage (required for mysql-test-run)
+
+* Wed Nov 27 2002 Lenz Grimmer <lenz@mysql.com>
+
+- moved init script from /etc/rc.d/init.d to /etc/init.d (the majority of
+  Linux distributions now support this scheme as proposed by the LSB either
+  directly or via a compatibility symlink)
+- Use new "restart" init script action instead of starting and stopping
+  separately
+- Be more flexible in activating the automatic bootup - use insserv (on
+  older SuSE versions) or chkconfig (Red Hat, newer SuSE versions and
+  others) to create the respective symlinks
+
+* Wed Sep 25 2002 Lenz Grimmer <lenz@mysql.com>
+
+- MySQL-Max now requires MySQL >= 4.0 to avoid version mismatches
+  (mixing 3.23 and 4.0 packages)
+
+* Fri Aug 09 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Turn off OpenSSL in MySQL-Max for now until it works properly again
+- enable RAID for the Max binary instead
+- added compatibility link: safe_mysqld -> mysqld_safe to ease the
+  transition from 3.23
+
+* Thu Jul 18 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Reworked the build steps a little bit: the Max binary is supposed
+  to include OpenSSL, which cannot be linked statically, thus trying
+  to statically link against a special glibc is futile anyway
+- because of this, it is not required to make yet another build run
+  just to compile the shared libs (saves a lot of time)
+- updated package description of the Max subpackage
+- clean up the BuildRoot directory afterwards
+
+* Mon Jul 15 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Updated Packager information
+- Fixed the build options: the regular package is supposed to
+  include InnoDB and linked statically, while the Max package
+  should include BDB and SSL support
+
+* Fri May 03 2002 Lenz Grimmer <lenz@mysql.com>
+
+- Use more RPM macros (e.g. infodir, mandir) to make the spec
+  file more portable
+- reorganized the installation of documentation files: let RPM
+  take care of this
+- reorganized the file list: actually install man pages along
+  with the binaries of the respective subpackage
+- do not include libmysqld.a in the devel subpackage as well, if we
+  have a special "embedded" subpackage
+- reworked the package descriptions
+
+* Mon Oct  8 2001 Monty
+
+- Added embedded server as a separate RPM
+
+* Fri Apr 13 2001 Monty
+
+- Added mysqld-max to the distribution
+
+* Tue Jan 2  2001  Monty
+
+- Added mysql-test to the bench package
+
+* Fri Aug 18 2000 Tim Smith <tim@mysql.com>
+
+- Added separate libmysql_r directory; now both a threaded
+  and non-threaded library is shipped.
+
+* Tue Sep 28 1999 David Axmark <davida@mysql.com>
+
+- Added the support-files/my-example.cnf to the docs directory.
+
+- Removed devel dependency on base since it is about client
+  development.
+
+* Wed Sep 8 1999 David Axmark <davida@mysql.com>
+
+- Cleaned up some for 3.23.
+
+* Thu Jul 1 1999 David Axmark <davida@mysql.com>
+
+- Added support for shared libraries in a separate sub
+  package. Original fix by David Fox (dsfox@cogsci.ucsd.edu)
+
+- The --enable-assembler switch is now automatically disables on
+  platforms there assembler code is unavailable. This should allow
+  building this RPM on non i386 systems.
+
+* Mon Feb 22 1999 David Axmark <david@detron.se>
+
+- Removed unportable cc switches from the spec file. The defaults can
+  now be overridden with environment variables. This feature is used
+  to compile the official RPM with optimal (but compiler version
+  specific) switches.
+
+- Removed the repetitive description parts for the sub rpms. Maybe add
+  again if RPM gets a multiline macro capability.
+
+- Added support for a pt_BR translation. Translation contributed by
+  Jorge Godoy <jorge@bestway.com.br>.
+
+* Wed Nov 4 1998 David Axmark <david@detron.se>
+
+- A lot of changes in all the rpm and install scripts. This may even
+  be a working RPM :-)
+
+* Sun Aug 16 1998 David Axmark <david@detron.se>
+
+- A developers changelog for MySQL is available in the source RPM. And
+  there is a history of major user visible changed in the Reference
+  Manual.  Only RPM specific changes will be documented here.
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/mysql.m4 mysql-5.5-5.5.43/support-files/mysql.m4
--- mysql-5.5-5.5.35+dfsg/support-files/mysql.m4	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/mysql.m4	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/MySQL-shared-compat.spec.sh mysql-5.5-5.5.43/support-files/MySQL-shared-compat.spec.sh
--- mysql-5.5-5.5.35+dfsg/support-files/MySQL-shared-compat.spec.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/MySQL-shared-compat.spec.sh	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright 2003-2008 MySQL AB, 2009 Sun Microsystems, Inc.
+# Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved.
 #
 # MySQL-shared-compat.spec
 #
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/mysql.spec.sh mysql-5.5-5.5.43/support-files/mysql.spec.sh
--- mysql-5.5-5.5.35+dfsg/support-files/mysql.spec.sh	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/mysql.spec.sh	2015-02-27 08:30:34.000000000 +0000
@@ -30,7 +30,7 @@
 %global mysqld_group    mysql
 %global mysqldatadir    /var/lib/mysql
 
-%global release         1  
+%global release         1 
 
 
 #
@@ -142,9 +142,9 @@
   %else
     %if %(test -f /etc/oracle-release && echo 1 || echo 0)
       %define elver %(rpm -qf --qf '%%{version}\\n' /etc/oracle-release | sed -e 's/^\\([0-9]*\\).*/\\1/g')
-      %if "%elver" == "6"
-        %define distro_description      Oracle Linux 6
-        %define distro_releasetag       el6
+      %if "%elver" == "6" || "%elver" == "7"
+        %define distro_description      Oracle Linux %elver
+        %define distro_releasetag       el%elver
         %define distro_buildreq         gcc-c++ ncurses-devel perl readline-devel time zlib-devel cmake libaio-devel
         %define distro_requires         chkconfig coreutils grep procps shadow-utils net-tools
       %else
@@ -251,6 +251,7 @@
 Packager:       MySQL Release Engineering <mysql-build@oss.oracle.com> 
 Vendor:         %{mysql_vendor}
 BuildRequires:  %{distro_buildreq}
+%{?el7:Patch0:         mysql-5.5-libmysqlclient-symbols.patch}
 
 # Regression tests may take a long time, override the default to skip them 
 %{!?runselftest:%global runselftest 1}
@@ -443,7 +444,8 @@
 ##############################################################################
 %prep
 %setup -T -a 0 -c -n %{src_dir}
-
+pushd %{src_dir}
+%{?el7:%patch0 -p1}
 ##############################################################################
 %build
 
@@ -497,12 +499,14 @@
   # Attempt to remove any optimisation flags from the debug build
   CFLAGS=`echo " ${CFLAGS} " | \
             sed -e 's/ -O[0-9]* / /' \
+                -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
                 -e 's/ -unroll2 / /' \
                 -e 's/ -ip / /' \
                 -e 's/^ //' \
                 -e 's/ $//'`
   CXXFLAGS=`echo " ${CXXFLAGS} " | \
               sed -e 's/ -O[0-9]* / /' \
+                  -e 's/-Wp,-D_FORTIFY_SOURCE=2/ /' \
                   -e 's/ -unroll2 / /' \
                   -e 's/ -ip / /' \
                   -e 's/^ //' \
@@ -511,6 +515,7 @@
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=Debug \
+           -DENABLE_DTRACE=OFF \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_debug}" \
@@ -526,6 +531,7 @@
   # XXX: install_layout so we can't just set it based on INSTALL_LAYOUT=RPM
   ${CMAKE} ../%{src_dir} -DBUILD_CONFIG=mysql_release -DINSTALL_LAYOUT=RPM \
            -DCMAKE_BUILD_TYPE=RelWithDebInfo \
+           -DENABLE_DTRACE=OFF \
            -DMYSQL_UNIX_ADDR="%{mysqldatadir}/mysql.sock" \
            -DFEATURE_SET="%{feature_set}" \
            -DCOMPILATION_COMMENT="%{compilation_comment_release}" \
@@ -557,6 +563,8 @@
 install -d $RBR%{_mandir}
 install -d $RBR%{_sbindir}
 
+mkdir -p $RBR%{_sysconfdir}/my.cnf.d
+
 # Install all binaries
 (
   cd $MBD/release
@@ -1092,6 +1100,7 @@
 %doc %attr(644, root, man) %{_mandir}/man1/resolveip.1*
 
 %ghost %config(noreplace,missingok) %{_sysconfdir}/my.cnf
+%dir %{_sysconfdir}/my.cnf.d
 
 %attr(755, root, root) %{_bindir}/innochecksum
 %attr(755, root, root) %{_bindir}/my_print_defaults
@@ -1217,6 +1226,9 @@
 # merging BK trees)
 ##############################################################################
 %changelog
+* Wed Jul 02 2014 Bjorn Munch <bjorn.munch@oracle.com>
+- Disable dtrace unconditionally, breaks after we install Oracle dtrace
+
 * Wed Oct 30 2013 Balasubramanian Kandasamy <balasubramanian.kandasamy@oracle.com>
 - Removed non gpl file docs/mysql.info from community packages
 
@@ -1240,12 +1252,12 @@
 * Mon Jun 11 2012 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Make sure newly added "SPECIFIC-ULN/" directory does not disturb packaging.
-  
+
 * Wed Sep 28 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Fix duplicate mentioning of "mysql_plugin" and its manual page,
   it is better to keep alphabetic order in the files list (merging!).
-  
+
 * Wed Sep 14 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Let the RPM capabilities ("obsoletes" etc) ensure that an upgrade may replace
@@ -1278,7 +1290,7 @@
 * Fri Aug 19 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Null-upmerge the fix of bug#37165: This spec file is not affected.
-- Replace "/var/lib/mysql" by the spec file variable "%{mysqldatadir}".
+- Replace "/var/lib/mysql" by the spec file variable "%%{mysqldatadir}".
 
 * Fri Aug 12 2011 Daniel Fischer <daniel.fischer@oracle.com>
 
@@ -1299,13 +1311,13 @@
   not in an RPM upgrade.
   This affects both the "mkdir" and the call of "mysql_install_db".
 
-* Thu Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
+* Wed Feb 09 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Fix bug#56581: If an installation deviates from the default file locations
   ("datadir" and "pid-file"), the mechanism to detect a running server (on upgrade)
   should still work, and use these locations.
   The problem was that the fix for bug#27072 did not check for local settings.
-  
+
 * Mon Jan 31 2011 Joerg Bruehe <joerg.bruehe@oracle.com>
 
 - Install the new "manifest" files: "INFO_SRC" and "INFO_BIN".
@@ -1420,7 +1432,7 @@
 - Fix some problems with the directives around "tcmalloc" (experimental),
   remove erroneous traces of the InnoDB plugin (that is 5.1 only).
 
-* Fri Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
+* Tue Oct 06 2009 Magnus Blaudd <mvensson@mysql.com>
 
 - Removed mysql_fix_privilege_tables
 
@@ -1538,7 +1550,7 @@
 
 * Thu Nov 30 2006 Joerg Bruehe <joerg@mysql.com>
 
-- Call "make install" using "benchdir_root=%{_datadir}",
+- Call "make install" using "benchdir_root=%%{_datadir}",
   because that is affecting the regression test suite as well.
 
 * Thu Nov 16 2006 Joerg Bruehe <joerg@mysql.com>
@@ -1617,7 +1629,7 @@
 
 - Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS
 
-* Wed Mar 07 2006 Kent Boortz <kent@mysql.com>
+* Tue Mar 07 2006 Kent Boortz <kent@mysql.com>
 
 - Changed product name from "Community Edition" to "Community Server"
 
@@ -1655,7 +1667,7 @@
 - Added zlib to the list of (static) libraries installed
 - Added check against libtool wierdness (WRT: sql/mysqld || sql/.libs/mysqld)
 - Compile MySQL with bundled zlib
-- Fixed %packager name to "MySQL Production Engineering Team"
+- Fixed %%packager name to "MySQL Production Engineering Team"
 
 * Mon Dec 05 2005 Joerg Bruehe <joerg@mysql.com>
 
@@ -1805,7 +1817,7 @@
 - ISAM and merge storage engines were purged. As well as appropriate
   tools and manpages (isamchk and isamlog)
 
-* Thu Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
+* Fri Dec 31 2004 Lenz Grimmer <lenz@mysql.com>
 
 - enabled the "Archive" storage engine for the max binary
 - enabled the "CSV" storage engine for the max binary
@@ -1865,7 +1877,7 @@
 
 - marked /etc/logrotate.d/mysql as a config file (BUG 2156)
 
-* Fri Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
+* Sat Dec 13 2003 Lenz Grimmer <lenz@mysql.com>
 
 - fixed file permissions (BUG 1672)
 
@@ -2007,7 +2019,7 @@
 - Added separate libmysql_r directory; now both a threaded
   and non-threaded library is shipped.
 
-* Wed Sep 28 1999 David Axmark <davida@mysql.com>
+* Tue Sep 28 1999 David Axmark <davida@mysql.com>
 
 - Added the support-files/my-example.cnf to the docs directory.
 
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/RHEL4-SElinux/mysql.fc mysql-5.5-5.5.43/support-files/RHEL4-SElinux/mysql.fc
--- mysql-5.5-5.5.35+dfsg/support-files/RHEL4-SElinux/mysql.fc	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/RHEL4-SElinux/mysql.fc	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/support-files/RHEL4-SElinux/mysql.te mysql-5.5-5.5.43/support-files/RHEL4-SElinux/mysql.te
--- mysql-5.5-5.5.35+dfsg/support-files/RHEL4-SElinux/mysql.te	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/support-files/RHEL4-SElinux/mysql.te	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/connect_test.c mysql-5.5-5.5.43/tests/connect_test.c
--- mysql-5.5-5.5.35+dfsg/tests/connect_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/connect_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002-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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/deadlock_test.c mysql-5.5-5.5.43/tests/deadlock_test.c
--- mysql-5.5-5.5.35+dfsg/tests/deadlock_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/deadlock_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 2000-2001, 2003-2004, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/tests/drop_test.pl mysql-5.5-5.5.43/tests/drop_test.pl
--- mysql-5.5-5.5.35+dfsg/tests/drop_test.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/drop_test.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/export.pl mysql-5.5-5.5.43/tests/export.pl
--- mysql-5.5-5.5.35+dfsg/tests/export.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/export.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright (C) 2000, 2001 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/fork2_test.pl mysql-5.5-5.5.43/tests/fork2_test.pl
--- mysql-5.5-5.5.35+dfsg/tests/fork2_test.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/fork2_test.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 2000, 2001 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/fork_big2.pl mysql-5.5-5.5.43/tests/fork_big2.pl
--- mysql-5.5-5.5.35+dfsg/tests/fork_big2.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/fork_big2.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2002, 2005 MySQL AB
+# Copyright (c) 2002, 2003, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/tests/fork_big.pl mysql-5.5-5.5.43/tests/fork_big.pl
--- mysql-5.5-5.5.35+dfsg/tests/fork_big.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/fork_big.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
-# Copyright (C) 2001 MySQL AB
+# Copyright (c) 2001, 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/tests/index_corrupt.pl mysql-5.5-5.5.43/tests/index_corrupt.pl
--- mysql-5.5-5.5.35+dfsg/tests/index_corrupt.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/index_corrupt.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/insert_and_repair.pl mysql-5.5-5.5.43/tests/insert_and_repair.pl
--- mysql-5.5-5.5.35+dfsg/tests/insert_and_repair.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/insert_and_repair.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 2000, 2001 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/insert_test.c mysql-5.5-5.5.43/tests/insert_test.c
--- mysql-5.5-5.5.35+dfsg/tests/insert_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/insert_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000-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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/list_test.c mysql-5.5-5.5.43/tests/list_test.c
--- mysql-5.5-5.5.35+dfsg/tests/list_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/list_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/lock_test.pl mysql-5.5-5.5.43/tests/lock_test.pl
--- mysql-5.5-5.5.35+dfsg/tests/lock_test.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/lock_test.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/pmail.pl mysql-5.5-5.5.43/tests/pmail.pl
--- mysql-5.5-5.5.35+dfsg/tests/pmail.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/pmail.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/rename_test.pl mysql-5.5-5.5.43/tests/rename_test.pl
--- mysql-5.5-5.5.35+dfsg/tests/rename_test.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/rename_test.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 2000, 2001 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/select_test.c mysql-5.5-5.5.43/tests/select_test.c
--- mysql-5.5-5.5.35+dfsg/tests/select_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/select_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2002-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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/showdb_test.c mysql-5.5-5.5.43/tests/showdb_test.c
--- mysql-5.5-5.5.35+dfsg/tests/showdb_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/showdb_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2003, 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/ssl_test.c mysql-5.5-5.5.43/tests/ssl_test.c
--- mysql-5.5-5.5.35+dfsg/tests/ssl_test.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/ssl_test.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
-/* Copyright (C) 2000 MySQL AB
+/* Copyright (c) 2000, 2003, 2004, 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/table_types.pl mysql-5.5-5.5.43/tests/table_types.pl
--- mysql-5.5-5.5.35+dfsg/tests/table_types.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/table_types.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl
 
 # Copyright (C) 2000, 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/test_delayed_insert.pl mysql-5.5-5.5.43/tests/test_delayed_insert.pl
--- mysql-5.5-5.5.35+dfsg/tests/test_delayed_insert.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/test_delayed_insert.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 2000, 2001 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
diff -Nru mysql-5.5-5.5.35+dfsg/tests/truncate.pl mysql-5.5-5.5.43/tests/truncate.pl
--- mysql-5.5-5.5.35+dfsg/tests/truncate.pl	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/tests/truncate.pl	2015-02-27 08:30:34.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/perl -w
 
 # Copyright (C) 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
diff -Nru mysql-5.5-5.5.35+dfsg/unittest/examples/simple-t.c mysql-5.5-5.5.43/unittest/examples/simple-t.c
--- mysql-5.5-5.5.35+dfsg/unittest/examples/simple-t.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/unittest/examples/simple-t.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,5 @@
 /* Copyright (C) 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/VERSION mysql-5.5-5.5.43/VERSION
--- mysql-5.5-5.5.35+dfsg/VERSION	2013-11-05 07:19:25.000000000 +0000
+++ mysql-5.5-5.5.43/VERSION	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
 MYSQL_VERSION_MAJOR=5
 MYSQL_VERSION_MINOR=5
-MYSQL_VERSION_PATCH=35
+MYSQL_VERSION_PATCH=43
 MYSQL_VERSION_EXTRA=
diff -Nru mysql-5.5-5.5.35+dfsg/vio/CMakeLists.txt mysql-5.5-5.5.43/vio/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/vio/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/vio/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -21,7 +21,6 @@
 ADD_CONVENIENCE_LIBRARY(vio ${VIO_SOURCES})
 TARGET_LINK_LIBRARIES(vio ${LIBSOCKET})
 
-INSTALL_DEBUG_SYMBOLS(vio)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(vio DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()
diff -Nru mysql-5.5-5.5.35+dfsg/vio/viossl.c mysql-5.5-5.5.43/vio/viossl.c
--- mysql-5.5-5.5.35+dfsg/vio/viossl.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/vio/viossl.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* 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 General Public License as published by
diff -Nru mysql-5.5-5.5.35+dfsg/vio/viosslfactories.c mysql-5.5-5.5.43/vio/viosslfactories.c
--- mysql-5.5-5.5.35+dfsg/vio/viosslfactories.c	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/vio/viosslfactories.c	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, 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
@@ -173,6 +173,7 @@
 {
   DH *dh;
   struct st_VioSSLFd *ssl_fd;
+  long ssl_ctx_options= SSL_OP_NO_SSLv2 | SSL_OP_NO_SSLv3;
   DBUG_ENTER("new_VioSSLFd");
   DBUG_PRINT("enter",
              ("key_file: '%s'  cert_file: '%s'  ca_file: '%s'  ca_path: '%s'  "
@@ -200,6 +201,8 @@
     DBUG_RETURN(0);
   }
 
+  SSL_CTX_set_options(ssl_fd->ssl_context, ssl_ctx_options);
+
   /*
     Set the ciphers that can be used
     NOTE: SSL_CTX_set_cipher_list will return 0 if
diff -Nru mysql-5.5-5.5.35+dfsg/zlib/CMakeLists.txt mysql-5.5-5.5.43/zlib/CMakeLists.txt
--- mysql-5.5-5.5.35+dfsg/zlib/CMakeLists.txt	2013-11-05 07:19:26.000000000 +0000
+++ mysql-5.5-5.5.43/zlib/CMakeLists.txt	2015-02-27 08:30:34.000000000 +0000
@@ -1,4 +1,4 @@
-# Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2014, 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
@@ -23,7 +23,6 @@
 ADD_CONVENIENCE_LIBRARY(zlib ${ZLIB_SOURCES})
 RESTRICT_SYMBOL_EXPORTS(zlib)
 
-INSTALL_DEBUG_SYMBOLS(zlib)
 IF(MSVC)
    INSTALL_DEBUG_TARGET(zlib DESTINATION ${INSTALL_LIBDIR}/debug)
 ENDIF()