summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* merge: 5.1 -> 5.1-rplLuis Soares2009-01-087-13/+9
|\
| * Merge from mysql-5.1.30-releaseunknown2008-11-277-13/+9
| |\
| | * mysql-test/r/partition.resultBuild Team2008-11-253-7/+3
| | * Changes of copyright output from "--version" and similar.unknown2008-11-143-4/+4
| | * Added "Sun Microsystems, Inc." to copyright headers on files modifiedBuild Team2008-11-102-2/+2
* | | merging 5.1 -> 5.1 rpl. 3 of 4 conflicts are resolved similarly to 6.0->6.0-r...Andrei Elkin2008-11-121-1/+1
|\ \ \ | |/ /
| * | Bug#37719: Crash if rename Archive table to same name with differentMattias Jonsson2008-10-031-1/+1
| |/
* | Merging 5.1 main into 5.1-rplMats Kindahl2008-10-232-2/+36
|\ \ | |/
| * Bug #38360: BLACKHOLE replication with RBR is brokenMats Kindahl2008-10-022-2/+36
* | Merge 5.1 main -> 5.1-rplHe Zhenxing2008-09-0619-100/+177
|\ \ | |/
| * MergeRamil Kalimullin2008-08-262-3/+3
| * merging fixesAlexey Botchkov2008-08-261-1/+1
| * mergingAlexey Botchkov2008-08-235-14/+48
| * Cherry-pick some changes from innodb-5.1-ss2545 snapshot. Includes fixes forTimothy Smith2008-08-203-7/+59
| * Cherry-pick one change from innodb-5.1-ss2485 snapshot. Fixes Bug#35602.Timothy Smith2008-08-191-1/+2
| * Cherry-pick some changes from innodb-5.1-ss2479 snapshot. Includes fixes forTimothy Smith2008-08-198-55/+41
| * Cherry-pick one part of innodb-5.1-ss2438 snapshot.Timothy Smith2008-08-191-1/+1
| * Merge from 5.0-bugteam.Chad MILLER2008-08-151-0/+3
| * Bug#36638 mysqld crashes when open file limit is passed and general query log...Sergey Glukhov2008-08-151-19/+19
| * Fix for bug#37537: myisamchk fails with Assertion failure with partitioned tableRamil Kalimullin2008-08-151-0/+1
| * Bug#20129: ALTER TABLE ... REPAIR PARTITION ... complains thatMattias Jonsson2008-08-111-1/+1
* | Merge 5.1 -> 5.1-rplSven Sandberg2008-07-061-1/+1
|\ \ | |/
| * Bug#36434: ha_innodb.so is installed in the wrong directoryTatiana A. Nurnberg2008-06-191-1/+1
* | Merge 5.1->5.1-rplMagnus Svensson2008-05-307-2/+46
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2008-05-201-0/+1
| |\
| | * Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1unknown2008-04-141-0/+1
| | |\
| | | * Fix for bug #35733 "main.symlink.test fails".unknown2008-04-071-0/+1
| * | | revert the following CS on grounds of "right patch, wrong time":unknown2008-05-145-67/+43
| * | | Apply InnoDB snapshot innodb-5.1-ss2438.unknown2008-05-105-43/+67
| * | | Bug #34297: MySQL Server crashes when processing large tableunknown2008-05-091-0/+8
| * | | Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)unknown2008-04-265-2/+37
| |/ /
* | | Revert faulty commitunknown2008-04-271-1/+1
* | | Add supression for expected warning(s) in slaves error logunknown2008-04-271-1/+1
|/ /
* | 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
|/ / / / / / / / / /