summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-10474-8353/+8483
* Merge nosik:/my/mysql-5.1monty@narttu.mysql.fi2007-05-0211-5/+126
|\
| * Added sql_mode PAD_CHAR_TO_FULL_LENGTH (WL#921)monty@mysql.com/nosik.monty.fi2007-04-2711-5/+126
* | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/maint/50tsmith@quadxeon.mysql.com2007-05-010-0/+0
|\ \
| * \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-05-0129-277/+650
| |\ \
| | * \ Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/50tsmith@quadxeon.mysql.com2007-05-0129-277/+650
| | |\ \
* | | | | mysql-test-run.pl:tsmith@quadxeon.mysql.com2007-05-011-11/+22
* | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-05-01187-863/+1098
|\ \ \ \ \
| * \ \ \ \ Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-05-016-16/+144
| |\ \ \ \ \
| | * \ \ \ \ Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-05-016-16/+144
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Post-merge fix.igor@olga.mysql.com2007-04-293-3/+8
| | | * | | | Merge olga.mysql.com:/home/igor/mysql-4.1-optigor@olga.mysql.com2007-04-294-4/+131
| | | |\ \ \ \
| | | | * | | | Fix in comments.igor@olga.mysql.com2007-04-291-1/+1
| | | | * | | | Fixed bug #24856: the result set of a ROLLUP query with DISTINCT could lackigor@olga.mysql.com2007-04-294-1/+132
| | | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-04-292-12/+8
| | | |\ \ \ \ \ | | | | |_|/ / / | | | |/| | | |
| | | | * | | | type_datetime.result, type_datetime.test:evgen@moonbone.local2007-04-292-12/+8
| * | | | | | | Merge whalegate.ndb.mysql.com:/home/tomas/mysql-5.1tomas@whalegate.ndb.mysql.com2007-04-3047-300/+1428
| |\ \ \ \ \ \ \ | | |/ / / / / /
| * | | | | | | shorten filenamestomas@whalegate.ndb.mysql.com2007-04-30167-819/+821
| * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndbjonas@perch.ndb.mysql.com2007-04-306-23/+46
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-04-306-23/+46
| | |\ \ \ \ \ \ \
| | | * | | | | | | ndb - bug#28161jonas@perch.ndb.mysql.com2007-04-306-23/+46
| * | | | | | | | | ndb_restore to set correct value force varparttomas@whalegate.ndb.mysql.com2007-04-305-3/+61
| |/ / / / / / / /
| * | | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/51-telco-gcajonas@perch.ndb.mysql.com2007-04-305-1/+25
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | ndb - force var part, part IIIjonas@perch.ndb.mysql.com2007-04-305-1/+25
| | * | | | | | | Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.1-telco-gcajonas@perch.ndb.mysql.com2007-04-309-156/+89
| | |\ \ \ \ \ \ \
| * | | | | | | | | enabled testtomas@whalegate.ndb.mysql.com2007-04-291-1/+1
* | | | | | | | | | Merge quadxeon.mysql.com:/benchmarks/ext3/TOSAVE/tsmith/bk/51tsmith@quadxeon.mysql.com2007-05-01110-2870/+6426
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-04-301-1/+0
| * | | | | | | | | 'no DBUG_RETURN' warning fixedholyfoot/hf@mysql.com/hfmain.(none)2007-04-301-4/+4
| * | | | | | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-04-291-0/+63
| * | | | | | | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-04-291-0/+32
| |\ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / | | |/| | | | | | |
| | * | | | | | | | Merge mysql.com:/d2/hf/mrg/mysql-4.1-optholyfoot/hf@mysql.com/hfmain.(none)2007-04-290-0/+0
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | | * | | | | | | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/hfmain.(none)2007-04-299-31/+175
| | | |\ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0holyfoot/hf@mysql.com/hfmain.(none)2007-04-2936-115/+1026
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1holyfoot/hf@hfmain.(none)2007-04-2946-296/+1330
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | merging fixholyfoot/hf@mysql.com/hfmain.(none)2007-04-296-19/+54
| | * | | | | | | | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optholyfoot/hf@hfmain.(none)2007-04-2933-150/+1078
| | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | Patch to eliminate compilation errors under VC after bug #13191 fix.gshchepa/uchum@gshchepa.loc2007-04-291-1/+1
| | | * | | | | | | | | Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-optgshchepa/uchum@gshchepa.loc2007-04-291-2/+2
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Patch to eliminate compilation errors under VC after bug #13191 fix.gshchepa/uchum@gshchepa.loc2007-04-291-2/+2
| | | * | | | | | | | | Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-optgshchepa/uchum@gshchepa.loc2007-04-295-35/+137
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / /
| | | | * | | | | | | | Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-optgshchepa/uchum@gshchepa.loc2007-04-295-30/+145
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fixed bug #13191.gshchepa/uchum@gshchepa.loc2007-04-295-30/+145
| | | * | | | | | | | | | Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-optgshchepa/uchum@gshchepa.loc2007-04-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Adjusted results after the fix for bug #20710.gshchepa/uchum@gshchepa.loc2007-04-291-1/+1
| | | * | | | | | | | | | Merge gshchepa.loc:/home/uchum/work/bk-trees/mysql-4.1-optgshchepa/uchum@gshchepa.loc2007-04-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / /
| | | | * | | | | | | | | Fixed bug #20710.gshchepa/uchum@gshchepa.loc2007-04-293-0/+29
| | | * | | | | | | | | | Additional fix for the bug#27590.evgen@sunlight.local2007-04-284-10/+10
| | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2007-04-276-33/+151
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Bug#16377: Wrong DATE/DATETIME comparison in BETWEEN function.evgen@moonbone.local2007-04-276-33/+151