summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.1-optunknown2007-08-016-1/+106
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-08-01179-6471/+1812
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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-3116-90/+369
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | 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-316-1/+105
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-3110-16/+252
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-311-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-308-15/+250
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Bug#24989: The DEADLOCK error is improperly handled by InnoDB.unknown2007-07-308-15/+250
* | | | | | | | | | | | | | | | | | | | | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-08-0143-200/+1393
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | Addendum to bug 27417: poor test results fixes.unknown2007-07-313-10/+12
| * | | | | | | | | | | | | | | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-3113-11/+156
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-316-1/+105
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/29717/my50-29717unknown2007-07-316-1/+105
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | mergingunknown2007-07-312-0/+43
| | | | * | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/29717/my41-29717unknown2007-07-314-1/+62
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/hf/work/029717/my41-29717unknown2007-07-316-1/+106
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | | | Bug #29717 INSERT INTO SELECT inserts values even ifunknown2007-07-316-1/+106
| | * | | | | | | | | | | | | | | | | | | | | | | | | sql_yacc.yy, sp.result, disabled.def:unknown2007-07-313-6/+5
| | * | | | | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-30120unknown2007-07-316-5/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | Fixed bug #30120.unknown2007-07-306-5/+47
| | | | |/ / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | / / / / / / / / / / / / / / / / / | | | | |_|_|_|_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | bigint.test:unknown2007-07-301-1/+1
| | | |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | | | merge of the fix for bug 17417 5.0-opt->5.1-optunknown2007-07-316-133/+135
| * | | | | | | | | | | | | | | | | | | | | | | 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-3016-85/+357
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / | | | / / / / / / / / / / / / / / / / / / / / / | | |/ / / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | (pushing for Andrei)unknown2007-07-3016-90/+368
| | | |_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | Moved the DBUG_ASSERT from bug 28983 tounknown2007-07-301-0/+1
| | |/ / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | disabled.def:unknown2007-07-301-0/+1
| * | | | | | | | | | | | | | | | | | | | sp_head.cc:unknown2007-07-291-1/+1
| * | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-296-68/+353
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-283-66/+321
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | Bug#29856: Insufficient buffer space led to a server crash.unknown2007-07-283-66/+321
| | * | | | | | | | | | | | | | | | | | | | Merge gshchepa@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-283-3/+147
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-07-283-1/+31
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | Bug#30020: Insufficient check led to a wrong info provided by theunknown2007-07-283-1/+31
| * | | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-283-4/+147
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-opt-29834unknown2007-07-283-3/+147
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Fixed bug #29834.unknown2007-07-283-3/+148
| * | | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-280-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0unknown2007-07-2812-23/+145
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.1unknown2007-07-2815-32/+374
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optunknown2007-07-280-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2007-07-285-15/+79
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-07-282-4/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \