bk commit into 5.1 tree (tomas:1.1915)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas 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
  1.1915 05/09/20 10:49:45 tomas@stripped +3 -0
  update mysqltest test to allow for setting environment variables

  mysql-test/t/mysqltest.test
    1.18 05/09/20 10:49:38 tomas@stripped +0 -3
    update mysqltest test to allow for setting environment variables

  mysql-test/r/mysqltest.result
    1.13 05/09/20 10:49:38 tomas@stripped +1 -2
    update mysqltest test to allow for setting environment variables

  client/mysqltest.c
    1.162 05/09/20 10:49:38 tomas@stripped +2 -1
    update mysqltest test to allow for setting environment variables

# 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:	tomas
# Host:	poseidon.ndb.mysql.com
# Root:	/home/tomas/mysql-5.1-wl2325-5.0

--- 1.12/mysql-test/r/mysqltest.result	2005-09-06 12:33:31 +02:00
+++ 1.13/mysql-test/r/mysqltest.result	2005-09-20 10:49:38 +02:00
@@ -213,12 +213,11 @@
 
 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 arguments to 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
 mysqltest: At line 1: Missing file name in source
 mysqltest: At line 1: Could not open file ./non_existingFile

--- 1.17/mysql-test/t/mysqltest.test	2005-09-07 09:33:20 +02:00
+++ 1.18/mysql-test/t/mysqltest.test	2005-09-20 10:49:38 +02:00
@@ -511,9 +511,6 @@
 --exec echo "let $=hi;" | $MYSQL_TEST  2>&1
 
 --error 1
---exec echo "let hi=hi;" | $MYSQL_TEST  2>&1
-
---error 1
 --exec echo "let $1 hi;" | $MYSQL_TEST  2>&1
 
 --error 1

--- 1.161/client/mysqltest.c	2005-09-19 22:34:34 +02:00
+++ 1.162/client/mysqltest.c	2005-09-20 10:49:38 +02:00
@@ -1562,7 +1562,8 @@
   while (*p && (*p != '=') && !my_isspace(charset_info,*p))
     p++;
   var_name_end= p;
-  if (var_name+1 == var_name_end)
+  if (var_name == var_name_end ||
+      (var_name+1 == var_name_end && *var_name == '$'))
     die("Missing variable name in let");
   while (my_isspace(charset_info,*p))
     p++;