summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* MDEV-12113: install_db shows corruption for rest encryption with innodb_data_...Jan Lindström2017-06-0116-594/+549
* Merge branch '10.0-galera' into 10.1Sergei Golubchik2017-05-264-4/+23
|\
| * Merge branch '10.0' into bb-10.0-galeraSachin Setiya2017-03-2021-565/+444
| |\
| * | Fixed test failure on galere_wsrep_log_conflicts on XtraDB.Jan Lindström2017-03-206-11/+144
| * | Merge tag 'mariadb-10.0.30' into bb-sachin-10.0-galera-mergeSachin Setiya2017-03-17248-3873/+6840
| |\ \
| * | | MW-28, codership/mysql-wsrep#28 Fix sync_thread_levels debug assertSachin Setiya2017-03-143-10/+134
| * | | Fix for post-merge build failure.mariadb-galera-10.0.29Nirbhay Choubey2017-01-131-13/+2
| * | | Merge tag 'mariadb-10.0.29' into 10.0-galeraNirbhay Choubey2017-01-13117-4738/+9542
| |\ \ \
| * | | | Fix a build failure noticed on Yakkety.Nirbhay Choubey2016-11-022-4/+4
* | | | | MDEV-12926 encryption.innodb_onlinealter_encryption, encryption.innodb-bad-ke...Marko Mäkelä2017-05-262-2/+2
* | | | | 10.1 additions for MDEV-12052 Shutdown crash presumably due to master thread ...Marko Mäkelä2017-05-2610-58/+71
* | | | | Merge 10.0 to 10.1Marko Mäkelä2017-05-262-176/+118
|\ \ \ \ \
| * | | | | MDEV-12052 Shutdown crash presumably due to master thread activityMarko Mäkelä2017-05-262-176/+118
* | | | | | MDEV-11335 Changing delay_key_write option for MyISAM table should not copy rowsSergei Golubchik2017-05-241-4/+6
* | | | | | MDEV-11311 Create federated table does not work as expected.Sergei Golubchik2017-05-241-1/+1
* | | | | | MDEV-12625 total_index_blocks is uninitialized in ALTER TABLE…ALGORITHM=INP...Marko Mäkelä2017-05-232-0/+2
* | | | | | MDEV-11264 Fix DeviceIoControl() usage in innodb.Vladislav Vaintroub2017-05-231-9/+14
* | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-2340-106/+124
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '5.5' into 10.0mariadb-10.0.31Sergei Golubchik2017-05-201-8/+17
| |\ \ \ \ \
| | * | | | | Make IF clear.Oleksandr Byelkin2017-05-181-8/+17
| * | | | | | compilation warnings in ConnectSergei Golubchik2017-05-1929-72/+71
| * | | | | | MDEV-6262 analyze the coverity report on mariadbSergei Golubchik2017-05-1912-27/+37
* | | | | | | MDEV-12615: InnoDB page compression method snappy mostly does not compress pagesJan Lindström2017-05-2010-150/+194
* | | | | | | After-merge fix for MDEV-11638Marko Mäkelä2017-05-205-6/+15
* | | | | | | Merge 10.0 into 10.1Marko Mäkelä2017-05-20221-4925/+6792
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Remove dead code added in merge commit d8b45b0c004edc0b91029b232d7cc9aad02cc822Marko Mäkelä2017-05-191-24/+0
| * | | | | | Update xtradb and innodb version to 5.6.36Vicențiu Ciorbaru2017-05-182-2/+2
| * | | | | | Fix xtradb handler compilation post mergeVicențiu Ciorbaru2017-05-181-0/+25
| * | | | | | Merge remote-tracking branch 'origin/10.0' into 10.0Vicențiu Ciorbaru2017-05-1879-542/+444
| |\ \ \ \ \ \
| * | | | | | | Fix windows compilation in xtradb post-mergeVicențiu Ciorbaru2017-05-171-5/+5
| * | | | | | | Fix tokudb test failures post mergeVicențiu Ciorbaru2017-05-1714-1/+13
| * | | | | | | Merge branch 'merge-innodb-5.6' into bb-10.0-vicentiuVicențiu Ciorbaru2017-05-1730-272/+505
| |\ \ \ \ \ \ \
| | * | | | | | | 5.6.36Vicențiu Ciorbaru2017-05-1531-292/+658
| * | | | | | | | Revert "Fix unit test after merge from mysql 5.5.35 perfschema"Vicențiu Ciorbaru2017-05-171-1/+0
| * | | | | | | | Merge branch 'merge-xtradb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1741-434/+1204
| |\ \ \ \ \ \ \ \
| | * | | | | | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1642-459/+1419
| * | | | | | | | | Remove tokudb_dir_cmd variableVicențiu Ciorbaru2017-05-161-71/+0
| * | | | | | | | | Merge branch 'merge-tokudb-5.6' into 10.0Vicențiu Ciorbaru2017-05-1634-187/+1816
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | 5.6.36-82.0Vicențiu Ciorbaru2017-05-1635-190/+1817
| * | | | | | | | | | Update perfschema version to 5.6.36 post-mergeVicențiu Ciorbaru2017-05-161-1/+1
| * | | | | | | | | | Merge remote-tracking branch 'connect/10.0' into 10.0Vicențiu Ciorbaru2017-05-16102-4083/+3563
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | MDEV-12651: change error code to ER_ILLEGAL_HA in rnd_pos (ha_connect.cc)Olivier Bertrand2017-05-121-1/+1
| | * | | | | | | | | | Fix failing test connect.json for MariaDB 10.0Olivier Bertrand2017-05-124-14/+8
| | * | | | | | | | | | Fix wrong value of JSON columnOlivier Bertrand2017-05-1199-3413/+2406
| | * | | | | | | | | | Fix MDEV-12603 Insert replaces values in ZIP fileOlivier Bertrand2017-05-064-21/+80
| | * | | | | | | | | | Fix MDEV-12653 Cannot add index for ZIP CONNECT tableOlivier Bertrand2017-05-046-11/+19
| | * | | | | | | | | | Disable json testsOlivier Bertrand2017-05-031-2/+2
| | * | | | | | | | | | Fix MDEV-12587 MariaDB CONNECT DIR TypeOlivier Bertrand2017-05-039-50/+82
| | * | | | | | | | | | Fix MDEV-12631 valgrind warning for zipped tablesOlivier Bertrand2017-04-291-4/+10
| | * | | | | | | | | | Fix MDEV-12520: Decimal values can be truncated for JDBC tablesOlivier Bertrand2017-04-222-2/+4