bk commit into 5.1 tree (msvensson:1.2357)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 repository of msvensson. When msvensson does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-12-08 16:53:59+01:00, msvensson@neptunus.(none) +4 -0
  Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
  into  neptunus.(none):/home/msvensson/mysql/mysql-5.1-maint
  MERGE: 1.1810.2359.23

  client/mysqltest.c@stripped, 2006-12-08 16:53:54+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.155.9.78

  mysql-test/Makefile.am@stripped, 2006-12-08 16:53:54+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.66.1.13

  scripts/make_binary_distribution.sh@stripped, 2006-12-08 16:53:54+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.101.1.15

  sql/sql_class.h@stripped, 2006-12-08 16:53:54+01:00, msvensson@neptunus.(none) +0 -0
    Auto merged
    MERGE: 1.230.1.84

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.1-maint/RESYNC

--- 1.135/scripts/make_binary_distribution.sh	2006-12-08 16:54:08 +01:00
+++ 1.136/scripts/make_binary_distribution.sh	2006-12-08 16:54:08 +01:00
@@ -248,7 +248,7 @@ $CP mysql-test/t/*.def $BASE/mysql-test/
 $CP mysql-test/std_data/*.dat mysql-test/std_data/*.frm \
     mysql-test/std_data/*.pem mysql-test/std_data/Moscow_leap \
     mysql-test/std_data/des_key_file mysql-test/std_data/*.*001 \
-    mysql-test/std_data/*.cnf \
+    mysql-test/std_data/*.cnf mysql-test/std_data/*.MY* \
     $BASE/mysql-test/std_data
 $CP mysql-test/t/*.test $BASE/mysql-test/t
 $CP mysql-test/t/*.imtest mysql-test/t/*.disabled $BASE/mysql-test/t

--- 1.257/client/mysqltest.c	2006-12-08 16:54:08 +01:00
+++ 1.258/client/mysqltest.c	2006-12-08 16:54:08 +01:00
@@ -1247,7 +1247,9 @@ void var_set(const char *var_name, const
       v->int_dirty= 0;
       v->str_val_len= strlen(v->str_val);
     }
-    strxmov(buf, v->name, "=", v->str_val, NullS);
+    my_snprintf(buf, sizeof(buf), "%.*s=%.*s",
+                v->name_len, v->name,
+                v->str_val_len, v->str_val);
     if (!(v->env_s= my_strdup(buf, MYF(MY_WME))))
       die("Out of memory");
     putenv(v->env_s);
@@ -4692,10 +4694,9 @@ void run_query_normal(struct st_connecti
     }
 
     /*
-      Store the result. If res is NULL, use mysql_field_count to
-      determine if that was expected
+      Store the result of the query if it will return any fields
     */
-    if (!(res= mysql_store_result(mysql)) && mysql_field_count(mysql))
+    if (mysql_field_count(mysql) && ((res= mysql_store_result(mysql)) == 0))
     {
       handle_error(command, mysql_errno(mysql), mysql_error(mysql),
 		   mysql_sqlstate(mysql), ds);
@@ -4747,7 +4748,10 @@ void run_query_normal(struct st_connecti
     }
 
     if (res)
+    {
       mysql_free_result(res);
+      res= 0;
+    }
     counter++;
   } while (!(err= mysql_next_result(mysql)));
   if (err > 0)
@@ -4814,7 +4818,7 @@ void handle_error(struct st_command *com
           err_errno, err_error);
 
     /* Abort the run of this test, pass the failed query as reason */
-    abort_not_supported_test("Query '%s' failed, required functionality" \
+    abort_not_supported_test("Query '%s' failed, required functionality " \
                              "not supported", command->query);
   }
 

--- 1.91/mysql-test/Makefile.am	2006-12-08 16:54:08 +01:00
+++ 1.92/mysql-test/Makefile.am	2006-12-08 16:54:08 +01:00
@@ -108,7 +108,7 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/std_data/Moscow_leap $(DESTDIR)$(testdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/*.pem $(DESTDIR)$(testdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/*.frm $(DESTDIR)$(testdir)/std_data
-	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(distdir)/std_data
+	$(INSTALL_DATA) $(srcdir)/std_data/*.MY* $(DESTDIR)$(distdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/*.cnf $(DESTDIR)$(testdir)/std_data
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup50/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup50
 	$(INSTALL_DATA) $(srcdir)/std_data/ndb_backup51/BACKUP* $(DESTDIR)$(testdir)/std_data/ndb_backup51