diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-07 08:17:47 +0200 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2018-11-07 08:17:47 +0200 |
commit | 89f948c766721a26e110bc9da0ca5ebc20f65112 (patch) | |
tree | 14acae07e4a4790b6af1c97c321a8012f1d0d00b /storage/innobase | |
parent | 04789ec801b6d0955c70b0387973f017424062b4 (diff) | |
parent | 59c82dde09984d10f16417c9c82cd759f81d770c (diff) | |
download | mariadb-git-89f948c766721a26e110bc9da0ca5ebc20f65112.tar.gz |
Merge 10.1 into 10.2
Diffstat (limited to 'storage/innobase')
-rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 54 | ||||
-rw-r--r-- | storage/innobase/handler/ha_innodb.h | 13 |
2 files changed, 13 insertions, 54 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 2d3d41eb9a5..638b8d73770 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -10076,25 +10076,6 @@ ha_innobase::ft_init_ext( return(reinterpret_cast<FT_INFO*>(fts_hdl)); } -/**********************************************************************//** -Initialize FT index scan -@return FT_INFO structure if successful or NULL */ - -FT_INFO* -ha_innobase::ft_init_ext_with_hints( -/*================================*/ - uint keynr, /* in: key num */ - String* key, /* in: key */ - void* hints) /* in: hints */ -{ - /* TODO Implement function properly working with FT hint. */ -#ifdef MYSQL_FT_INIT_EXT - return(ft_init_ext(hints->get_flags(), keynr, key)); -#else - return NULL; -#endif -} - /*****************************************************************//** Set up search tuple for a query through FTS_DOC_ID_INDEX on supplied Doc ID. This is used by MySQL to retrieve the documents @@ -10288,16 +10269,6 @@ next_record: return(HA_ERR_END_OF_FILE); } -/************************************************************************* -*/ - -void -ha_innobase::ft_end() -{ - ib::info() << "ft_end()"; - - rnd_end(); -} #ifdef WITH_WSREP extern dict_index_t* wsrep_dict_foreign_find_index( @@ -11847,21 +11818,18 @@ create_table_info_t::check_table_options() options->encryption_key_id = FIL_DEFAULT_ENCRYPTION_KEY; } - /* If default encryption is used make sure that used kay is found - from key file. */ - if (encrypt == FIL_ENCRYPTION_DEFAULT && - !srv_encrypt_tables && - options->encryption_key_id != FIL_DEFAULT_ENCRYPTION_KEY) { - if (!encryption_key_id_exists((unsigned int)options->encryption_key_id)) { - push_warning_printf( - m_thd, Sql_condition::WARN_LEVEL_WARN, - HA_WRONG_CREATE_OPTION, - "InnoDB: ENCRYPTION_KEY_ID %u not available", - (uint)options->encryption_key_id + /* If default encryption is used and encryption is disabled, you may + not use nondefault encryption_key_id as it is not stored anywhere. */ + if (encrypt == FIL_ENCRYPTION_DEFAULT + && !srv_encrypt_tables + && options->encryption_key_id != FIL_DEFAULT_ENCRYPTION_KEY) { + compile_time_assert(FIL_DEFAULT_ENCRYPTION_KEY == 1); + push_warning_printf( + m_thd, Sql_condition::WARN_LEVEL_WARN, + HA_WRONG_CREATE_OPTION, + "InnoDB: innodb_encrypt_tables=OFF only allows ENCRYPTION_KEY_ID=1" ); - return "ENCRYPTION_KEY_ID"; - - } + return "ENCRYPTION_KEY_ID"; } return NULL; diff --git a/storage/innobase/handler/ha_innodb.h b/storage/innobase/handler/ha_innodb.h index da2cc403796..d7fd26612d7 100644 --- a/storage/innobase/handler/ha_innodb.h +++ b/storage/innobase/handler/ha_innodb.h @@ -157,17 +157,8 @@ public: int rnd_pos(uchar * buf, uchar *pos); int ft_init(); - - void ft_end(); - - FT_INFO* ft_init_ext(uint flags, uint inx, String* key); - - FT_INFO* ft_init_ext_with_hints( - uint inx, - String* key, - void* hints); - //Ft_hints* hints); - + void ft_end() { rnd_end(); } + FT_INFO *ft_init_ext(uint flags, uint inx, String* key); int ft_read(uchar* buf); void position(const uchar *record); |