summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge on pullmonty@mysql.com2004-11-031304-21750/+58512
|\
| * Fixes after merge with 4.1monty@mysql.com2004-11-0353-563/+653
| * merge with 4.1monty@mysql.com2004-10-291288-21668/+58339
| |\
| | * Produce a "truncated" warning if a value cannot be convertedbar@mysql.com2004-10-288-16/+66
| | * Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1joerg@mysql.com2004-10-281-12/+14
| | |\
| | | * Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1joerg@mysql.com2004-10-281-12/+14
| | | |\
| | | | * Fix for bug#5385 ("Text files have unix line break"): joerg@mysql.com2004-10-271-12/+14
| | * | | An extra "separator" class member was removed from Item_func_concat_ws.bar@mysql.com2004-10-284-74/+14
| | * | | Making the latest fix for Bug#6166 (key.test) work in prepared statements.konstantin@mysql.com2004-10-281-2/+4
| | * | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-274-24/+91
| | |\ \ \
| | | * \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.1bell@sanja.is.com.ua2004-10-274-24/+91
| | | |\ \ \
| | | | * | | removed incorrect error message about aggregate functionsbell@sanja.is.com.ua2004-10-274-24/+91
| | * | | | | A fix and test case for Bug#6096 "field.max_length is always zero for konstantin@mysql.com2004-10-273-5/+120
| | * | | | | Fixed access to freed memorymonty@mysql.com2004-10-274-9/+7
| | * | | | | Merge with 4.0monty@mysql.com2004-10-2712-7/+94
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
| | | * | | | Fix when compiling without InnoDBmonty@mysql.com2004-10-273-1/+6
| | | * | | | Backport innodb_max_purge_lag from 4.1marko@hundin.mysql.fi2004-10-279-1/+84
| | | * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-2410-11/+92
| | | |\ \ \ \
| | | | * | | | postreview fixesbell@sanja.is.com.ua2004-10-223-4/+6
| | | | * | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-224-8/+29
| | | | |\ \ \ \
| | | | * | | | | Check of temporary tables hiding for query fetched from QC (BUG#6084)bell@sanja.is.com.ua2004-10-214-1/+59
| | | * | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-4.0bell@sanja.is.com.ua2004-10-2212-29/+128
| | | |\ \ \ \ \ \ | | | | |/ / / / /
| | | * | | | | | fixed retsult codebell@sanja.is.com.ua2004-10-191-1/+1
| | * | | | | | | after merge fixserg@serg.mylan2004-10-261-1/+0
| | * | | | | | | mergedserg@serg.mylan2004-10-264-17/+8
| | |\ \ \ \ \ \ \
| | | * | | | | | | Bug #6019 - SELECT tries to use too short prefix index on utf8 dataserg@serg.mylan2004-10-264-17/+8
| | * | | | | | | | Playing with test_bug5399() to make it work on HPUX 64 bit: no konstantin@mysql.com2004-10-261-18/+19
| | * | | | | | | | Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1heikki@hundin.mysql.fi2004-10-263-14/+50
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | fil0fil.c:heikki@hundin.mysql.fi2004-10-261-0/+10
| | | * | | | | | | | row0mysql.c:heikki@hundin.mysql.fi2004-10-263-14/+40
| | * | | | | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.1lenz@mysql.com2004-10-261-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / / | | |/| | | | | | | |
| | | * | | | | | | | - Bumped up version number to 4.1.8 in configure.inlenz@mysql.com2004-10-261-1/+1
| | | |/ / / / / / /
| | * | | | | | | | Added missing initialiermonty@mysql.com2004-10-261-2/+2
| | * | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-10-2656-197/+935
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | A lot of fixes for prepared statements (PS):monty@mysql.com2004-10-2656-197/+935
| | * | | | | | | | Use my_sleep instead of nanosleep for portabilitytomas@poseidon.ndb.mysql.com2004-10-261-0/+5
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-261-2/+2
| | |\ \ \ \ \ \ \
| | | * | | | | | | removed compiler warningtomas@poseidon.ndb.mysql.com2004-10-261-2/+2
| | * | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2004-10-261-1/+1
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Typo fixgluh@gluh.mysql.r18.ru2004-10-261-1/+1
| | * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-2622-112/+113
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | compilation fix for AIXtomas@poseidon.ndb.mysql.com2004-10-2622-112/+113
| | * | | | | | | | | Bug 6206: ENUMs are not case sensitive even if declared BINARYbar@mysql.com2004-10-267-15/+70
| | | |/ / / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1gluh@gluh.mysql.r18.ru2004-10-263-1/+26
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | | |
| | | * | | | | | | Fix for bug #6166: index prefix length of 0 not rejectedgluh@gluh.mysql.r18.ru2004-10-263-1/+26
| | * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1tomas@poseidon.ndb.mysql.com2004-10-264-16/+37
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | - Check ENUM/SET duplicate values taking in account charset/collation.bar@mysql.com2004-10-264-16/+37
| | * | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1-ndbtomas@poseidon.ndb.mysql.com2004-10-264-29/+67
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / /
| | | * | | | | | | Reuse more code: two equal pieces for ENUM and SET where movedbar@mysql.com2004-10-263-26/+58
| | | | |_|_|_|_|/ | | | |/| | | | |
| | | * | | | | | Merge mysql.com:/M41/mysql-4.1 into mysql.com:/M41/push-4.1joerg@mysql.com2004-10-251-3/+9
| | | |\ \ \ \ \ \