summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MDEV-7110 : Add missing MySQL variable log_bin_basename and log_bin_indexbb-10.1-mdev7110Nirbhay Choubey2015-06-0535-14/+614
* MDEV-8250: InnoDB: Page compressed tables are not compressed and compressed+e...Jan Lindström2015-06-0421-409/+569
* fix for 32-bit testsmariadb-10.1.5Sergei Golubchik2015-06-032-235/+214
* AES-GCM support in file_key_management pluginSergei Golubchik2015-06-022-1/+32
* my_aes_encrypt_gcm() and my_aes_decrypt_gcm()Sergei Golubchik2015-06-024-3/+103
* my_aes_get_size()Sergei Golubchik2015-06-024-11/+13
* file_key_management plugin: complain if key id 1 is not foundSergei Golubchik2015-06-024-2/+46
* just like tempfiles: use key id 2 for temp Aria tablesSergei Golubchik2015-06-025-9/+32
* MDEV-8126 encryption for temp filesSergei Golubchik2015-06-0221-16/+518
* always use my_b_pread() instead of mysql_file_pread()Sergei Golubchik2015-06-025-19/+23
* my_b_fill, inline my_b_* functions instead of hairy macrosSergei Golubchik2015-06-025-105/+97
* misc IO_CACHE cleanupsSergei Golubchik2015-06-0211-228/+236
* myisam/aria: don't mess with IO_CACHE::fileSergei Golubchik2015-06-022-57/+60
* cleanup: LOAD DATA replication support in IO_CACHESergei Golubchik2015-06-025-98/+37
* fix cmake dependenciesSergei Golubchik2015-06-021-3/+6
* remove few #ifdefs in innodb/xtradbSergei Golubchik2015-06-024-50/+6
* MDEV-8202 - st_select_lex::master_unit() takes 0.17% in OLTP ROSergey Vojtovich2015-06-022-15/+1
* MDEV-8192 - THD::set_command() takes 0.05% in OLTP ROSergey Vojtovich2015-06-022-9/+7
* MDEV-8191 - THD::set_query() takes 0.07% in OLTP ROSergey Vojtovich2015-06-022-14/+10
* MDEV-8222 "string_field LIKE int_const" returns a wrong result in case of UCS2Alexander Barkov2015-06-027-37/+126
* update for 32-bit, againSergei Golubchik2015-06-021-70/+67
* compilation failure on windowsSergei Golubchik2015-06-011-1/+1
* avoid ulong sysvars, prefer uint or ulonglongSergei Golubchik2015-06-015-5/+5
* MDEV-7913 main.openssl_6975 'tlsv10' fails in buildbot on Wheezy and PreciseSergei Golubchik2015-06-011-2/+2
* MDEV-8220 Server crashes if started with --enforce-storage-engine optionSergei Golubchik2015-06-014-0/+24
* Merge remote-tracking branch 'github/10.1' into 10.1Sergei Golubchik2015-06-016-66/+47
|\
| * Fix test warnings by adding global supression to InnoDB warnings.Jan Lindström2015-05-311-0/+2
| * Fix compiler warning.Jan Lindström2015-05-312-2/+2
| * MDEV-7484: Log Time not consistent with InnoDB errors nor with MySQL error lo...Jan Lindström2015-05-305-66/+45
* | generalize ER_TABLE_NEEDS_UPGRADE to work for views tooSergei Golubchik2015-06-0110-17/+20
* | Merge tag 'mariadb-10.0.19' into 10.1Sergei Golubchik2015-06-011133-24286/+51910
|\ \ | |/ |/|
| * Fix win/ files to be stored with LF in repositorymariadb-10.0.1910.0-defragmentVicentiu Ciorbaru2015-05-0814-862/+862
| * update .gitattributesSergei Golubchik2015-05-081-4/+5
| * convert files from CRLF to LF line endingsSergei Golubchik2015-05-08171-14008/+14008
| * bump the VERSIONSergei Golubchik2015-05-081-1/+1
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-05-087-5/+31
| |\
| | * MDEV-8115 mysql_upgrade crashes the server with REPAIR VIEWSergei Golubchik2015-05-073-1/+17
| | * Fix compiler error if compiler does not support c99 styleJan Lindström2015-05-074-3/+14
| | * Merge pull request #52 from openquery/MDEV-8053-c99-style-for-structure-membersJan Lindström2015-05-062-2/+2
| | |\
| | | * c99 style for assigning structure membersDaniel Black2015-04-252-2/+2
| * | | Fixing connect.dbf test failures on big endian machines.Alexander Barkov2015-05-071-24/+38
| * | | Merge MDEV-8103 into 10.0mariadb-10.0.18Kristian Nielsen2015-05-061-1/+1
| |\ \ \
| * \ \ \ Merge branch 'Buggynours:10.0' into 10.0Sergei Golubchik2015-05-0517-116/+303
| |\ \ \ \
| | * | | | - Fix a regression bug on (XML) HTML tables.Olivier Bertrand2015-05-057-18/+201
| | * | | | Fix MDEV-8090 in tabmysql.cppSergei Golubchik2015-05-051-2/+9
| | * | | | - Fix bug on updating JSON expanded valuesOlivier Bertrand2015-05-019-60/+57
| * | | | | MDEV-8096 vio timeouts are multiplied by 1000 for sslSergei Golubchik2015-05-054-2/+57
| * | | | | MDEV-7985: MySQL Users Break when Migrating to MariaDB, part 2Vicențiu Ciorbaru2015-05-053-30/+436
| * | | | | Merge branch 'bb-10.0-serg' into 10.0Sergei Golubchik2015-05-05882-10425/+37075
| |\ \ \ \ \
| | * | | | | mroonga doesn't work in embedded anymoreSergei Golubchik2015-05-053-0/+11