bk commit into 4.1 tree (gluh:1.2288) 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.2288 05/05/23 13:31:54 gluh@stripped +3 -0
  Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
    set value to DEFAULT for 'set' variables if we use SET ... = NULL

  sql/set_var.cc
    1.165 05/05/23 13:31:11 gluh@stripped +4 -0
    Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message
      set value to DEFAULT for 'set' variables if we use SET ... = NULL

  mysql-test/t/sql_mode.test
    1.8 05/05/23 13:31:11 gluh@stripped +5 -0
    Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message

  mysql-test/r/sql_mode.result
    1.11 05/05/23 13:31:11 gluh@stripped +4 -0
    Fix for bug#10732: Set SQL_MODE to NULL gives garbled error message

# 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/Bugs/4.1.10732

--- 1.10/mysql-test/r/sql_mode.result	Thu Nov  4 08:48:56 2004
+++ 1.11/mysql-test/r/sql_mode.result	Mon May 23 13:31:11 2005
@@ -138,3 +138,7 @@
   `min_num` decimal(7,6) default '0.000001'
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1
 drop table t1 ;
+set @@SQL_MODE=NULL;
+show variables like 'sql_mode';
+Variable_name	Value
+sql_mode	

--- 1.7/mysql-test/t/sql_mode.test	Thu Nov  4 08:47:51 2004
+++ 1.8/mysql-test/t/sql_mode.test	Mon May 23 13:31:11 2005
@@ -80,3 +80,8 @@
 show create table t1;
 drop table t1 ;
 
+#
+# Bug #10732: Set SQL_MODE to NULL gives garbled error message
+#
+set @@SQL_MODE=NULL;
+show variables like 'sql_mode';

--- 1.164/sql/set_var.cc	Sat Apr 16 05:40:27 2005
+++ 1.165/sql/set_var.cc	Mon May 23 13:31:11 2005
@@ -1512,6 +1512,10 @@
   uint error_len= 0;
   String str(buff, sizeof(buff), system_charset_info), *res;
 
+  /* set value to DEFAULT if we use SET ... = NULL */
+  if (var->value->null_value)
+    return ((var->value= 0));
+
   if (var->value->result_type() == STRING_RESULT)
   {
     if (!(res= var->value->val_str(&str)))