summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* mysql-test/suite/funcs_1/r/storedproc.result:Michael Widenius2011-05-021-2/+3
* Added ALTER ONLINE TABLE, which will give an error if the change can't be don...Michael Widenius2011-04-281-4/+15
* Added option "AND DISABLE CHECKPOINT" to "FLUSH TABLES WITH READ LOCK"Michael Widenius2011-04-288-9/+140
* mergeVladislav Vaintroub2011-04-101-2/+10
|\
| * Detect Boost installation and build OQGRAPH when possible. For now, disable o...Vladislav Vaintroub2011-04-101-2/+10
* | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-0815-326/+561
|\ \
| * | MWL#116: After-review fixes.unknown2011-04-074-135/+164
| * | 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-01284-4894/+5883
| |\ \
| * \ \ Merge MWL#116 after-review fixes.unknown2011-03-313-2/+9
| |\ \ \
| | * | | MWL#116: After-review fixes.unknown2011-03-313-2/+9
| * | | | Merge MWL#116, PBXT part into mariadb-5.2-rplunknown2011-01-314-47/+146
| |\ \ \ \
| | * | | | MWL#116: Efficient group commit: PBXT partunknown2010-10-154-47/+146
| * | | | | 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-2629-99/+37
| |\ \ \ \ \
| * | | | | | 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-0195-567/+2066
| | |\ \ \ \ \
| | * | | | | | 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-01594-20165/+55117
| | |\ \ \ \ \
| | * | | | | | MWL#116: Efficient group commit for binary logunknown2010-09-301-106/+102
* | | | | | | | Merge: Make EXPLAIN better at displaying MRR/BKASergey Petrunya2011-04-046-1/+20
|\ \ \ \ \ \ \ \
| * | | | | | | | Make EXPLAIN better at displaying MRR/BKA:Sergey Petrunya2011-04-026-1/+20
* | | | | | | | | Fixed all BUILD scripts to use g++ instead of gcc for linkingMichael Widenius2011-03-311-0/+10
|/ / / / / / / /
* | | | | | | | merge mwl#55Vladislav Vaintroub2011-03-113-33/+18
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | merge 5.2Vladislav Vaintroub2011-03-10265-4801/+5546
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | MBUG#688404 : Fix pbxt crashes on Windows 64 in debug build Vladislav Vaintroub2011-02-041-2/+15
| * | | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in orderVladislav Vaintroub2011-01-293-33/+18
* | | | | | | | Merge with 5.2Michael Widenius2011-03-09269-4798/+5539
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | |
| * | | | | | | Fixed wrong filenames in maria unittest that caused unittest to failMichael Widenius2011-03-011-2/+2
| * | | | | | | Merge with 5.1 to get fixes for tests and compiler warningsMichael Widenius2011-03-011-2/+2
| |\ \ \ \ \ \ \
| | * | | | | | | Get rid of compiler warningsMichael Widenius2011-02-281-2/+2
| * | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-28266-4793/+5549
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Automatic merge with 5.1-merge to get in Merge with MySQL 5.1.55Michael Widenius2011-02-26228-4400/+4747
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fixed compiler warningsMichael Widenius2011-02-251-2/+2
| | | * | | | | | | Fixed compiler and build error:Michael Widenius2011-02-252-1/+3
| | | * | | | | | | - maria/ma_test_all.sh can now be run with --tmpdir=/dev/shm for faster testingMichael Widenius2011-02-2511-132/+192
| | | * | | | | | | - 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-234-12/+10
| | | * | | | | | | 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
| | | * | | | | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-20156-3506/+2189
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ mergeGeorgi Kodinov2011-01-1032-393/+521
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Increment InnoDB Plugin version from 1.0.14 to 1.0.15.Vasil Dimov2011-01-081-1/+1
| | | | | * | | | | | | | Followup to vasil.dimov@oracle.com-20110107091222-q23qpb5skev0j9gcVasil Dimov2011-01-071-12/+15
| | | | | * | | | | | | | Merge mysql-5.1 -> mysql-5.1-innodbVasil Dimov2011-01-07105-2793/+989
| | | | | |\ \ \ \ \ \ \ \