summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge host.loc:/work/bk/5.0-bugteamunknown2008-05-184-0/+113
|\
| * Merge host.loc:/work/bugs/5.0-bugteam-36676unknown2008-05-184-0/+113
| |\
| | * Fixed bug#36676: multiupdate using LEFT JOIN updates onlyunknown2008-05-184-0/+113
* | | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-bugteamunknown2008-05-180-0/+0
|\ \ \ | |/ /
| * | Bug #36705 key_buffer_size of >= 2G allocates all availabel virtual memory on...unknown2008-05-171-2/+2
| * | Merge bk-internal.mysql.com:/home/bk/mysql-5.0-bugteamunknown2008-05-168-61/+535
| |\ \
| | * \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570unknown2008-05-168-61/+535
| | |\ \
| * | \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-bugteamunknown2008-05-163-4/+31
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2008-05-161-2/+2
| |\ \ \ \
| | * | | | Raise version number after cloning 5.0.62unknown2008-05-161-2/+2
* | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my51-bug36570unknown2008-05-169-71/+550
|\ \ \ \ \ \
| * | | | | | Re-record results from unmerged file.unknown2008-05-161-0/+11
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570unknown2008-05-161-0/+5
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | |
| | * | | | | Add a test at Andrei's behest. Show the SHOW CREATE on theunknown2008-05-162-0/+16
| * | | | | | Fix merge problems and re-record output for legitimate changes.unknown2008-05-165-46/+89
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570unknown2008-05-162-0/+362
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Updated to address Davi's complaint about missing binlog.unknown2008-05-162-0/+358
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570unknown2008-05-155-21/+36
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \unknown2008-05-158-61/+161
| * | | | | | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/bug36570/my50-bug36570unknown2008-05-152-16/+59
| |\ \ \ \ \ \
| | * | | | | | Bug#36570: Parse error of CREATE PROCEDURE stmt with comments on \unknown2008-05-146-51/+132
| | |/ / / / /
* | | | | | | subselect.result:unknown2008-05-161-6/+6
* | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B36011-take2-5.0-bugteamunknown2008-05-1632-4/+205045
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Bug #36011: server crash with explain extended on query unknown2008-05-163-4/+31
| | |_|_|/ / | |/| | | |
* | | | | | Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteamunknown2008-05-163-44/+34
|\ \ \ \ \ \
| * | | | | | Fixes to make rpl_insert_id pass in 5.1-bugteam.unknown2008-05-163-44/+34
* | | | | | | Merge mysql.com:/Users/davi/mysql/mysql-5.0-bugteamunknown2008-05-160-0/+0
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge host.loc:/work/bugs/5.0-bugteam-36488unknown2008-05-163-0/+23
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
* | | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-167-812/+74
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | |
| * | | | | | Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-167-812/+74
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-167-812/+74
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge mats-laptop.(none):/home/bkroot/mysql-5.1-bugteamunknown2008-05-157-812/+74
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge mkindahl@bk-internal.mysql.com:/home/bk/mysql-5.1-bug36197unknown2008-05-128-211/+112
| | | | |\ \ \ \ \ \
| | | | | * | | | | | BUG#36197: flush tables (or little table cache) can cause crash on slaveunknown2008-05-128-211/+112
* | | | | | | | | | | Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5....unknown2008-05-163-0/+23
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge host.loc:/work/bugs/5.0-bugteam-36488unknown2008-05-163-0/+23
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | / / / / | | | |_|_|_|/ / / / | | |/| | | | | | |
| | * | | | | | | | Fixed bug #36488: regexp returns false matches, concatenatingunknown2008-05-133-0/+23
* | | | | | | | | | Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5....unknown2008-05-15228-18951/+3182
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Merge riska.(none):/home/sven/bkroot/5.1-bugteamunknown2008-05-152-90/+104
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#36433: rpl_insert_id detects inconsistency on masterunknown2008-05-152-90/+104
| | | |_|_|_|_|/ / / | | |/| | | | | | |
| * | | | | | | | | Merge five.local.lan:/work/merge/mysql-5.1-bugteam-newjpunknown2008-05-15226-18861/+3078
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Fix forunknown2008-05-15226-18861/+3078
* | | | | | | | | | Merge pcrews-mac-local.local:/Users/pcrews/usr/local/bin/data0/clean/mysql-5....unknown2008-05-1514-1949/+1913
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Disable thread_cache_size_func as reported in bug 36733unknown2008-05-151-0/+1
| * | | | | | | | | Bug #32966: status still fails : disablingunknown2008-05-141-0/+1
| * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1-bugteamunknown2008-05-143-6/+6
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-143-6/+6
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge kpettersson@bk-internal.mysql.com:/home/bk/mysql-5.1-bugteamunknown2008-05-143-6/+6
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Bug#32966 main.status failsunknown2008-05-133-6/+6
| * | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/merge-5.0-bugteamunknown2008-05-140-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / | | |/| | | | | | | | | |