database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

remove Aria-only handler flag

Browse Source
This commit is contained in:
Sergei Golubchik
2015-03-26 17:00:49 +01:00
parent 39865322c6
commit f379c9a820
4 changed files with 2 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
include/my_base.h
View File

@@ -354,8 +354,7 @@ enum ha_base_keytype {
#define HA_CREATE_DELAY_KEY_WRITE 64 #define HA_CREATE_DELAY_KEY_WRITE 64
#define HA_CREATE_RELIES_ON_SQL_LAYER 128 #define HA_CREATE_RELIES_ON_SQL_LAYER 128
#define HA_CREATE_INTERNAL_TABLE 256 #define HA_CREATE_INTERNAL_TABLE 256
#define HA_CREATE_ENCRYPTED 512 #define HA_PRESERVE_INSERT_ORDER 512
#define HA_PRESERVE_INSERT_ORDER 1024
/* Flags used by start_bulk_insert */ /* Flags used by start_bulk_insert */

1
sql/sql_select.cc
View File

@@ -16987,7 +16987,6 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo,
{ {
/* encryption is only supported for BLOCK_RECORD */ /* encryption is only supported for BLOCK_RECORD */
file_type= BLOCK_RECORD; file_type= BLOCK_RECORD;
create_flags|= HA_CREATE_ENCRYPTED;
if (table->used_for_duplicate_elimination) if (table->used_for_duplicate_elimination)
{ {
/* /*

5
storage/maria/ha_maria.cc
View File

@@ -3138,11 +3138,6 @@ int ha_maria::create(const char *name, register TABLE *table_arg,
ha_create_info->page_checksum == HA_CHOICE_YES) ha_create_info->page_checksum == HA_CHOICE_YES)
create_flags|= HA_CREATE_PAGE_CHECKSUM; 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, (void) translog_log_debug_info(0, LOGREC_DEBUG_INFO_QUERY,
(uchar*) thd->query(), thd->query_length()); (uchar*) thd->query(), thd->query_length());

2
storage/maria/ma_create.c
View File

@@ -73,7 +73,7 @@ int maria_create(const char *name, enum data_file_type datafile_type,
my_bool forced_packed; my_bool forced_packed;
myf sync_dir= 0; myf sync_dir= 0;
uchar *log_data= NULL; 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); my_bool insert_order= MY_TEST(flags & HA_PRESERVE_INSERT_ORDER);
uint crypt_page_header_space= 0; uint crypt_page_header_space= 0;
DBUG_ENTER("maria_create"); DBUG_ENTER("maria_create");