summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug26294/my50-bug26294cmiller@zippy.cornsilk.net2008-04-035-8/+8
|\
| * Bug#26294: library name conflict between MySQL 4.x, 5.0 and Qt 3.3cmiller@zippy.cornsilk.net2008-04-035-8/+8
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-buildcmiller@zippy.cornsilk.net2008-04-037-62/+435
|\ \
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-buildcmiller@zippy.cornsilk.net2008-04-027-62/+435
| |\ \
| | * \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug15776/my50-bug15776cmiller@zippy.cornsilk.net2008-04-027-62/+435
| | |\ \
| | | * | Test updated.cmiller@zippy.cornsilk.net2008-04-011-0/+1
| | | * | Fix minor complaints of Marc Alff, for patch against B-g#15776.cmiller@zippy.cornsilk.net2008-03-262-2/+5
| | | * | Bug#15776: 32-bit signed int used for length of blobcmiller@zippy.cornsilk.net2007-08-317-63/+434
* | | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2008-04-03116-10700/+9096
|\ \ \ \ \
| * \ \ \ \ Merge five.local.lan:/work/merge/mysql-5.0-funcs_1mleich@five.local.lan2008-04-021-2/+2
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Correct the location of the directory formleich@five.local.lan2008-04-021-2/+2
| * | | | | Merge mleich@bk-internal.mysql.com:/home/bk/mysql-5.0-buildmleich@five.local.lan2008-04-02116-10700/+9096
| |\ \ \ \ \
| | * \ \ \ \ Merge five.local.lan:/work/merge/mysql-5.0-Bugmleich@five.local.lan2008-04-01116-10700/+9096
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Fix for mleich@five.local.lan2008-03-31116-10700/+9096
* | | | | | | Post-merge fixes.mkindahl@dl145h.mysql.com2008-04-011-2/+2
* | | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0mkindahl@dl145h.mysql.com2008-04-0118-140/+696
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Removing race conditions from rpl_packet causing test to fail.mkindahl@dl145h.mysql.com2008-03-312-1/+19
| * | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.0mkindahl@dl145h.mysql.com2008-03-3116-137/+677
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | post fix after push of BUG#33029hezx@mail.hezx.com2008-03-276-107/+107
| | * | | | | Merge mail.hezx.com:/media/sda3/work/mysql/bkroot/mysql-5.0-rplhezx@mail.hezx.com2008-03-264-3/+290
| | |\ \ \ \ \
| | | * | | | | BUG#33029 5.0 to 5.1 replication fails on dup key when insertinghezx@mail.hezx.com2008-03-144-3/+290
| | * | | | | | Merge mysql1000.(none):/home/andrei/MySQL/FIXES/5.0/bug35178_bh_aiaelkin/andrei@mysql1000.(none)2008-03-213-3/+42
| | |\ \ \ \ \ \
| | | * | | | | | Bug #35178 INSERT_ID not written to binary log for inserts against BLACKHOLE ...aelkin/andrei@mysql1000.(none)2008-03-193-3/+42
| | * | | | | | | Merge mysql1000.(none):/home/andrei/MySQL/FIXES/5.0/bug18199-purge_no_warnaelkin/andrei@mysql1000.(none)2008-03-215-26/+240
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug #18199 PURGE BINARY LOGS fails silently with missing logs;aelkin/andrei@mysql1000.(none)2008-03-175-26/+240
| | | |/ / / / / /
* | | | | | | | | Bug#26243 - Cleanup Valgrind erroriggy@amd64.(none)2008-03-301-1/+1
* | | | | | | | | fixed warnings from the fix of 26243gkodinov/kgeorge@macbook.gmz2008-03-297-17/+18
* | | | | | | | | fixes for warnings and compile errors for the fix of bug 26243gkodinov/kgeorge@macbook.gmz2008-03-294-5/+9
* | | | | | | | | fixed warnings and compile errors from the fix for bug 26243gkodinov/kgeorge@macbook.gmz2008-03-2927-79/+75
* | | | | | | | | Merge amd64.(none):/src/mysql-5.0-bugteamiggy@amd64.(none)2008-03-283-8/+8
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix tree:anozdrin/alik@quad.opbmk2008-03-283-8/+8
* | | | | | | | | | Merge amd64.(none):/src/mysql-5.0-bugteamiggy@amd64.(none)2008-03-2819-1444/+1754
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Bug#26243 mysql command line crash after control-ciggy@amd64.(none)2008-03-2819-1444/+1754
* | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteamanozdrin/alik@quad.opbmk2008-03-285-14/+207
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW.anozdrin/alik@quad.opbmk2008-03-285-14/+207
* | | | | | | | | | | Merge witty.:/Users/mattiasj/clones/bug21413-50-enginesmattiasj@witty.2008-03-281-7/+21
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-enginesmattiasj@witty.2008-03-280-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#21413 - Engine table handler used by multiple threadsmattiasj@witty.2008-03-281-3/+2
| * | | | | | | | | | | Merge witty.:/Users/mattiasj/Public/shared-vms/bug21413-41-enginesmattiasj@witty.2008-03-271-7/+21
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Recommit of antonys previous commit.mattiasj@witty.2008-03-271-14/+30
* | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteamevgen@moonbone.local2008-03-2810-36/+395
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Bug#27219: Aggregate functions in ORDER BY.evgen@moonbone.local2008-03-2710-36/+395
* | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov/kgeorge@magare.gmz2008-03-286-36/+190
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0gkodinov/kgeorge@magare.gmz2008-03-286-36/+190
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / | |/| | | | | | | | | | |
| | * | | | | | | | | | | Patch clean up.davi@mysql.com/endora.local2008-03-272-4/+4
| | * | | | | | | | | | | Merge mysql.com:/Users/davi/mysql/mysql-5.1-bug33201davi@endora.local2008-03-273-0/+51
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Bug#33201 Crash occurs when granting update privilege on one column of a viewthek@adventure.(none)2008-02-013-0/+51
| | * | | | | | | | | | | | Merge tnurnberg@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteamtnurnberg@white.intern.koehntopp.de2008-03-273-36/+139
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | / / / / / / | | | |_|_|_|_|/ / / / / / | | |/| | | | | | | | | |
| | | * | | | | | | | | | Merge mysql.com:/misc/mysql/34731_/50-34731tnurnberg@white.intern.koehntopp.de2008-03-273-36/+139
| | | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | | * | | | | | | | | Bug#34731: highest possible value for INT erroneously filtered by WHEREtnurnberg@mysql.com/white.intern.koehntopp.de2008-03-103-36/+140