diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-15 12:59:13 +0200 |
| commit | f62c12b405ba7ec80b8e2490856b83c6f5899211 (patch) | |
| tree | 010605c7f145da6ea6ac14b39abc4cf700d619b1 /sql/set_var.h | |
| parent | f947f73b2b6d2bd246b81a9038224d2a85777520 (diff) | |
| parent | f1afc003eefe0aafd3e070c7453d9e029d8445a8 (diff) | |
| download | mariadb-git-f62c12b405ba7ec80b8e2490856b83c6f5899211.tar.gz | |
Merge 10.0.14 into 10.1
Diffstat (limited to 'sql/set_var.h')
| -rw-r--r-- | sql/set_var.h | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/set_var.h b/sql/set_var.h index e48f394c316..fe2a0d8e953 100644 --- a/sql/set_var.h +++ b/sql/set_var.h @@ -284,9 +284,7 @@ public: if (value_arg && value_arg->type() == Item::FIELD_ITEM) { Item_field *item= (Item_field*) value_arg; - if (!(value=new Item_string(item->field_name, - (uint) strlen(item->field_name), - system_charset_info))) // names are utf8 + if (!(value=new Item_string_sys(item->field_name))) // names are utf8 value=value_arg; /* Give error message later */ } else |