summaryrefslogtreecommitdiff
path: root/storage/xtradb
Commit message (Expand)AuthorAgeFilesLines
* merge with 5.1-microSergei Golubchik2011-06-072-5/+2
* Merge with 5.1-microsecondsMichael Widenius2011-05-281-2/+14
* Original idea from Zardosht Kasheff to add HA_CLUSTERED_INDEXMichael Widenius2011-05-181-4/+7
* Merge with 5.2Michael Widenius2011-05-161-3/+4
|\
| * Fix Windows embedded warningsVladislav Vaintroub2011-05-101-3/+4
* | Merge with MariaDB 5.2Michael Widenius2011-05-1058-878/+1235
|\ \ | |/
| * Automatic merge with 5.1Michael Widenius2011-05-041-1/+1
| |\
| | * Fixed compiler warningMichael Widenius2011-05-041-1/+1
| * | Automatic merge with MariaDB 5.1Michael Widenius2011-05-034-6/+5
| |\ \ | | |/
| | * Automatic mergeMichael Widenius2011-05-032-4/+2
| | |\
| | | * Fixed after-merge failures found by buildbotMichael Widenius2011-05-032-4/+2
| | * | Fix Xtradb compile error on Win64 - conversion between pointers of different ...Vladislav Vaintroub2011-05-031-1/+1
| | * | Fix compile errors:Vladislav Vaintroub2011-05-021-1/+2
| | |/
| * | Merge with MariaDB 5.1Michael Widenius2011-05-0358-875/+1233
| |\ \ | | |/
| | * Merge XtraDB from Percona Server 5.1.56-12.7 into MariaDB-5.1.unknown2011-04-2958-875/+1233
* | | Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"Michael Widenius2011-04-284-8/+122
* | | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-087-144/+251
|\ \ \
| * | | Change lock release to assert in XtraDB commit_ordered(); we never want tounknown2011-04-073-43/+43
| * | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-0162-760/+2365
| |\ \ \ | | |/ /
| * | | Merge MWL#116 after-review fixes.unknown2011-03-313-2/+9
| |\ \ \
| | * | | MWL#116: After-review fixes.unknown2011-03-313-2/+9
| * | | | After-merge fixes for MWL#47 (which causes changes in binlog positions in .re...unknown2011-01-271-1/+2
| * | | | Merge three Percona patches into mariadb-5.2-rpl:unknown2011-01-264-27/+11
| |\ \ \ \
| * | | | | Fix wrong printf() format.unknown2011-01-261-1/+2
| * | | | | Merge MWL#163 into mariadb-5.2-rplunknown2010-12-254-1/+82
| |\ \ \ \ \
| | * | | | | MWL#163: release of row locks in InnoDB during prepareunknown2010-11-034-1/+82
| | | |/ / / | | |/| | |
| * | | | | Merge MWL#116 into mariadb-5.2-rpl.unknown2010-12-253-135/+153
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge latest MariaDB 5.1 into MWL#116.unknown2010-11-0146-293/+1053
| | |\ \ \ \
| | * | | | | MWL#116: Efficient group commit: Fix bug that binlog pos stored by XtraDB dur...unknown2010-10-182-24/+12
| | * | | | | MWL#116: Efficient group commitunknown2010-10-042-67/+101
| | * | | | | Merge with latest MariaDB 5.1unknown2010-10-01250-2928/+42106
| | |\ \ \ \ \
| | * | | | | | MWL#116: Efficient group commit for binary logunknown2010-09-301-106/+102
* | | | | | | | Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-022-0/+5
* | | | | | | | Merge with 5.2Michael Widenius2011-03-0961-757/+2363
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | |
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-2861-758/+2364
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Fixed compiler warningsMichael Widenius2011-02-251-2/+2
| | * | | | | | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-253-2/+3
| | * | | | | | - Reduced memory requirements for mysqltest to 1/4.th This also gave a speed...Michael Widenius2011-02-241-0/+2
| | * | | | | | Fixed build failuresMichael Widenius2011-02-232-4/+5
| | * | | | | | Merged InnoDB plugin from MySQL 5.1.54 -> MySQL 5.1.55 into xtradbMichael Widenius2011-02-2227-404/+671
| | * | | | | | Merge with xtradb code changesMichael Widenius2011-02-2248-427/+1762
| | |\ \ \ \ \ \
| | | * | | | | | Merge XtraDB from Percona Server 5.1.54-12.5 into MariaDB.unknown2011-02-0448-427/+1762
| | * | | | | | | Fixed compiler warningsMichael Widenius2011-02-101-1/+1
| | |/ / / / / /
| | * | | | | | Fixed bugs found by buildbot:Michael Widenius2011-01-261-1/+1
* | | | | | | | MRR interface: change range_info's type from char* to range_id_t typedef. The...Sergey Petrunya2011-03-042-2/+2
* | | | | | | | automatic mergeMichael Widenius2011-02-251-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Fixed compiler warningsMichael Widenius2011-02-251-1/+1
* | | | | | | | | BUG#724537: innodb_mysql.test fails with --embedded-serverSergey Petrunya2011-02-241-2/+2
|/ / / / / / / /
* | | | | | | | Fixed build issuesMichael Widenius2011-02-231-1/+1
* | | | | | | | Merge in new handler and handlersocket code into 5.3 mainMichael Widenius2011-02-222-2/+2
|\ \ \ \ \ \ \ \