summaryrefslogtreecommitdiff
path: root/storage
Commit message (Expand)AuthorAgeFilesLines
* Merge chilla.local:/home/mydev/mysql-5.1--mainunknown2006-09-2110-10/+10
|\
| * Bug#22417unknown2006-09-1810-10/+10
* | Merge chilla.local:/home/mydev/mysql-5.0-bug14400-montyunknown2006-09-193-37/+37
* | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0-enginesunknown2006-09-185-10/+30
* | Merge april.(none):/home/svoj/devel/bk/mysql-5.1unknown2006-09-183-20/+43
|\ \ | |/ |/|
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2006-09-151-2/+2
| |\
| | * Merge chilla.local:/home/mydev/mysql-5.0-bug14400unknown2006-09-141-2/+2
| * | Merge chilla.local:/home/mydev/mysql-5.1--mainunknown2006-09-143-20/+43
| |\ \ | | |/
| | * Merge chilla.local:/home/mydev/mysql-5.0-bug14400unknown2006-09-071-20/+34
* | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.1unknown2006-09-1610-143/+150
|\ \ \
| * | | This changes the order of the universe, black is now the new white.unknown2006-09-1510-143/+150
| |/ /
* | | Merge shellback.(none):/home/msvensson/mysql/work/my50-workunknown2006-09-151-4/+0
* | | Post-merge fix: remove dup() call in ha_archive.cc which resulted in a memory...unknown2006-09-141-1/+1
* | | Post-merge fixes:unknown2006-09-131-1/+0
* | | Merge maint2.mysql.com:/data/localhome/tsmith/bk/mrg50/50unknown2006-09-132-1/+2
|/ /
* | Correct faulty merge, "mysql_priv.h" must be included for the ifdef WITH_INNO...unknown2006-09-121-2/+2
* | Merge bk-internal:/home/bk/mysql-5.1-new-maintunknown2006-09-121-0/+11
|\ \
| * | Merge naruto.:C:/cpp/bug20789/my50-bug20789unknown2006-09-121-0/+11
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1unknown2006-09-12128-8505/+9383
|\ \ \ | |/ /
| * | Merge shellback.(none):/home/msvensson/mysql/mysql-5.1unknown2006-09-08127-8454/+9301
| |\ \
| | * | mi_test_all.sh needs "./" before the executable names otherwise theyunknown2006-09-061-128/+128
| | * | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-maintunknown2006-09-051-2/+2
| | * | Applied InnoDB 5.1 snapshot ss787.unknown2006-09-05126-8199/+9160
| | * | Merge maint2.mysql.com:/data/localhome/tsmith/bk/g51unknown2006-09-0417-171/+57
| | |\ \
| | | * \ Manual merge.unknown2006-08-301-1/+1
| | | |\ \
| | | * \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-08-2834-181/+6893
| | | |\ \ \ | | | | |/ /
| | | * | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-08-212-3/+1
| | | |\ \ \
| | | * \ \ \ Merge salvation.intern.azundris.com:/home/tnurnberg/work/mysql-5.1-maint-i51unknown2006-08-1718-186/+65
| | | |\ \ \ \
| | | | * \ \ \ Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.1-new-maintunknown2006-08-1718-186/+65
| | | | |\ \ \ \
| | | | | * \ \ \ Merge tnurnberg@maint1:/data/localhome/tnurnberg/i51unknown2006-08-1618-186/+65
| | | | | |\ \ \ \
| | | | | | * | | | Applied innodb-5.1-ss677, -ss680, -ss713, and -ss720 snapshots.unknown2006-08-1518-186/+65
* | | | | | | | | | Warning fixes for Windows, and an include fix for Windows for Innodb.unknown2006-09-073-8/+11
* | | | | | | | | | Fix for a compile problem in Windows. unknown2006-09-071-28/+0
* | | | | | | | | | Moves Innodb handler to the Innodb storage directory.unknown2006-09-076-1/+7997
|/ / / / / / / / /
* | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-068-8/+24
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-09-018-8/+24
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-08-318-8/+24
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | add 2 placeholder values for config and system variables.unknown2006-08-308-8/+24
| | | | |_|_|_|_|/ / | | | |/| | | | | |
* | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.1unknown2006-09-0314-50/+43
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-5.1-optunknown2006-09-0114-50/+43
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-08-3114-50/+43
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Merge moonbone.local:/work/tmp_merge-5.0-mysqlunknown2006-08-2914-50/+43
* | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbunknown2006-09-034-28/+43
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | ndb -unknown2006-09-033-7/+24
| * | | | | | | | | | ndb -unknown2006-09-031-21/+19
| |/ / / / / / / / /
* | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1-ndbunknown2006-09-0236-185/+1053
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Added missing returnunknown2006-09-011-1/+1
| * | | | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2006-09-0136-185/+1053
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Fixed ndbapi-examples, and added tests for mysql-test-run.plunknown2006-09-0121-80/+903
| | * | | | | | | | | NDBAPI cleanupunknown2006-08-3015-105/+150
| | | |_|_|_|_|_|/ / | | |/| | | | | | |