summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge trift2.:/MySQL/M50/spec-5.0clone-5.0.32-buildunknown2006-12-141-1/+9
|\
| * support-files/mysql.spec.shunknown2006-12-141-1/+2
| * Merge trift2.:/MySQL/M41/spec-4.1unknown2006-12-141-0/+7
| |\
| | * support-files/mysql.spec.shunknown2006-12-141-0/+7
* | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0unknown2006-12-146-73/+113
|\ \ \ | |/ /
| * | Merge mysql.com:/home/gluh/MySQL/Merge/4.1-optunknown2006-12-120-0/+0
| |\ \ | | |/
| | * Merge mysql.com:/home/gluh/MySQL/Merge/4.1unknown2006-12-116-55/+93
| | |\
| | * \ Merge bk-internal:/home/bk/mysql-4.1-maintunknown2006-12-050-0/+0
| | |\ \
| | * \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836unknown2006-12-051-8/+0
| | |\ \ \
| | * \ \ \ Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836unknown2006-12-044-28/+147
| | |\ \ \ \
| * | \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2006-12-126-73/+113
| |\ \ \ \ \ \
| | * | | | | | merging fixunknown2006-12-072-2/+2
| | * | | | | | mergingunknown2006-12-073-18/+19
| | * | | | | | Merge mysql.com:/home/hf/work/22372/my41-22372unknown2006-12-066-62/+101
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | bug #22372unknown2006-12-061-0/+1
| | | * | | | | bug #22372 (LOAD DATA crashes the table with the geometry field)unknown2006-12-065-55/+92
* | | | | | | | BUG#24902 in 5.0unknown2006-12-121-1/+1
* | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0unknown2006-12-114-9/+16
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-12-071-3/+9
| |\ \ \ \ \ \ \
| | * | | | | | | do not autorelease build ids when a child of mysql-test-run.pl diesunknown2006-12-071-3/+9
| * | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-12-073-6/+7
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | BUG#24780 use --sysconfdir in scriptsunknown2006-12-073-6/+7
| * | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-12-051-0/+3
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
* | | | | | | | | Only call mysql_server_end if mysql_server_init has been called. unknown2006-12-061-2/+9
* | | | | | | | | Flush stderr after print of error message to get predictable outputunknown2006-12-061-0/+1
* | | | | | | | | Adjust replace to mask win pathsunknown2006-12-061-2/+2
* | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-maintunknown2006-12-0537-176/+682
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintunknown2006-12-050-0/+0
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Remove hack that removes vardirunknown2006-12-051-3/+0
| | * | | | | | | | Merge bk-internal:/home/bk/mysql-4.1-buildunknown2006-12-051-0/+3
| | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / | | | |/| | | / / / | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | re-enable multiple test runs in sequence for 4.1 on non-windowsunknown2006-12-051-0/+3
| | | | |_|/ / / | | | |/| | | |
| * | | | | | | Cset exclude: msvensson@neptunus.(none)|ChangeSet|20061204181655|04883unknown2006-12-051-19/+0
| * | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0unknown2006-12-0536-157/+682
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-053-5/+16
| | |\ \ \ \ \ \ \ | | | | |_|_|/ / / | | | |/| | | | |
| | * | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-0436-157/+682
| | |\ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-12-011-0/+9
| | | |\ \ \ \ \ \
| | | | * | | | | | ndb - bug#24752unknown2006-12-011-0/+9
| | | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workunknown2006-12-0122-48/+279
| | | |\ \ \ \ \ \ \ | | | | |/ / / / / /
| | | | * | | | | | ndb - bug#24748unknown2006-12-011-1/+4
| | | | * | | | | | ndb -unknown2006-12-015-6/+64
| | | | * | | | | | ndb - bug#24717unknown2006-12-0110-19/+87
| | | | * | | | | | ndb - bug#24503unknown2006-11-221-9/+0
| | | | * | | | | | ndb - bug#24503unknown2006-11-225-7/+38
| | | | * | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-11-221-8/+10
| | | | |\ \ \ \ \ \
| | | | | * | | | | | ndb - bug#24461unknown2006-11-221-8/+10
| | | | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-11-221-4/+0
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | ndb - bug#24461 - LockPagesInMemory ignoredunknown2006-11-221-4/+0
| | | | * | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workunknown2006-11-214-4/+86
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / /
| | | | | * | | | | | ndb -unknown2006-11-211-1/+6
| | | | | * | | | | | ndb - bug#24447unknown2006-11-213-3/+80