diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2015-03-26 17:16:37 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2015-04-05 13:14:37 +0200 |
| commit | 6a7ee5a5a540f2c69c8b56448e06098d368ecdb4 (patch) | |
| tree | 92cf8574a44eb226b791492dd5c6c3e512e8eafb /sql/sql_select.cc | |
| parent | 87604c4cadac0c9f86068d7f0075bb3cdeabdf0b (diff) | |
| download | mariadb-git-6a7ee5a5a540f2c69c8b56448e06098d368ecdb4.tar.gz | |
encryption cleanup: small changes
* comments
* move my_bytes_to_key() and my_aes_hex2uint() into file_key_management_plugin
* rename HA_INSERT_ORDER -> HA_PRESERVE_INSERT_ORDER
* remove unused variables and declarations
* fix casts
* don't link innodb with pcre
* remove redundant entries from aria's TARGET_LINK_LIBRARIES
Diffstat (limited to 'sql/sql_select.cc')
| -rw-r--r-- | sql/sql_select.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/sql_select.cc b/sql/sql_select.cc index c087732bab1..7cf5f65c350 100644 --- a/sql/sql_select.cc +++ b/sql/sql_select.cc @@ -16874,7 +16874,6 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, MARIA_UNIQUEDEF uniquedef; TABLE_SHARE *share= table->s; MARIA_CREATE_INFO create_info; - my_bool encrypt= encrypt_tmp_disk_tables; DBUG_ENTER("create_internal_tmp_table"); if (share->keys) @@ -16984,14 +16983,14 @@ bool create_internal_tmp_table(TABLE *table, KEY *keyinfo, DYNAMIC_RECORD : BLOCK_RECORD); uint create_flags= HA_CREATE_TMP_TABLE | HA_CREATE_INTERNAL_TABLE; - if (file_type != NO_RECORD && MY_TEST(encrypt)) + if (file_type != NO_RECORD && encrypt_tmp_disk_tables) { /* encryption is only supported for BLOCK_RECORD */ file_type= BLOCK_RECORD; create_flags|= HA_CREATE_ENCRYPTED; if (table->keep_row_order) { - create_flags|= HA_INSERT_ORDER; + create_flags|= HA_PRESERVE_INSERT_ORDER; } if (table->used_for_duplicate_elimination) |