summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge bb-10.2-ext into 10.3Marko Mäkelä2018-01-0428-130/+418
|\
| * Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-032-14/+14
| |\
| | * Merge 10.1 into 10.2Marko Mäkelä2018-01-032-14/+14
| | |\
| | | * Merge 10.0 into 10.1Marko Mäkelä2018-01-032-14/+14
| | | |\
| | | | * Merge 5.5 into 10.0Marko Mäkelä2018-01-032-14/+14
| | | | |\
| | | | | * Silence some -Wimplicit-fallthrough by proper spellingMarko Mäkelä2018-01-032-14/+14
| * | | | | Merge 10.2 into bb-10.2-extMarko Mäkelä2018-01-037-37/+76
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge 10.1 into 10.2, with some MDEV-14799 fixupsmariadb-10.2.12Marko Mäkelä2018-01-037-37/+76
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge 10.0 into 10.1Marko Mäkelä2018-01-026-8/+34
| | | |\ \ \ | | | | |/ /
| | | | * | Merge 5.5 into 10.0Marko Mäkelä2018-01-026-8/+34
| | | | |\ \ | | | | | |/
| | | | | * Follow-up to MDEV-14799: Remove bogus debug assertionsMarko Mäkelä2018-01-022-6/+0
| | | | | * MDEV-14799 After UPDATE of indexed columns, old values will not be purged fro...Marko Mäkelä2018-01-026-4/+34
| * | | | | Follow-up fix of MDEV-14717 RENAME TABLE in InnoDB is not crash-safeMarko Mäkelä2018-01-031-5/+5
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-031-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Rocksdb fails to build when the source and build directory are not the same. ...Varun Gupta2018-01-021-0/+1
| * | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extMonty2018-01-0129-119/+362
| |\ \ \ \ \ | | |/ / / /
| | * | | | Fixed compiler warnings about possible uninitialized variablesMonty2018-01-011-1/+1
| | * | | | MDEV-12458: Variable and log records to indicate RocksDB version are missingVarun Gupta2017-12-316-0/+33
| | * | | | Merge remote-tracking branch 'origin/10.1' into bb-10.2-vicentiuVicențiu Ciorbaru2017-12-281-22/+25
| | |\ \ \ \ | | | |/ / /
| | | * | | MDEV-14272 Mariadb crashes with signal 11 when using federatedx engine and ga...Sergei Golubchik2017-12-281-2/+7
| | | * | | cleanup: ha_myisam::data_file_name and index_file_nameSergei Golubchik2017-12-251-22/+25
| | * | | | Removed curr_bitmap_pos++ from possible macroMonty2017-12-281-1/+2
| | * | | | Merge branch '10.2' into bb-10.2-mariarocksSergei Petrunia2017-12-2311-65/+40
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/10.1' into 10.2Vicențiu Ciorbaru2017-12-2211-65/+40
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Merge 10.0 into 10.1Marko Mäkelä2017-12-212-36/+30
| | | | |\ \ \ | | | | | |/ /
| | | | | * | MDEV-12827 Assertion failure when reporting duplicate key error in online tab...Marko Mäkelä2017-12-212-36/+30
| | | | * | | MDEV-6247 post-fix: Re-enable some debug assertionsMarko Mäkelä2017-12-214-16/+0
| | | | * | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-12-204-16/+8
| | | | |\ \ \ | | | | | |/ /
| | | | | * | Correct a function commentMarko Mäkelä2017-12-204-16/+8
| | | | * | | DEV-14701: install_db shows corruption for rest encryption with innodb_data_f...Jan Lindström2017-12-192-2/+5
| | * | | | | Fix a typo in previous commitSergei Petrunia2017-12-221-1/+1
| | * | | | | Better comments: explain why slave_use_idempotent_for_recovery is disabledSergei Petrunia2017-12-221-2/+1
| | * | | | | More fixes in MyRocks' rocksdb_rpl testsuiteSergei Petrunia2017-12-225-15/+21
| | * | | | | Cleanup in storage/rocksdb/mysql-test/rocksdb_rpl/t/disabled.defSergei Petrunia2017-12-221-1/+1
| | |/ / / /
| | * | | | Merge branch '10.2' into bb-10.2-mariarocksSergei Petrunia2017-12-2146-630/+765
| | |\ \ \ \
| | | * | | | Better comments part #2Sergei Petrunia2017-12-211-2/+1
| | | * | | | Better comments part #1Sergei Petrunia2017-12-211-3/+10
| | | * | | | Disable back rocksdb.col_opt_zerofill due to MDEV-14729Sergei Petrunia2017-12-211-0/+1
| | | * | | | MDEV-14165: not MyRocks -problem in ps-protocol, happens in upstream tooSergei Petrunia2017-12-201-1/+0
| | | * | | | Cleanup out of date comments (no real changes).Sergei Petrunia2017-12-201-8/+1
| | * | | | | MDEV-14290 Binlog rotate crashes when two commit_checkpoint_notify capable en...Andrei Elkin2017-12-113-0/+227
* | | | | | | MDEV-14848 MariaDB 10.3 refuses InnoDB crash-upgrade from MariaDB 10.2Marko Mäkelä2018-01-037-88/+233
* | | | | | | This is a full cost-based implementation of the optimization that employsIgor Babaev2017-12-304-4/+4
* | | | | | | fix a data race in debug build (#523)Eugene Kosov2017-12-251-8/+8
* | | | | | | MDEV-14477 InnoDB update_time is wrongly updated after partial rollback or in...Sergey Vojtovich2017-12-221-7/+2
* | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-12-201-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-14585 Automatically remove #sql- tables in InnoDB dictionary during reco...Marko Mäkelä2017-12-201-1/+1
* | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-12-2013-86/+219
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-14717 RENAME TABLE in InnoDB is not crash-safeMarko Mäkelä2017-12-2012-84/+217
* | | | | | | Merge bb-10.2-ext into 10.3Marko Mäkelä2017-12-1914-173/+209
|\ \ \ \ \ \ \ | |/ / / / / /