summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge chilla.local:/home/mydev/mysql-5.0-axmrgclone-5.1.16-buildunknown2007-02-200-0/+0
|\
| * Fixed a bad merge. Got a duplicate symbol on OSX.unknown2007-02-201-2/+0
* | Merge chilla.local:/home/mydev/mysql-5.0-axmrgunknown2007-02-160-0/+0
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-164-0/+38
| |\
| * \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0mysql-5.0.36clone-5.0.36-buildunknown2007-02-1434-86/+686
| |\ \
* | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-168-4/+86
|\ \ \ \
| * \ \ \ Merge chilla.local:/home/mydev/mysql-5.0-axmrgunknown2007-02-140-0/+0
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Merge chilla.local:/home/mydev/mysql-4.1-axmrgunknown2007-02-140-0/+0
| | |\ \ \
| | | * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-4.1unknown2007-02-1342-128/+466
| | | |\ \ \
| | | | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1unknown2007-02-1342-128/+466
| | | | |\ \ \
| | | * | \ \ \ Merge bk@192.168.21.1:mysql-4.1-optunknown2007-02-131-7/+27
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | * | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-144-0/+38
| | |\ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-1434-164/+718
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-138-4/+86
| |\ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-enginesunknown2007-02-135-4/+50
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Bug#25460 - High concurrency MyISAM access causes severe mysqld crash.unknown2007-02-135-4/+50
| | * | | | | | | | | remove symbol after mergeunknown2007-02-081-2/+0
| | * | | | | | | | | Merge ppcg5.local:/Users/antony/Work/p3-bug12204.4unknown2007-02-084-0/+38
| | |\ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / | | | |/| | | | | | |
| | | * | | | | | | | Bug#12204unknown2007-02-073-0/+36
| | | * | | | | | | | thd_lib_detected moved so that it is correctly declared as a dataunknown2007-02-062-1/+2
* | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2007-02-1556-697685/+0
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | objects is only for internal use.unknown2007-02-1356-697685/+0
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-02-1434-164/+718
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Post-merge fixunknown2007-02-132-101/+31
| * | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Post-merge fixunknown2007-02-132-2/+0
| | * | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-02-1334-86/+688
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.1-optunknown2007-02-1330-94/+683
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-133-14/+52
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-123-8/+46
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Fixed bug #26209.unknown2007-02-113-8/+46
| | * | | | | | | | | | | | | Post-merge fix.unknown2007-02-1310-46/+31
| | * | | | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-1331-86/+658
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / /
| | | * | | | | | | | | | | | Merge mysql.com:/home/hf/work/20691/my50-20691unknown2007-02-135-3/+39
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optunknown2007-02-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/gluh/MySQL/Merge/5.0unknown2007-02-1231-75/+607
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-02-121-7/+12
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | valgrind error fixunknown2007-02-121-7/+12
| | | | * | | | | | | | | | | | | | | Fixed MacOSX/Intel linking problemunknown2007-02-121-1/+1
| | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Bug#24630 Subselect query crashes mysqldunknown2007-02-127-13/+93
| | | | * | | | | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-115-3/+55
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / | | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | sql_view.cc:unknown2007-02-112-2/+2
| | | | | * | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-02-113-1/+53
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | | | | | Bug#12122: The MERGE algorithm isn't applicable if the ORDER BY clause isunknown2007-02-103-1/+53
| | | | * | | | | | | | | | | | | | | Fixed bug #26159.unknown2007-02-103-5/+57
| | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-094-4/+44
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Fixed bug #26017.unknown2007-02-094-4/+44
| | | | * | | | | | | | | | | | | | | Bug#23170: LAST_INSERT_ID isn't reset to 0 in INSERT .. SELECT when no rows wereunknown2007-02-093-1/+28
| | | | * | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optunknown2007-02-091-12/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | Addendum to fix of bug #22344 : removed dead code.unknown2007-02-091-12/+1