summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed a bug on status variables and added basic tests for all newbb-10.1-encryptionJan Lindström2014-11-2714-61/+317
* Fix Windows compiler error and one possible null pointer usage.Jan Lindström2014-11-262-2/+11
* Remove unneeded test file.Jan Lindström2014-11-262-48/+0
* Remove eperi unittest and revert unneeded server changes.Jan Lindström2014-11-2655-1217/+149
* Fix Windows compiler error.Jan Lindström2014-11-261-6/+6
* Fix buffer usage.Jan Lindström2014-11-263-63/+54
* Merge branch '10.1' into bb-10.1-encryptionJan Lindström2014-11-2645-237/+2547
|\
| * MDEV-7181: innodb.innodb_defrag_concurrent fails in buildbotJan Lindström2014-11-252-74/+1
| * MDEV-7167: innodb.innodb_bug12902967 fails in buildbot on WindowsJan Lindström2014-11-242-0/+4
| * MDEV-7169: innodb.innodb_bug14147491 fails in buildbot on WindowsJan Lindström2014-11-241-0/+3
| * MDEV-7168: Tests innodb.innodb_stats_create_tableJan Lindström2014-11-242-0/+24
| * MDEV-7164: innodb.innodb-alter-table-disk-full fails in buildbot on WindowsJan Lindström2014-11-243-11/+12
| * MDEV-7171 funcs_1.is_tables_is and main.information_schema-big fail in buildbot.Alexey Botchkov2014-11-242-0/+96
| * MDEV-7166: innodb.innodb-page_compression_zip fails in buildbotJan Lindström2014-11-244-2/+50
| * MDEV-7161: Build failure in buildbot on work-amd64-valgrindNirbhay Choubey2014-11-233-1/+3
| * MDEV-7053: WSREP_STATUS & WSREP_MEMBERSHIP I_S tablesNirbhay Choubey2014-11-2217-22/+469
| * Removing some duplicate code: deriving Item_func_opt_neg from Item_bool_func.Alexander Barkov2014-11-201-7/+5
| * Deriving Item_bool_func from Item_bool_func2.Alexander Barkov2014-11-201-5/+3
| * MDEV-7005 NULLIF does not work as documentedAlexander Barkov2014-11-2010-62/+1595
| * Sharing similar code between Item_func_ifnull and Item_func_ifAlexander Barkov2014-11-192-54/+42
| * MDEV-7133: InnoDB: Assertion failure in dict_tf_is_validJan Lindström2014-11-194-0/+241
* | More Windows fixes.Jan Lindström2014-11-252-2/+2
* | Fix windows compiler error.Jan Lindström2014-11-251-1/+1
* | Merge branch '10.1' of https://github.com/eperi-GmbH/server into bb-10.1-encr...Jan Lindström2014-11-25101-102/+11429
|\ \ | |/ |/|
| * fix win 64 build (only page_encryption files)Ludger Goeckel2014-11-036-32/+34
| * fixed unit testLudger Göckel2014-10-311-2/+3
| * changed comments, removed dead codeLudger Göckel2014-10-312-9/+2
| * free allocated buffersLudger Goeckel2014-10-301-7/+11
| * Removed printf from productive build.Clemens Dörrhöfer2014-10-303-9/+15
| * Merge remote-tracking branch 'mariadb/10.1' into pageencClemens Dörrhöfer2014-10-294128-649230/+147897
| |\
| * | page type 8 and 9 are not encrypted anymore to support recovery for row_forma...Ludger Göckel2014-10-297-48/+190
| * | added unit tests for page_encryption, added support for row_format=compressedLudger Göckel2014-10-2830-254/+358
| * | improved cbc enc/dec with no padding supportLudger Goeckel2014-10-273-141/+235
| * | fix ut_align call, removed keys from output (debug)Ludger Goeckel2014-10-242-4/+4
| * | introduced yassl for encryption, improved compilier flags for windows compila...Ludger Goeckel2014-10-245-182/+278
| * | added a commentLudger Göckel2014-10-231-1/+1
| * | use openssl compiler flagLudger Göckel2014-10-237-59/+99
| * | removed superfluous definesLudger Göckel2014-10-231-3/+0
| * | removed superfluous stuffLudger Göckel2014-10-231-6/+1
| * | cleanup of codeLudger Göckel2014-10-222-8/+2
| * | Merge remote-tracking branch 'Windows network path'Clemens Dörrhöfer2014-10-161-4/+6
| |\ \
| | * | fix windows issues, support unc pathunknown2014-10-161-6/+7
| * | | String terminators removed.Clemens Dörrhöfer2014-10-161-2/+0
| |/ /
| * | encryptin sec file possible (with std. passphrase)Ludger Göckel2014-10-1611-16/+149
| |\ \
| | * | backup meines zwischenstandes...Ludger Göckel2014-10-164-17/+53
| * | | Merge branch '10.1' of svnClemens Dörrhöfer2014-10-162-28/+64
| |\ \ \ | | |/ /
| | * | changed checksum calculation, so that headers are included, added a unit testLudger Göckel2014-10-152-28/+64
| * | | Salt now reading the correct number of bytesClemens Dörrhöfer2014-10-161-7/+1
| |/ /
| * | fixed decryption original page type and improved unit test!Ludger Göckel2014-10-152-34/+58
| * | Merge remote-tracking branch 'svn/10.1' into mergemeClemens Dörrhöfer2014-10-149-49/+161
| |\ \