diff options
| -rw-r--r-- | sql/table.cc | 5 | ||||
| -rw-r--r-- | storage/example/ha_example.cc | 9 |
2 files changed, 12 insertions, 2 deletions
diff --git a/sql/table.cc b/sql/table.cc index cf079ed212a..2d73e15d5fb 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -1633,10 +1633,11 @@ static int open_binary_frm(THD *thd, TABLE_SHARE *share, uchar *head, if (share->db_create_options & HA_OPTION_TEXT_CREATE_OPTIONS) { DBUG_ASSERT(options_len); - if (engine_table_options_frm_read(options, options_len, share) || - parse_engine_table_options(thd, handler_file->ht, share)) + if (engine_table_options_frm_read(options, options_len, share)) goto free_and_err; } + if (parse_engine_table_options(thd, handler_file->ht, share)) + goto free_and_err; my_free(buff, MYF(MY_ALLOW_ZERO_PTR)); if (share->found_next_number_field) diff --git a/storage/example/ha_example.cc b/storage/example/ha_example.cc index 98ab6c6be31..5059c729ae9 100644 --- a/storage/example/ha_example.cc +++ b/storage/example/ha_example.cc @@ -367,6 +367,15 @@ int ha_example::open(const char *name, int mode, uint test_if_locked) DBUG_RETURN(1); thr_lock_data_init(&share->lock,&lock,NULL); + example_table_options_struct *options= + (example_table_options_struct *)table->s->option_struct; + + DBUG_ASSERT(options); + DBUG_PRINT("info", ("strparam: '%-.64s' ullparam: %llu enumparam: %u "\ + "boolparam: %u", + (options->strparam ? options->strparam : "<NULL>"), + options->ullparam, options->enumparam, options->boolparam)); + DBUG_RETURN(0); } |