summaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-buildkent@kent-amd64.(none)2007-07-306-10/+9
|\
| * Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildkent@kent-amd64.(none)2007-07-305-7/+9
| |\
| | * Generate "config.h" directly into the "include" directory, later copiedkent@mysql.com/kent-amd64.(none)2007-07-305-7/+9
| | * Merge mysql.com:/home/kent/bk/config_h/mysql-4.1-buildkent@kent-amd64.(none)2007-07-300-0/+0
| | |\
| | | * my_pthread.c:kent@mysql.com/kent-amd64.(none)2007-07-301-1/+1
| * | | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0-buildkent@kent-amd64.(none)2007-07-307-20/+2
| |\ \ \
| | * | | SSL/Makefile.am mysql-test/Makefile.am:kent@mysql.com/kent-amd64.(none)2007-07-277-20/+2
| * | | | Merge trift2.:/MySQL/M50/mysql-5.0joerg@trift2.2007-07-30107-6170/+602
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-buildjperkin@production.mysql.com2007-07-272-145/+199
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.0-buildjperkin@production.mysql.com2007-07-2784-5366/+1
| | | |\ \
| | * | \ \ Merge debian.(none):/M50/rowlock-5.0joerg@debian.(none)2007-07-2684-5366/+1
| | |\ \ \ \ | | | | |/ / | | | |/| |
| | * | | | Merge debian.(none):/M41/push-4.1joerg@debian.(none)2007-07-260-0/+0
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Merge debian.(none):/M41/bug16635-4.1joerg@debian.(none)2007-07-261-3/+3
| | | |\ \ \
| | * | \ \ \ Merge debian.(none):/M50/bug16635-5.0joerg@debian.(none)2007-07-260-0/+0
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge debian.(none):/M50/mysql-5.0joerg@debian.(none)2007-07-2621-659/+402
| | |\ \ \ \ \ \
* | | \ \ \ \ \ \ Merge obarnir@bk-internal.mysql.com:/home/bk/mysql-5.1-buildomer@linux.site2007-07-3059-2978/+2358
|\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge linux.site:/home/omer/source/bld50_0724omer@linux.site2007-07-3018-2978/+2358
| |\ \ \ \ \ \ \ \ \ | | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Updated/fixed test and result files to 5.0.46omer@linux.site2007-07-2421-659/+402
| * | | | | | | | | Merge mysqldev@production.mysql.com:my/mysql-5.1-funcs1-depjoerg@debian.(none)2007-07-270-0/+0
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merge mysql.com:/data0/mysqldev/my/mysql-5.1joerg/mysqldev@production.mysql.com2007-07-270-0/+0
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge mysql.com:/data0/mysqldev/my/mysql-5.1joerg/mysqldev@mysql.com/production.mysql.com2007-07-271-0/+1
| | | |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Fix a bad BitKeeper dependency structure for the "funcs_1" suite:joerg@debian.(none)2007-07-2751-6951/+12379
| * | | | | | | | | | | | Fix a bad BitKeeper dependency structure for the "funcs_1" suite:joerg@debian.(none)2007-07-2784-12379/+6951
| |/ / / / / / / / / / /
* | | | | | | | | | | | Merge trift2.:/MySQL/M51/mysql-5.1joerg@trift2.2007-07-3094-5518/+243
|\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ Merge jperkin@bk-internal.mysql.com:/home/bk/mysql-5.1-buildjperkin@production.mysql.com2007-07-272-145/+200
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge production.mysql.com:/usersnfs/jperkin/bk/bug-28585-5.0jperkin@production.mysql.com2007-07-272-145/+200
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | | |
| | | * | | | | | | | | | | More fixes and cleanups for bug#28585:jperkin@production.mysql.com2007-07-271-29/+78
| | | * | | | | | | | | | | mysql_install_db.sh:jperkin@production.mysql.com2007-07-261-1/+1
| | | * | | | | | | | | | | Apply a few more cleanups to improve the robustness of mysql_install_dbjperkin@production.mysql.com2007-07-261-4/+13
| | | * | | | | | | | | | | Clean up the mysql_install_db script to ensure that a sane environment isjperkin@production.mysql.com2007-07-262-140/+136
| | | | |_|_|/ / / / / / / | | | |/| | | | | | | | |
| * | | | | | | | | | | | BUG#20815 for the 5.1 branchdf@pippilotta.erinye.com2007-07-271-0/+3
| * | | | | | | | | | | | Merge debian.(none):/M51/rowlock-5.1joerg@debian.(none)2007-07-2684-5368/+1
| |\ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ Merge debian.(none):/M50/rowlock-5.0joerg@debian.(none)2007-07-2684-5368/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | / | | | | |_|_|_|_|_|_|_|_|/ | | | |/| | | | | | | | |
| | | * | | | | | | | | | Remove the "row_lock" suite from the sources.joerg@debian.(none)2007-07-2684-5366/+1
| | | |/ / / / / / / / /
| * | | | | | | | | | | Merge debian.(none):/M51/bug16635-5.1joerg@debian.(none)2007-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ Merge debian.(none):/M50/bug16635-5.0joerg@debian.(none)2007-07-260-0/+0
| | |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / / / | | |/| | | | | | | / / / | | | | |_|_|_|_|_|/ / / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge debian.(none):/M41/bug16635-4.1joerg@debian.(none)2007-07-260-0/+0
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | / | | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| | | | * | | | | | | Raise the 64 character limit for path names in the error messagesjoerg@debian.(none)2007-07-261-3/+3
| * | | | | | | | | | Merge debian.(none):/M51/mysql-5.1joerg@debian.(none)2007-07-2634-145/+896
| |\ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Fix for bug#29641 - $CC on Open Server is set to contain argumentsjperkin@production.mysql.com2007-07-251-4/+0
| * | | | | | | | | | Many files:kent@mysql.com/kent-amd64.(none)2007-07-236-1/+39
| | |/ / / / / / / / | |/| | | | | | | |
* | | | | | | | | | Merge mysql.com:/home/svoj/devel/mysql/BUG29957/mysql-5.0-enginessvoj@june.mysql.com2007-07-273-1/+25
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0-enginessvoj@june.mysql.com2007-07-273-1/+25
| |\ \ \ \ \ \ \ \ \
| | * | | | | | | | | BUG#29957 - alter_table.test failssvoj@mysql.com/june.mysql.com2007-07-273-1/+25
* | | | | | | | | | | Merge xiphis.org:/anubis/antony/work/mysql-5.0-engines.mergeacurtis/antony@ltamd64.xiphis.org2007-07-260-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | Merge xiphis.org:/anubis/antony/work/mysql-5.0-enginesacurtis/antony@ltamd64.xiphis.org2007-07-2630-101/+867
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ / | | |/| | | | | | | |
* | | | | | | | | | | Merge xiphis.org:/anubis/antony/work/mysql-5.1-enginesacurtis/antony@ltamd64.xiphis.org2007-07-2634-145/+896
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / | |/| | | | | | | | |
| * | | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0-optgshchepa/uchum@gleb.loc2007-07-260-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge gleb.loc:/home/uchum/work/bk/5.0gshchepa/uchum@gleb.loc2007-07-2622-41/+656
| | |\ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ Merge gleb.loc:/home/uchum/work/bk/5.1gshchepa/uchum@gleb.loc2007-07-2624-49/+648
| |\ \ \ \ \ \ \ \ \ \ \