summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* SHOW STATUS does not anymore change local status variables (except com_show_s...monty@mysql.com2006-06-2021-220/+406
* Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@mysql.com2006-06-1919-102/+141
|\
| * unsigned char -> ucharmonty@mysql.com2006-06-1919-102/+141
* | rpl_log.test, rpl_stm_log.result:evgen@moonbone.local2006-06-195-82/+36
* | Manually mergedevgen@moonbone.local2006-06-1851-230/+1060
|\ \
| * \ Merge moonbone.local:/work/tmp_merge-5.0evgen@moonbone.local2006-06-1741-277/+971
| |\ \
| | * \ Manually mergedevgen@moonbone.local2006-06-178-2/+77
| | |\ \
| | | * \ Manually mergedevgen@moonbone.local2006-06-1727-53/+515
| | | |\ \
| | * | | | select.result:evgen@moonbone.local2006-06-171-0/+10
| | * | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-optevgen@moonbone.local2006-06-174-24/+58
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | | * | | item_strfunc.cc:evgen@moonbone.local2006-06-162-22/+13
| | | * | | Merge moonbone.local:/home/evgen/bk-trees/mysql-4.1-optevgen@moonbone.local2006-06-152-11/+6
| | | |\ \ \
| | | | * | | item_cmpfunc.h, cast.result:evgen@moonbone.local2006-06-152-11/+6
| | | * | | | Merge moonbone.local:/work/15351-bug-4.1-mysqlevgen@moonbone.local2006-06-1526-53/+484
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Fixed bug#15351: Wrong collation used for comparison of md5() and sha()evgen@moonbone.local2006-05-283-2/+45
| | * | | | | Manually mergedevgen@moonbone.local2006-06-1739-284/+934
| | |\ \ \ \ \
| | | * | | | | Post_merges fixes.igor@rurik.mysql.com2006-06-151-2/+0
| | | * | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1-optigor@rurik.mysql.com2006-06-153-2/+26
| | | |\ \ \ \ \
| | | | * | | | | Post-review corrections of the fix for bug #18206.igor@rurik.mysql.com2006-06-133-2/+26
| | | | * | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-4.1-optigor@rurik.mysql.com2006-06-133-13/+73
| | | | |\ \ \ \ \
| | | * | \ \ \ \ \ Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optigor@rurik.mysql.com2006-06-1525-50/+628
| | | |\ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-optevgen@moonbone.local2006-06-153-0/+95
| | | | |\ \ \ \ \ \ \
| | | | | * | | | | | | Fixed bug#18175: The nest_level counter wasn't decremented for union parts whichevgen@moonbone.local2006-06-153-0/+95
| | | | * | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-optevgen@moonbone.local2006-06-153-0/+18
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fixed bug#19789: REPLACE was allowed for a VIEW with CHECK OPTION enabled.evgen@moonbone.local2006-06-073-0/+18
| | | | | |/ / / / / / /
| | | | * | | | | | | | Many files:evgen@moonbone.local2006-06-156-73/+52
| | | | * | | | | | | | Manually mergedevgen@moonbone.local2006-06-1415-32/+352
| | | | |\ \ \ \ \ \ \ \ | | | | | | |_|_|_|/ / / | | | | | |/| | | | | |
| | | | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-06-141-1/+7
| | | | | |\ \ \ \ \ \ \
| | | | | | * | | | | | | Better comments in KEY_PART_INFO structsergefp@mysql.com2006-06-141-1/+7
| | | | | | | |/ / / / / | | | | | | |/| | | | |
| | | | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-06-139-42/+293
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / /
| | | | | | * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-06-139-42/+293
| | | | | | |\ \ \ \ \ \
| | | | | | | * | | | | | Fixed bug#16377: result of DATE/TIME functions were compared as strings whichevgen@moonbone.local2006-06-139-42/+293
| | | | | * | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1-optevgen@moonbone.local2006-06-128-8/+86
| | | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / /
| | | | | * | | | | | | | Merge moonbone.local:/work/16716-bug-4.1-mysqlevgen@moonbone.local2006-06-126-4/+83
| | | | | |\ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / | | | | | | |/| | | | | |
| | | | | * | | | | | | | Fixed bug#16716: subselect in concat() may lead to a wrong result.evgen@moonbone.local2006-05-263-1/+18
| | | | * | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleangkodinov@mysql.com2006-06-143-1/+54
| | | | |\ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleangkodinov@mysql.com2006-06-143-1/+54
| | | | | |\ \ \ \ \ \ \ \ \
| | | | | | * | | | | | | | | Bug #18895: BIT values cause joins to failgkodinov@mysql.com2006-06-143-1/+54
| | | | * | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-06-143-1/+23
| | | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | Merge moonbone.local:/home/evgen/bk-trees/mysql-5.0-optevgen@moonbone.local2006-06-143-1/+23
| | | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / | | | | | |/| | | | | | | | |
| | | | | | * | | | | | | | | Fixed bug#15962: CONCAT() in UNION may lead to a data trucation.evgen@moonbone.local2006-06-073-1/+23
| | | | | | | |_|_|/ / / / / | | | | | | |/| | | | | | |
| | | | * | | | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleangkodinov@mysql.com2006-06-143-0/+87
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | | * | | | | | | | | Bug #20195: INSERT DELAYED with auto_increment is assigned wrong valuesgkodinov@mysql.com2006-06-133-0/+87
| | | * | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1-optigor@rurik.mysql.com2006-06-134-17/+74
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / | | | |/| | | | | | / / / / | | | | | |_|_|_|_|/ / / / | | | | |/| | | | | | | |
| | | | * | | | | | | | | Fixed bug #14896.igor@rurik.mysql.com2006-06-133-13/+73
| | | | | |_|_|_|/ / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Cleanup for the fix of bug 18206.igor@rurik.mysql.com2006-06-021-4/+0
| | | * | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optigor@rurik.mysql.com2006-06-113-11/+56
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Merge mysql.com:/home/kgeorge/mysql/5.0/teamcleangkodinov@mysql.com2006-06-083-11/+56
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Bug #15355: Common natural join column not resolved in prepared statement nes...gkodinov@mysql.com2006-06-083-11/+56
| | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | * | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-4.1-optigor@rurik.mysql.com2006-06-025-7/+61
| | | |\ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / | | | |/| | / / / / / / | | | | | |/ / / / / / | | | | |/| | | | | |