summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | Changes from the innodb-5.1-ss28 snapshot.unknown2005-12-1315-235/+137
| | | |_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | |
* | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0-pushunknown2005-12-142-3/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-147-6/+72
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-147-6/+72
| | |\ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-1447-106/+512
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | | Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-131-4/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-126-15/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-122-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-123-2/+45
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge knielsen@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-121-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal:/home/bk/mysql-5.0unknown2005-12-081-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Fix QNX and IRIX compilationunknown2005-12-081-1/+1
* | | | | | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-146-4/+66
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-146-4/+66
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-146-4/+66
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | bug#15682 - ndb - invalid handling of varchar in position/rnd_posunknown2005-12-147-6/+74
* | | | | | | | | | | | | | | | | | | | | Removed wrong merge from 5.0 - 5.1unknown2005-12-141-1/+0
* | | | | | | | | | | | | | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0unknown2005-12-143-4/+11
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | Patch for Bug#13640unknown2005-12-141-2/+2
| * | | | | | | | | | | | | | | | | | | | Disabled test. Fails in ps-protocol mode.unknown2005-12-141-0/+1
| * | | | | | | | | | | | | | | | | | | | Disabled archive db for Netware.unknown2005-12-142-4/+4
| * | | | | | | | | | | | | | | | | | | | Datadir variable should not be reset, if it wasunknown2005-12-141-2/+8
* | | | | | | | | | | | | | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0unknown2005-12-145-4/+23
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | Netware specific changes.unknown2005-12-142-2/+2
| * | | | | | | | | | | | | | | | | | | | Fixed test case.unknown2005-12-141-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-143-3/+21
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-133-3/+21
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Fix bug #15268 Unchecked null value caused server crashunknown2005-12-093-3/+21
| * | | | | | | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-1310-78/+191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-newunknown2005-12-1415-4/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.0unknown2005-12-1325-16/+304
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.1unknown2005-12-1315-4/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Minor Netware specific changes.unknown2005-12-133-2/+12
| | | * | | | | | | | | | | | | | | | | | | | Merge a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-4.0unknown2005-12-1313-0/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | Increased stack size for clients on Netware.unknown2005-12-1313-0/+13
* | | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/alexi/innodb-ss/mysql-5.0-ss92unknown2005-12-132-4/+30
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | |/| | | | | / / / / / / / / / / / / / / / / / | |_|_|_|_|_|/ / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-1310-78/+191
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Fix BUG#12071: "Windows hang:'Opening tables' or 'Waiting forunknown2005-12-1310-78/+191
| * | | | | | | | | | | | | | | | | | | | | | Bug#15675 - ndb - fix read_multi_range.test drop all tables it usingunknown2005-12-131-1/+1
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | Null-merge from 4.1unknown2005-12-131-86/+86
| | * | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/alexi/mysql-4.1unknown2005-12-131-86/+86
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | / / / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-1215-166/+253
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | Fix BUG#12071: "Windows hang: 'Opening tables' or 'Waiting forunknown2005-12-1215-166/+253
| | | * | | | | | | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-12-122-6/+6
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/bug12429unknown2005-12-122-6/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | ndb - merge errorunknown2005-12-131-0/+6
| * | | | | | | | | | | | | | | | | | | | | | | Update ndb version in configure.inunknown2005-12-131-1/+1
| * | | | | | | | | | | | | | | | | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/mysql-5.0unknown2005-12-139-8/+250
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | / / / / / / / / / / / / / / / | | | |_|_|_|_|_|/ / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | Merge rparranovo@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-12-121-4/+24
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |