summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge tkatchaounov@bk-internal.mysql.com:/home/bk/mysql-5.0-opttimour/tkatchaounov@lamia.home2006-07-212-15/+20
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.(none)2006-07-131-11/+13
| |\
| | * Bug #19779: mysql_explain_log documentation is outdated.iggy@rolltop.ignatz42.dyndns.org2006-07-131-11/+13
| * | Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0cmiller@zippy.(none)2006-07-131-4/+7
| |\ \ | | |/
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maintcmiller@zippy.(none)2006-06-291-4/+7
| | |\
| | | * Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maintigreenhoe@mysql.com2006-06-281-4/+7
| | | |\
| | | | * Fix for bug #17353.igreenhoe@mysql.com2006-04-171-4/+7
* | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optigor@rurik.mysql.com2006-07-141-2/+2
|\ \ \ \ \ | |/ / / /
| * | | | Merge mysql.com:/home/emurphy/src/bk-clean/mysql-4.1elliot@mysql.com2006-06-301-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Bug#19298 mysqld_safe still uses obsolete --skip-locking parameteriggy@mysql.com2006-06-271-2/+2
* | | | | Merge ibabaev@bk-internal.mysql.com:/home/bk/mysql-5.0-optigor@rurik.mysql.com2006-07-013-8/+18
|\ \ \ \ \ | |/ / / /
| * | | | Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-5.0joerg@mysql.com2006-06-273-4/+4
| |\ \ \ \
| | * | | | The binary "mysql_upgrade" must be included in the distribution. (bug#18516 +...joerg@mysql.com2006-06-231-1/+1
| | * | | | Improved fix for bug#18516 (also 19353):joerg@mysql.com2006-06-222-3/+3
| | | |/ / | | |/| |
| * | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-newkent@mysql.com2006-06-271-4/+14
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0kent@mysql.com2006-06-261-4/+14
| | |\ \
| | | * | make_sharedlib_distribution.sh:kent@mysql.com2006-06-262-6/+18
* | | | | Fixed some dsp files.igor@rurik.mysql.com2006-06-231-1/+1
|/ / / /
* | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-newkent@mysql.com2006-06-171-11/+6
|\ \ \ \ | |/ / /
| * | | make_win_src_distribution.sh:kent@mysql.com2006-06-171-11/+6
* | | | make_win_src_distribution.sh:kent@mysql.com2006-06-171-2/+0
* | | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-newkent@mysql.com2006-06-171-16/+33
|\ \ \ \ | |/ / /
| * | | make_win_src_distribution.sh:kent@mysql.com2006-06-171-16/+33
* | | | Merge rurik.mysql.com:/home/igor/tmp_mergeigor@rurik.mysql.com2006-05-312-2/+5
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | make_win_src_distribution.sh:kent@mysql.com2006-05-291-0/+1
| * | make_sharedlib_distribution.sh:kent@mysql.com2006-05-231-2/+4
* | | Mergekent@mysql.com2006-04-031-1/+2
|\ \ \ | |/ /
| * | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0kent@mysql.com2006-04-031-1/+2
| |\ \ | | |/
| | * mysql_install_db.sh, MySQLEULA.txt, mysql_install_db.c:kent@mysql.com2006-04-031-1/+2
| * | mysqld_safe.sh:kent@mysql.com2006-03-291-0/+28
* | | Mergekent@mysql.com2006-03-291-1/+6
|\ \ \ | |/ /
| * | mysql_config.sh:kent@mysql.com2006-03-291-1/+6
* | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-newkent@mysql.com2006-03-271-1/+1
|\ \ \ | |/ /
| * | mysql_config.sh:kent@mysql.com2006-03-271-1/+1
* | | Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1-newkent@mysql.com2006-03-271-8/+19
|\ \ \ | |/ /
| * | mysql_config.sh:kent@mysql.com2006-03-271-8/+19
| * | Merge mysql.com:/M40/mysql-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2006-03-021-1/+1
| |\ \ | | |/
* | | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-0/+6
* | | Messgges corrected in mysql_upgrade scriptholyfoot@deer.(none)2006-02-201-5/+5
* | | --help option added to mysql_upgrade scriptholyfoot@deer.(none)2006-02-181-0/+18
* | | WL#2645 (CHECK TABLE FOR UPGRADE)holyfoot@deer.(none)2006-02-172-0/+188
* | | Mergekent@mysql.com2006-02-121-1/+1
|\ \ \
| * \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.0kent@mysql.com2006-02-121-1/+1
| |\ \ \ | | |/ / | |/| / | | |/
| | * make_binary_distribution.sh:kent@mysql.com2006-02-121-1/+1
* | | Manual merge of the fix for bug#16106.joerg@mysql.com2006-01-161-3/+0
|\ \ \ | |/ /
| * | Merge mysql.com:/M40/push-4.0 into mysql.com:/M41/merge-4.1joerg@mysql.com2006-01-131-3/+0
| |\ \ | | |/
| | * extra/comp_err.c + scripts/mysqld_multi.sh :joerg@mysql.com2006-01-131-3/+0
| * | Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1kent@mysql.com2005-12-151-2/+2
| |\ \
* | \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-5.0-releasekent@mysql.com2005-12-141-2/+2
|\ \ \ \
| * \ \ \ Merge mysql.com:/Users/kent/mysql/bk/mysql-4.1kent@mysql.com2005-12-111-2/+2
| |\ \ \ \ | | | |/ / | | |/| |