Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maint

.bzrignore

@@ -403,8 +403,10 @@ heap/hp_test2
 help
 help.c
 help.h
+include/check_abi
 include/my_config.h
 include/my_global.h
+include/mysql_h.ic
 include/mysql_version.h
 include/mysqld_ername.h
 include/mysqld_error.h
@@ -704,6 +706,7 @@ mysql-test/r/bdb-deadlock.err
 mysql-test/r/bdb.err
 mysql-test/r/bdb.log
 mysql-test/r/bdb_cache.err
+mysql-test/r/blackhole.log
 mysql-test/r/client_test.err
 mysql-test/r/csv.err
 mysql-test/r/ctype_ucs.err

BitKeeper/etc/collapsed

@@ -5,5 +5,13 @@
 45001f7c3b2hhCXDKfUvzkX9TNe6VA
 45002051rHJfMEXAIMiAZV0clxvKSA
 4513d8e4Af4dQWuk13sArwofRgFDQw
+45143312u0Tz4r0wPXCbUKwdHa2jWA
+45143b90ewOQuTW8-jrB3ZSAQvMRJw
+45184588w9U72A6KX1hUFeAC4shSHA
+45185df8mZbxfp85FbA0VxUXkmDewA
 4519a6c5BVUxEHTf5iJnjZkixMBs8g
 451ab499rgdjXyOnUDqHu-wBDoS-OQ
+451b110a3ZV6MITl93ehXk2wxrbW7g
+45214442pBGT9KuZEGixBH71jTzbOA
+45214a07hVsIGwvwa-WrO-jpeaSwVw
+452a92d0-31-8wSzSfZi165fcGcXPA

Makefile.am

@@ -135,6 +135,11 @@ test-force-pl:
 	./mysql-test-run.pl --force && \
 	./mysql-test-run.pl --ps-protocol --force
 
+test-force-pl-mem:
+	cd mysql-test; \
+	./mysql-test-run.pl --force --mem && \
+	./mysql-test-run.pl --ps-protocol --force --mem
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%
 

client/Makefile.am

@@ -38,7 +38,9 @@ noinst_HEADERS =		sql_string.h completion_hash.h my_readline.h \
 mysql_SOURCES =			mysql.cc readline.cc sql_string.cc completion_hash.cc
 mysqladmin_SOURCES =		mysqladmin.cc
 mysql_LDADD =			@readline_link@ @TERMCAP_LIB@ $(LDADD) $(CXXLDFLAGS)
-mysqltest_SOURCES=              mysqltest.c $(top_srcdir)/mysys/my_getsystime.c \
+mysqltest_SOURCES=              mysqltest.c \
+				$(top_srcdir)/mysys/my_getsystime.c \
+				$(top_srcdir)/mysys/my_copy.c \
                                 $(yassl_dummy_link_fix)
 mysqltest_LDADD =		$(top_builddir)/regex/libregex.a $(LDADD)
 mysqlbinlog_SOURCES =   mysqlbinlog.cc $(top_srcdir)/mysys/mf_tempdir.c $(top_srcdir)/mysys/my_new.cc

client/mysql.cc

@@ -388,6 +388,21 @@ int main(int argc,char *argv[])
   else
     status.add_to_history=1;
   status.exit_status=1;
+
+  {
+    /* 
+     The file descriptor-layer may be out-of-sync with the file-number layer,
+     so we make sure that "stdout" is really open.  If its file is closed then
+     explicitly close the FD layer. 
+    */
+    int stdout_fileno_copy;
+    stdout_fileno_copy= dup(fileno(stdout)); /* Okay if fileno fails. */
+    if (stdout_fileno_copy == -1)
+      fclose(stdout);
+    else
+      close(stdout_fileno_copy);             /* Clean up dup(). */
+  }
+
   load_defaults("my",load_default_groups,&argc,&argv);
   defaults_argv=argv;
   if (get_options(argc, (char **) argv))
@@ -2109,6 +2124,8 @@ com_go(String *buffer,char *line __attribute__((unused)))
 		(long) mysql_num_rows(result),
 		(long) mysql_num_rows(result) == 1 ? "row" : "rows");
 	end_pager();
+        if (mysql_errno(&mysql))
+          error= put_error(&mysql);
       }
     }
     else if (mysql_affected_rows(&mysql) == ~(ulonglong) 0)
@@ -2919,7 +2936,11 @@ com_connect(String *buffer, char *line)
   bzero(buff, sizeof(buff));
   if (buffer)
   {
-    strmake(buff, line, sizeof(buff) - 1);
+    /*
+      Two null bytes are needed in the end of buff to allow
+      get_arg to find end of string the second time it's called.
+    */
+    strmake(buff, line, sizeof(buff)-2);
     tmp= get_arg(buff, 0);
     if (tmp && *tmp)
     {

client/mysqldump.c

@@ -45,6 +45,7 @@
 #include <m_string.h>
 #include <m_ctype.h>
 #include <hash.h>
+#include <stdarg.h>
 
 #include "client_priv.h"
 #include "mysql.h"
@@ -523,6 +524,8 @@ static void write_header(FILE *sql_file, char *db_name)
   if (opt_xml)
   {
     fputs("<?xml version=\"1.0\"?>\n", sql_file);
+    /* Schema reference.  Allows use of xsi:nil for NULL values and 
+       xsi:type to define an element's data type. */
     fputs("<mysqldump ", sql_file);
     fputs("xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\"",
           sql_file);
@@ -1123,7 +1126,7 @@ static char *quote_for_like(const char *name, char *buff)
 
   SYNOPSIS
     print_quoted_xml()
-    output      - output file
+    xml_file    - output file
     str         - string to print
     len         - its length
 
@@ -1160,34 +1163,63 @@ static void print_quoted_xml(FILE *xml_file, const char *str, ulong len)
 
 
 /*
-  Print xml tag with one attribute.
+  Print xml tag. Optionally add attribute(s).
 
   SYNOPSIS
-    print_xml_tag1()
+    print_xml_tag(xml_file, sbeg, send, tag_name, first_attribute_name, 
+                    ..., attribute_name_n, attribute_value_n, NullS)
     xml_file              - output file
     sbeg                  - line beginning
-    stag_atr    - tag and attribute
-    sval        - value of attribute
     send                  - line ending
+    tag_name              - XML tag name.
+    first_attribute_name  - tag and first attribute
+    first_attribute_value - (Implied) value of first attribute
+    attribute_name_n      - attribute n
+    attribute_value_n     - value of attribute n
 
   DESCRIPTION
-    Print tag with one attribute to the xml_file. Format is:
-      sbeg<stag_atr="sval">send
+    Print XML tag with any number of attribute="value" pairs to the xml_file.
+
+    Format is:
+      sbeg<tag_name first_attribute_name="first_attribute_value" ... 
+      attribute_name_n="attribute_value_n">send
   NOTE
-    sval MUST be a NULL terminated string.
-    sval string will be qouted before output.
+    Additional arguments must be present in attribute/value pairs.
+    The last argument should be the null character pointer.
+    All attribute_value arguments MUST be NULL terminated strings.
+    All attribute_value arguments will be quoted before output.
 */
 
-static void print_xml_tag1(FILE * xml_file, const char* sbeg,
-                           const char* stag_atr, const char* sval,
-                           const char* send)
+static void print_xml_tag(FILE * xml_file, const char* sbeg, const char* send, 
+                          const char* tag_name, 
+                          const char* first_attribute_name, ...)
 {
+  va_list arg_list;
+  const char *attribute_name, *attribute_value;
+
   fputs(sbeg, xml_file);
-  fputs("<", xml_file);
-  fputs(stag_atr, xml_file);
-  fputs("\"", xml_file);
-  print_quoted_xml(xml_file, sval, strlen(sval));
-  fputs("\">", xml_file);
+  fputc('<', xml_file);
+  fputs(tag_name, xml_file);  
+
+  va_start(arg_list, first_attribute_name);
+  attribute_name= first_attribute_name;
+  while (attribute_name != NullS)
+  {
+    attribute_value= va_arg(arg_list, char *);
+    DBUG_ASSERT(attribute_value != NullS);
+
+    fputc(' ', xml_file);
+    fputs(attribute_name, xml_file);    
+    fputc('\"', xml_file);
+    
+    print_quoted_xml(xml_file, attribute_value, strlen(attribute_value));
+    fputc('\"', xml_file);
+
+    attribute_name= va_arg(arg_list, char *);
+  }
+  va_end(arg_list);
+
+  fputc('>', xml_file);
   fputs(send, xml_file);
   check_io(xml_file);
 }
@@ -1270,6 +1302,28 @@ static void print_xml_row(FILE *xml_file, const char *row_name,
   check_io(xml_file);
 }
 
+/*
+  Print hex value for blob data.
+
+  SYNOPSIS
+    print_blob_as_hex()
+    output_file         - output file
+    str                 - string to print
+    len                 - its length
+
+  DESCRIPTION
+    Print hex value for blob data.
+*/
+
+static void print_blob_as_hex(FILE *output_file, const char *str, ulong len)
+{
+    /* sakaik got the idea to to provide blob's in hex notation. */
+    const char *ptr= str, *end= ptr + len;
+    for (; ptr < end ; ptr++)
+      fprintf(output_file, "%02X", *((uchar *)ptr));
+    check_io(output_file);
+}
+
 /*
   dump_routines_for_db
   -- retrievs list of routines for a given db, and prints out
@@ -1714,7 +1768,8 @@ static uint get_table_structure(char *table, char *db, char *table_type,
       if (!opt_xml)
         fprintf(sql_file, "CREATE TABLE %s (\n", result_table);
       else
-        print_xml_tag1(sql_file, "\t", "table_structure name=", table, "\n");
+        print_xml_tag(sql_file, "\t", "\n", "table_structure", "name=", table, 
+                NullS);
       check_io(sql_file);
     }
 
@@ -2283,8 +2338,8 @@ static void dump_table(char *table, char *db)
     rownr=0;
     init_length=(uint) insert_pat.length+4;
     if (opt_xml)
-      print_xml_tag1(md_result_file, "\t", "table_data name=", table, "\n");
-
+      print_xml_tag(md_result_file, "\t", "\n", "table_data", "name=", table,
+              NullS);
     if (opt_autocommit)
     {
       fprintf(md_result_file, "set autocommit=0;\n");
@@ -2338,7 +2393,7 @@ static void dump_table(char *table, char *db)
                    field->type == MYSQL_TYPE_LONG_BLOB ||
                    field->type == MYSQL_TYPE_MEDIUM_BLOB ||
                    field->type == MYSQL_TYPE_TINY_BLOB)) ? 1 : 0;
-        if (extended_insert)
+        if (extended_insert && !opt_xml)
         {
           if (i == 0)
             dynstr_set(&extended_row,"(");
@@ -2427,18 +2482,25 @@ static void dump_table(char *table, char *db)
             {
               if (opt_xml)
               {
-                print_xml_tag1(md_result_file, "\t\t", "field name=",
-                              field->name, "");
+                if (opt_hex_blob && is_blob && length)
+                {
+                    /* Define xsi:type="xs:hexBinary" for hex encoded data */
+                    print_xml_tag(md_result_file, "\t\t", "", "field", "name=",
+                            field->name, "xsi:type=", "xs:hexBinary", NullS);
+                    print_blob_as_hex(md_result_file, row[i], length);
+                }
+                else
+                {
+                    print_xml_tag(md_result_file, "\t\t", "", "field", "name=", 
+                            field->name, NullS);
                     print_quoted_xml(md_result_file, row[i], length);
+                }
                 fputs("</field>\n", md_result_file);
               }
               else if (opt_hex_blob && is_blob && length)
               {
-                /* sakaik got the idea to to provide blob's in hex notation. */
-                char *ptr= row[i], *end= ptr + length;
                 fputs("0x", md_result_file);
-                for (; ptr < end ; ptr++)
-                  fprintf(md_result_file, "%02X", *((uchar *)ptr));
+                print_blob_as_hex(md_result_file, row[i], length);
               }
               else
                 unescape(md_result_file, row[i], length);
@@ -2449,8 +2511,8 @@ static void dump_table(char *table, char *db)
               char *ptr= row[i];
               if (opt_xml)
               {
-                print_xml_tag1(md_result_file, "\t\t", "field name=",
-                               field->name, "");
+                print_xml_tag(md_result_file, "\t\t", "", "field", "name=",
+                        field->name, NullS);
                 fputs(!my_isalpha(charset_info, *ptr) ? ptr: "NULL",
                       md_result_file);
                 fputs("</field>\n", md_result_file);
@@ -2781,7 +2843,7 @@ static int dump_all_tables_in_db(char *database)
   if (init_dumping(database, init_dumping_tables))
     return 1;
   if (opt_xml)
-    print_xml_tag1(md_result_file, "", "database name=", database, "\n");
+    print_xml_tag(md_result_file, "", "\n", "database", "name=", database, NullS);
   if (lock_tables)
   {
     DYNAMIC_STRING query;
@@ -2858,7 +2920,7 @@ static my_bool dump_all_views_in_db(char *database)
   if (init_dumping(database, init_dumping_views))
     return 1;
   if (opt_xml)
-    print_xml_tag1(md_result_file, "", "database name=", database, "\n");
+    print_xml_tag(md_result_file, "", "\n", "database", "name=", database, NullS);
   if (lock_tables)
   {
     DYNAMIC_STRING query;
@@ -2997,7 +3059,7 @@ static int dump_selected_tables(char *db, char **table_names, int tables)
      /* We shall countinue here, if --force was given */
   }
   if (opt_xml)
-    print_xml_tag1(md_result_file, "", "database name=", db, "\n");
+    print_xml_tag(md_result_file, "", "\n", "database", "name=", db, NullS);
 
   /* Dump each selected table */
   for (pos= dump_tables; pos < end; pos++)
@@ -3104,7 +3166,7 @@ static int do_reset_master(MYSQL *mysql_con)
 }
 
 
-static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now)
+static int start_transaction(MYSQL *mysql_con)
 {
   /*
     We use BEGIN for old servers. --single-transaction --master-data will fail
@@ -3119,10 +3181,8 @@ static int start_transaction(MYSQL *mysql_con, my_bool consistent_read_now)
                                         "SET SESSION TRANSACTION ISOLATION "
                                         "LEVEL REPEATABLE READ") ||
           mysql_query_with_error_report(mysql_con, 0,
-                                        consistent_read_now ?
                                         "START TRANSACTION "
-                                        "WITH CONSISTENT SNAPSHOT" :
-                                        "BEGIN"));
+                                        "/*!40100 WITH CONSISTENT SNAPSHOT */"));
 }
 
 
@@ -3612,7 +3672,7 @@ int main(int argc, char **argv)
   if ((opt_lock_all_tables || opt_master_data) &&
       do_flush_tables_read_lock(mysql))
     goto err;
-  if (opt_single_transaction && start_transaction(mysql, test(opt_master_data)))
+  if (opt_single_transaction && start_transaction(mysql))
       goto err;
   if (opt_delete_master_logs && do_reset_master(mysql))
     goto err;

configure.in

@@ -449,6 +449,10 @@ AC_SUBST(DOXYGEN)
 AC_SUBST(PDFLATEX)
 AC_SUBST(MAKEINDEX)
 
+# icheck, used for ABI check
+AC_PATH_PROG(ICHECK, icheck, no)
+AC_SUBST(ICHECK)
+
 # Lock for PS
 AC_PATH_PROG(PS, ps, ps)
 AC_MSG_CHECKING("how to check if pid exists")
@@ -1176,12 +1180,16 @@ EOF
           cat > $filesed << EOF
 s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
 s,\(: conf_to_src\),\1.linux,
+s,libyassl.la,.libs/libyassl.a,
+s,libtaocrypt.la,.libs/libtaocrypt.a,
 EOF
           ;;
         libmysql_r/Makefile.in)
           cat > $filesed << EOF
 s,\(\./conf_to_src\)\( \$(top_srcdir)\),\1.linux\2,
 s,\(: conf_to_src\),\1.linux,
