summaryrefslogtreecommitdiff
path: root/sql
Commit message (Expand)AuthorAgeFilesLines
* Merge 50 -> 51 (-opt changesets)unknown2007-08-018-24/+127
|\
| * Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-08-0119-182/+288
| |\
| | * Merge ramayana.hindu.god:/home/tsmith/m/bk/50unknown2007-08-019-20/+28
| | |\
| | | * Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-08-015-16/+15
| | | |\
| | | * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintunknown2007-07-271-0/+4
| | | |\ \
| | * | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-07-3112-162/+260
| | |\ \ \ \
| * | \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-311-1/+2
| |\ \ \ \ \ \
| | * | | | | | ha_innodb.cc:unknown2007-07-311-1/+2
| * | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-3114-88/+136
| |\ \ \ \ \ \ \
| * | | | | | | | Post-merge fixesunknown2007-07-311-2/+2
| * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-313-18/+51
| |\ \ \ \ \ \ \ \
| | * | | | | | | | BUG#29582: huge memory consumption with union, subselect, joins:unknown2007-07-313-18/+51
| * | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-312-1/+12
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-317-15/+79
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-306-15/+78
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB.unknown2007-07-306-15/+78
* | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-0123-191/+328
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-316-6/+27
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-312-1/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/29717/my50-29717unknown2007-07-312-1/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / | | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | | Merge mysql.com:/home/hf/work/29717/my41-29717unknown2007-07-312-1/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/029717/my41-29717unknown2007-07-312-1/+12
| | | | | |\ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | Bug #29717 INSERT INTO SELECT inserts values even ifunknown2007-07-312-1/+12
| | * | | | | | | | | | | | | | | sql_yacc.yy, sp.result, disabled.def:unknown2007-07-311-1/+1
| | * | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-314-5/+15
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / | | |/| | | | / / / / / / / / / / | | | | |_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Fixed bug #30120.unknown2007-07-304-5/+15
| | | |/ / / / / / / / / / / /
| * | | | | | | | | | | | | | merge of the fix for bug 17417 5.0-opt->5.1-optunknown2007-07-313-3/+3
| * | | | | | | | | | | | | | Merge magare.gmz:/home/kgeorge/mysql/work/B27417-5.0-optunknown2007-07-311-1/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | addendum for the fix for bug 27417:unknown2007-07-311-1/+2
| * | | | | | | | | | | | | | (Pushing for Andrei)unknown2007-07-3014-85/+126
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / | | | / / / / / / / / / / / / | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | (pushing for Andrei)unknown2007-07-3014-88/+135
| | | |_|_|/ / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | Moved the DBUG_ASSERT from bug 28983 tounknown2007-07-301-0/+1
| | |/ / / / / / / / / /
| * | | | | | | | | | | sp_head.cc:unknown2007-07-291-1/+1
| * | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-292-68/+82
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-281-66/+78
| | |\ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | Bug#29856: Insufficient buffer space led to a server crash.unknown2007-07-281-66/+78
| | * | | | | | | | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-281-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-281-1/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | Bug#30020: Insufficient check led to a wrong info provided by theunknown2007-07-281-1/+3
| * | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-281-4/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / | | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29834unknown2007-07-281-3/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Fixed bug #29834.unknown2007-07-281-3/+3
| | * | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0unknown2007-07-287-22/+59
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / / | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2007-07-283-15/+47
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / | | | |/| | | | | | | | | | |
| | * | | | | | | | | | | | | Merge xiphis.org:/anubis/antony/work/mysql-5.0-enginesunknown2007-07-2610-83/+130
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | fix pushbuild failuresunknown2007-07-251-0/+1
| | * | | | | | | | | | | | | | Bug#25679unknown2007-07-252-155/+142
| | * | | | | | | | | | | | | | Merge xiphis.org:/anubis/antony/work/p2-bug25714.1unknown2007-07-231-3/+11
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Bug#25714unknown2007-07-231-3/+11
| | * | | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-5.0-amainunknown2007-07-222-4/+8
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \