summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* MergeIgor Babaev2011-04-2611-256/+817
|\
| * Fixed LP bugs #717577, #724942.Igor Babaev2011-04-2611-256/+817
* | Fixed LP bug #752353.Igor Babaev2011-04-204-0/+40
* | lp:730035 Handlersocket does not loadSergei Golubchik2011-04-194-2/+27
* | Merge test case fix from MariaDB 5.2-rpl into 5.3.unknown2011-04-142-0/+4
|\ \
| * | Fix race in testcase innodb_plugin.group_commitunknown2011-04-142-0/+4
* | | Missing PBXT result file updates after previous patch.unknown2011-04-122-3/+3
* | | mergeVladislav Vaintroub2011-04-101-2/+10
|\ \ \
| * | | Detect Boost installation and build OQGRAPH when possible. For now, disable o...Vladislav Vaintroub2011-04-101-2/+10
| * | | mergeVladislav Vaintroub2011-04-085-32/+269
| |\ \ \
* | \ \ \ Merge various replication-related patches into MariaDB 5.3:unknown2011-04-08105-893/+7066
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Fix merge error.unknown2011-04-071-4/+0
| * | | | MWL#116: After-review fixes.unknown2011-04-0723-142/+171
| * | | | Change lock release to assert in XtraDB commit_ordered(); we never want tounknown2011-04-073-43/+43
| * | | | After-merge fixes.unknown2011-04-041-0/+4
| * | | | Merge --binlog_optimize_thread_scheduling into mariadb-5.2-rpl.unknown2011-04-0411-6/+583
| |\ \ \ \
| | * | | | MWL#116: group commitunknown2011-03-2311-6/+573
| * | | | | Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-011686-42265/+28353
| |\ \ \ \ \
| * \ \ \ \ \ Merge MWL#136 after-review fixes into mariadb-5.2-rplunknown2011-04-011-6/+20
| |\ \ \ \ \ \
| | * | | | | | MWL#136 after-review fixes.unknown2011-04-011-6/+20
| * | | | | | | Merge MWL#116 after-review fixes.unknown2011-03-3114-124/+192
| |\ \ \ \ \ \ \
| | * | | | | | | MWL#116: After-review fixes.unknown2011-03-3114-124/+187
| | | |_|/ / / / | | |/| | | | |
| * | | | | | | Merge MWL#116, PBXT part into mariadb-5.2-rplunknown2011-01-316-48/+254
| |\ \ \ \ \ \ \
| | * | | | | | | MWL#116: Efficient group commit: PBXT partunknown2010-10-155-47/+253
| * | | | | | | | Merge missing result file update for lp:697174 fix.unknown2011-01-271-1/+1
| |\ \ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | lp:697174, missing result file update.unknown2011-01-271-1/+1
| * | | | | | | | Merge fix for lp:697174unknown2011-01-272-10/+22
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | lp:697174: Do not put absolute path in status variable binlog_snapshot_file.unknown2011-01-272-10/+22
| * | | | | | | | After-merge fixes for MWL#47 (which causes changes in binlog positions in .re...unknown2011-01-278-62/+71
| * | | | | | | | automergeunknown2011-01-271-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | MWL#136: Fix typo (wrong type) breaking compile.unknown2011-01-271-1/+1
| * | | | | | | | Merge three Percona patches into mariadb-5.2-rpl:unknown2011-01-26154-491/+3403
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Fix incorrect DBUG_ASSERT().unknown2011-01-261-1/+1
| | * | | | | | | | Make mysqlbinlog omit redundant `use` around BEGIN/SAVEPOINT/COMMIT/ROLLBACK ...unknown2011-01-132-8/+15
| | * | | | | | | | Fix two compiler warnings from Buildbot (including one bad merge).unknown2011-01-112-2/+2
| | * | | | | | | | Mergeunknown2011-01-104-23/+492
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Merge Percona patch row_based_replication_without_primary_key.patch into Mari...unknown2010-12-274-23/+492
| | * | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-1052-156/+2649
| * | | | | | | | | | Fix wrong printf() format.unknown2011-01-261-1/+2
| * | | | | | | | | | Merge MWL#163 into mariadb-5.2-rplunknown2010-12-258-1/+319
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | MWL#163: release of row locks in InnoDB during prepareunknown2010-11-038-1/+324
| * | | | | | | | | | | Merge MWL#136 into mariadb-5.2-rplunknown2010-12-259-45/+520
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | MWL#136: Rename binlog_trx_{file,position} to the much better binlog_snapshot...unknown2010-11-084-32/+33
| | * | | | | | | | | | MWL#136: Fix test failures for row-based binlogging by fixing binlog format.unknown2010-11-084-0/+8
| | * | | | | | | | | | MWL#136: Cross-engine consistency for START TRANSACTION WITH CONSISTENT SNAPSHOTunknown2010-11-077-45/+511
| | | |_|_|_|/ / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge MWL#116 into mariadb-5.2-rpl.unknown2010-12-2523-443/+1921
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | MWL#116: Add two more test cases:unknown2010-11-035-0/+263
| | |/ / / / / / / /
| | * | | | | | | | Fix error insert to have deterministic errno (fixes test failure on mac).unknown2010-11-022-3/+4
| | * | | | | | | | Minor whitespace/comment cleanup.unknown2010-11-012-7/+4
| | * | | | | | | | Merge latest MariaDB 5.1 into MWL#116.unknown2010-11-01253-1596/+4990
| | |\ \ \ \ \ \ \ \