From f160958770ce85fe0d26f3b816d059caaf2fd67d Mon Sep 17 00:00:00 2001
From: unknown <gluh@eagle.intranet.mysql.r18.ru>
Date: Thu, 9 Jun 2005 14:39:29 +0500
Subject: [PATCH] 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 | 2 ++
 mysql-test/t/sql_mode.test   | 5 +++++
 sql/set_var.cc               | 3 +++
 3 files changed, 10 insertions(+)

diff --git a/mysql-test/r/sql_mode.result b/mysql-test/r/sql_mode.result
index c18be2df403..652913d1fdb 100644
--- a/mysql-test/r/sql_mode.result
+++ b/mysql-test/r/sql_mode.result
@@ -138,3 +138,5 @@ t1	CREATE TABLE `t1` (
   `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'
diff --git a/mysql-test/t/sql_mode.test b/mysql-test/t/sql_mode.test
index f841d36e837..985c0853bd2 100644
--- a/mysql-test/t/sql_mode.test
+++ b/mysql-test/t/sql_mode.test
@@ -80,3 +80,8 @@ create table t1 ( min_num   dec(6,6)     default .000001);
 show create table t1;
 drop table t1 ;
 
+#
+# Bug #10732: Set SQL_MODE to NULL gives garbled error message
+#
+--error 1231
+set @@SQL_MODE=NULL;
diff --git a/sql/set_var.cc b/sql/set_var.cc
index 0fa9932dbbc..0f13a8a7f2d 100644
--- a/sql/set_var.cc
+++ b/sql/set_var.cc
@@ -1515,7 +1515,10 @@ bool sys_var::check_set(THD *thd, set_var *var, TYPELIB *enum_names)
   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(),