summaryrefslogtreecommitdiff
path: root/include/my_base.h
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2015-03-26 17:16:37 +0100
committerSergei Golubchik <serg@mariadb.org>2015-04-05 13:14:37 +0200
commit6a7ee5a5a540f2c69c8b56448e06098d368ecdb4 (patch)
tree92cf8574a44eb226b791492dd5c6c3e512e8eafb /include/my_base.h
parent87604c4cadac0c9f86068d7f0075bb3cdeabdf0b (diff)
downloadmariadb-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 'include/my_base.h')
-rw-r--r--include/my_base.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_base.h b/include/my_base.h
index 3f34adcef6d..b0a15a11dc8 100644
--- a/include/my_base.h
+++ b/include/my_base.h
@@ -355,7 +355,7 @@ enum ha_base_keytype {
#define HA_CREATE_RELIES_ON_SQL_LAYER 128
#define HA_CREATE_INTERNAL_TABLE 256
#define HA_CREATE_ENCRYPTED 512
-#define HA_INSERT_ORDER 1024
+#define HA_PRESERVE_INSERT_ORDER 1024
/* Flags used by start_bulk_insert */