5 commits

Author	SHA1	Message	Date
Marko Mäkelä	be85d3e61b	Merge 10.2 into 10.3	2019-05-14 17:18:46 +03:00
Vicențiu Ciorbaru	cb248f8806	Merge branch '5.5' into 10.1	2019-05-11 22:19:05 +03:00
Michael Widenius	4aaa38d26e	Enusure that my_global.h is included first ... - Added sql/mariadb.h file that should be included first by files in sql directory, if sql_plugin.h is not used (sql_plugin.h adds SHOW variables that must be done before my_global.h is included) - Removed a lot of include my_global.h from include files - Removed include's of some files that my_global.h automatically includes - Removed duplicated include's of my_sys.h - Replaced include my_config.h with my_global.h	2017-08-24 01:05:44 +02:00
Sergei Golubchik	6a7ee5a5a5	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	2015-04-05 13:14:37 +02:00
Monty	d7d589dc01	Push for testing of encryption	2015-02-10 10:21:17 +01:00