summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Manually mergedunknown2005-10-284-9/+64
|\
| * Fix bug #14138 ROLLUP and PROCEDURE ANALYSE() hang server unknown2005-10-284-11/+66
* | Merge bk-internal:/home/bk/mysql-5.0unknown2005-10-284-1/+18
|\ \
| * | Update test with changed result after mergeunknown2005-10-281-1/+1
| * | Merge mysql.com:/home/jimw/my/mysql-4.1-cleanunknown2005-10-273-0/+17
| |\ \ | | |/
| | * Merge mysql.com:/home/jimw/my/mysql-4.1-14009unknown2005-10-27101-1015/+1333
| | |\
| | * | Fix Item_func_abs::fix_length_and_dec() to set maybe_null properly. (Bug #14009)unknown2005-10-173-0/+17
* | | | Merge mysql.com:/usr/local/bk/mysql-5.0unknown2005-10-285-4/+75
|\ \ \ \
| * | | | Fixed BUG#14256: definer in view definition is not fully qualifiedunknown2005-10-285-4/+75
* | | | | disabling archive_gisunknown2005-10-281-0/+1
* | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-10-284-10/+50
|\ \ \ \ \
| * \ \ \ \ Merge pchardin@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-284-9/+49
| |\ \ \ \ \
| | * | | | | fix Bug #14103 IM tests fail on SCOunknown2005-10-284-9/+49
| * | | | | | fix a typounknown2005-10-281-1/+1
| | |_|/ / / | |/| | | |
* | | | | | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0unknown2005-10-2876-925/+894
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-281-1/+1
| |\ \ \ \ \
| | * | | | | Makefile.am:unknown2005-10-281-1/+1
| * | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2005-10-2875-924/+893
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Merge 4.1 - 5.0unknown2005-10-287-320/+49
| | * | | | | Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1unknown2005-10-2774-923/+1163
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | |
| | | * | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-274-1/+19
| | | |\ \ \ \
| | | | * | | | select.result:unknown2005-10-271-8/+8
| | | | * | | | Manually mergedunknown2005-10-274-1/+19
| | | | |\ \ \ \
| | | | | * \ \ \ Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-252-1/+5
| | | | | |\ \ \ \
| | | | | | * | | | Imported fixes from 4.1 and 5.0 to 4.0.unknown2005-10-252-1/+5
| | | | | * | | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0-build-threadunknown2005-10-252-9/+25
| | | | | |\ \ \ \ \ | | | | | | |/ / / / | | | | | |/| | | |
| | | | | * | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-143-0/+18
| | | | | |\ \ \ \ \
| | | | | | * | | | | Fix bug #13855 select distinct with group by caused server crashunknown2005-10-143-0/+18
| | | | | * | | | | | Merge lgrimmer@bk-internal.mysql.com:/home/bk/mysql-4.0unknown2005-10-131-4/+11
| | | | | |\ \ \ \ \ \ | | | | | | |/ / / / / | | | | | |/| | | | |
| | | * | | | | | | | Merge aivanov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-2733-654/+1
| | | |\ \ \ \ \ \ \ \ | | | | |/ / / / / / / | | | |/| | | | | | |
| | | | * | | | | | | Removed innobase/my_cnf, innobase/include/makefilewin.i,unknown2005-10-2633-654/+1
| | | * | | | | | | | conf_to_src.c:unknown2005-10-271-2/+11
| | | * | | | | | | | conf_to_src.c:unknown2005-10-271-26/+40
| | | * | | | | | | | Merge abarkov@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-273-34/+120
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Bug#13347: empty result from query with like and cp1250 charsetunknown2005-10-253-34/+120
| | | * | | | | | | | | Imported fix from 5.0.unknown2005-10-261-1/+1
| | | | |/ / / / / / / | | | |/| | | | | | |
| | | * | | | | | | | mysql-test-run.pl:unknown2005-10-261-3/+29
| | | * | | | | | | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-2511-10/+85
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge mysql.com:/home/jimw/my/mysql-4.1-12925unknown2005-10-253-5/+24
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fix incorrect casts in my_getopt code that capped the maximum of longlongunknown2005-10-253-5/+24
| | | | * | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-253-0/+26
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix bug #14016 date_format() 2nd parameter was compared using case insensitive unknown2005-10-253-0/+26
| | | | * | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-253-0/+27
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | Fix bug#13392 Wrong VALUES() behaviour in INSERT SELECT with ON DUPLICATEunknown2005-10-253-0/+27
| | | | | |/ / / / / / / / /
| | | | * | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-250-0/+0
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-130-0/+0
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-130-0/+0
| | | | | | |\ \ \ \ \ \ \ \ \
| | | | | | | * \ \ \ \ \ \ \ \ Merge mysql.com:/M41/clone-4.1-current into mysql.com:/M41/mysql-4.1unknown2005-10-1310-28/+2464
| | | | | | | |\ \ \ \ \ \ \ \ \
| | | | * | | | \ \ \ \ \ \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1unknown2005-10-252-5/+8
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Changed some dbug print options.unknown2005-10-252-5/+8