summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/hf/work/current_stmt/my50-current_stmtholyfoot/hf@deer.(none)2006-10-243-7/+7
|\
| * Merge mysql.com:/home/hf/work/0current_stmt/my41-current_stmtholyfoot/hf@mysql.com/deer.(none)2006-10-243-7/+7
| |\
| | * Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-243-11/+11
* | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-optgkodinov@dl145s.mysql.com2006-10-200-0/+0
|\ \ \ | |/ /
| * | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-optgkodinov@dl145s.mysql.com2006-10-200-0/+0
| |\ \ | | |/
| | * Merge bk-internal:/home/bk/mysql-4.1gkodinov@dl145s.mysql.com2006-10-2011-9/+143
| | |\
| * | \ Merge bk-internal:/home/bk/mysql-5.0gkodinov@dl145s.mysql.com2006-10-2045-200/+1122
| |\ \ \
* | \ \ \ Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-10-2045-174/+1093
|\ \ \ \ \
| * | | | | sql_rename.cc, sql_table.cc, type_decimal.result, mix2_myisam.result:gkodinov@dl145s.mysql.com2006-10-204-18/+21
| * | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-5.0-optgkodinov@dl145s.mysql.com2006-10-1939-164/+1019
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/MERGE/mysql-4.1-optgkodinov@dl145s.mysql.com2006-10-193-2/+30
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-4.1gkodinov@dl145s.mysql.com2006-10-1911-9/+143
| | | |\ \ \
| | | | * \ \ Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-4.1-optgkodinov/kgeorge@rakia.(none)2006-10-165-8/+77
| | | | |\ \ \
| | | | * \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1-optholyfoot/hf@mysql.com/deer.(none)2006-10-013-0/+36
| | | | |\ \ \ \
| | | | * | | | | Fixed bug#20825: rollup puts non-equal values togetherevgen@moonbone.local2006-09-293-1/+30
| | * | | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.0gkodinov@dl145s.mysql.com2006-10-1943-198/+1092
| | |\ \ \ \ \ \ \
| | | * | | | | | | Changed test case for bug 22342 to make it platform independent.igor@rurik.mysql.com2006-10-182-4/+4
| | | * | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@sunlight.local2006-10-181-1/+1
| | | |\ \ \ \ \ \ \
| | | | * | | | | | | sql_rename.cc:evgen@sunlight.local2006-10-181-1/+1
| | | * | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optigor@rurik.mysql.com2006-10-177-35/+238
| | | |\ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ Merge rurik.mysql.com:/home/igor/mysql-5.0-optigor@rurik.mysql.com2006-10-177-35/+238
| | | | |\ \ \ \ \ \ \ \
| | | | | * | | | | | | | Fixed bug #19579: at range analysis optimizer did not take into igor@rurik.mysql.com2006-10-167-35/+238
| | | * | | | | | | | | | rename of the new members introduced in the fix for bug 21798gkodinov/kgeorge@macbook.gmz2006-10-172-12/+12
| | | |/ / / / / / / / /
| | | * | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2006-10-178-12/+104
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Bug#21798: memory leak during query execution with subquery in columngkodinov/kgeorge@macbook.gmz2006-10-178-12/+104
| | | * | | | | | | | | | merge changes becuase of the fix for bug 22367gkodinov/kgeorge@macbook.gmz2006-10-171-3/+3
| | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2006-10-176-9/+38
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug #22367: Optimizer uses ref join type instead of eq_ref for simple join on gkodinov/kgeorge@macbook.gmz2006-10-166-9/+38
| | | * | | | | | | | | | | Merge gkodinov@bk-internal.mysql.com:/home/bk/mysql-5.0-optgkodinov/kgeorge@rakia.(none)2006-10-164-0/+75
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Bug #22342: No results returned for query using max and group bygkodinov/kgeorge@macbook.gmz2006-10-164-0/+75
| | | * | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2006-10-165-8/+82
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / / / / / | | | |/| | | | | | | | | |
| | | | * | | | | | | | | | Merge update of the fix for bug 14019 in 5.0gkodinov/kgeorge@macbook.gmz2006-10-161-0/+4
| | | | * | | | | | | | | | Merge macbook.gmz:/Users/kgeorge/mysql/work/B14019-4.1-optgkodinov/kgeorge@macbook.gmz2006-10-165-8/+78
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|/ / / | | | | | |/| | | | | | | |
| | | | | * | | | | | | | | BUG#14019 : group by converts literal string to column namegkodinov/kgeorge@macbook.gmz2006-10-165-8/+77
| | | * | | | | | | | | | | Bug#14959: ALTER TABLE isn't able to rename a viewevgen@moonbone.local2006-10-135-72/+196
| | | |/ / / / / / / / / /
| | | * | | | | | | | | | Bug#22138: Unhandled NULL caused server crashevgen@moonbone.local2006-10-113-3/+29
| | | * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.local2006-10-098-57/+183
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | Bug #22781: SQL_BIG_RESULT fails to influence sort plangkodinov/kgeorge@macbook.local2006-10-098-57/+183
| | | * | | | | | | | | | | Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-10-013-2/+28
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-10-013-2/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.0-optholyfoot/hf@mysql.com/deer.(none)2006-10-013-0/+36
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | | | |/| | | | | | | | | | | |
| | | * | | | | | | | | | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optigor@rurik.mysql.com2006-09-293-0/+26
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-09-293-1/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / / / / | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | Fixed bug#20503: Server crash due to the ORDER clause not taken into accountevgen@moonbone.local2006-09-293-1/+28
| | | * | | | | | | | | | | | | | Merge rurik.mysql.com:/home/igor/mysql-5.0-optigor@rurik.mysql.com2006-09-293-1/+58
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | Fixed bug #22753.igor@rurik.mysql.com2006-09-293-1/+58
| | | | | |_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data/bk/team_tree_merge/mysql-5.1gkodinov@dl145s.mysql.com2006-10-196-3/+64
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-5.1-optholyfoot/hf@deer.(none)2006-10-013-3/+28
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1-optholyfoot/hf@deer.(none)2006-10-013-3/+28
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mysql.com:/home/hf/work/16813/my50-16813holyfoot/hf@deer.(none)2006-09-293-2/+28
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|/ / / / / / / / / | | | | | |/| | | | | | | | | | | | |