bk commit into 5.1 tree (davi:1.2610)

[Davi Arnaut]

Below is the list of changes that have just been committed into a local
5.1 repository of davi.  When davi 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, 2008-05-06 10:37:36-03:00, davi@stripped +1 -0
  Silence warning due to copying the address of a string constant 
  into a non-const string pointer.

  client/mysqltest.c@stripped, 2008-05-06 10:37:32-03:00, davi@stripped +3 -1
    Don't use a constant string as val may be modified later.

diff -Nrup a/client/mysqltest.c b/client/mysqltest.c
--- a/client/mysqltest.c	2008-05-05 17:26:41 -03:00
+++ b/client/mysqltest.c	2008-05-06 10:37:32 -03:00
@@ -5597,6 +5597,8 @@ void fix_win_paths(const char *val, int 
 void append_field(DYNAMIC_STRING *ds, uint col_idx, MYSQL_FIELD* field,
                   char* val, ulonglong len, my_bool is_null)
 {
+  char null[]= "NULL";
+
   if (col_idx < max_replace_column && replace_column[col_idx])
   {
     val= replace_column[col_idx];
@@ -5604,7 +5606,7 @@ void append_field(DYNAMIC_STRING *ds, ui
   }
   else if (is_null)
   {
-    val= "NULL";
+    val= null;
     len= 4;
   }
 #ifdef __WIN__