summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from 5.0 to 5.1 (bug#20216 + bug#18516).joerg@mysql.com2006-06-291-12/+16
|\
| * Manual merge for bug#20216.joerg@mysql.com2006-06-271-1/+3
| |\
| | * Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216),joerg@mysql.com2006-06-271-1/+5
| | |\
| | | * Move "mysqldumpslow" from the client RPM to the server RPM (bug#20216).joerg@mysql.com2006-06-271-1/+5
| * | | Revert all previous attempts to call "mysql_upgrade" during RPM upgrade.joerg@mysql.com2006-06-271-19/+7
| * | | Merge mysql.com:/M50/bug19353-5.0-2 into mysql.com:/M50/bug20216-5.0joerg@mysql.com2006-06-271-4/+18
| |\ \ \
| | * | | Improved fix for bug#18516 (also 19353):joerg@mysql.com2006-06-221-4/+18
* | | | | Manual mergeevgen@moonbone.local2006-06-281-0/+13
|\ \ \ \ \ | |/ / / /
| * | | | Merge moonbone.local:/work/tmp_merge-4.1-opt-mysqlevgen@moonbone.local2006-06-231-0/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | mysql.spec.sh:kent@mysql.com2006-06-231-0/+1
| | |/ /
| | * | Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M41/mysql-4.1joerg@mysql.com2006-06-141-0/+1
| | |\ \
* | | \ \ Merge mysql.com:/M50/bug19353-5.0 into mysql.com:/M51/bug19353-5.1joerg@trift2.2006-06-222-5/+29
|\ \ \ \ \ | |/ / / /
| * | | | Fix for bug#18516 (also #19353, reported for 5.1):joerg@mysql.com2006-06-202-5/+29
| * | | | Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M50/mysql-5.0joerg@mysql.com2006-06-141-0/+1
| |\ \ \ \
* | | | | | make_win_src_distribution.sh:kent@mysql.com2006-06-201-11/+7
* | | | | | Merge mysql.com:/M50/bug18810-5.0 into mysql.com:/M51/bug18810-5.1joerg@trift2.2006-06-141-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Merge mysql.com:/M41/bug18810-4.1 into mysql.com:/M50/bug18810-5.0joerg@mysql.com2006-06-141-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | support-files/mysql.server.sh : Fix the startup sequence. bug#18810 + bug#...joerg@mysql.com2006-06-141-0/+1
* | | | | | Removing mysql_explain_log from 5.1brian@zim.(none)2006-05-231-1/+0
* | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-newanozdrin@mysql.com2006-05-221-1/+4
|\ \ \ \ \ \
| * | | | | | This is an implementation of two WL items:anozdrin@mysql.com2006-05-181-1/+4
* | | | | | | Mergekent@mysql.com2006-05-211-1/+5
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Mergekent@mysql.com2006-05-211-0/+5
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | / / | | | |_|/ / | | |/| | |
| | * | | | Mergekent@mysql.com2006-05-201-0/+5
| | |\ \ \ \ | | | |_|/ / | | |/| | / | | | | |/ | | | |/|
| | | * | mysql.spec.sh:kent@mysql.com2006-05-201-0/+5
| | * | | Merge jonas@perch:src/mysql-4.1tomas@poseidon.ndb.mysql.com2006-05-161-0/+1
| | |\ \ \
| | | * \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-4.1jonas@perch.ndb.mysql.com2006-05-081-0/+1
| | | |\ \ \
| * | | \ \ \ Merge jonas@perch:src/mysql-5.0tomas@poseidon.ndb.mysql.com2006-05-161-1/+8
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0jonas@perch.ndb.mysql.com2006-05-081-0/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-04-261-0/+1
| | |\ \ \ \ \ \ \
* | | \ \ \ \ \ \ \ Mergekent@mysql.com2006-05-171-4/+4
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | mysql.spec.sh:kent@mysql.com2006-05-161-1/+4
* | | | | | | | | | | Merge mysql.com:/data0/mysqldev/my/tmp_mergekent@mysql.com2006-05-161-1/+8
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | / / / / / / | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Mergekent@mysql.com2006-05-101-1/+8
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | / / / / / | | | |_|/ / / / / | | |/| | | | | |
| | * | | | | | | mysql.spec.sh:kent@mysql.com2006-05-101-1/+8
| | | |_|/ / / / | | |/| | | | |
* | | | | | | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1-newtomas@poseidon.ndb.mysql.com2006-05-041-24/+26
|\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Mergekent@mysql.com2006-05-021-23/+17
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | Mergekent@mysql.com2006-05-011-24/+20
| | |\ \ \ \ \ \ \ | | | |/ / / / / /
| | | * | | | | | mysql.spec.sh:kent@mysql.com2006-05-011-15/+11
| | | * | | | | | mysql.spec.sh:kent@mysql.com2006-04-291-15/+57
| * | | | | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-04-301-2/+10
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | | | | | | | | / | | |_|_|_|_|_|/ | |/| | | | | |
| | * | | | | | mysql.spec.sh:kent@mysql.com2006-04-281-1/+10
| | | |/ / / / | | |/| | | |
* | | | | | | Merge perch.ndb.mysql.com:/home/jonas/src/50-workjonas@perch.ndb.mysql.com2006-04-261-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | / / / | | |_|/ / / | |/| | | |
| * | | | | Merge perch.ndb.mysql.com:/home/jonas/src/41-workjonas@perch.ndb.mysql.com2006-04-261-0/+1
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Add ndb_config to rpm specjonas@perch.ndb.mysql.com2006-04-261-0/+1
| | | |/ / | | |/| |
* | | | | Remove ancient version of Debian packaging files.jimw@mysql.com2006-04-1345-1472/+0
* | | | | Clean up problem in mysql.spec caused by over-aggressive editor word-wrappingjimw@mysql.com2006-04-131-2/+3
* | | | | Remove sql-bench from the server repository -- it is being maintainedjimw@mysql.com2006-04-131-27/+10
* | | | | Remove old cruft from the tree: mysqltestmanager, mysql_test_run_new,jimw@mysql.com2006-04-111-3/+5
* | | | | Merge mysql.com:/home/hartmut/projects/mysql/dev/5.0hartmut@mysql.com2006-04-071-2/+10
|\ \ \ \ \ | | |_|/ / | |/| | |