+s,libyassl.la,.libs/libyassl.a,
+s,libtaocrypt.la,.libs/libtaocrypt.a,
 EOF
           ;;
         strings/Makefile.in)

extra/yassl/include/yassl_int.hpp

@@ -40,6 +40,13 @@
 #include "lock.hpp"
 #include "openssl/ssl.h"  // ASN1_STRING and DH
 
+// Check if _POSIX_THREADS should be forced
+#if !defined(_POSIX_THREADS) && (defined(__NETWARE__) || defined(__hpux))
+// HPUX does not define _POSIX_THREADS as it's not _fully_ implemented
+// Netware supports pthreads but does not announce it
+#define _POSIX_THREADS
+#endif
+
 #ifdef _POSIX_THREADS
     #include <pthread.h>
 #endif

extra/yassl/taocrypt/include/hmac.hpp

@@ -60,12 +60,12 @@ private:
     T     mac_;
 
     // MSVC 6 HACK, gives compiler error if calculated in array
-    enum { BSIZE = T::BLOCK_SIZE  / sizeof(word32),
-           DSIZE = T::DIGEST_SIZE / sizeof(word32) };
+    enum { HMAC_BSIZE = T::BLOCK_SIZE  / sizeof(word32),
+           HMAC_DSIZE = T::DIGEST_SIZE / sizeof(word32) };
 
-    word32 ip_[BSIZE];          // align ipad_ on word32
-    word32 op_[BSIZE];          // align opad_ on word32
-    word32 innerH_[DSIZE];      // align innerHash_ on word32
+    word32 ip_[HMAC_BSIZE];          // align ipad_ on word32
+    word32 op_[HMAC_BSIZE];          // align opad_ on word32
+    word32 innerH_[HMAC_DSIZE];      // align innerHash_ on word32
 
     void KeyInnerHash();
 

extra/yassl/testsuite/test.hpp

@@ -27,9 +27,12 @@
 #endif /* _WIN32 */
 
 
-#if !defined(_SOCKLEN_T) && (defined(_WIN32) || defined(__NETWARE__))
+#if !defined(_SOCKLEN_T) && defined(_WIN32)
     typedef int socklen_t;
 #endif
+#if !defined(_SOCKLEN_T) && defined(__NETWARE__)
+    typedef size_t socklen_t;
+#endif
 
 
 // Check type of third arg to accept

include/Makefile.am

@@ -15,14 +15,14 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-BUILT_SOURCES =		mysql_version.h m_ctype.h my_config.h
+BUILT_SOURCES =		mysql_version.h my_config.h mysql_h.ic
 pkginclude_HEADERS =	my_dbug.h m_string.h my_sys.h my_list.h my_xml.h \
 			mysql.h mysql_com.h mysql_embed.h \
 		  	my_semaphore.h my_pthread.h my_no_pthread.h raid.h \
 			errmsg.h my_global.h my_net.h my_alloc.h \
 			my_getopt.h sslopt-longopts.h my_dir.h typelib.h \
 			sslopt-vars.h sslopt-case.h sql_common.h keycache.h \
-			mysql_time.h $(BUILT_SOURCES)
+			mysql_time.h m_ctype.h $(BUILT_SOURCES)
 noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			heap.h my_bitmap.h\
 			myisam.h myisampack.h myisammrg.h ft_global.h\
@@ -33,8 +33,8 @@ noinst_HEADERS =	config-win.h config-os2.h config-netware.h \
 			mysql_version.h.in my_handler.h my_time.h decimal.h \
 			my_user.h my_libwrap.h
 
-# mysql_version.h are generated
-CLEANFILES =            mysql_version.h my_config.h readline openssl
+# Remove built files and the symlinked directories
+CLEANFILES =            $(BUILT_SOURCES) readline openssl
 
 # Some include files that may be moved and patched by configure
 DISTCLEANFILES =	sched.h $(CLEANFILES)
@@ -52,5 +52,30 @@ my_config.h: ../config.h
 dist-hook:
 	$(RM) -f $(distdir)/mysql_version.h $(distdir)/my_config.h
 
+#
+# Rules for checking that ABI has not changed
+#
+
+# Create a icheck file for mysql.h
+mysql_h.ic: mysql.h mysql_version.h mysql_com.h mysql_time.h my_list.h \
+            my_alloc.h typelib.h
+	@set -x; \
+	if [ @ICHECK@ != no ] ; then \
+	  @ICHECK@ --canonify --skip-from-re /usr/ -o $@ mysql.h; \
+	else \
+	  touch $@; \
+	fi;
+
+# Compare the icheck file to the reference
+check_abi: mysql_h.ic
+	@set -ex; \
+	if [ @ICHECK@ != no ] ; then \
+	  @ICHECK@ --compare mysql_h.ic mysql_h_abi.ic; \
+	fi; \
+	touch check_abi;
+
+all: check_abi
+
+
 # Don't update the files from bitkeeper
 %::SCCS/s.%

include/my_dbug.h

@@ -36,7 +36,8 @@ extern	void _db_enter_(const char *_func_,const char *_file_,uint _line_,
 extern	void _db_return_(uint _line_,const char **_sfunc_,const char **_sfile_,
 			 uint *_slevel_);
 extern	void _db_pargs_(uint _line_,const char *keyword);
-extern	void _db_doprnt_ _VARARGS((const char *format,...));
+extern	void _db_doprnt_ _VARARGS((const char *format,...))
+  ATTRIBUTE_FORMAT(printf, 1, 2);
 extern	void _db_dump_(uint _line_,const char *keyword,const char *memory,
 		       uint length);
 extern	void _db_output_(uint flag);

include/my_time.h

@@ -49,6 +49,16 @@ typedef long my_time_t;
 #define TIME_NO_ZERO_DATE	(TIME_NO_ZERO_IN_DATE*2)
 #define TIME_INVALID_DATES	(TIME_NO_ZERO_DATE*2)
 
+#define MYSQL_TIME_WARN_TRUNCATED    1
+#define MYSQL_TIME_WARN_OUT_OF_RANGE 2
+
+/* Limits for the TIME data type */
+#define TIME_MAX_HOUR 838
+#define TIME_MAX_MINUTE 59
+#define TIME_MAX_SECOND 59
+#define TIME_MAX_VALUE (TIME_MAX_HOUR*10000 + TIME_MAX_MINUTE*100 + \
+                        TIME_MAX_SECOND)
+
 enum enum_mysql_timestamp_type
 str_to_datetime(const char *str, uint length, MYSQL_TIME *l_time,
                 uint flags, int *was_cut);
@@ -61,7 +71,9 @@ ulonglong TIME_to_ulonglong(const MYSQL_TIME *time);
 
 
 my_bool str_to_time(const char *str,uint length, MYSQL_TIME *l_time,
-                    int *was_cut);
+                    int *warning);
+
+int check_time_range(struct st_mysql_time *time, int *warning);
 
 long calc_daynr(uint year,uint month,uint day);
 uint calc_days_in_year(uint year);

include/mysql.h

@@ -14,6 +14,17 @@
    along with this program; if not, write to the Free Software
    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
+/*
+  This file defines the client API to MySQL and also the ABI of the
+  dynamically linked libmysqlclient.
+
+  The ABI should never be changed in a released product of MySQL
+  thus you need to take great care when changing the file. In case
+  the file is changed so the ABI is broken, you must also
+  update the SHAREDLIB_MAJOR_VERSION in configure.in .
+
+*/
+
 #ifndef _mysql_h
 #define _mysql_h
 

myisam/sort.c

@@ -322,12 +322,15 @@ pthread_handler_t thr_find_all_keys(void *arg)
 
   if (my_thread_init())
     goto err;
+
+
+  { /* Add extra block since DBUG_ENTER declare variables */
     DBUG_ENTER("thr_find_all_keys");
     DBUG_PRINT("enter", ("master: %d", sort_param->master));
     if (sort_param->sort_info->got_error)
       goto err;
 
-  if (sort_param->keyinfo->flag && HA_VAR_LENGTH_KEY)
+    if (sort_param->keyinfo->flag & HA_VAR_LENGTH_KEY)
     {
       sort_param->write_keys=     write_keys_varlen;
       sort_param->read_to_buffer= read_to_buffer_varlen;
@@ -361,7 +364,7 @@ pthread_handler_t thr_find_all_keys(void *arg)
         uint skr;
         do
         {
-        skr=maxbuffer;
+          skr= maxbuffer;
           if (memavl < sizeof(BUFFPEK)*maxbuffer ||
               (keys=(memavl-sizeof(BUFFPEK)*maxbuffer)/
                (sort_length+sizeof(char*))) <= 1 ||
@@ -388,13 +391,15 @@ pthread_handler_t thr_find_all_keys(void *arg)
         else
           break;
       }
-    old_memavl=memavl;
-    if ((memavl=memavl/4*3) < MIN_SORT_MEMORY && old_memavl > MIN_SORT_MEMORY)
-      memavl=MIN_SORT_MEMORY;
+      old_memavl= memavl;
+      if ((memavl= memavl/4*3) < MIN_SORT_MEMORY &&
+          old_memavl > MIN_SORT_MEMORY)
+        memavl= MIN_SORT_MEMORY;
     }
     if (memavl < MIN_SORT_MEMORY)
     {
-    mi_check_print_error(sort_param->sort_info->param, "Sort buffer too small");
+      mi_check_print_error(sort_param->sort_info->param,
+                           "Sort buffer too small");
       goto err; /* purecov: tested */
     }
 
@@ -403,8 +408,8 @@ pthread_handler_t thr_find_all_keys(void *arg)
              sort_param->key + 1, keys);
     sort_param->sort_keys= sort_keys;
 
-  idx=error=0;
-  sort_keys[0]=(uchar*) (sort_keys+keys);
+    idx= error= 0;
+    sort_keys[0]= (uchar*) (sort_keys+keys);
 
     DBUG_PRINT("info", ("reading keys"));
     while (!(error= sort_param->sort_info->got_error) &&
@@ -424,9 +429,9 @@ pthread_handler_t thr_find_all_keys(void *arg)
                                    (BUFFPEK*) alloc_dynamic(&sort_param->buffpek),
                                    &sort_param->tempfile))
           goto err;
-      sort_keys[0]=(uchar*) (sort_keys+keys);
+        sort_keys[0]= (uchar*) (sort_keys+keys);
         memcpy(sort_keys[0], sort_keys[idx - 1], (size_t) sort_param->key_length);
-      idx=1;
+        idx= 1;
       }
       sort_keys[idx]= sort_keys[idx - 1] + sort_param->key_length;
     }
@@ -475,6 +480,7 @@ pthread_handler_t thr_find_all_keys(void *arg)
     pthread_mutex_unlock(&sort_param->sort_info->mutex);
 
     DBUG_PRINT("exit", ("======== ending thread ========"));
+  }
   my_thread_end();
   return NULL;
 }
@@ -542,7 +548,7 @@ int thr_write_keys(MI_SORT_PARAM *sort_param)
   {
     if (got_error)
       continue;
-    if (sinfo->keyinfo->flag && HA_VAR_LENGTH_KEY)
+    if (sinfo->keyinfo->flag & HA_VAR_LENGTH_KEY)
     {
       sinfo->write_keys=write_keys_varlen;
       sinfo->read_to_buffer=read_to_buffer_varlen;

mysql-test/include/analyze_failure_sync_with_master.test

+# Connect to both master and slave
+connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
+connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);
+
+vertical_results;
+
+echo == MASTER ===========================================================;
+connection master;
+show master status;
+show slave status;
+
+echo == SLAVE ===========================================================;
+connection slave;
+show master status;
+show slave status;

mysql-test/include/ctype_like_escape.inc

@@ -11,8 +11,8 @@ insert into t1 values('ab_def');
 insert into t1 values('abc_ef');
 insert into t1 values('abcd_f');
 insert into t1 values('abcde_');
--- should return ab_def
+# should return ab_def
 select c1 as c1u from t1 where c1 like 'ab\_def';
--- should return ab_def
+# should return ab_def
 select c1 as c2h from t1 where c1 like 'ab#_def' escape '#';
 drop table t1;

mysql-test/include/mysqltest_while.inc

-let $1 = 10;
-while ($1)
-{
-while ($1)
-{
-while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
- while ($1)
-{
-  echo $1;
-  dec $1;
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}
-}

mysql-test/include/sourced.inc

-echo here is the sourced script;

mysql-test/include/sourced1.inc

---source include/sourced.inc

mysql-test/include/wait_for_query_to_suceed.inc

+#
+# Run a query over and over until it suceeds ot timeout occurs
+#
+
+
+let $counter= 100;
+
+disable_abort_on_error;
+disable_query_log;
+disable_result_log;
+eval $query;
+while ($mysql_errno)
+{
+  eval $query;
+  sleep 0.1;
+  dec $counter;
+
+  if (!$counter)
+  {
+    die("Waited too long for query to suceed");
+  }
+}
+enable_abort_on_error;
+enable_query_log;
+enable_result_log;

mysql-test/lib/mtr_gcov.pl

@@ -23,12 +23,28 @@ sub gcov_prepare () {
     -or -name \*.da | xargs rm`;
 }
 
+# Used by gcov
+our @mysqld_src_dirs=
+  (
+   "strings",
+   "mysys",
+   "include",
+   "extra",
+   "regex",
+   "isam",
+   "merge",
+   "myisam",
+   "myisammrg",
+   "heap",
+   "sql",
+  );
+
 sub gcov_collect () {
 
   print "Collecting source coverage info...\n";
   -f $::opt_gcov_msg and unlink($::opt_gcov_msg);
   -f $::opt_gcov_err and unlink($::opt_gcov_err);
-  foreach my $d ( @::mysqld_src_dirs )
+  foreach my $d ( @mysqld_src_dirs )
   {
     chdir("$::glob_basedir/$d");
     foreach my $f ( (glob("*.h"), glob("*.cc"), glob("*.c")) )

mysql-test/lib/mtr_im.pl

@@ -249,7 +249,7 @@ sub mtr_im_check_main_alive($) {
 
   # Check that IM does not accept client connections.
 
-  if ( mtr_ping_mysqld_server($im->{'port'}) )
+  if ( mtr_ping_port($im->{'port'}) )
   {
     mtr_debug("IM-main (port: $im->{port}) " .
               "is accepting connections.");
@@ -338,7 +338,7 @@ sub mtr_im_check_mysqld_alive($) {
 
   # Check that mysqld does not accept client connections.
 
-  if ( mtr_ping_mysqld_server($mysqld_instance->{'port'}) )
+  if ( mtr_ping_port($mysqld_instance->{'port'}) )
   {
     mtr_debug("Mysqld instance (port: $mysqld_instance->{port}) " .
               "is accepting connections.");
@@ -510,7 +510,7 @@ sub mtr_im_wait_for_connection($$$) {
   {
     mtr_debug("Trying to connect to IM ($cur_attempt of $total_attempts)...");
 
-    if ( mtr_ping_mysqld_server($im->{'port'}) )
+    if ( mtr_ping_port($im->{'port'}) )
     {
       mtr_debug("IM is accepting connections " .
                 "on port $im->{port}.");
@@ -543,7 +543,7 @@ sub mtr_im_wait_for_mysqld($$$) {
     mtr_debug("Trying to connect to mysqld " .
               "($cur_attempt of $total_attempts)...");
 
-    if ( mtr_ping_mysqld_server($mysqld->{'port'}) )
+    if ( mtr_ping_port($mysqld->{'port'}) )
     {
       mtr_debug("Mysqld is accepting connections " .
                 "on port $mysqld->{port}.");

mysql-test/lib/mtr_io.pl

@@ -11,6 +11,8 @@ sub mtr_get_opts_from_file ($);
 sub mtr_fromfile ($);
 sub mtr_tofile ($@);
 sub mtr_tonewfile($@);
+sub mtr_lastlinefromfile($);
+sub mtr_appendfile_to_file ($$);
 
 ##############################################################################
 #
@@ -35,18 +37,16 @@ sub mtr_get_pid_from_file ($) {
     open(FILE, '<', $pid_file_path)
       or mtr_error("can't open file \"$pid_file_path\": $!");
 
+    # Read pid number from file
     my $pid= <FILE>;
-
-    chomp($pid) if defined $pid;
-
     close FILE;
 
-    return $pid if defined $pid && $pid ne '';
+    return $pid if $pid=~ /^(\d+)/;
 
-    mtr_debug("Pid file '$pid_file_path' is empty. " .
-              "Sleeping $timeout second(s)...");
+    mtr_debug("Pid file '$pid_file_path' does not yet contain pid number.\n" .
+              "Sleeping $timeout second(s) more...");
 
-    sleep(1);
+    sleep($timeout);
   }
 
   mtr_error("Pid file '$pid_file_path' is corrupted. " .
@@ -139,6 +139,20 @@ sub mtr_fromfile ($) {
   return $text;
 }
 
+sub mtr_lastlinefromfile ($) {
+  my $file=  shift;
+  my $text;
+
+  open(FILE,"<",$file) or mtr_error("can't open file \"$file\": $!");
+  while (my $line= <FILE>)
+  {
+    $text= $line;
+  }
+  close FILE;
+  return $text;
+}
+
+
 sub mtr_tofile ($@) {
   my $file=  shift;
 
@@ -155,5 +169,17 @@ sub mtr_tonewfile ($@) {
   close FILE;
 }
 
+sub mtr_appendfile_to_file ($$) {
+  my $from_file=  shift;
+  my $to_file=  shift;
+
+  open(TOFILE,">>",$to_file) or mtr_error("can't open file \"$to_file\": $!");
+  open(FROMFILE,"<",$from_file)
+    or mtr_error("can't open file \"$from_file\": $!");
+  print TOFILE while (<FROMFILE>);
+  close FROMFILE;
+  close TOFILE;
+}
+
 
 1;

mysql-test/lib/mtr_misc.pl

@@ -14,6 +14,7 @@ sub mtr_path_exists(@);
 sub mtr_script_exists(@);
 sub mtr_file_exists(@);
 sub mtr_exe_exists(@);
+sub mtr_exe_maybe_exists(@);
 sub mtr_copy_dir($$);
 sub mtr_same_opts($$);
 sub mtr_cmp_opts($$);
@@ -65,6 +66,9 @@ sub mtr_add_arg ($$@) {
 
 ##############################################################################
 
+# Note - More specific paths should be given before less specific.  For examle
+# /client/debug should be listed before /client
+
 sub mtr_path_exists (@) {
   foreach my $path ( @_ )
   {
@@ -80,6 +84,9 @@ sub mtr_path_exists (@) {
   }
 }
 
+# Note - More specific paths should be given before less specific.  For examle
+# /client/debug should be listed before /client
+
 sub mtr_script_exists (@) {
   foreach my $path ( @_ )
   {
@@ -110,8 +117,23 @@ sub mtr_file_exists (@) {
   return "";
 }
 
-sub mtr_exe_exists (@) {
+# Note - More specific paths should be given before less specific.  For examle
+# /client/debug should be listed before /client
+
+sub mtr_file_exists (@) {
+  foreach my $path ( @_ )
+  {
+    return $path if -e $path;
+  }
+  return "";
+}
+
+# Note - More specific paths should be given before less specific.  For examle
+# /client/debug should be listed before /client
+
+sub mtr_exe_maybe_exists (@) {
   my @path= @_;
+
   map {$_.= ".exe"} @path if $::glob_win32;
   foreach my $path ( @path )
   {
@@ -124,6 +146,19 @@ sub mtr_exe_exists (@) {
       return $path if -x $path;
     }
   }
+  return "";
+}
+
+# Note - More specific paths should be given before less specific.  For examle
+# /client/debug should be listed before /client
+
+sub mtr_exe_exists (@) {
+  my @path= @_;
+  if (my $path= mtr_exe_maybe_exists(@path))
+  {
+    return $path;
+  }
+  # Could not find exe, show error
   if ( @path == 1 )
   {
     mtr_error("Could not find $path[0]");
@@ -139,6 +174,8 @@ sub mtr_copy_dir($$) {
   my $from_dir= shift;
   my $to_dir= shift;
 
+#  mtr_verbose("Copying from $from_dir to $to_dir");
+
   mkpath("$to_dir");
   opendir(DIR, "$from_dir")
     or mtr_error("Can't find $from_dir$!");

mysql-test/lib/mtr_report.pl

@@ -10,6 +10,7 @@ sub mtr_report_test_name($);
 sub mtr_report_test_passed($);
 sub mtr_report_test_failed($);
 sub mtr_report_test_skipped($);
+sub mtr_report_test_not_skipped_though_disabled($);
 
 sub mtr_show_failed_diff ($);
 sub mtr_report_stats ($);
@@ -21,6 +22,7 @@ sub mtr_warning (@);
 sub mtr_error (@);
 sub mtr_child_error (@);
 sub mtr_debug (@);
+sub mtr_verbose (@);
 
 
 ##############################################################################
@@ -51,13 +53,6 @@ sub mtr_show_failed_diff ($) {
   {
     $result_file=  $eval_file;
   }
-  elsif ( $::opt_result_ext and
-          ( $::opt_record or -f "$result_file$::opt_result_ext" ))
-  {
-    # If we have an special externsion for result files we use it if we are
-    # recording or a result file with that extension exists.
-    $result_file=  "$result_file$::opt_result_ext";
-  }
 
   my $diffopts= $::opt_udiff ? "-u" : "-c";
 
@@ -96,7 +91,24 @@ sub mtr_report_test_skipped ($) {
   }
   else
   {
-    print "[ skipped ]\n";
+    print "[ skipped ]   $tinfo->{'comment'}\n";
+  }
+}
+
+sub mtr_report_tests_not_skipped_though_disabled ($) {
+  my $tests= shift;
+
+  if ( $::opt_enable_disabled )
+  {
+    my @disabled_tests= grep {$_->{'dont_skip_though_disabled'}} @$tests;
+    if ( @disabled_tests )
+    {
+      print "\nTest(s) which will be run though they are marked as disabled:\n";
+      foreach my $tinfo ( sort {$a->{'name'} cmp $b->{'name'}} @disabled_tests )
+      {
+        printf "  %-20s : %s\n", $tinfo->{'name'}, $tinfo->{'comment'};
+      }
+    }
   }
 }
 
@@ -107,7 +119,7 @@ sub mtr_report_test_passed ($) {
   if ( $::opt_timer and -f "$::opt_vardir/log/timer" )
   {
     $timer= mtr_fromfile("$::opt_vardir/log/timer");
-    $::glob_tot_real_time += $timer;
+    $::glob_tot_real_time += ($timer/1000);
     $timer= sprintf "%12s", $timer;
   }
   $tinfo->{'result'}= 'MTR_RES_PASSED';
@@ -118,13 +130,9 @@ sub mtr_report_test_failed ($) {
   my $tinfo= shift;
 
   $tinfo->{'result'}= 'MTR_RES_FAILED';
-  if ( $tinfo->{'timeout'} )
+  if ( defined $tinfo->{'timeout'} )
   {
     print "[ fail ]  timeout\n";
-  }
-  elsif ( $tinfo->{'ndb_test'} and  !$::flag_ndb_status_ok)
-  {
-    print "[ fail ]  ndbcluster start failure\n";
     return;
   }
   else
@@ -132,9 +140,11 @@ sub mtr_report_test_failed ($) {
     print "[ fail ]\n";
   }
 
-  # FIXME Instead of this test, and meaningless error message in 'else'
-  # we should write out into $::path_timefile when the error occurs.
-  if ( -f $::path_timefile )
+  if ( $tinfo->{'comment'} )
+  {
+    print "\nERROR: $tinfo->{'comment'}\n";
+  }
+  elsif ( -f $::path_timefile )
   {
     print "\nErrors are (from $::path_timefile) :\n";
     print mtr_fromfile($::path_timefile); # FIXME print_file() instead
@@ -157,7 +167,8 @@ sub mtr_report_stats ($) {
   my $tot_passed= 0;
   my $tot_failed= 0;
   my $tot_tests=  0;
-  my $found_problems= 0;            # Some warnings are errors...
+  my $tot_restarts= 0;
+  my $found_problems= 0; # Some warnings in the logfiles are errors...
 
   foreach my $tinfo (@$tests)
   {
@@ -175,6 +186,10 @@ sub mtr_report_stats ($) {
       $tot_tests++;
       $tot_failed++;
     }
+    if ( $tinfo->{'restarted'} )
+    {
+      $tot_restarts++;
+    }
   }
 
   # ----------------------------------------------------------------------
@@ -188,8 +203,9 @@ sub mtr_report_stats ($) {
   else
   {
     my $ratio=  $tot_passed * 100 / $tot_tests;
-    printf "Failed $tot_failed/$tot_tests tests, " .
-      "%.2f\% were successful.\n\n", $ratio;
+    print "Failed $tot_failed/$tot_tests tests, ";
+    printf("%.2f", $ratio);
+    print "\% were successful.\n\n";
     print
       "The log files in var/log may give you some hint\n",
       "of what went wrong.\n",
@@ -197,6 +213,14 @@ sub mtr_report_stats ($) {
       "the documentation at\n",
       "http://www.mysql.com/doc/en/MySQL_test_suite.html\n";
   }
+  print
+      "The servers were restarted $tot_restarts times\n";
+
+  if ( $::opt_timer )
+  {
+    print
+      "Spent $::glob_tot_real_time seconds actually executing testcases\n"
+  }
 
   # ----------------------------------------------------------------------
   # If a debug run, there might be interesting information inside
@@ -216,7 +240,10 @@ sub mtr_report_stats ($) {
     else
     {
       # We report different types of problems in order
-      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x" )
+      foreach my $pattern ( "^Warning:", "^Error:", "^==.* at 0x",
+			    "InnoDB: Warning", "missing DBUG_RETURN",
+			    "mysqld: Warning",
+			    "Attempting backtrace", "Assertion .* failed" )
       {
         foreach my $errlog ( sort glob("$::opt_vardir/log/*.err") )
         {
@@ -230,7 +257,8 @@ sub mtr_report_stats ($) {
             # Skip some non fatal warnings from the log files
             if ( /Warning:\s+Table:.* on (delete|rename)/ or
                  /Warning:\s+Setting lower_case_table_names=2/ or
-                 /Warning:\s+One can only use the --user.*root/ )
+                 /Warning:\s+One can only use the --user.*root/ or
+	         /InnoDB: Warning: we did not need to do crash recovery/)
             {
               next;                       # Skip these lines
             }
@@ -241,6 +269,7 @@ sub mtr_report_stats ($) {
             }
           }
         }
+      }
       if ( $found_problems )
       {
 	mtr_warning("Got errors/warnings while running tests, please examine",
@@ -248,10 +277,10 @@ sub mtr_report_stats ($) {
       }
     }
   }
-  }
 
   print "\n";
 
+  # Print a list of testcases that failed
   if ( $tot_failed != 0 )
   {
     my $test_mode= join(" ", @::glob_test_mode) || "default";
@@ -265,7 +294,30 @@ sub mtr_report_stats ($) {
       }
     }
     print "\n";
+
   }
+
+  # Print a list of check_testcases that failed(if any)
+  if ( $::opt_check_testcases )
+  {
+    my @check_testcases= ();
+
+    foreach my $tinfo (@$tests)
+    {
+      if ( defined $tinfo->{'check_testcase_failed'} )
+      {
+	push(@check_testcases, $tinfo->{'name'});
+      }
+    }
+
+    if ( @check_testcases )
+    {
+      print "Check of testcase failed for: ";
+      print join(" ", @check_testcases);
+      print "\n\n";
+    }
+  }
+
   if ( $tot_failed != 0 || $found_problems)
   {
     mtr_error("there where failing test cases");
@@ -331,5 +383,11 @@ sub mtr_debug (@) {
     print STDERR "####: ",join(" ", @_),"\n";
   }
 }
+sub mtr_verbose (@) {
+  if ( $::opt_verbose )
+  {
+    print STDERR "> ",join(" ", @_),"\n";
+  }
+}
 
 1;

mysql-test/lib/mtr_stress.pl

@@ -25,10 +25,9 @@ sub run_stress_test ()
 
   mtr_report("Starting stress testing\n");
 
-  if ( ! $::glob_use_embedded_server and ! $::opt_local_master )
+  if ( ! $::glob_use_embedded_server )
   {
-    $::master->[0]->{'pid'}= mysqld_start('master',0,[],[],0);
-    if ( ! $::master->[0]->{'pid'} )
+    if ( ! mysqld_start($::master->[0],[],[]) )
     {
       mtr_error("Can't start the mysqld server");
     }

mysql-test/lib/mtr_timer.pl

@@ -4,23 +4,19 @@
 # and is part of the translation of the Bourne shell script with the
 # same name.
 
-use Carp qw(cluck);
 use Socket;
 use Errno;
 use strict;
 
-#use POSIX ":sys_wait_h";
-use POSIX 'WNOHANG';
-
 sub mtr_init_timers ();
 sub mtr_timer_start($$$);
 sub mtr_timer_stop($$);
 sub mtr_timer_stop_all($);
-sub mtr_timer_waitpid($$$);
+
 
 ##############################################################################
 #
-#  Initiate a structure shared by all timers
+#  Initiate the structure shared by all timers
 #
 ##############################################################################
 
@@ -35,17 +31,19 @@ sub mtr_init_timers () {
 #  Start, stop and poll a timer
 #
 #  As alarm() isn't portable to Windows, we use separate processes to
-#  implement timers. That is why there is a mtr_timer_waitpid(), as this
-#  is where we catch a timeout.
+#  implement timers.
 #
 ##############################################################################
 
 sub mtr_timer_start($$$) {
   my ($timers,$name,$duration)= @_;
 
+  mtr_verbose("mtr_timer_start: $name, $duration");
+
   if ( exists $timers->{'timers'}->{$name} )
   {
     # We have an old running timer, kill it
+    mtr_verbose("There is an old timer running");
     mtr_timer_stop($timers,$name);
   }
 
@@ -57,7 +55,7 @@ sub mtr_timer_start($$$) {
     {
       if ( $! == $!{EAGAIN} )           # See "perldoc Errno"
       {
-        mtr_debug("Got EAGAIN from fork(), sleep 1 second and redo");
+        mtr_warning("Got EAGAIN from fork(), sleep 1 second and redo");
         sleep(1);
         redo FORK;
       }
@@ -70,6 +68,7 @@ sub mtr_timer_start($$$) {
     if ( $tpid )
     {
       # Parent, record the information
+      mtr_verbose("timer parent, record info($name, $tpid, $duration)");
       $timers->{'timers'}->{$name}->{'pid'}= $tpid;
       $timers->{'timers'}->{$name}->{'duration'}= $duration;
       $timers->{'pids'}->{$tpid}= $name;
@@ -85,6 +84,7 @@ sub mtr_timer_start($$$) {
       $SIG{INT}= 'DEFAULT';
 
       $0= "mtr_timer(timers,$name,$duration)";
+      mtr_verbose("timer child $name, sleep $duration");
       sleep($duration);
       exit(0);
     }
@@ -95,9 +95,12 @@ sub mtr_timer_start($$$) {
 sub mtr_timer_stop ($$) {
   my ($timers,$name)= @_;
 
+  mtr_verbose("mtr_timer_stop: $name");
+
   if ( exists $timers->{'timers'}->{$name} )
   {
     my $tpid= $timers->{'timers'}->{$name}->{'pid'};
+    mtr_verbose("Stopping timer with pid $tpid");
 
     # FIXME as Cygwin reuses pids fast, maybe check that is
     # the expected process somehow?!
@@ -114,7 +117,7 @@ sub mtr_timer_stop ($$) {
   }
   else
   {
-    mtr_debug("Asked to stop timer \"$name\" not started");
+    mtr_error("Asked to stop timer \"$name\" not started");
     return 0;
   }
 }
@@ -136,10 +139,8 @@ sub mtr_timer_timeout ($$) {
 
   return "" unless exists $timers->{'pids'}->{$pid};
 
-  # We got a timeout
-  my $name= $timers->{'pids'}->{$pid};
-  mtr_timer_stop($timers, $timers->{'timers'}->{$name});
-  return $name;
+  # We got a timeout, return the name ot the timer
+  return $timers->{'pids'}->{$pid};
 }
 
 1;

mysql-test/r/check.result

 drop table if exists t1;
 create table t1(n int not null, key(n), key(n), key(n), key(n));
- check table t1 extended;
+check table t1 extended;
 insert into t1 values (200000);
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK

mysql-test/r/create.result

@@ -767,11 +767,5 @@ t1	CREATE TABLE `t1` (
   `i` int(11) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 MAX_ROWS=4294967295
 drop table t1;
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
-character set utf8 collate utf8_general_ci;
-Warnings:
-Warning	1071	Specified key was too long; max key length is 765 bytes
-insert into t1 values('aaa');
-drop table t1;
 create table t1 (upgrade int);
 drop table t1;

mysql-test/r/csv.result

@@ -4913,8 +4913,7 @@ bonfire
 Colombo
 nondecreasing
 DROP TABLE t1;
-ALTER TABLE t2 RENAME t1
-#;
+ALTER TABLE t2 RENAME t1;
 DROP TABLE t1;
 CREATE TABLE t1 (
 Period smallint(4) unsigned zerofill DEFAULT '0000' NOT NULL,

mysql-test/r/drop.result

@@ -77,9 +77,9 @@ drop table if exists t1;
 create table t1 (i int);
 lock tables t1 read;
 create database mysqltest;
- drop table t1;
+drop table t1;
 show open tables;
- drop database mysqltest;
+drop database mysqltest;
 select 1;
 1
 1

mysql-test/r/flush.result

@@ -9,13 +9,13 @@ n
 flush tables with read lock;
 drop table t2;
 ERROR HY000: Can't execute the query because you have a conflicting read lock
- drop table t2;
+drop table t2;
 unlock tables;
 create database mysqltest;
 create table mysqltest.t1(n int);
 insert into mysqltest.t1 values (23);
 flush tables with read lock;
- drop database mysqltest;
+drop database mysqltest;
 select * from mysqltest.t1;
 n
 23
@@ -51,7 +51,7 @@ drop table t1, t2, t3;
 create table t1 (c1 int);
 create table t2 (c1 int);
 lock table t1 write;
- flush tables with read lock;
- insert into t2 values(1);
+flush tables with read lock;
+insert into t2 values(1);
 unlock tables;
 drop table t1, t2;

mysql-test/r/flush_block_commit.result

@@ -5,7 +5,7 @@ insert into t1 values(1);
 flush tables with read lock;
 select * from t1;
 a
- commit;
+commit;
 select * from t1;
 a
 unlock tables;
@@ -14,8 +14,8 @@ select * from t1 for update;
 a
 1
 begin;
- select * from t1 for update;
- flush tables with read lock;
+select * from t1 for update;
+flush tables with read lock;
 commit;
 a
 1
@@ -45,7 +45,7 @@ flush tables with read lock;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	98		
- commit;
+commit;
 show master status;
 File	Position	Binlog_Do_DB	Binlog_Ignore_DB
 master-bin.000001	98		

mysql-test/r/flush_read_lock_kill.result

 drop table if exists t1;
 create table t1 (kill_id int);
 insert into t1 values(connection_id());
- flush tables with read lock;
+flush tables with read lock;
 select ((@id := kill_id) - kill_id) from t1;
 ((@id := kill_id) - kill_id)
 0

mysql-test/r/func_compress.result

@@ -79,6 +79,16 @@ uncompress(a)	uncompressed_length(a)
 NULL	NULL
 a	1
 drop table t1;
+create table t1(a blob);
+insert into t1 values ('0'), (NULL), ('0');
+select compress(a), compress(a) from t1;
+select compress(a) is null from t1;
+compress(a) is null
+0
+1
+0
+drop table t1;
+End of 4.1 tests
 create table t1 (a varchar(32) not null);
 insert into t1 values ('foo');
 explain select * from t1 where uncompress(a) is null;

mysql-test/r/func_date_add.result

@@ -71,3 +71,17 @@ NULL
 NULL
 NULL
 drop table t1;
+End of 4.1 tests
+SELECT CAST('2006-09-26' AS DATE) + INTERVAL 1 DAY;
+CAST('2006-09-26' AS DATE) + INTERVAL 1 DAY
+2006-09-27
+SELECT CAST('2006-09-26' AS DATE) + INTERVAL 1 MONTH;
+CAST('2006-09-26' AS DATE) + INTERVAL 1 MONTH
+2006-10-26
+SELECT CAST('2006-09-26' AS DATE) + INTERVAL 1 YEAR;
+CAST('2006-09-26' AS DATE) + INTERVAL 1 YEAR
+2007-09-26
+SELECT CAST('2006-09-26' AS DATE) + INTERVAL 1 WEEK;
+CAST('2006-09-26' AS DATE) + INTERVAL 1 WEEK
+2006-10-03
+End of 5.0 tests

mysql-test/r/func_misc.result

@@ -63,7 +63,7 @@ FROM t1
 WHERE conn = 'default';
 IS_USED_LOCK('bug16501') = connection_id
 1
- SELECT GET_LOCK('bug16501',600);
+SELECT GET_LOCK('bug16501',600);
 SELECT IS_USED_LOCK('bug16501') = CONNECTION_ID();
 IS_USED_LOCK('bug16501') = CONNECTION_ID()
 1

mysql-test/r/func_sapdb.result

@@ -107,7 +107,9 @@ subtime("02:01:01.999999", "01:01:01.999999")
 01:00:00.000000
 select timediff("1997-01-01 23:59:59.000001","1995-12-31 23:59:59.000002");
 timediff("1997-01-01 23:59:59.000001","1995-12-31 23:59:59.000002")
-8807:59:59.999999
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '8807:59:59.999999'
 select timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002");
 timediff("1997-12-31 23:59:59.000001","1997-12-30 01:01:01.000002")
 46:58:57.999999
@@ -219,13 +221,16 @@ SELECT TIMEDIFF(t1, t4) As ttt, TIMEDIFF(t2, t3) As qqq,
 TIMEDIFF(t3, t2) As eee, TIMEDIFF(t2, t4) As rrr from test;
 ttt	qqq	eee	rrr
 -744:00:00	NULL	NULL	NULL
-26305:01:02	22:58:58	-22:58:58	NULL
--26305:01:02	-22:58:58	22:58:58	NULL
+838:59:59	22:58:58	-22:58:58	NULL
+-838:59:59	-22:58:58	22:58:58	NULL
 NULL	26:02:02	-26:02:02	NULL
 00:00:00	-26:02:02	26:02:02	NULL
 NULL	NULL	NULL	NULL
 NULL	NULL	NULL	NULL
 00:00:00	-24:00:00	24:00:00	NULL
+Warnings:
+Warning	1292	Truncated incorrect time value: '26305:01:02'
+Warning	1292	Truncated incorrect time value: '-26305:01:02'
 drop table t1, test;
 select addtime("-01:01:01.01", "-23:59:59.1") as a;
 a
@@ -235,7 +240,9 @@ a
 10000
 select microsecond(19971231235959.01) as a;
 a
-10000
+0
+Warnings:
+Warning	1292	Truncated incorrect time value: '19971231235959.01'
 select date_add("1997-12-31",INTERVAL "10.09" SECOND_MICROSECOND) as a;
 a
 1997-12-31 00:00:10.090000

mysql-test/r/func_time.result

@@ -339,7 +339,9 @@ extract(DAY_MINUTE FROM "02 10:11:12")
 21011
 select extract(DAY_SECOND FROM "225 10:11:12");
 extract(DAY_SECOND FROM "225 10:11:12")
-225101112
+8385959
+Warnings:
+Warning	1292	Truncated incorrect time value: '225 10:11:12'
 select extract(HOUR FROM "1999-01-02 10:11:12");
 extract(HOUR FROM "1999-01-02 10:11:12")
 10
@@ -612,7 +614,7 @@ date_add(date,INTERVAL "1 1:1:1" DAY_SECOND)
 2003-01-03 01:01:01
 select date_add(date,INTERVAL "1" WEEK) from t1;
 date_add(date,INTERVAL "1" WEEK)
-2003-01-09 00:00:00
+2003-01-09
 select date_add(date,INTERVAL "1" QUARTER) from t1;
 date_add(date,INTERVAL "1" QUARTER)
 2003-04-02
@@ -621,7 +623,7 @@ timestampadd(MINUTE, 1, date)
 2003-01-02 00:01:00
 select timestampadd(WEEK, 1, date) from t1;
 timestampadd(WEEK, 1, date)
-2003-01-09 00:00:00
+2003-01-09
 select timestampadd(SQL_TSI_SECOND, 1, date) from t1;
 timestampadd(SQL_TSI_SECOND, 1, date)
 2003-01-02 00:00:01
@@ -890,6 +892,93 @@ t1	CREATE TABLE `t1` (
   `from_unixtime(1) + 0` double(23,6) default NULL
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
+SELECT SEC_TO_TIME(3300000);
+SEC_TO_TIME(3300000)
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '3300000'
+SELECT SEC_TO_TIME(3300000)+0;
+SEC_TO_TIME(3300000)+0
+8385959.000000
+Warnings:
+Warning	1292	Truncated incorrect time value: '3300000'
+SELECT SEC_TO_TIME(3600 * 4294967296);
+SEC_TO_TIME(3600 * 4294967296)
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '15461882265600'
+SELECT TIME_TO_SEC('916:40:00');
+TIME_TO_SEC('916:40:00')
+3020399
+Warnings:
+Warning	1292	Truncated incorrect time value: '916:40:00'
+SELECT ADDTIME('500:00:00', '416:40:00');
+ADDTIME('500:00:00', '416:40:00')
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '916:40:00'
+SELECT ADDTIME('916:40:00', '416:40:00');
+ADDTIME('916:40:00', '416:40:00')
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '916:40:00'
+Warning	1292	Truncated incorrect time value: '1255:39:59'
+SELECT SUBTIME('916:40:00', '416:40:00');
+SUBTIME('916:40:00', '416:40:00')
+422:19:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '916:40:00'
+SELECT SUBTIME('-916:40:00', '416:40:00');
+SUBTIME('-916:40:00', '416:40:00')
+-838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '-916:40:00'
+Warning	1292	Truncated incorrect time value: '-1255:39:59'
+SELECT MAKETIME(916,0,0);
+MAKETIME(916,0,0)
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '916:00:00'
+SELECT MAKETIME(4294967296, 0, 0);
+MAKETIME(4294967296, 0, 0)
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '4294967296:00:00'
+SELECT MAKETIME(-4294967296, 0, 0);
+MAKETIME(-4294967296, 0, 0)
+-838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '-4294967296:00:00'
+SELECT MAKETIME(0, 4294967296, 0);
+MAKETIME(0, 4294967296, 0)
+NULL
+SELECT MAKETIME(0, 0, 4294967296);
+MAKETIME(0, 0, 4294967296)
+NULL
+SELECT MAKETIME(CAST(-1 AS UNSIGNED), 0, 0);
+MAKETIME(CAST(-1 AS UNSIGNED), 0, 0)
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '18446744073709551615:00:00'
+SELECT EXTRACT(HOUR FROM '100000:02:03');
+EXTRACT(HOUR FROM '100000:02:03')
+838
+Warnings:
+Warning	1292	Truncated incorrect time value: '100000:02:03'
+CREATE TABLE t1(f1 TIME);
+INSERT INTO t1 VALUES('916:00:00 a');
+Warnings:
+Warning	1265	Data truncated for column 'f1' at row 1
+Warning	1264	Out of range value adjusted for column 'f1' at row 1
+SELECT * FROM t1;
+f1
+838:59:59
+DROP TABLE t1;
+SELECT SEC_TO_TIME(CAST(-1 AS UNSIGNED));
+SEC_TO_TIME(CAST(-1 AS UNSIGNED))
+838:59:59
+Warnings:
+Warning	1292	Truncated incorrect time value: '18446744073709551615'
 SET NAMES latin1;
 SET character_set_results = NULL;
 SHOW VARIABLES LIKE 'character_set_results';

mysql-test/r/grant2.result

@@ -336,12 +336,12 @@ drop database mysqltest_1;
 set password = password("changed");
 ERROR 42000: Access denied for user ''@'localhost' to database 'mysql'
 lock table mysql.user write;
- flush privileges;
- grant all on *.* to 'mysqltest_1'@'localhost';
+flush privileges;
+grant all on *.* to 'mysqltest_1'@'localhost';
 unlock tables;
 lock table mysql.user write;
- set password for 'mysqltest_1'@'localhost' = password('');
- revoke all on *.* from 'mysqltest_1'@'localhost';
+set password for 'mysqltest_1'@'localhost' = password('');
+revoke all on *.* from 'mysqltest_1'@'localhost';
 unlock tables;
 drop user 'mysqltest_1'@'localhost';
 create database TESTDB;

mysql-test/r/handler.result

@@ -452,7 +452,7 @@ handler t1 read first;
 c1
 1
 send the below to another connection, do not wait for the result
- optimize table t1;
+optimize table t1;
 proceed with the normal connection
 handler t1 read next;
 c1
@@ -469,7 +469,7 @@ flush tables with read lock;
 drop table t1;
 ERROR HY000: Can't execute the query because you have a conflicting read lock
 send the below to another connection, do not wait for the result
- drop table t1;
+drop table t1;
 proceed with the normal connection
 select * from t1;
 c1

mysql-test/r/im_utils.result

@@ -22,8 +22,8 @@ basedir	VALUE
 server_id	VALUE
 skip-stack-trace	VALUE
 skip-innodb	VALUE
-skip-bdb	VALUE
 skip-ndbcluster	VALUE
+skip-bdb	VALUE
 SHOW INSTANCE OPTIONS mysqld2;
 option_name	value
 instance_name	VALUE
@@ -42,8 +42,8 @@ basedir	VALUE
 server_id	VALUE
 skip-stack-trace	VALUE
 skip-innodb	VALUE
-skip-bdb	VALUE
 skip-ndbcluster	VALUE
+skip-bdb	VALUE
 START INSTANCE mysqld2;
 Success: the process has been started.
 STOP INSTANCE mysqld2;

mysql-test/r/information_schema.result

@@ -737,6 +737,7 @@ select table_schema,table_name, column_name from
 information_schema.columns 
 where data_type = 'longtext';
 table_schema	table_name	column_name
+information_schema	COLUMNS	COLUMN_DEFAULT
 information_schema	COLUMNS	COLUMN_TYPE
 information_schema	ROUTINES	ROUTINE_DEFINITION
 information_schema	ROUTINES	SQL_MODE
@@ -1240,3 +1241,16 @@ WHERE table_name=(SELECT MAX(table_name)
 FROM information_schema.tables);
 table_name
 VIEWS
+DROP TABLE IF EXISTS bug23037;
+DROP FUNCTION IF EXISTS get_value;
+SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT) FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
+COLUMN_NAME	MD5(COLUMN_DEFAULT)	LENGTH(COLUMN_DEFAULT)
+fld1	7cf7a6782be951a1f2464a350da926a5	65532
+SELECT MD5(get_value());
+MD5(get_value())
+7cf7a6782be951a1f2464a350da926a5
+SELECT COLUMN_NAME, MD5(COLUMN_DEFAULT), LENGTH(COLUMN_DEFAULT), COLUMN_DEFAULT=get_value() FROM INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME='bug23037';
+COLUMN_NAME	MD5(COLUMN_DEFAULT)	LENGTH(COLUMN_DEFAULT)	COLUMN_DEFAULT=get_value()
+fld1	7cf7a6782be951a1f2464a350da926a5	65532	1
+DROP TABLE bug23037;
+DROP FUNCTION get_value;

mysql-test/r/innodb_mysql.result

@@ -104,6 +104,14 @@ SELECT `id1` FROM `t1` WHERE `id1` NOT IN (SELECT `id1` FROM `t2` WHERE `id2` =
 id1
 2
 DROP TABLE t1, t2;
+create table t1 (c1 int) engine=innodb;
+handler t1 open;
+handler t1 read first;
+c1
+Before and after comparison
+0
+drop table t1;
+End of 4.1 tests
 create table t1m (a int) engine=myisam;
 create table t1i (a int) engine=innodb;
 create table t2m (a int) engine=myisam;
@@ -353,6 +361,12 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t2	index	NULL	fkey	5	NULL	5	Using index
 1	SIMPLE	t1	eq_ref	PRIMARY	PRIMARY	4	test.t2.fkey	1	Using where
 DROP TABLE t1,t2;
+create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
+character set utf8 collate utf8_general_ci;
+Warnings:
+Warning	1071	Specified key was too long; max key length is 765 bytes
+insert into t1 values('aaa');
+drop table t1;
 CREATE TABLE t1 (a INT PRIMARY KEY, b INT, c FLOAT, KEY b(b)) ENGINE = INNODB;
 INSERT INTO t1 VALUES (    1 , 1              , 1);
 INSERT INTO t1 SELECT  a + 1 , MOD(a + 1 , 20), 1 FROM t1;
@@ -369,3 +383,4 @@ EXPLAIN SELECT SQL_BIG_RESULT b, SUM(c) FROM t1 GROUP BY b;
 id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	ALL	NULL	NULL	NULL	NULL	128	Using filesort
 DROP TABLE t1;
+End of 5.0 tests

mysql-test/r/innodb_notembedded.result

@@ -10,7 +10,7 @@ start transaction;
 select f1();
 f1()
 100
- update t1 set col2=0 where col1=1;
+update t1 set col2=0 where col1=1;
 select * from t1;
 col1	col2
 1	100

mysql-test/r/kill.result

@@ -22,7 +22,7 @@ create table t2 (id int unsigned not null);
 insert into t2 select id from t1;
 create table t3 (kill_id int);
 insert into t3 values(connection_id());
- select id from t1 where id in (select distinct id from t2);
+select id from t1 where id in (select distinct id from t2);
 select ((@id := kill_id) - kill_id) from t3;
 ((@id := kill_id) - kill_id)
 0
@@ -32,7 +32,7 @@ drop table t1, t2, t3;
 select get_lock("a", 10);
 get_lock("a", 10)
 1
- select get_lock("a", 10);
+select get_lock("a", 10);
 get_lock("a", 10)
 NULL
 select 1;

mysql-test/r/lock_multi.result

@@ -2,8 +2,8 @@ drop table if exists t1,t2;
 create table t1(n int);
 insert into t1 values (1);
 lock tables t1 write;
- update low_priority t1 set n = 4;
- select n from t1;
+update low_priority t1 set n = 4;
+select n from t1;
 unlock tables;
 n
 4
@@ -11,8 +11,8 @@ drop table t1;
 create table t1(n int);
 insert into t1 values (1);
 lock tables t1 read;
- update low_priority t1 set n = 4;
- select n from t1;
+update low_priority t1 set n = 4;
+select n from t1;
 unlock tables;
 n
 1
@@ -23,7 +23,7 @@ insert into t1 values(1,1);
 insert into t1 values(2,2);
 insert into t2 values(1,2);
 lock table t1 read;
- update t1,t2 set c=a where b=d;
+update t1,t2 set c=a where b=d;
 select c from t2;
 c
 2
@@ -32,7 +32,7 @@ drop table t2;
 create table t1 (a int);
 create table t2 (a int);
 lock table t1 write, t2 write;
- insert t1 select * from t2;
+insert t1 select * from t2;
 drop table t2;
 ERROR 42S02: Table 'test.t2' doesn't exist
 drop table t1;
@@ -45,7 +45,7 @@ unlock tables;
 drop table t1;
 CREATE DATABASE mysqltest_1;
 FLUSH TABLES WITH READ LOCK;
- DROP DATABASE mysqltest_1;
+DROP DATABASE mysqltest_1;
 DROP DATABASE mysqltest_1;
 ERROR HY000: Can't execute the query because you have a conflicting read lock
 UNLOCK TABLES;
@@ -55,7 +55,7 @@ use mysql;
 LOCK TABLES columns_priv WRITE, db WRITE, host WRITE, user WRITE;
 FLUSH TABLES;
 use mysql;
- SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
+SELECT user.Select_priv FROM user, db WHERE user.user = db.user LIMIT 1;
 OPTIMIZE TABLES columns_priv, db, host, user;
 Table	Op	Msg_type	Msg_text
 mysql.columns_priv	optimize	status	OK
@@ -69,14 +69,14 @@ use test;
 use test;
 CREATE TABLE t1 (c1 int);
 LOCK TABLE t1 WRITE;
- FLUSH TABLES WITH READ LOCK;
+FLUSH TABLES WITH READ LOCK;
 CREATE TABLE t2 (c1 int);
 UNLOCK TABLES;
 UNLOCK TABLES;
 DROP TABLE t1, t2;
 CREATE TABLE t1 (c1 int);
 LOCK TABLE t1 WRITE;
- FLUSH TABLES WITH READ LOCK;
+FLUSH TABLES WITH READ LOCK;
 CREATE TABLE t2 AS SELECT * FROM t1;
 ERROR HY000: Table 't2' was not locked with LOCK TABLES
 UNLOCK TABLES;
@@ -84,7 +84,7 @@ UNLOCK TABLES;
 DROP TABLE t1;
 create table t1 (f1 int(12) unsigned not null auto_increment, primary key(f1)) engine=innodb;
 lock tables t1 write;
- alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
- alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
+alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
+alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; alter table t1 auto_increment=0; //
 unlock tables;
 drop table t1;

mysql-test/r/mix_innodb_myisam_binlog.result

@@ -195,7 +195,7 @@ select (@before:=unix_timestamp())*0;
 (@before:=unix_timestamp())*0
 0
 begin;
- select * from t1 for update;
+select * from t1 for update;
 insert into t2 values (20);
 ERROR HY000: Lock wait timeout exceeded; try restarting transaction
 select (@after:=unix_timestamp())*0;

mysql-test/r/multi_update.result

@@ -509,8 +509,8 @@ create table t2 (a int);
 insert into t2 values (10), (20), (30);
 create view v1 as select a as b, a/10 as a from t2;
 lock table t1 write;
- alter table t1 add column c int default 100 after a;
- update t1, v1 set t1.b=t1.a+t1.b+v1.b where t1.a=v1.a;
+alter table t1 add column c int default 100 after a;
+update t1, v1 set t1.b=t1.a+t1.b+v1.b where t1.a=v1.a;
 unlock tables;
 select * from t1;
 a	c	b

mysql-test/r/mysql.result

@@ -149,4 +149,34 @@ ERROR at line 1: USE must be followed by a database name
 \\
 ';
 ';
+create table t17583 (a int);
+insert into t17583 (a) values (0),(1),(2),(3),(4),(5),(6),(7),(8),(9);
+insert into t17583 select a from t17583;
+insert into t17583 select a from t17583;
+insert into t17583 select a from t17583;
+insert into t17583 select a from t17583;
+insert into t17583 select a from t17583;
+insert into t17583 select a from t17583;
+insert into t17583 select a from t17583;
+select count(*) from t17583;
+count(*)
+1280
+drop table t17583;
+Test connect without db- or host-name => reconnect
+Test connect with dbname only => new dbname, old hostname
+ERROR 1064 (42000) at line 1: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'connecttest' at line 1
+Test connect with _invalid_ dbname only => new invalid dbname, old hostname
+ERROR 1049 (42000) at line 1: Unknown database 'invalid'
+ERROR 1049 (42000) at line 1: Unknown database 'invalid'
+Test connect with dbname + hostname
+Test connect with dbname + _invalid_ hostname
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'invalid_hostname' (errno)
+The commands reported in the bug report
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyril has found a bug :)XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
+Too long dbname
+ERROR 1049 (42000) at line 1: Unknown database 'test_really_long_dbnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX'
+Too long hostname
+ERROR 2005 (HY000) at line 1: Unknown MySQL server host 'cyrils_superlonghostnameXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX' (errno)
 End of 5.0 tests

mysql-test/r/mysqldump-max.result

-drop table if exists t1;
-Warnings:
-Note	1051	Unknown table 't1'
-drop table if exists t2;
-Warnings:
-Note	1051	Unknown table 't2'
-drop table if exists t3;
-Warnings:
-Note	1051	Unknown table 't3'
-drop table if exists t4;
-Warnings:
-Note	1051	Unknown table 't4'
-drop table if exists t5;
-Warnings:
-Note	1051	Unknown table 't5'
-drop table if exists t6;
-Warnings:
-Note	1051	Unknown table 't6'
+drop table if exists t1, t2, t3, t4, t5, t6;
 create table t1 (id int(8), name varchar(32));
 create table t2 (id int(8), name varchar(32)) ENGINE="MyISAM";
 create table t3 (id int(8), name varchar(32)) ENGINE="MEMORY";

mysql-test/r/mysqldump.result

@@ -3196,5 +3196,27 @@ UNLOCK TABLES;
 
 DROP TABLE `t1`;
 #
+# Bug #19745: mysqldump --xml produces invalid xml
+#
+DROP TABLE IF EXISTS t1;
+CREATE TABLE t1 (f1 int(10), data MEDIUMBLOB);
+INSERT INTO t1 VALUES(1,0xff00fef0);
+<?xml version="1.0"?>
+<mysqldump xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<database name="test">
+	<table_structure name="t1">
+		<field Field="f1" Type="int(10)" Null="YES" Key="" Extra="" />
+		<field Field="data" Type="mediumblob" Null="YES" Key="" Extra="" />
+	</table_structure>
+	<table_data name="t1">
+	<row>
+		<field name="f1">1</field>
+		<field name="data" xsi:type="xs:hexBinary">FF00FEF0</field>
+	</row>
+	</table_data>
+</database>
+</mysqldump>
+DROP TABLE t1;
+#
 # End of 5.0 tests
 #

mysql-test/r/mysqltest.result

@@ -152,8 +152,38 @@ mysqltest: At line 1: Missing delimiter
 mysqltest: At line 1: End of line junk detected: "sleep 7
 # Another comment
 "
+mysqltest: At line 1: Missing delimiter
+mysqltest: At line 1: Missing delimiter
+mysqltest: At line 1: End of line junk detected: "disconnect default
+
+#
+# comment
+# comment2
+
+# comment 3
+--disable_query_log
+"
+mysqltest: At line 1: End of line junk detected: "disconnect default # comment
+# comment part2
+
+# comment 3
+--disable_query_log
+"
 mysqltest: At line 1: Extra delimiter ";" found
 mysqltest: At line 1: Extra delimiter ";" found
+mysqltest: At line 1: Missing argument(s) to 'error'
+mysqltest: At line 1: Missing argument(s) to 'error'
+mysqltest: At line 1: The sqlstate definition must start with an uppercase S
+mysqltest: At line 1: The error name definition must start with an uppercase E
+mysqltest: At line 1: Invalid argument to error: '9eeeee' - the errno may only consist of digits[0-9]
+mysqltest: At line 1: Invalid argument to error: '1sssss' - the errno may only consist of digits[0-9]
+mysqltest: At line 1: The sqlstate must be exactly 5 chars long
+mysqltest: At line 1: The sqlstate may only consist of digits[0-9] and _uppercase_ letters
+mysqltest: At line 1: The sqlstate must be exactly 5 chars long
+mysqltest: At line 1: Unknown SQL error name 'E9999'
+mysqltest: At line 1: Invalid argument to error: '999e9' - the errno may only consist of digits[0-9]
+mysqltest: At line 1: Invalid argument to error: '9b' - the errno may only consist of digits[0-9]
+mysqltest: At line 1: Too many errorcodes specified
 MySQL
 "MySQL"
 MySQL: The world''s most popular open source database
@@ -168,8 +198,8 @@ source database
 - most popular open
 - source database
 - MySQL: The world''s
--- most popular open
--- source database
+-- most popular
+-- open source database
 # MySQL: The
 --world''s
 # most popular
@@ -195,8 +225,8 @@ source database
 # source database
 -- MySQL: The
 -- world''s most
--- popular open
--- source database
+-- popular
+-- open source database
 # MySQL: The
 - world''s most
 -- popular open
@@ -224,12 +254,11 @@ banana = banana
 Not a banana: ba\$cat\$cat
 mysqltest: At line 1: Missing arguments to let
 mysqltest: At line 1: Missing variable name in let
-mysqltest: At line 1: Variable name in hi=hi does not start with '$'
 mysqltest: At line 1: Missing assignment operator in let
 mysqltest: At line 1: Missing assignment operator in let
 mysqltest: At line 1: Missing assignment operator in let
 mysqltest: At line 1: Missing variable name in let
-mysqltest: At line 1: Variable name in =hi does not start with '$'
+mysqltest: At line 1: Missing variable name in let
 mysqltest: At line 1: Missing assignment operator in let
 # Execute: --echo # <whatever> success: $success
 # <whatever> success: 1
@@ -240,7 +269,7 @@ mysqltest: At line 1: Missing assignment operator in let
 1
 # Execute: echo $success ;
 1 
-mysqltest: At line 1: Missing file name in source
+mysqltest: At line 1: Missing required argument 'filename' to command 'source'
 mysqltest: At line 1: Could not open file ./non_existingFile
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/recursive.sql": At line 1: Source directives are nesting too deep
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/error.sql": At line 1: query 'garbage ' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'garbage' at line 1
@@ -333,16 +362,16 @@ Counter is greater than 0, (counter=10)
 Counter is not 0, (counter=0)
 1
 Testing while with not
-mysqltest: In included file "./include/mysqltest_while.inc": At line 64: Nesting too deeply
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest_while.inc": At line 64: Nesting too deeply
 mysqltest: At line 1: missing '(' in while
 mysqltest: At line 1: missing ')' in while
 mysqltest: At line 1: Missing '{' after while. Found "dec $i"
 mysqltest: At line 1: Stray '}' - end of block before beginning
 mysqltest: At line 1: Stray 'end' command - end of block before beginning
-mysqltest: At line 1: query '' failed: 1065: Query was empty
+mysqltest: At line 1: query '{' failed: 1064: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near '{' at line 1
 mysqltest: At line 1: Missing '{' after while. Found "echo hej"
 mysqltest: At line 3: Missing end of block
-mysqltest: At line 1: Missing newline between while and '{'
+mysqltest: At line 3: Missing end of block
 mysqltest: At line 1: missing '(' in if
 mysqltest: At line 1: Stray 'end' command - end of block before beginning
 select "b" bs col1, "c" bs col2;
@@ -372,17 +401,15 @@ mysqltest: At line 1: Wrong column number to replace_column in 'replace_column 1
 mysqltest: At line 1: Invalid integer argument "10!"
 mysqltest: At line 1: End of line junk detected: "!"
 mysqltest: At line 1: Invalid integer argument "a"
-mysqltest: At line 1: Syntax error in connect - expected '(' found 'mysqltest: At line 1: Missing connection host
-mysqltest: At line 1: Missing connection host
-mysqltest: At line 1: Missing connection user
-mysqltest: At line 1: Missing connection user
-mysqltest: At line 1: Missing connection password
-mysqltest: At line 1: Missing connection db
-mysqltest: At line 1: Could not open connection 'con2': 1049 Unknown database 'illegal_db'
+mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'
+mysqltest: At line 1: Missing required argument 'connection name' to command 'connect'
+mysqltest: At line 1: Missing required argument 'host' to command 'connect'
+mysqltest: At line 1: Missing required argument 'host' to command 'connect'
+mysqltest: At line 1: query 'connect  con2,localhost,root,,illegal_db' failed: 1049: Unknown database 'illegal_db'
 mysqltest: At line 1: Illegal argument for port: 'illegal_port'
 mysqltest: At line 1: Illegal option to connect: SMTP
 OK
-mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted - increase MAX_CONS in mysqltest.c
+mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 7: Connection limit exhausted, you can have max 128 connections
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 3: connection 'test_con1' not found in connection pool
 mysqltest: In included file "MYSQLTEST_VARDIR/tmp/mysqltest.sql": At line 2: Connection test_con1 already exists
 connect(localhost,root,,test,MASTER_PORT,MASTER_SOCKET);
@@ -450,3 +477,47 @@ sleep;
 ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near 'sleep' at line 1
 ;
 ERROR 42000: Query was empty
+select "b" as col1, "c" as col2;
+col1	col2
+b	c
+select "b" as col1, "b" as col2, "c" as col3;
+col1	col2	col3
+b	b	c
+seled "b" bs col1, "d" bs col2;
+col1	col2
+b	d
+select "raspberry and strawberry","blackberry","tomato";
+raspberry and strawberry	blackberry	tomato
+raspberry and strawberry	blackberry	tomato
+mysqltest: At line 1: Error parsing replace_regex "a"
+mysqltest: At line 1: Error parsing replace_regex "a;"
+mysqltest: At line 1: Error parsing replace_regex "a"
+mysqltest: At line 1: Error parsing replace_regex "a "
+mysqltest: At line 1: Error parsing replace_regex "a b"
+mysqltest: At line 1: Error parsing replace_regex "/a b c"
+mysqltest: At line 1: Error parsing replace_regex "/a /b c "
+create table t1 (a int, b int);
+insert into t1 values (1,3);
+insert into t1 values (2,4);
+select * from t1;
+a	D
+1	1
+1	4
+drop table t1;
+mysqltest: At line 1: Missing required argument 'filename' to command 'remove_file'
+mysqltest: At line 1: Missing required argument 'filename' to command 'write_file'
+mysqltest: At line 1: End of file encountered before 'EOF' delimiter was found
+mysqltest: At line 1: End of line junk detected: "write_file filename ";
+"
+mysqltest: At line 1: Missing required argument 'filename' to command 'file_exists'
+mysqltest: At line 1: Missing required argument 'from_file' to command 'copy_file'
+mysqltest: At line 1: Missing required argument 'to_file' to command 'copy_file'
+hello
+hello
+hello
+mysqltest: At line 1: Max delimiter length(16) exceeded
+hello
+hello
+mysqltest: At line 1: test of die
+Some output
+End of tests

mysql-test/r/ps.result

@@ -1476,4 +1476,21 @@ i
 DEALLOCATE PREPARE stmt;
 DROP TABLE t1, t2;
 DROP PROCEDURE IF EXISTS p1;
+flush status;
+prepare sq from 'show status like "slow_queries"';
+execute sq;
+Variable_name	Value
+Slow_queries	0
+prepare no_index from 'select 1 from information_schema.tables limit 1';
+execute sq;
+Variable_name	Value
+Slow_queries	0
+execute no_index;
+1
+1
+execute sq;
+Variable_name	Value
+Slow_queries	1
+deallocate prepare no_index;
+deallocate prepare sq;
 End of 5.0 tests.

mysql-test/r/ps_11bugs.result

@@ -130,3 +130,36 @@ prepare st_18492 from 'select * from t1 where 3 in (select (1+1) union select 1)
 execute st_18492;
 a
 drop table t1;
+create table t1 (a int, b varchar(4));
+create table t2 (a int, b varchar(4), primary key(a));
+prepare stmt1 from 'insert into t1 (a, b) values (?, ?)';
+prepare stmt2 from 'insert into t2 (a, b) values (?, ?)';
+set @intarg= 11;
+set @varchararg= '2222';
+execute stmt1 using @intarg, @varchararg;
+execute stmt2 using @intarg, @varchararg;
+set @intarg= 12;
+execute stmt1 using @intarg, @UNDEFINED;
+execute stmt2 using @intarg, @UNDEFINED;
+set @intarg= 13;
+execute stmt1 using @UNDEFINED, @varchararg;
+execute stmt2 using @UNDEFINED, @varchararg;
+ERROR 23000: Column 'a' cannot be null
+set @intarg= 14;
+set @nullarg= Null;
+execute stmt1 using @UNDEFINED, @nullarg;
+execute stmt2 using @nullarg, @varchararg;
+ERROR 23000: Column 'a' cannot be null
+select * from t1;
+a	b
+11	2222
+12	NULL
+NULL	2222
+NULL	NULL
+select * from t2;
+a	b
+11	2222
+12	NULL
+drop table t1;
+drop table t2;
+End of 5.0 tests.

mysql-test/r/query_cache_notembedded.result

@@ -326,7 +326,7 @@ insert into t1 values(3);
 set i_var = sleep(3);
 return 0;
 end;|
- select f1();
+select f1();
 select sleep(4);
 sleep(4)
 0

mysql-test/r/range.result

@@ -665,6 +665,16 @@ OR ((pk4 =1) AND (((pk1 IN ( 7, 2, 1 ))) OR (pk1 =522)) AND ((pk2 IN ( 0, 2635))
 pk1	pk2	pk3	pk4	filler
 2621	2635	1000015	0	filler
 drop table t1, t2;
+create table t1(a char(2), key(a(1)));
+insert into t1 values ('x'), ('xx');
+explain select a from t1 where a > 'x';
+id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	range	a	a	2	NULL	2	Using where
+select a from t1 where a > 'x';
+a
+xx
+drop table t1;
+End of 4.1 tests
 CREATE TABLE t1 (
 id int(11) NOT NULL auto_increment,
 status varchar(20),

mysql-test/r/rename.result

@@ -43,7 +43,7 @@ Note	1051	Unknown table 't4'
 CREATE TABLE t1 (a int);
 CREATE TABLE t3 (a int);
 FLUSH TABLES WITH READ LOCK;
- RENAME TABLE t1 TO t2, t3 to t4;
+RENAME TABLE t1 TO t2, t3 to t4;
 show tables;
 Tables_in_test
 t1

mysql-test/r/rpl000001.result

@@ -44,7 +44,7 @@ create table t2(id int);
 insert into t2 values(connection_id());
 create temporary table t3(n int);
 insert into t3 select get_lock('crash_lock%20C', 1) from t2;
- update t1 set n = n + get_lock('crash_lock%20C', 2);
+update t1 set n = n + get_lock('crash_lock%20C', 2);
 select (@id := id) - id from t2;
 (@id := id) - id
 0

mysql-test/r/rpl000018.result

-reset master;
-reset slave;
-start slave;
-show binary logs;
-Log_name
-master-bin.000001
-master-bin.000002
-drop table if exists t1;
-create table t1(n int);
-insert into t1 values (3351);
-select * from t1;
-n
-3351
-drop table t1;

mysql-test/r/rpl_chain_temp_table.result

-slave stop;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-slave start;
-reset master;
-change master to master_host='127.0.0.1',master_port=9307, master_user='root';
-start slave;
-create temporary table t1 (a int);
-create temporary table t1 (a int);
-show status like 'slave_open_temp_tables';
-Variable_name	Value
-Slave_open_temp_tables	2
-create temporary table t1 (a int);
-create temporary table t1 (a int);
-show status like 'slave_open_temp_tables';
-Variable_name	Value
-Slave_open_temp_tables	4
-stop slave;
-insert into t1 values(1);
-create table t2 as select * from t1;
-start slave;
-show status like 'slave_open_temp_tables';
-Variable_name	Value
-Slave_open_temp_tables	4
-select * from t2;
-a
-1
-drop table t2;

mysql-test/r/rpl_error_ignored_table.result

@@ -20,7 +20,7 @@ create table t2 (a int primary key);
 insert into t2 values(1);
 create table t3 (id int);
 insert into t3 values(connection_id());
- update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
+update t2 set a = a + 1 + get_lock('crash_lock%20C', 10);
 select (@id := id) - id from t3;
 (@id := id) - id
 0

mysql-test/r/rpl_failsafe.result

-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-show variables like 'rpl_recovery_rank';
-Variable_name	Value
-rpl_recovery_rank	1
-show status like 'Rpl_status';
-Variable_name	Value
-Rpl_status	AUTH_MASTER
-create table t1(n int);
-drop table t1;
-show variables like 'rpl_recovery_rank';
-Variable_name	Value
-rpl_recovery_rank	2
-show status like 'Rpl_status';
-Variable_name	Value
-Rpl_status	ACTIVE_SLAVE
-start slave;
-show variables like 'rpl_recovery_rank';
-Variable_name	Value
-rpl_recovery_rank	3
-show status like 'Rpl_status';
-Variable_name	Value
-Rpl_status	ACTIVE_SLAVE
-start slave;
-show variables like 'rpl_recovery_rank';
-Variable_name	Value
-rpl_recovery_rank	4
-show status like 'Rpl_status';
-Variable_name	Value
-Rpl_status	ACTIVE_SLAVE

mysql-test/r/rpl_heap.result

-reset master;
-drop table if exists t1;
-create table t1 type=HEAP select 10 as a;
-insert into t1 values(11);
-show binlog events from 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.001	79	Query	1	79	use `test`; create table t1 type=HEAP select 10 as a
-master-bin.001	154	Query	1	154	use `test`; insert into t1 values(11)
-reset slave;
-start slave;
-show create table t1;
-Table	Create Table
-t1	CREATE TABLE `t1` (
-  `a` bigint(2) NOT NULL default '0'
-) TYPE=HEAP
-select * from t1;
-a
-10
-11
-select * from t1;
-a
-select * from t1 limit 10;
-a
-show binlog events in 'master-bin.002' from 79;
-Log_name	Pos	Event_type	Server_id	Orig_log_pos	Info
-master-bin.002	79	Query	1	79	use `test`; DELETE FROM `test`.`t1`
-select * from t1;
-a
-drop table t1;

mysql-test/r/rpl_master_pos_wait.result

@@ -12,7 +12,7 @@ id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
 Warnings:
 Note	1003	select master_pos_wait(_latin1'master-bin.999999',0,2) AS `master_pos_wait('master-bin.999999',0,2)`
- select master_pos_wait('master-bin.999999',0);
+select master_pos_wait('master-bin.999999',0);
 stop slave sql_thread;
 master_pos_wait('master-bin.999999',0)
 NULL

mysql-test/r/rpl_trigger.result

@@ -71,8 +71,6 @@ get_lock("bug12480",2)
 1
 create table t1 (a datetime,b  datetime, c datetime);
 drop function if exists bug12480;
-Warnings:
-Note	1305	FUNCTION bug12480 does not exist
 create function bug12480() returns datetime
 begin
 set @a=get_lock("bug12480",2);

mysql-test/r/show_check.result

@@ -520,6 +520,7 @@ t1	NULL	NULL	NULL	NULL	#	#	#	#	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Incorrect
 show create table t1;
 ERROR HY000: Incorrect information in file: './test/t1.frm'
 drop table t1;
+End of 4.1 tests
 CREATE TABLE txt1(a int);
 CREATE TABLE tyt2(a int);
 CREATE TABLE urkunde(a int);
@@ -629,3 +630,19 @@ SHOW TABLES FROM no_such_database;
 ERROR 42000: Unknown database 'no_such_database'
 SHOW COLUMNS FROM no_such_table;
 ERROR 42S02: Table 'test.no_such_table' doesn't exist
+flush status;
+show status like 'slow_queries';
+Variable_name	Value
+Slow_queries	0
+show tables;
+Tables_in_test
+show status like 'slow_queries';
+Variable_name	Value
+Slow_queries	0
+select 1 from information_schema.tables limit 1;
+1
+1
+show status like 'slow_queries';
+Variable_name	Value
+Slow_queries	1
+End of 5.0 tests

mysql-test/r/sp-threads.result

@@ -31,7 +31,7 @@ create procedure bug9486()
 update t1, t2 set val= 1 where id1=id2;
 call bug9486();
 lock tables t2 write;
- call bug9486();
+call bug9486();
 show processlist;
 Id	User	Host	db	Command	Time	State	Info
 #	root	localhost	test	Sleep	#		NULL
@@ -77,7 +77,7 @@ select * from t1;
 end|
 use test;
 lock table t1 write;
- call p2();
+call p2();
 use test;
 drop procedure p1;
 create procedure p1() select * from t1;

mysql-test/r/sp_notembedded.result

@@ -85,8 +85,7 @@ flush status|
 flush query cache|
 delete from t1|
 drop procedure bug3583|
-drop table t1;
-#|
+drop table t1|
 drop procedure if exists bug6807|
 create procedure bug6807()
 begin

mysql-test/r/subselect.result

@@ -2717,8 +2717,7 @@ select (1,2,3) = (select * from t1);
 ERROR 21000: Operand should contain 3 column(s)
 select (select * from t1) = (1,2,3);
 ERROR 21000: Operand should contain 2 column(s)
-drop table t1
-#;
+drop table t1;
 CREATE TABLE `t1` (
 `itemid` bigint(20) unsigned NOT NULL auto_increment,
 `sessionid` bigint(20) unsigned default NULL,

mysql-test/r/type_newdecimal.result

@@ -978,8 +978,6 @@ t1	CREATE TABLE `t1` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1;
 drop procedure if exists wg2;
-Warnings:
-Note	1305	PROCEDURE wg2 does not exist
 create procedure wg2()
 begin
 declare v int default 1;

mysql-test/r/union.result

@@ -836,27 +836,27 @@ count(*)
 26
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	1
+Slow_queries	0
 select count(*) from t1 where b=13;
 count(*)
 10
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	3
+Slow_queries	1
 select count(*) from t1 where b=13 union select count(*) from t1 where a=7;
 count(*)
 10
 26
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	5
+Slow_queries	2
 select count(*) from t1 where a=7 union select count(*) from t1 where b=13;
 count(*)
 26
 10
 show status like 'Slow_queries';
 Variable_name	Value
-Slow_queries	7
+Slow_queries	3
 flush status;
 select a from t1 where b not in (1,2,3) union select a from t1 where b not in (4,5,6);
 a

mysql-test/r/user_var.result

@@ -215,6 +215,7 @@ select @@version;
 select @@global.version;
 @@global.version
 #
+End of 4.1 tests
 set @first_var= NULL;
 create table t1 select @first_var;
 show create table t1;
@@ -301,3 +302,11 @@ select @var;
 @var
 3
 drop table t1;
+insert into city 'blah';
+ERROR 42000: You have an error in your SQL syntax; check the manual that corresponds to your MySQL server version for the right syntax to use near ''blah'' at line 1
+SHOW COUNT(*) WARNINGS;
+@@session.warning_count
+1
+SHOW COUNT(*) ERRORS;
+@@session.error_count
+1

mysql-test/r/view.result

@@ -1980,7 +1980,7 @@ v1	CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VI
 drop view v1;
 drop table t1;
 set sql_mode='strict_all_tables';
-CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL) ENGINE = INNODB;
+CREATE TABLE t1 (col1 INT NOT NULL, col2 INT NOT NULL);
 CREATE VIEW v1 (vcol1) AS SELECT col1 FROM t1;
 CREATE VIEW v2 (vcol1) AS SELECT col1 FROM t1 WHERE col2 > 2;
 INSERT INTO t1 (col1) VALUES(12);
@@ -2032,7 +2032,7 @@ f3	f1
 1	3
 drop view v1;
 drop table t1;
-CREATE TABLE t1 (f1 char) ENGINE = innodb;
+CREATE TABLE t1 (f1 char);
 INSERT INTO t1 VALUES ('A');
 CREATE VIEW  v1 AS SELECT * FROM t1;
 INSERT INTO t1 VALUES('B');

mysql-test/std_data/server-cert-des.pem

+-----BEGIN CERTIFICATE-----
+MIICljCCAX4CAQEwDQYJKoZIhvcNAQEEBQAwUTELMAkGA1UEBhMCU0UxEDAOBgNV
+BAgTB1VwcHNhbGExETAPBgNVBAoTCE15U1FMIEFCMRAwDgYDVQQLEwdTdXBwb3J0
+MQswCQYDVQQDEwJDQTAeFw0wNjA4MjgxMTA4NTlaFw0wOTA1MjQxMTA4NTlaMFUx
+CzAJBgNVBAYTAlNFMRAwDgYDVQQIEwdVcHBzYWxhMREwDwYDVQQKEwhNeVNRTCBB
+QjEQMA4GA1UECxMHU3VwcG9ydDEPMA0GA1UEAxMGc2VydmVyMIGfMA0GCSqGSIb3
+DQEBAQUAA4GNADCBiQKBgQDEiOVZcWYzZe7I8xhhUwCzvmkZifAXeMTH+8XKGLHX
+NWF3FLduAmeAad9oOZgBKb+oWTdRDWXqwu6nYYUBfrUpaY27/wLkgWRgewL3LZnw
+W2FjhNsjx3gI2NK+Pix47q9d+a+5T4AW5+lK499l0K0k2cvyFdIerhDW8R0t8Uru
+twIDAQABMA0GCSqGSIb3DQEBBAUAA4IBAQC2LQcqLg52RbelWrKutlJ5E6rzugnJ
+ZAlbN9sM98O2xFiIGDA3tb5j9LAEjE0E+RqdptEYnvy9b3szhLYXtIILZTkClf9r
+Uwu1nUYPTyp+9ZYCa4fovOU5h1Ogv+9UZPds/LPDwWEn8K+lvscB4X57wJyuoEck
+1Mu41OA6h77181MydSdgZo0oquJDWhdCsYHXVFVs0F6naMm2uPMCTDiQVlhHJuTO
+VQMNIwxRFtvsv2tpsXsaP/8sT32d5CFebfxxSVnqQvJ4ZdIrphl6L43XU01rsEcE
+K8KYujZQ6SKws+HVcGqsr7TPgJfJE6D+5RazvvIQISPvx4eduebqzqdC
+-----END CERTIFICATE-----

mysql-test/std_data/server-key-des.pem

+-----BEGIN RSA PRIVATE KEY-----
+Proc-Type: 4,ENCRYPTED
+DEK-Info: DES-EDE3-CBC,D2BE7598C7E3BDA5
+
+1W3qPgw5ut80OhaAGVZZe/tfFiBAlwpX1SohdApWj+QYP+dK/mdEBhgI3BXTFNLW
+pJqDTzGlKtft7hHN6QDFEdZMKxej5+2iLu14V62o+5yQgUoqswoXcmmqJCJ7AvyJ
+yMBmGAzxRFlQsT8lf6o5TS1/efBvjvWhh3NG2Zq2LpyhWRRqA3kNhzktzt2WjDZe
+ZkKmZJJnArr/Aw7jEBC4sH+nmgxoR18GzDddRG12hv1AWyHc3+VisTBpyNzeBy17
+rxuQtqLzkAJmId723ddw83RVNSvBUUS3G0rx5O3HPobvZK89UqVxcXtIgc11WTVU
+N3DbcJq5it43Loo0W3gAngtESDm2E3rTadrmdUSDGv2wQ5dNFl6cQ1f397Sdd/WC
+A0grn1tKjJ6COp80Ymdyvn+stjv/+Rl1/KHSeG0lNeZxqjPPOJ7NHaKv7qjYsJ6W
+LT35/Xc3oCo5qk9FOlq/0tGjHxf6RcFr5U7k5ILKZs+RmvJ4Sv/VYShLfLTcfGbJ
+wBNfRKvcHZBQJQBb1+s/kRrjFFtvhrUwLz4+c9kskp+t4qRVYywUAnGGGsMs/GPm
+wYsLQZO6Bs5/taaVUyaJQW015J7FGGv+/7/A1dIhu73S/Xl/YcFbX/CMEVq2Lxxd
+hZdFIuaZ7LE+0MDQWsvYMYPDPLDH11diczb/jeKBdLPOzk/FUqVx3Fin1PpcaBxY
+b+7oZJhYdg/rAWDeQ/nji9qnEG8waK6x1hdkYPOrqqWQPfgM/LPsSrgWeuTSdx2B
+Ixi01UlBb5UP4K7UrjyddPobmcVjXaQLNe7zaq0+OS3UnIG85GtHrQ==
+-----END RSA PRIVATE KEY-----

mysql-test/t/bdb-alter-table-2-master.opt

---skip-external-locking
+--force-restart
 

mysql-test/t/connect.test

@@ -55,6 +55,7 @@ flush privileges;
 
 connect (con10,localhost,test,gambling2,);
 connect (con5,localhost,test,gambling2,mysql);
+connection con5;
 set password="";
 --error 1372
 set password='gambling3';

mysql-test/t/create.test

@@ -666,14 +666,6 @@ alter table t1 max_rows=100000000000;
 show create table t1;
 drop table t1;
 
-#
-# Bug#17530: Incorrect key truncation on table creation caused server crash.
-#
-create table t1(f1 varchar(800) binary not null, key(f1)) engine = innodb 
-  character set utf8 collate utf8_general_ci;
-insert into t1 values('aaa');
-drop table t1;
-
 #
 # Bug#21772: can not name a column 'upgrade' when create a table
 #

mysql-test/t/csv.test

@@ -1295,7 +1295,7 @@ SELECT fld3 FROM t2;
 #
 
 DROP TABLE t1;
-ALTER TABLE t2 RENAME t1
+ALTER TABLE t2 RENAME t1;
 
 #
 # Drop and recreate

mysql-test/t/im_daemon_life_cycle.imtest

@@ -8,6 +8,9 @@
 
 --source include/im_check_env.inc
 
+# Turn on reconnect, not on by default anymore
+--enable_reconnect
+
 ###########################################################################
 
 # Kill the IM main process and check that the IM Angel will restart the main