summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fixed compiler warnings (for linux and win32 and win64)unknown2007-02-2243-61/+122
* After merge fixesunknown2007-02-2118-44/+20
* Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-21240-3203/+3444
|\
| * Fixed unsafe define of uint4korr()unknown2007-02-215-84/+105
| * Avoid compiler warnings on powermacg5unknown2007-01-234-4/+8
| * Fixed compiler warningsunknown2007-01-228-13/+22
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-01-223-4/+18
| |\
| | * Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-01-11231-3110/+3317
| | |\
| | | * New file for autopush. To disable (known) compiler warnings.unknown2007-01-101-0/+12
| | | * Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0-marvelunknown2007-01-102-4/+6
| | | |\
| | | | * Added two possible error cases for a test.unknown2007-01-102-4/+6
| | | * | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-01-09228-3106/+3299
| | | |\ \
| * | | \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-01-22229-3100/+3291
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | After merge fixes:unknown2006-12-155-25/+26
| | * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-12-15227-3081/+3273
| | |\ \ \ \
| | | * | | | Fixed compiler warnings detected by option -Wshadow and -Wunused:unknown2006-12-15227-3082/+3273
* | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-02-201-2/+2
|\ \ \ \ \ \ \
| * | | | | | | Raise version number after cloning 5.0.36unknown2007-02-201-2/+2
* | | | | | | | Fixed a bad merge. Got a duplicate symbol on OSX.unknown2007-02-201-2/+0
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-164-0/+38
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Bug#12204unknown2007-02-073-0/+36
| | * | | | | | | | | | thd_lib_detected moved so that it is correctly declared as a dataunknown2007-02-062-1/+2
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-02-1434-86/+686
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Post-merge fixunknown2007-02-132-2/+0
| * | | | | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-02-1334-86/+688
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-02-123-8/+46
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | Fixed bug #26209.unknown2007-02-113-8/+46
| | * | | | | | | | | | | | Merge mysql.com:/home/hf/work/20691/my50-20691unknown2007-02-135-3/+39
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | bug #20691 (INSERT (DEFAULT) may insert garbage with NO DEFAULT NOT NULL field)unknown2007-02-125-3/+39
| | * | | | | | | | | | | | | Merge bk@192.168.21.1:mysql-5.0-optunknown2007-02-130-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/25492/my41-25492unknown2007-02-130-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | |
| | | | * | | | | | | | | | | | bug #25492 (Invalid deallocation in mysql_stmt_fetch)unknown2007-02-131-6/+26
| | | | * | | | | | | | | | | | bug #25492 (Invalid deallocation in mysql_stmt_fetch)unknown2007-01-291-1/+1
| | * | | | | | | | | | | | | | 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