summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | fix build failure introduced by 5.1-marvel mergeunknown2006-12-011-1/+1
* | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2006-12-01217-677/+67283
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge mskold@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-015-33/+93
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-01200-649/+66827
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-12-014-2/+16
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dfischer@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-12-014-2/+16
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-11-301-0/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|/ / / / / / / / / / / / / / / / / / | | | | | |/| | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | late after-merge fixunknown2006-11-301-1/+7
| | | | * | | | | | | | | | | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-workunknown2006-11-301-1/+1
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-workunknown2006-11-301-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|/ / / / / / / / / / / / / / / | | | | | | |/| | | | | | | | | | | | | | | | | |
| | | | | | * | | | | | | | | | | | | | | | | | | minor fix to mtr_process.plunknown2006-11-301-1/+1
| | | | * | | | | | | | | | | | | | | | | | | | | Merge trift2.:/MySQL/M51/push-5.1unknown2006-11-301-1/+6
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | | | | | | | | support-files/mysql.spec.sh : Call "make install" using "benchdir_root=%{_d...unknown2006-11-301-1/+6
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2006-11-301-0/+3
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / /
| | | | | * | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-4.1-buildunknown2006-11-291-0/+1
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |/ / / / / / / / / / / / / / / / / / /
| | | | | | | * | | | | | | | | | | | | | | | | | | Makefile.am:unknown2006-11-291-0/+1
| | | | | * | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-1/+2
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | Makefile.am:unknown2006-11-291-1/+2
| | | | | * | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/kent/bk/mysql-5.0-buildunknown2006-11-291-0/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |/ / / / / / / / / / / / / / / / / / / /
| | | | | | * | | | | | | | | | | | | | | | | | | | Makefile.am:unknown2006-11-291-0/+1
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1unknown2006-11-2911-39/+34
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2006-11-291-1/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2006-11-2931-71/+274
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge trift2.:/MySQL/M51/mysql-5.1unknown2006-11-281-9/+9
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge monty@192.168.0.9:/home/my/mysql-5.1unknown2006-11-301-0/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2006-11-301-0/+3
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | More fully disable ccache when not compatible with gcov.unknown2006-11-281-0/+3
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-30196-647/+66808
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | After merge fixesunknown2006-11-306-6/+6
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-3024-75/+86
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warningsunknown2006-11-3027-96/+129
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed portability issue in my_thr_init.c (was added in my last push)unknown2006-11-3045-163/+168
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Don't abort if we call my_thread_end() multiple timesunknown2006-11-305-210/+55
| | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Fixed compiler warnings (Mostly VC++):unknown2006-11-3063-208/+198
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge mysql.com:/home/my/mysql-5.0unknown2006-11-2915-38/+98
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Ignore some generated filesunknown2006-11-293-12/+48
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0unknown2006-11-2912-25/+53
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | | | | | | | | | | | | Increased heap max length to > 4G for 64 bit machines unknown2006-11-2812-25/+53
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2006-11-29109-130/+66386
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | | | | | | | | | | Added back sql-bench directory, so that one can more easily run benchmarks on...unknown2006-11-29109-130/+66386
| | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / | | | | |/| | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.1unknown2006-12-011-0/+1
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Bug #24487 Valgrind: uninited byte in table->record[1] in binlog code for rbr...unknown2006-11-301-0/+1
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-optunknown2006-11-304-27/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge bk-internal:/home/bk/mysql-5.0-optunknown2006-11-304-27/+3
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | func_group.test, func_group.result, func_gconcat.result, func_gconcat.test:unknown2006-11-304-27/+3
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-5.0-optunknown2006-11-302-19/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / / / / / / / / / / / / / /
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/MERGE/mysql-4.1-optunknown2006-11-300-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | | | | | | | | | | | | | Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-4.1unknown2006-11-301-0/+2
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge dl145s.mysql.com:/data0/bk/team_tree_merge/mysql-5.0unknown2006-11-3024-28/+470
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / / / / / / / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | / / / / / / / / / / / / / / | | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ / / / / / / / / / / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | |