summaryrefslogtreecommitdiff
path: root/storage/rocksdb/mysql-test/rocksdb/r/rocksdb_locks.result
Commit message (Expand)AuthorAgeFilesLines
* Merge MyRocks merge tree into bb-10.2-mariarocks, unfinished.Sergei Petrunia2017-07-291-1/+1
|\
| * Copy ofSergei Petrunia2017-07-281-1/+1
* | Merge remote-tracking branch 'mergetrees/merge-myrocks' into 10.2-mariarocksSergei Petrunia2017-01-011-0/+1
|\ \ | |/
| * Copy ofSergei Petrunia2016-12-311-0/+1
* | MariaRocks port: temporarily? update ER_LOCK_WAIT_TIMEOUT error messagesSergei Petrunia2016-11-121-1/+1
|/
* Initial commit,Sergei Petrunia2016-10-061-0/+63