summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | | | | | | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-093-1/+24
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Fix for bug #9798: Rollup crash with InnoDB in setup_sum_funcs().ramil@ram-book.(none)2005-05-093-1/+24
| | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Mergebrian@zim.(none)2005-05-084-8/+112
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / | | |/| | | / / / / / / / / / / / / / / / | | | | |_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1brian@brian-akers-computer.local2005-05-084-8/+111
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Patch for --insert-ignorebrian@brian-akers-computer.local2005-05-074-8/+111
| | * | | | | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-05-091-0/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | make_binary_distribution.sh:mwagner@ultrafly.mysql.com2005-05-082-0/+17
| | * | | | | | | | | | | | | | | | | | | Mergemskold@mysql.com2005-05-084-2/+10
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-05-084-6/+18
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Fixes to compile with iccmskold@mysql.com2005-05-082-1/+8
| | | | * | | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-4.1mskold@mysql.com2005-05-072-5/+10
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / / / | | | | |/| | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-4.1mwagner@ultrafly.mysql.com2005-05-0825-0/+25
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | errmsg.txt:mwagner@ultrafly.mysql.com2005-05-0825-0/+25
| | | | |/ / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1antony@ltantony.mysql.com2005-05-081-0/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | - Windows compile fix for ha_blackhole.cc - use #include "mysql_priv.h" inste...lenz@mysql.com2005-05-071-1/+1
| | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | Mergejimw@mysql.com2005-05-071-0/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Backport fix for escaping multibyte characters. (Bug #9864)jimw@mysql.com2005-05-071-0/+34
| | | | * | | | | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0lenz@mysql.com2005-05-071-0/+5
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | [backport of 4.1, because 4.0 autobuild now hits the same problem;gbichot@production.mysql.com2005-05-073-2/+2
| | * | | | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-05-083-17/+19
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | Removed call to cond_push for empty condmskold@mysql.com2005-05-082-19/+19
| | | * | | | | | | | | | | | | | | | | Mergemskold@mysql.com2005-05-073-5/+12
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | bug#9813: Post review fixesmskold@mysql.com2005-05-072-5/+10
| | | * | | | | | | | | | | | | | | | | Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.0mskold@mysql.com2005-05-072-23/+20
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | Removed double cond_pushmskold@mysql.com2005-05-072-23/+20
| | * | | | | | | | | | | | | | | | | | | Added export symbols for workaround of bugs #8317,#9637 in PHP5georg@lmy002.wdf.sap.corp2005-05-081-0/+3
| | * | | | | | | | | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0antony@ltantony.mysql.com2005-05-081-0/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge ltantony.mysql.com:/usr/home/antony/work2/fixbuild-4.1antony@ltantony.mysql.com2005-05-082-0/+13
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model.antony@ltantony.mysql.com2005-05-082-0/+13
| | * | | | | | | | | | | | | | | | | | | | Bug#6925antony@ltantony.mysql.com2005-05-081-0/+9
| | * | | | | | | | | | | | | | | | | | | | Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-5.0antony@ltantony.mysql.com2005-05-073-7/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@trift-lap.fambruehe2005-05-073-7/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Corrections to test "sp", stored procedure "fib" (see entry 9937 in the bug DB).joerg@trift-lap.fambruehe2005-05-073-7/+28
| | * | | | | | | | | | | | | | | | | | | | Mergeantony@ltantony.mysql.com2005-05-077-4/+55
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / | | |/| | | | | | / / / / / / / / / / / / / | | | | |_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Merge ltantony.mysql.com:/usr/home/antony/work2/p4-bug9666antony@ltantony.mysql.com2005-05-073-4/+24
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Bug#9666 - Can't use 'DEFAULT FALSE' for column of type boolantony@ltantony.mysql.com2005-05-074-4/+25
| | | * | | | | | | | | | | | | | | | | | | Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug9725antony@ltantony.mysql.com2005-05-073-0/+29
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate ke...antony@ltantony.mysql.com2005-05-074-0/+30
| | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-05-071-0/+5
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | * | | | | | | | | | | | | | | | | | Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-4.1pekka@mysql.com2005-05-071-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | ndb - bug#8928pekka@mysql.com2005-05-071-0/+2
| | * | | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0jimw@mysql.com2005-05-072-7/+12
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | Fix for embedded server to compileholyfoot@hf-ibm.(none)2005-05-071-3/+3
| | | | |_|_|/ / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-071-4/+9
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | A fix (bug #5056: defaults-extra-file throws no error when file is inaccessib...ramil@ram-book.(none)2005-05-061-4/+9
| | * | | | | | | | | | | | | | | | | | | | | Fix tests after mergejimw@mysql.com2005-05-073-2/+4
| | * | | | | | | | | | | | | | | | | | | | | Mergejimw@mysql.com2005-05-0712-19/+49
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / / / | | |/| | / / / / / / / / / / / / / / / / / / | | | | |/ / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-9186jimw@mysql.com2005-05-071-1/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | Change mysql prompt while inside a multiline comment. (Bug #9186)jimw@mysql.com2005-03-151-1/+2
| | | * | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8648jimw@mysql.com2005-05-071-6/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \