summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Additional "make distcheck" changes specific to 5.0unknown2005-11-099-10/+20
* Mergeunknown2005-11-0419-90/+102
|\
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-11-0419-101/+111
| |\
| | * Makefile.am, configure.in:unknown2005-09-2419-101/+111
* | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-041-3/+4
|\ \ \
| * \ \ Mergeunknown2005-11-031-3/+4
| |\ \ \
| | * | | base64.c:unknown2005-11-031-3/+4
* | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-0310-44/+47
|\ \ \ \ \
| * | | | | Disabled ps_protocol for two statements.unknown2005-11-031-0/+2
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-039-44/+45
| |\ \ \ \ \
| | * \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-039-44/+45
| | |\ \ \ \ \
| | | * \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-039-44/+45
| | | |\ \ \ \ \
| | | | * | | | | Changes in get_table_type() and mysql_frm_type(). The main problem wasunknown2005-11-039-44/+45
* | | | | | | | | Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-0389-2266/+825
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | test enabledunknown2005-11-031-1/+0
| * | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-034-5/+19
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Disabled a test temporarily.unknown2005-11-031-0/+1
| | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-031-1/+2
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-035-5/+72
| | |\ \ \ \ \ \ \
| | | * \ \ \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-11-034-2/+69
| | | |\ \ \ \ \ \ \ | | | | | |_|_|_|/ / | | | | |/| | | | |
| | | | * | | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.0unknown2005-11-033-5/+18
| | | | |\ \ \ \ \ \
| | | | | * | | | | | Added test-force to Makefile.unknown2005-11-031-0/+4
| | | | | * | | | | | Added new build script for pentium64.unknown2005-11-031-0/+13
| | | | | * | | | | | Changed mysql-test-run to correspond to the one in 5.0 tree.unknown2005-11-031-2/+2
| | | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-031-3/+3
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-031-3/+3
| | | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / | | | | |/| | | | | | |
| | | | | * | | | | | | Changed MTR_BUILD_THREAD port reserving policy.unknown2005-11-011-3/+3
| * | | | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-0311-29/+186
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / / | | |/| | | | | | | | |
| | * | | | | | | | | | opt_range.cc:unknown2005-11-031-1/+2
| | |/ / / / / / / / /
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-0311-28/+184
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | | * | | | | | | | A fix and a test case for Bug#14210 "Simple query with > operator on unknown2005-11-0311-28/+184
| * | | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-035-1/+72
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-035-1/+72
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
| | | * | | | | | | | Fix bug #14093 Query takes a lot of time when date format is not validunknown2005-11-035-1/+72
| * | | | | | | | | | Mergingunknown2005-11-032-9/+6
| * | | | | | | | | | Merge mysql.com:/home/hf/work/mysql-4.1.14183unknown2005-11-032-0/+54
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge bk@192.168.21.1:mysql-4.1unknown2005-11-0335-2315/+103
| | |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | | Fix for bug #14183 (ctype_cp983.test fails with the embedded server)unknown2005-11-014-39/+54
| * | | | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-031-1/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | Fix for bug #9551 (Show commands fail)unknown2005-10-281-1/+1
| * | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-036-35/+102
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-036-35/+102
| | |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|/ / / / / | | |/| | | | | | | | |
| | | * | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-026-35/+102
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Additional fix for #13573unknown2005-11-021-0/+4
| | | | * | | | | | | | | Merge bk@192.168.21.1:/usr/home/bk/mysql-5.0unknown2005-11-025-35/+98
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Conflicts resolvingunknown2005-11-015-35/+98
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Additional fix for bug #13573unknown2005-10-261-9/+8
| | | | | | * | | | | | | | | Fix for bug #13573 (wrong data inserted for too big decimals)unknown2005-10-155-26/+91
| * | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-034-3/+29
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / /
| | * | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-11-034-3/+29
| | |\ \ \ \ \ \ \ \ \ \ \ \ \