diff options
| author | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2005-06-09 14:39:29 +0500 |
|---|---|---|
| committer | unknown <gluh@eagle.intranet.mysql.r18.ru> | 2005-06-09 14:39:29 +0500 |
| commit | f160958770ce85fe0d26f3b816d059caaf2fd67d (patch) | |
| tree | 417c40506a0a56513b22ab4e2f679b8127e96fdf /sql/set_var.cc | |
| parent | 897b3c50e8cd5d80e61b8ae8276604a7e3d76ba5 (diff) | |
| download | mariadb-git-f160958770ce85fe0d26f3b816d059caaf2fd67d.tar.gz | |
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
Diffstat (limited to 'sql/set_var.cc')
| -rw-r--r-- | sql/set_var.cc | 3 |
1 files changed, 3 insertions, 0 deletions
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(), |