summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Move reset of insert_values to ensure it's done also during error conditionsmonty@mysql.com2005-06-285-3/+8
* ctype_ucs.result, ctype_ucs.test, ctype_utf8.result, ctype_utf8.test:bar@mysql.com2005-06-286-5/+51
* Makefile.am:kent@mysql.com2005-06-281-1/+1
* configure.in:kent@mysql.com2005-06-281-1/+6
* mysqld.dsp:kent@mysql.com2005-06-281-1/+1
* opt_range.cc:kent@mysql.com2005-06-281-1/+1
* Fix test after last pushmonty@mysql.com2005-06-271-0/+1
* Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-06-270-0/+0
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-06-270-0/+0
| |\
| | * Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-06-076-24/+28
| | |\
| | * \ Merge narttu:/my/mysql-4.1 into mysql.com:/my/mysql-4.1monty@mysql.com2005-06-073-0/+79
| | |\ \
| | * \ \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2005-06-074-5/+9
| | |\ \ \
* | | | | | Portability fixesmonty@mishka.local2005-06-279-68/+65
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-06-2722-131/+194
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Better bug fix for:monty@mishka.local2005-06-2714-78/+123
| * | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mishka.local2005-06-238-53/+71
| |\ \ \ \ \
| | * | | | | Cleanup during review of new codemonty@mishka.local2005-06-218-53/+71
* | | | | | | Include <sys/wait.h> to get WEXITSTATUSmsvensson@neptunus.(none)2005-06-271-1/+1
* | | | | | | Add "#include <stdlib.h>" to define WEXITSTATUSmsvensson@neptunus.(none)2005-06-271-0/+1
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-06-2712-35/+160
|\ \ \ \ \ \ \
| * | | | | | | Bug#10178 - failure to find a row in heap table by concurrent UPDATEsingo@mysql.com2005-06-244-17/+43
| * | | | | | | backport for #10568: Function 'LAST_DAY(date)' does not return NULL for inval...ramil@mysql.com2005-06-243-1/+23
| * | | | | | | an improvement (bug #7851: C++ 'new' conflicts with kernel header asm/system.h).ramil@mysql.com2005-06-241-2/+0
| * | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1timour@mysql.com2005-06-231-8/+8
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-gcakent@mysql.com2005-06-231-8/+8
| | |\ \ \ \ \ \ \
| | | * | | | | | | mysql-test-run.pl:kent@mysql.com2005-06-231-8/+8
| * | | | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1timour@mysql.com2005-06-234-2/+29
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / /
| * | | | | | | | | Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-4.1timour@mysql.com2005-06-233-7/+86
| |\ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| | * | | | | | | | Merge mysql.com:/home/timka/mysql/src/4.1-virgintimour@mysql.com2005-06-233-7/+86
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Fix for BUG#11185.timour@mysql.com2005-06-233-7/+86
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-06-234-2/+29
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-06-231-1/+0
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | sql_parse.cc:evgen@moonbone.local2005-06-231-1/+0
| | |/ / / / / / / / /
| * | | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-06-233-1/+29
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-06-233-1/+29
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | Merge spetrunia@bk-internal.mysql.com:/home/bk/mysql-4.1sergefp@mysql.com2005-06-223-1/+29
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Fix for BUG#10151: In Item_func_case::find_item don't assume that parameter s...sergefp@mysql.com2005-06-203-1/+29
* | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-06-234-39/+19
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-234-10/+218
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | | | | | | / / / / / / | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | - manual merge of the new node nameslenz@mysql.com2005-06-233-37/+6
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | - fixed text file generation - the node names in the info page had changedlenz@mysql.com2005-06-233-36/+5
| * | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-221-2/+13
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-2120-184/+290
| | |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-202-30/+18
| | |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-201-2/+13
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-171-2/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-06-161-2/+13
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | - Do not build the RPMs statically on i386 by default, only when adding eitherlenz@mysql.com2005-06-141-2/+13
* | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1msvensson@neptunus.(none)2005-06-2217-35/+450
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | Merge mysql.com:/home/bkroot/mysql-4.1 into mysql.com:/home/bk/mysql-4.1lars@mysql.com2005-06-222-6/+8
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \