summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* * Manual merge fix.unknown2008-02-011-23/+23
* Merge adventure.(none):/home/thek/Development/cpp/bug33201/my50-bug33201unknown2008-02-013-1/+52
|\
| * Bug#33201 Crash occurs when granting update privilege on one column of a viewunknown2008-02-013-0/+51
* | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2008-01-292-8/+12
|\ \
| * | Fix test case of Bug 30331unknown2008-01-292-8/+12
* | | Fix Bug#27812 "an ampersand is missed in sql/sql_bitmap.h, line 68"unknown2008-01-291-1/+1
|/ /
* | Remove spurious commented out test line.unknown2008-01-281-1/+0
* | Bug#30331 Table_locks_waited shows inaccurate valuesunknown2008-01-283-1/+40
* | Merge quad.:/mnt/raid/alik/MySQL/devel/5.0-rtunknown2008-01-240-0/+0
|\ \ | |/
| * Merge quad.:/mnt/raid/alik/MySQL/devel/5.0unknown2008-01-2411-50/+589
| |\
* | \ Merge quad.:/mnt/raid/alik/MySQL/devel/5.1unknown2008-01-2438-635/+1874
|\ \ \
| * | | Manual mergeunknown2008-01-235-17/+297
| * | | Merge lambda.hsd1.co.comcast.net.:/home/malff/TREE/mysql-5.0-33618unknown2008-01-236-37/+276
| |\ \ \ | | | |/ | | |/|
| | * | manual mergeunknown2008-01-231-0/+16
| | * | Merge malff@bk-internal.mysql.com:/home/bk/mysql-5.0-runtimeunknown2008-01-2311-66/+549
| | |\ \
| | | * | Bug#33618 (Crash in sp_rcontext)unknown2008-01-2311-50/+549
| * | | | Fix merge.unknown2008-01-201-2/+21
| * | | | Merge ibm.:/home/alik/Documents/MySQL/devel/5.0-rtunknown2008-01-201-2/+31
| |\ \ \ \ | | |/ / /
| | * | | Merge ibm.:/home/alik/Documents/MySQL/devel/5.0unknown2008-01-192-0/+40
| | |\ \ \
| | | * | | Bug#29770 Two handlers are allowed to catch an error in an stored procedure.unknown2008-01-082-0/+40
| | | |/ /
| * | | | Merge ibm.:/home/alik/Documents/MySQL/devel/5.1unknown2008-01-1928-577/+1249
| |\ \ \ \
| | * | | | A minor cleanup.unknown2008-01-161-1/+0
| | * | | | Post merge fix for BUG 33728unknown2008-01-111-1/+1
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2008-01-113-2/+61
| | |\ \ \ \
| | | * | | | Bug#33728 Atomic builtinsunknown2008-01-113-2/+61
| | * | | | | Fixed faulty test case caused by race condition.unknown2008-01-112-3/+4
| | |/ / / /
| | * | | | Fixed test layout error.unknown2008-01-074-66/+69
| | * | | | Merge adventure.(none):/home/thek/Development/cpp/bug30887/my51-bug30887unknown2008-01-033-2/+122
| | |\ \ \ \
| | | * | | | Bug#30887 Server crashes on SET GLOBAL query_cache_size=0unknown2008-01-035-2/+195
| | * | | | | Bug #29836 enable-pstack option appears even if --with-pstack is disabledunknown2007-12-201-1/+6
| | * | | | | A pre-requisite for the fix for Bug#12713 "Error in a stored function unknown2007-12-2013-184/+548
| | * | | | | Merge mysql.com:/Users/davi/mysql/bugs/28317-5.1unknown2007-12-193-24/+57
| | |\ \ \ \ \
| | | * | | | | Bug#28317 Left Outer Join with {oj outer-join}unknown2007-12-195-24/+130
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-12-196-38/+127
| | |\ \ \ \ \ \
| | | * | | | | | Make handler::{write,delete,update}_row private. It's criticalunknown2007-12-196-38/+127
| | * | | | | | | SHOW_VAR arrays are null-terminated :-[]unknown2007-12-191-3/+5
| | * | | | | | | Followup for bug#30252.unknown2007-12-192-149/+182
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-12-191-126/+115
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Sort class handler public declarations. unknown2007-12-191-126/+115
| | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-runtimeunknown2007-12-184-114/+162
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | Merge damien-katzs-computer.local:/Users/dkatz/mysql-5.1-runtimeunknown2007-12-183-0/+70
| | | |\ \ \ \ \ \
| | | | * | | | | | Bug #30252 Com_create_function is not incremented.unknown2007-12-143-0/+70
| | | * | | | | | | Consistently use doxygen comments in class handler.unknown2007-12-181-114/+92
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-12-1772-633/+5597
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-12-140-0/+0
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-12-10123-856/+2648
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-12-03201-1587/+11250
| | | |\ \ \ \ \ \ \ \ \
* | | | \ \ \ \ \ \ \ \ \ Merge ssh://bk-internal.mysql.com//home/bk/mysql-5.1unknown2008-01-241-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | Raise version number after cloning 5.1.23-rcunknown2008-01-191-1/+1
* | | | | | | | | | | | | Merge kaamos.(none):/data/src/opt/mysql-5.0-optunknown2008-01-202-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | |