diff options
| author | unknown <gluh@mysql.com> | 2005-06-09 15:26:46 +0500 |
|---|---|---|
| committer | unknown <gluh@mysql.com> | 2005-06-09 15:26:46 +0500 |
| commit | 42b4b3ce5850e55594d30bab6da4e5d7ee671351 (patch) | |
| tree | 638d30ba88cee25c867bccfc83b3f45651222186 /sql | |
| parent | 0e54a4e84f11d13421e85b93d1fac51c31f92bf0 (diff) | |
| parent | f160958770ce85fe0d26f3b816d059caaf2fd67d (diff) | |
| download | mariadb-git-42b4b3ce5850e55594d30bab6da4e5d7ee671351.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/gluh/MySQL/Merge/4.1
Diffstat (limited to 'sql')
| -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(), |