mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

move Aria/S3 specific flag into Aria code

Browse source 
it doesn't belong in include/my_base.h
This commit is contained in:
Sergei Golubchik 2019-08-23 13:58:11 +02:00
parent 1b5e5bdef3
commit e6bad1c75d
4 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/maria.h
View file

@ -152,7 +152,7 @@ typedef struct st_maria_create_info
uint compression_algorithm;
enum data_file_type org_data_file_type;
uint16 language;
my_bool with_auto_increment, transactional;
my_bool with_auto_increment, transactional, encrypted;
} MARIA_CREATE_INFO;
struct st_maria_share;

1
include/my_base.h
View file

@ -368,7 +368,6 @@ enum ha_base_keytype {
#define HA_CREATE_INTERNAL_TABLE 256U
#define HA_PRESERVE_INSERT_ORDER 512U
#define HA_CREATE_NO_ROLLBACK 1024U
#define HA_CREATE_ENCRYPTED 2048U
/* Flags used by start_bulk_insert */

3
storage/maria/ha_maria.cc
View file

@ -3165,8 +3165,7 @@ int ha_maria::create(const char *name, TABLE *table_arg,
(void) translog_log_debug_info(0, LOGREC_DEBUG_INFO_QUERY,
(uchar*) thd->query(), thd->query_length());
if (maria_encrypt_tables && ht == maria_hton)
create_flags|= HA_CREATE_ENCRYPTED;
create_info.encrypted= maria_encrypt_tables && ht == maria_hton;
/* TODO: Check that the following fn_format is really needed */
error=
maria_create(fn_format(buff, name, "", "",

3
storage/maria/ma_create.c
View file

@ -95,8 +95,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= ((flags & HA_CREATE_ENCRYPTED) &&
datafile_type == BLOCK_RECORD);
my_bool encrypted= ci->encrypted && 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");