summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* don't use tmp file for such a trivialityserg@sergbook.mylan2005-05-091-4/+1
* Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2005-05-092-1/+3
|\
| * - fix the range test to pass when InnoDB is note enabled (e.g. in the "-class...lenz@mysql.com2005-05-091-0/+2
| * Merge mysql.com:/space/my/mysql-4.1lenz@mysql.com2005-05-091-1/+1
| |\
| | * - added cmd-line-utils/libedit/vis.h to the source distributionlenz@mysql.com2005-05-091-1/+1
* | | 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-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
| |\ \ \
| | * | | bug#9813: Post review fixesmskold@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
|\ \ \ \
| * | | | FreeBSD doesn't have /proc/cpuinfo, use sysctl to find cpu model.antony@ltantony.mysql.com2005-05-082-0/+13
* | | | | - 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 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 mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-05-071-1/+1
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | - typo fix in BUILD/compile-distlenz@mysql.com2005-05-071-1/+1
| * | | | | Merge mysql.com:/space/my/mysql-4.0-buildlenz@mysql.com2005-05-071-0/+5
| |\ \ \ \ \ | | |/ / / /
| | * | | | - added some required CXXFLAGS to BUILD/compile-dist to allow the distributio...lenz@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 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
|\ \ \ \ \ \ \ \
| * | | | | | | | Fix option handling of ./BUILD/compile-* to not try and pass options tojimw@mysql.com2005-05-051-6/+0
* | | | | | | | | Merge mysql.com:/home/jimw/my/mysql-4.1-8497jimw@mysql.com2005-05-075-4/+27
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | |
| * | | | | | | | Make sure that the filename for temporary tables is built with fn_format()jimw@mysql.com2005-03-015-4/+27
* | | | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-05-072-0/+2
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge acurtis@bk-internal.mysql.com:/home/bk/mysql-4.1antony@ltantony.mysql.com2005-05-062-0/+2
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
| | * | | | | | | | Merge ltantony.mysql.com:/usr/home/antony/work2/p2-bug6616antony@ltantony.mysql.com2005-05-062-0/+2
| | |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Bug#6616antony@ltantony.mysql.com2005-05-062-0/+2
| | | | |_|_|/ / | | | |/| | | |
* | | | | | | | fix for bug #4082: Integer lengths cause truncation with DISTINCT CONCAT and ...ramil@ram-book.(none)2005-05-065-6/+21
|/ / / / / / /
* | | | | | | Bug#6611: wrong sorting order.bar@noter.(none)2005-05-062-2/+26
* | | | | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-4.1ramil@mysql.com2005-05-061-12/+0
|\ \ \ \ \ \ \
| * | | | | | | A fix (bug #7970: CONFIG_NR_CPUS not defined for kernel header percpu.h).ramil@ram-book.(none)2005-05-061-12/+0
* | | | | | | | Bug#6505 Wrong sorting order:bar@noter.(none)2005-05-063-20/+23
* | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1rburnett@bk-internal.mysql.com2005-05-061-0/+6
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | |
| * | | | | | | Bug #10245 VC++ compiler error with mysql.cc rburnett@bk-internal.mysql.com2005-05-052-0/+7
* | | | | | | | Merge bk-internal.mysql.com:/data0/bk/mysql-4.1rburnett@bk-internal.mysql.com2005-05-0622-44/+14770
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge ssmith@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbstewart@mysql.com2005-05-061-0/+5
| |\ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |