diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2013-07-26 23:02:48 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2013-07-26 23:02:48 +0400 |
| commit | b3a1f420439a1b7b8a151ca04d5c5e136c589006 (patch) | |
| tree | 34a937f50ed6a0e380de767723dd8270ee178c12 | |
| parent | 62feb0c5aea9deed8da70774e0674fb459a84e34 (diff) | |
| download | mariadb-git-b3a1f420439a1b7b8a151ca04d5c5e136c589006.tar.gz | |
MDEV-4786 - merge 10.0-monty - 10.0
Fixed connect.grant failure.
sql/create_options.cc:
Keep "first" list intact, allocate new list for merge result.
Normally "first" is options list on TABLE_SHARE. ALTER TABLE may fail
after the merge and leave share with corrupt list in the table definition
cache.
sql/create_options.h:
Construct engine_option_value from another engine_option_value.
| -rw-r--r-- | sql/create_options.cc | 6 | ||||
| -rw-r--r-- | sql/create_options.h | 7 |
2 files changed, 10 insertions, 3 deletions
diff --git a/sql/create_options.cc b/sql/create_options.cc index d956d01aa66..774d739f153 100644 --- a/sql/create_options.cc +++ b/sql/create_options.cc @@ -743,9 +743,9 @@ engine_option_value *merge_engine_table_options(engine_option_value *first, DBUG_ENTER("merge_engine_table_options"); LINT_INIT(end); - /* find last element */ - if (first && second) - for (end= first; end->next; end= end->next) /* no-op */; + /* Create copy of first list */ + for (opt= first, first= 0; opt; opt= opt->next) + new (root) engine_option_value(opt, &first, &end); for (opt= second; opt; opt= opt->next) new (root) engine_option_value(opt->name, opt->value, opt->quoted_value, diff --git a/sql/create_options.h b/sql/create_options.h index ea05bf75fac..c7fac8b37fd 100644 --- a/sql/create_options.h +++ b/sql/create_options.h @@ -34,6 +34,13 @@ class engine_option_value: public Sql_alloc bool parsed; ///< to detect unrecognized options bool quoted_value; ///< option=VAL vs. option='VAL' + engine_option_value(engine_option_value *src, + engine_option_value **start, engine_option_value **end) : + name(src->name), value(src->value), + next(NULL), parsed(src->parsed), quoted_value(src->quoted_value) + { + link(start, end); + } engine_option_value(LEX_STRING &name_arg, LEX_STRING &value_arg, bool quoted, engine_option_value **start, engine_option_value **end) : name(name_arg), value(value_arg), |