summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* 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.1kostja@bodhi.(none)2008-05-201-0/+1
| |\
| | * Merge kpdesk.mysql.com:/home/thek/Development/cpp/mysql-5.1thek@kpdesk.mysql.com2008-04-141-0/+1
| | |\
| | | * Fix for bug #35733 "main.symlink.test fails".dlenev@mockturtle.local2008-04-071-0/+1
| * | | revert the following CS on grounds of "right patch, wrong time":tnurnberg@noir.wlan.koehntopp.de2008-05-145-67/+43
| * | | Apply InnoDB snapshot innodb-5.1-ss2438.tsmith@ramayana.hindu.god2008-05-105-43/+67
| * | | Bug #34297: MySQL Server crashes when processing large tabletsmith@ramayana.hindu.god2008-05-091-0/+8
| * | | Fixed bug#36006: Optimizer does table scan for SELECT COUNT(*)gshchepa/uchum@host.loc2008-04-265-2/+37
| |/ /
* | | Revert faulty commitmsvensson@pilot.mysql.com2008-04-271-1/+1
* | | Add supression for expected warning(s) in slaves error logmsvensson@pilot.mysql.com2008-04-271-1/+1
|/ /
* | Merge bk-internal:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-3112-33/+115
|\ \
| * \ Merge bk-internal:/home/bk/mysql-5.1-buildgkodinov/kgeorge@magare.gmz2008-03-3126-54/+60
| |\ \
| | * \ Merge bk-internal:/home/bk/mysql-5.1gkodinov/kgeorge@magare.gmz2008-03-3125-50/+53
| | |\ \
| | * | | Fix for bug #35392: Delete all statement does not execute properly ramil/ram@mysql.com/ramil.myoffice.izhnet.ru2008-03-281-4/+7
| | | |/ | | |/|
| * | | Merge debian.(none):/MySQL/M51/mysql-5.1joerg@debian.(none)2008-03-281-0/+2
| |\ \ \ | | |/ /
| * | | apply snapshot innodb-5.1-ss2387df@pippilotta.erinye.com2008-03-2711-29/+108
* | | | Merge mysql1000.(none):/home/andrei/MySQL/BARE/mysql-5.1aelkin/andrei@mysql1000.(none)2008-03-3025-50/+53
|\ \ \ \ | | |_|/ | |/| |
| * | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-2825-50/+53
| |\ \ \ | | |_|/ | |/| |
| | * | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-03-134-5/+20
| | |\ \
| | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2008-02-2725-50/+53
| | |\ \ \
| | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2008-02-0825-50/+53
| | | |\ \ \
| | | | * \ \ Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-mainjani@a88-113-38-195.elisa-laajakaista.fi2007-12-0725-50/+53
| | | | |\ \ \
| | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-2625-50/+53
| | | | | |\ \ \
| | | | | | * \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-141-57/+167
| | | | | | |\ \ \
| | | | | | * \ \ \ Merge hynda.mysql.fi:/home/my/mysql-5.1-mainjani@hynda.mysql.fi2007-11-0825-50/+53
| | | | | | |\ \ \ \
| | | | | | | * | | | Moved a lot of old bug fixes and safe cleanups from Maria 5.1 tree to 5.1monty@mysql.com/narttu.mysql.fi2007-10-1125-50/+53
* | | | | | | | | | | Merge mysql1000.(none):/home/andrei/MySQL/MERGE/5.0-main2rplaelkin/andrei@mysql1000.(none)2008-03-291-1/+1
|/ / / / / / / / / /
* | | | | | | | | | Merge mysql.com:/misc/mysql/mysql-5.1tnurnberg@white.intern.koehntopp.de2008-03-271-0/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Merge host.loc:/home/uchum/work/mysql-5.1gshchepa/uchum@host.loc2008-03-271-0/+2
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Bug#35406 5.1-opt crashes on select from I_S.REFERENTIAL_CONSTRAINTSgluh@mysql.com/mgluh.(none)2008-03-181-0/+2
| | | |_|_|_|_|_|_|/ | | |/| | | | | | |
* | | | | | | | | | Merge trift2.:/MySQL/M51/ndb-decl-5.1joerg@trift2.2008-03-271-2/+3
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ndb_version.h.in : Fix a syntax error (variable declaration came too late).joerg@trift2.2008-02-051-2/+3
* | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-2714-40/+75
|\ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge rhel5-ia64-a.mysql.com:/data0/tsmith/51tsmith@rhel5-ia64-a.mysql.com2008-03-278-30/+60
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Apply innodb-5.1-ss2360 snapshottsmith@rhel5-ia64-a.mysql.com2008-03-278-30/+60
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1tsmith@rhel5-ia64-a.mysql.com2008-03-276-10/+15
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2008-03-144-5/+20
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | * | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildjperkin/jonathan@chorlton.adsl.perkin.org.uk2008-03-065-9/+14
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Use pkglibdir to simplify pkgplugindir, and fix the path in ajperkin/jonathan@chorlton.adsl.perkin.org.uk2008-01-025-5/+5
| | | * | | | | | | | | | Add new pkgplugindir handling to seperate plugins from libraries,jperkin/jonathan@chorlton.adsl.perkin.org.uk2007-12-195-9/+14
| | * | | | | | | | | | | Merge mysql.com:/home/kent/bk/build/mysql-5.0-buildkent@kent-amd64.(none)2008-02-261-1/+1
| | | |_|_|/ / / / / / / | | |/| | | | | | | | |
* | | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-amainistruewing@stella.local2008-03-269-62/+177
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / |/| | | | | | | | | | |
| * | | | | | | | | | | Post-merge fixistruewing@stella.local2008-03-261-1/+2
| * | | | | | | | | | | Merge stella.local:/home2/mydev/mysql-5.1-ateamistruewing@stella.local2008-03-261-1/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/push/mysql-5.0-enginessvoj@june.mysql.com2008-03-211-1/+8
| | * | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.1-enginesantony@pcg5ppc.xiphis.org2008-03-144-5/+20
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge pcg5ppc.xiphis.org:/Network/Servers/anubis.xiphis.org/home/antony/work/...antony@pcg5ppc.xiphis.org2008-03-144-5/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | * | | | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG28248/mysql-5.0-enginessvoj@june.mysql.com2008-03-141-0/+6
| | |/ / / / / / / / / / /