bk commit into 4.1 tree (gluh:1.2328) BUG#10732

[gluh]

Below is the list of changes that have just been committed into a local
4.1 repository of gluh. When gluh 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.2328 05/06/09 14:39:29 gluh@stripped +3 -0
  Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
    generate proper error message if we use SET ... = NULL for 'set'
    variables

  sql/set_var.cc
    1.170 05/06/09 14:38:50 gluh@stripped +3 -0
    Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
      generate proper error message if we use SET ... = NULL for 'set'
      variables

  mysql-test/t/sql_mode.test
    1.8 05/06/09 14:38:50 gluh@stripped +5 -0
    Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
      generate proper error message if we use SET ... = NULL for 'set'
      variables

  mysql-test/r/sql_mode.result
    1.11 05/06/09 14:38:50 gluh@stripped +2 -0
    Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
      generate proper error message if we use SET ... = NULL for 'set'
      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:	gluh
# Host:	eagle.intranet.mysql.r18.ru
# Root:	/home/gluh/MySQL/Merge/4.1

--- 1.10/mysql-test/r/sql_mode.result	Thu Nov  4 08:48:56 2004
+++ 1.11/mysql-test/r/sql_mode.result	Thu Jun  9 14:38:50 2005
@@ -138,3 +138,5 @@
   `min_num` decimal(7,6) default '0.000001'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1 ;
+set @@SQL_MODE=NULL;
+ERROR 42000: Variable 'sql_mode' can't be set to the value of 'NULL'

--- 1.7/mysql-test/t/sql_mode.test	Thu Nov  4 08:47:51 2004
+++ 1.8/mysql-test/t/sql_mode.test	Thu Jun  9 14:38:50 2005
@@ -80,3 +80,8 @@
 show create table t1;
 drop table t1 ;
 
+#
+# Bug #10732: Set SQL_MODE to NULL gives garbled error message
+#
+--error 1231
+set @@SQL_MODE=NULL;

--- 1.169/sql/set_var.cc	Sun Jun  5 22:38:41 2005
+++ 1.170/sql/set_var.cc	Thu Jun  9 14:38:50 2005
@@ -1515,7 +1515,10 @@
   if (var->value->result_type() == STRING_RESULT)
   {
     if (!(res= var->value->val_str(&str)))
+    {
+      strmake(buff, "NULL", 4);
       goto err;
+    }
     var->save_result.ulong_value= ((ulong)
 				   find_set(enum_names, res->c_ptr(),
 					    res->length(),