diff options
| author | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
|---|---|---|
| committer | Galina Shalygina <galina.shalygina@mariadb.com> | 2018-06-01 21:57:10 +0200 |
| commit | 6db465d7ce455cf75ec224108cbe61ca8be63d3d (patch) | |
| tree | 9648ff1fc677eebb60b278c2e2c13131934ed2a0 /sql/create_options.h | |
| parent | ffe83e8e7bef32eb2a80aad2d382f0b023dd3a44 (diff) | |
| parent | 4a49f7f88cfa82ae6eb8e7b5a528e91416b33b52 (diff) | |
| download | mariadb-git-shagalla-10.4.tar.gz | |
Merge 10.3.7 into 10.4shagalla-10.4
Diffstat (limited to 'sql/create_options.h')
| -rw-r--r-- | sql/create_options.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/create_options.h b/sql/create_options.h index c82cb875743..16be5affde0 100644 --- a/sql/create_options.h +++ b/sql/create_options.h @@ -63,7 +63,7 @@ class engine_option_value: public Sql_alloc name(name_arg), next(NULL), parsed(false), quoted_value(false) { char *str; - if ((value.str= str= (char *)alloc_root(root, 22))) + if (likely((value.str= str= (char *)alloc_root(root, 22)))) { value.length= longlong10_to_str(value_arg, str, 10) - str; link(start, end); |