summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add a method to disable semaphore instrumentation.bb-10.1-semaJan Lindström2015-02-2120-54/+171
* Merge branch '10.1' into bb-10.1-semaJan Lindström2015-02-2057-413/+1418
|\
| * Merged from 10.0-FusionIO:Jan Lindström2015-02-1921-55/+999
| * Push forgotten file change to fix compiler errors.Jan Lindström2015-02-191-2/+2
| * MDEV-7604: wsrep plugin lists its plugin_maturity as UnknownJan Lindström2015-02-183-4/+14
| * MDEV-7593: Default encryption key does not work correctly for pageJan Lindström2015-02-1813-21/+249
| * MDEV-7305 Difficulties building cracklib_password_checkSergei Golubchik2015-02-175-5/+33
| * cleanup: remove old debian/ubuntu names from debian/* filesSergei Golubchik2015-02-173-10/+4
| * innodb/xtradb: update nonnull attributes to match the new semanticsSergei Golubchik2015-02-172-4/+4
| * Add a testcase for EXPLAIN FORMAT=JSON for ROR-union index_merge.Sergei Petrunia2015-02-172-0/+32
| * update result filesSergei Golubchik2015-02-151-24/+38
| * followup for "MDEV-6248 GUI-friendly cmake options to enable/disable plugins"Sergei Golubchik2015-02-1510-46/+44
| * Don't link plugins with libmysys.a or libmysys_ssl.aSergei Golubchik2015-02-152-3/+3
| * yassl builds: don't hide mysys_ssl symbols that cannot possibly collide with ...Sergei Golubchik2015-02-151-1/+0
| * Removing the Hybrid_type_traits framework. It's not used since 5.5.Alexander Barkov2015-02-122-243/+0
| * Fix test failure seen on p8-rhel7Jan Lindström2015-02-112-10/+10
* | MDEV-7109: Add support for INFORMATION_SCHEMA.INNODB_SEMAPHORE_WAITSJan Lindström2015-02-1931-305/+2005
|/
* Revert "Fixing ConnectSE compilation warnings"Sergei Golubchik2015-02-101-7/+0
* Fixing ConnectSE compilation warnings (and failires in maintainer mode).Alexander Barkov2015-02-101-0/+7
* MDEV-7450 key management plugins don't work with yasslSergei Golubchik2015-02-103-2/+7
* update 32-bit rdiff files in sys_vars suiteSergei Golubchik2015-02-104-286/+357
* Do not yet allow encrypted tables with compressed tables.Jan Lindström2015-02-1011-119/+461
* Pass down the information should we encrypt the page at os0file.ccJan Lindström2015-02-1028-249/+425
* mtr check for openssl support for AES_CTRSergei Golubchik2015-02-106-1/+10
* cmake-time detection for EVP_aes_128_ctr()Sergei Golubchik2015-02-104-3/+8
* Add test case for combination Google encryption and page compressed tables.Jan Lindström2015-02-106-6/+145
* encryption keys serviceSergei Golubchik2015-02-1025-44/+245
* encryption key management plugin apiSergei Golubchik2015-02-1050-344/+696
* initialize plugins in the specific order by plugin typeSergei Golubchik2015-02-102-77/+89
* Fixed XtraDB implementation of encryption and page encryption.Jan Lindström2015-02-1027-927/+331
* Push for testing of encryptionMonty2015-02-10273-1094/+23385
* cleanups done as part of adding encryptionMonty2015-02-109-18/+37
* fix for cmake builds on windowsSergei Golubchik2015-02-101-2/+2
* new read-only server variable version_ssl_librarySergei Golubchik2015-02-107-10/+51
* minor cleanup: ssl.cmakeSergei Golubchik2015-02-101-10/+2
* --getopt-prefix-matching command-line optionSergei Golubchik2015-02-1039-58/+88
* password validation plugin API: renamesSergei Golubchik2015-02-105-8/+8
* don't mention bzr in "make distclean" warning messageSergei Golubchik2015-02-101-3/+1
* small cleanup of my_default.cSergei Golubchik2015-02-101-3/+3
* update test results for embeddedSergei Golubchik2015-02-103-228/+1
* MDEV-6918 Create a way to see a user's default role.Vicențiu Ciorbaru2015-02-0912-48/+434
* MDEV-7151 ha_archive.so missing from .debSergei Golubchik2015-02-082-4/+14
* Merge branch 'bb-10.1-merge' into 10.1Sergei Golubchik2015-02-07124-276/+6469
|\
| * after-merge fixes for test casesSergei Golubchik2015-02-066-50/+27
| * wsrep: check options as early as possibleSergei Golubchik2015-02-061-5/+3
| * wsrep: ha_abort_transaction() does NOT end the transactionSergei Golubchik2015-02-061-1/+3
| * Merge 10.0-galera into 10.1Sergei Golubchik2015-02-06118-214/+6431
| |\
| | * maria-10.0.16 mergeNirbhay Choubey2015-01-26409-2850/+13024
| | |\
| | * | Minor test modifications.Nirbhay Choubey2015-01-265-28/+20
| | * | Backported changes done in wsrep_guess_ip() from 10.1.Nirbhay Choubey2015-01-261-48/+25