diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-26 17:00:49 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-08 10:58:48 +0200 |
| commit | f379c9a8203233f4c2eb2c9a4c6dae819bd4b78c (patch) | |
| tree | b445c29ff4ae9f7bdeeca98a00ced7014c423505 | |
| parent | 39865322c6026ecd0c935ba2884c20799eef7e5f (diff) | |
| download | mariadb-git-f379c9a8203233f4c2eb2c9a4c6dae819bd4b78c.tar.gz | |
remove Aria-only handler flag
| -rw-r--r-- | include/my_base.h | 3 | ||||
| -rw-r--r-- | sql/sql_select.cc | 1 | ||||
| -rw-r--r-- | storage/maria/ha_maria.cc | 5 | ||||
| -rw-r--r-- | storage/maria/ma_create.c | 2 |
4 files changed, 2 insertions, 9 deletions
diff --git a/include/my_base.h b/include/my_base.h index b0a15a11dc8..a52ad51485e 100644 --- a/include/my_base.h +++ b/include/my_base.h @@ -354,8 +354,7 @@ enum ha_base_keytype { #define HA_CREATE_DELAY_KEY_WRITE 64 #define HA_CREATE_RELIES_ON_SQL_LAYER 128 #define HA_CREATE_INTERNAL_TABLE 256 -#define HA_CREATE_ENCRYPTED 512 -#define HA_PRESERVE_INSERT_ORDER 1024 +#define HA_PRESERVE_INSERT_ORDER 512 /* Flags used by start_bulk_insert */ diff --git a/sql/sql_select.cc b/sql/sql_select.cc index b1dc3083381..8688b30331e 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16987,7 +16987,6 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, { /* encryption is only supported for BLOCK_RECORD */ file_type= BLOCK_RECORD; - create_flags|= HA_CREATE_ENCRYPTED; if (table->used_for_duplicate_elimination) { /* diff --git a/storage/maria/ha_maria.cc b/storage/maria/ha_maria.cc index 4b95725a743..fba0beda802 100644 --- a/storage/maria/ha_maria.cc +++ b/storage/maria/ha_maria.cc @@ -3138,11 +3138,6 @@ int ha_maria::create(const char *name, register TABLE *table_arg, ha_create_info->page_checksum == HA_CHOICE_YES) create_flags|= HA_CREATE_PAGE_CHECKSUM; - mysql_mutex_lock(&LOCK_global_system_variables); - mysql_mutex_unlock(&LOCK_global_system_variables); - if (row_type == BLOCK_RECORD && maria_encrypt_tables) - create_flags|= HA_CREATE_ENCRYPTED; - (void) translog_log_debug_info(0, LOGREC_DEBUG_INFO_QUERY, (uchar*) thd->query(), thd->query_length()); diff --git a/storage/maria/ma_create.c b/storage/maria/ma_create.c index 35491b1d31d..f160499a94e 100644 --- a/storage/maria/ma_create.c +++ b/storage/maria/ma_create.c @@ -73,7 +73,7 @@ int maria_create(const char *name, enum data_file_type datafile_type, my_bool forced_packed; myf sync_dir= 0; uchar *log_data= NULL; - my_bool encrypted= MY_TEST(flags & HA_CREATE_ENCRYPTED); + my_bool encrypted= maria_encrypt_tables && datafile_type == BLOCK_RECORD; my_bool insert_order= MY_TEST(flags & HA_PRESERVE_INSERT_ORDER); uint crypt_page_header_space= 0; DBUG_ENTER("maria_create"); |