summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my50-bug20836iggy@rolltop.ignatz42.dyndns.org2006-12-043-57/+90
|\
| * Bug#20836 Selecting into variables results in wrong results being returnediggy@rolltop.ignatz42.dyndns.org2006-11-303-127/+68
| * Merge rolltop.ignatz42.dyndns.org:/mnt/storeage/bug20836/my41-bug20836iggy@rolltop.ignatz42.dyndns.org2006-11-294-55/+147
| |\
| | * Bug#20836 Selecting into variables results in wrong results being returnediggy@rolltop.ignatz42.dyndns.org2006-11-284-28/+147
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-12-041-2/+4
|\ \ \
| * \ \ Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1msvensson@neptunus.(none)2006-12-0415-112/+283
| |\ \ \
| * \ \ \ Merge bk-internal:/home/bk/mysql-4.1-maintmsvensson@neptunus.(none)2006-12-044-8/+304
| |\ \ \ \
| | * \ \ \ Merge ahristov@bk-internal.mysql.com:/home/bk/mysql-4.1-maintandrey@example.com2006-12-014-8/+304
| | |\ \ \ \
| * | | | | | Bug#24389 mysqltest: Could not open connection 'default': 2013 Lost connectio...msvensson@neptunus.(none)2006-12-041-2/+4
* | | | | | | Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0msvensson@neptunus.(none)2006-12-04152-623/+1862
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optgkodinov@dl145s.mysql.com2006-12-043-5/+16
| |\ \ \ \ \ \ \
| | * | | | | | | type_varchar.result:gkodinov/kgeorge@macbook.gmz2006-12-041-0/+1
| | * | | | | | | item_func.cc:gkodinov/kgeorge@macbook.gmz2006-12-042-5/+15
| * | | | | | | | mysql_install_db.sh:kent@mysql.com/kent-amd64.(none)2006-12-023-34/+49
| * | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-12-022-0/+12
| * | | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2006-12-020-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | |
| | * | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-4.1df@kahlann.erinye.com2006-12-012-1/+2
| | |\ \ \ \ \ \ \
| * | | | | | | | | mysql_upgrade.def Makefile.am:kent@mysql.com/kent-amd64.(none)2006-12-0129-21/+40
| * | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0-marveldf@kahlann.erinye.com2006-12-0177-285/+387
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | Fixed compiler warningsmonty@mysql.com/narttu.mysql.fi2006-11-3027-96/+129
| | * | | | | | | | | Fixed portability issue in my_thr_init.c (was added in my last push)monty@mysql.com/narttu.mysql.fi2006-11-3045-163/+168
| | * | | | | | | | | Ignore some generated filesmonty@mysql.com/narttu.mysql.fi2006-11-293-12/+48
| | * | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2006-11-2912-25/+53
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Increased heap max length to > 4G for 64 bit machines monty@mysql.com/nosik.monty.fi2006-11-2812-25/+53
| * | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.0df@kahlann.erinye.com2006-12-013-2/+11
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | late after-merge fixdf@kahlann.erinye.com2006-11-301-1/+7
| | * | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workdf@kahlann.erinye.com2006-11-301-1/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / | | | |/| | | | | | | |
| | | * | | | | | | | | minor fix to mtr_process.pldf@kahlann.erinye.com2006-11-301-1/+1
| | * | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildkent@mysql.com/kent-amd64.(none)2006-11-291-0/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-11-291-0/+1
| | * | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-11-291-1/+2
| | * | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-11-291-0/+1
| | | |/ / / / / / / / | | |/| | | | | | | |
| * | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optgkodinov/kgeorge@macbook.gmz2006-11-304-27/+3
| |\ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | func_group.test, func_group.result, func_gconcat.result, func_gconcat.test:gkodinov/kgeorge@macbook.gmz2006-11-304-27/+3
| * | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-optgkodinov@dl145s.mysql.com2006-11-300-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1gkodinov@dl145s.mysql.com2006-11-301-0/+2
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0gkodinov@dl145s.mysql.com2006-11-3024-28/+470
| |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / | | |/| | | | | | | | | |
| | * | | | | | | | | | | func_gconcat.result, func_gconcat.test:gkodinov/kgeorge@macbook.gmz2006-11-302-19/+2
| | * | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optgkodinov@dl145s.mysql.com2006-11-291-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | view_grant.result:evgen@moonbone.local2006-11-291-2/+1
| | * | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0gkodinov@dl145s.mysql.com2006-11-290-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|/ / / / / / / / | | | |/| | | | | | | | | |
| | * | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0-optgkodinov@dl145s.mysql.com2006-11-29214-1115/+1465
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / / / / / | | |/| | | | | | | | | | |
| | | * | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-optgkodinov@dl145s.mysql.com2006-11-291-1/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1gkodinov@dl145s.mysql.com2006-11-291-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|_|/ / / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-4.1-optgkodinov@dl145s.mysql.com2006-11-290-0/+0
| | | |\ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / | | | | |/| | | | | | | | |
| | | | * | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1gkodinov@dl145s.mysql.com2006-11-291-0/+2
| | | | |\ \ \ \ \ \ \ \ \ \
| | | * | \ \ \ \ \ \ \ \ \ \ Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0gkodinov@dl145s.mysql.com2006-11-2917-27/+372
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-11-293-0/+47
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | Bug#20327: Marking of a wrong field leads to a wrong result on select with view,evgen@moonbone.local2006-11-293-0/+46
| | * | | | | | | | | | | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optevgen@moonbone.local2006-11-2917-27/+372
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / | | | |/| | | | | | | | | | | | |