summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil/ram@mysql.com/myoffice.izhnet.ru2006-07-233-1/+18
|\
| * Fix for #16327: invalid TIMESTAMP values retrievedramil@mysql.com2006-05-173-1/+18
* | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-202-2/+8
|\ \
| * | bug #19983 (mysql_client_test_embedded fails)holyfoot@deer.(none)2006-06-022-2/+8
* | | mysql.spec.sh:kent@mysql.com/c-4b4072d5.010-2112-6f72651.cust.bredbandsbolaget.se2006-07-191-0/+3
* | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1evgen@moonbone.local2006-07-1817-25/+268
|\ \ \
| * \ \ Merge moonbone.local:/work/mysql-4.1evgen@moonbone.local2006-07-186-3/+48
| |\ \ \
| * \ \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-optgkodinov/kgeorge@rakia.(none)2006-07-143-1/+81
| |\ \ \ \
| | * | | | Bug #17212 results not sorted correctly by ORDER BY when using indexgkodinov/kgeorge@macbook.gmz2006-07-123-1/+81
| * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-07-123-0/+34
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-07-123-0/+34
| | |\ \ \ \
| | | * | | | Fixed bug#18503: Queries with a quantified subquery returning empty setevgen@moonbone.local2006-07-123-0/+34
| * | | | | | Merge moonbone.local:/work/allany-4.1-mysqlevgen@moonbone.local2006-07-113-1/+30
| |\ \ \ \ \ \
| | * \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-07-113-1/+30
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Fixed bug#16302: Quantified subquery without any tables gives wrong resultsevgen@moonbone.local2006-07-113-1/+30
| | | |/ / / /
| * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-07-1112-23/+123
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge rakia:mysql/4.1/B14553gkodinov/kgeorge@macbook.gmz2006-07-107-3/+60
| | |\ \ \ \ \
| | | * | | | | BUG#14553: NULL in WHERE resets LAST_INSERT_IDgkodinov/kgeorge@mysql.com/rakia.(none)2006-07-107-3/+60
| | * | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-optigor@olga.mysql.com2006-07-064-18/+54
| | |\ \ \ \ \ \
| | | * | | | | | Fixed bug #18243.igor@olga.mysql.com2006-07-064-18/+54
| | * | | | | | | Better comments for void Item::top_level_item()sergefp@mysql.com2006-07-041-2/+9
| | |/ / / / / /
* | | | | | | | Backporting Kostja's changes made for 5.0 into 4.1.bar@mysql.com/bar.intranet.mysql.r18.ru2006-07-182-111/+112
* | | | | | | | Merge orca.ndb.mysql.com:/space_old/pekka/ndb/version/my41pekka@orca.ndb.mysql.com2006-07-151-1/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | ndb - (4.1) trivial fix to error.log (wday=0 was printed as "x")pekka@orca.ndb.mysql.com2006-07-111-1/+1
* | | | | | | | | mysql.spec.sh:kent@mysql.com/g4-2.local2006-07-151-1/+0
* | | | | | | | | Increment the version number to 4.1.22, as 4.1.21 is cloned.joerg@trift2.2006-07-141-2/+2
* | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil/ram@mysql.com/myoffice.izhnet.ru2006-07-147-6/+26
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | --{skip-}merge option added which allows the user to disable merge engine andramil/ram@mysql.com/myoffice.izhnet.ru2006-07-147-6/+26
* | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-148-48/+74
|\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-138-48/+74
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-018-48/+74
* | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.(none)2006-07-132-4/+9
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge dl145k.mysql.com:/data0/mkindahl/bkroot/mysql-4.1mkindahl@dl145k.mysql.com2006-07-121-3/+5
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | BUG#20919 temp tables closing fails when binlog is offaelkin/elkin@dsl-hkigw8-feb1fb00-100.dhcp.inet.fi2006-07-101-3/+5
| * | | | | | | | | | | Merge cmiller@bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@maint1.mysql.com2006-07-123-2/+14
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge zippy.(none):/home/cmiller/work/mysql/mysql-4.0__bug19006cmiller@zippy.(none)2006-07-111-1/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | Add a more reliable "getconf" test for Linuxthreads. The later trees should ...cmiller@zippy.(none)2006-07-071-6/+15
| | * | | | | | | | | | | | Bug#19006: 4.0 valgrind problems (in test func_str)cmiller@zippy.(none)2006-07-014-3/+22
* | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1-maintcmiller@zippy.(none)2006-07-1355-141/+2708
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1cmiller@zippy.(none)2006-07-113-2/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | ndb - bug#20847: non-debug compile fixpekka@orca.ndb.mysql.com2006-07-101-0/+4
| * | | | | | | | | | | | | Merge orca.ndb.mysql.com:/space/pekka/ndb/version/my41pekka@orca.ndb.mysql.com2006-07-1045-102/+2217
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1pekka@orca.ndb.mysql.com2006-07-1030-64/+365
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge chilla.local:/home/mydev/mysql-4.1-bug19835ingo/mydev@chilla.local2006-07-081-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | Bug#19835 - Binary copy of corrupted tables crash the server when issuing a q...ingo@mysql.com2006-06-281-0/+3
| | | * | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug17877ingo/mydev@chilla.local2006-07-086-7/+98
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | Bug#17877 - Corrupted spatial indexingo@mysql.com2006-06-286-7/+98
| | | | |/ / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | Merge chilla.local:/home/mydev/mysql-4.1-bug14400ingo/mydev@chilla.local2006-07-082-9/+21
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/mydev/mysql-4.0-bug14400ingo@mysql.com2006-07-042-9/+21
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | Bug#14400 - Query joins wrong rows from table which is subject of "concurrent...ingo@mysql.com2006-06-282-5/+17