summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* WL#4374 "Maria - force start if Recovery fails multiple times"Guilhem Bichot2008-06-0213-112/+503
* Fixed build errors/warnings caused by my last pushMichael Widenius2008-06-023-7/+8
* After merge fixesunknown2008-05-293-2/+4
* Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-2966-741/+1870
|\
| * WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"unknown2008-05-2942-601/+1195
| * Added versioning of row dataunknown2008-04-1034-171/+718
* | Logical merge of changes in myisam to maria.unknown2008-05-265-43/+87
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-14130-2956/+6863
|\ \
| * | After merge fixes.unknown2008-04-291-6/+0
| * | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-28130-2956/+6869
| |\ \
| | * \ Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-3112-33/+115
| | |\ \
| | | * \ Merge bk-internal:/home/bk/mysql-5.1-buildunknown2008-03-3126-54/+60
| | | |\ \
| | | | * \ Merge bk-internal:/home/bk/mysql-5.1unknown2008-03-3125-50/+53
| | | | |\ \
| | | | * | | Fix for bug #35392: Delete all statement does not execute properly unknown2008-03-281-4/+7
| | | * | | | Merge debian.(none):/MySQL/M51/mysql-5.1unknown2008-03-281-0/+2
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | apply snapshot innodb-5.1-ss2387unknown2008-03-2711-29/+108
| | * | | | | Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1unknown2008-03-3025-50/+53
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | |
| | | * | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-2825-50/+53
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-03-134-5/+20
| | | | |\ \ \
| | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2008-02-2725-50/+53
| | | | |\ \ \ \
| | | | | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2008-02-0825-50/+53
| | | | | |\ \ \ \
| | | | | | * \ \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainunknown2007-12-0725-50/+53
| | | | | | |\ \ \ \
| | | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-2625-50/+53
| | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-141-57/+167
| | | | | | | | |\ \ \ \
| | | | | | | | * \ \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainunknown2007-11-0825-50/+53
| | | | | | | | |\ \ \ \ \
| | | | | | | | | * | | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1unknown2007-10-1125-50/+53
| | * | | | | | | | | | | | Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rplunknown2008-03-291-1/+1
| | |/ / / / / / / / / / /
| | * | | | | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.1unknown2008-03-271-0/+2
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge host.loc:/home/uchum/work/mysql-5.1unknown2008-03-271-0/+2
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTSunknown2008-03-181-0/+2
| | | | | |_|_|_|_|_|_|/ / | | | | |/| | | | | | | |
| | * | | | | | | | | | | Merge trift2.:/MySQL/M51/ndb-decl-5.1unknown2008-03-271-2/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | ndb_version.h.in : Fix a syntax error (variable declaration came too late).unknown2008-02-051-2/+3
| | * | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-2714-40/+75
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51unknown2008-03-278-30/+60
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Apply innodb-5.1-ss2360 snapshotunknown2008-03-278-30/+60
| | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-03-276-10/+15
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2008-03-144-5/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / /
| | | | * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-065-9/+14
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | Use pkglibdir to simplify pkgplugindir, and fix the path in aunknown2008-01-025-5/+5
| | | | | * | | | | | | | | | | Add new pkgplugindir handling to seperate plugins from libraries,unknown2007-12-195-9/+14
| | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildunknown2008-02-261-1/+1
| | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainunknown2008-03-269-62/+177
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Post-merge fixunknown2008-03-261-1/+2
| | | * | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-ateamunknown2008-03-261-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/push/mysql-5.0-enginesunknown2008-03-211-1/+8
| | | | * | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2008-03-144-5/+20
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...unknown2008-03-144-5/+20
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|/ / / / / / / / / | | | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-enginesunknown2008-03-141-0/+6
| | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2008-03-261-5/+12
| | | * | | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.0-axmrgunknown2008-03-141-0/+6