summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | | * | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workdf@kahlann.erinye.com2006-11-301-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / | | | | | |/| | | | | | | | | |
| | | | | * | | | | | | | | | | late after-merge fixdf@kahlann.erinye.com2006-11-301-1/+7
| | | | * | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workdf@kahlann.erinye.com2006-11-301-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / /
| | | | | * | | | | | | | | | | 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 trift2.:/MySQL/M51/push-5.1joerg@trift2.2006-11-301-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_d...joerg@trift2.2006-11-301-1/+6
| | | | * | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildjoerg@trift2.2006-11-301-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-11-291-0/+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
| | | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-11-291-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-11-291-1/+2
| | | | | * | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildkent@kent-amd64.(none)2006-11-291-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / /
| | | | | | * | | | | | | | | | | Makefile.am:kent@mysql.com/kent-amd64.(none)2006-11-291-0/+1
| | | | * | | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2006-11-2911-39/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / /
| | | | * | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildjoerg@trift2.2006-11-291-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2006-11-2931-71/+274
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2006-11-281-9/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge monty@192.168.0.9:/home/my/mysql-5.1monty@hasky.mysql.fi2006-11-301-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelmonty@hasky.mysql.fi2006-11-301-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | More fully disable ccache when not compatible with gcov.knielsen/pushbuild@production.mysql.com2006-11-281-0/+3
| | * | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-30196-647/+66808
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | After merge fixesmonty@mysql.com/narttu.mysql.fi2006-11-306-6/+6
| | | * | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-3024-75/+86
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / | | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | 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
| | | * | | | | | | | | | | | | | | | | | | Don't abort if we call my_thread_end() multiple timesmonty@mysql.com/narttu.mysql.fi2006-11-305-210/+55
| | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | Fixed compiler warnings (Mostly VC++):monty@mysql.com/narttu.mysql.fi2006-11-3063-208/+198
| | | * | | | | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2006-11-2915-38/+98
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | 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 bk-internal.mysql.com:/home/bk/mysql-5.1monty@narttu.mysql.fi2006-11-29109-130/+66386
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Added back sql-bench directory, so that one can more easily run benchmarks on...monty@mysql.com/narttu.mysql.fi2006-11-29109-130/+66386
| | | | | |_|/ / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1gkodinov@dl145s.mysql.com2006-12-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / | | | | | | | | | | | | | | | / / / / / | | |_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr...aelkin/elkin@dsl-hkibras-fe30f900-107.dhcp.inet.fi2006-11-301-0/+1
| * | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-optgkodinov@dl145s.mysql.com2006-11-304-27/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / | | |/| | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | 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-5.0-optgkodinov@dl145s.mysql.com2006-11-302-19/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | 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.1gkodinov@dl145s.mysql.com2006-11-3024-28/+496
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE2/mysql-5.0-optgkodinov@dl145s.mysql.com2006-11-291-2/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | 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/MERGE2/mysql-5.0-optgkodinov@dl145s.mysql.com2006-11-296-1/+116
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / / / / / / / / /