summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-256-11/+8
|\
| * merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-014-4/+0
| |\
| | * merged 5.1-main -> 5.1-pe-stageGeorgi Kodinov2009-03-092-6/+7
| | |\
| | * | Backport from 6.0 fix for Bug#38249Davi Arnaut2009-02-124-4/+0
| * | | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria.Guilhem Bichot2009-03-112-8/+9
| |\ \ \ | | | |/ | | |/|
| | * | Only specify the current year for the Sun product copyrightunknown2009-02-241-3/+3
| | * | Insert current year as last copyright year for the productunknown2009-02-242-6/+7
| | |/
| * | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow.Guilhem Bichot2009-02-122-28/+69
| |\ \ | | |/
* | | Merge with base MySQL 5.1Michael Widenius2009-02-152-28/+69
|\ \ \ | |/ / |/| / | |/
| * MergeKent Boortz2008-12-281-1/+1
| |\
| | * Increased thread stack size to 128K, as this is the minimum (Bug#41577)Kent Boortz2008-12-281-1/+1
| * | Make sure cluster builds include all charsetsKent Boortz2008-12-281-0/+4
| * | mysql-test/r/partition.resultBuild Team2008-11-251-3/+4
| * | Changes of copyright output from "--version" and similar.unknown2008-11-141-14/+22
| * | Merge second fix for bug#40546 to the 5.1.30 tree.Joerg Bruehe2008-11-071-6/+15
| |\ \
| | * \ Upmerge the second fix for bug#40546 from 5.0 to 5.1Joerg Bruehe2008-11-071-6/+15
| | |\ \
| | | * | "spec" file for RPM builds:Joerg Bruehe2008-11-071-2/+10
| | | |/
| * | | Back merges from 6.0.8unknown2008-11-061-28/+23
| |/ /
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-216-14/+66
|\ \ \ | |/ /
| * | Bug #40546 Debug server in RPM is built with compiler optimizationJoerg Bruehe2008-11-061-8/+20
| |\ \ | | |/
| | * Bug #40546 Debug server in RPM is built with compiler optimizationJoerg Bruehe2008-11-061-4/+21
| | * Merge the bug fix development (37098: "unpackaged files")Joerg Bruehe2008-08-271-0/+23
| | |\
| * | | Bug #39812: Make statement replication default for 5.1 (to match 5.0)Georgi Kodinov2008-10-035-0/+15
| * | | Removed option to control if federated is enabled, and enabled it.Kent Boortz2008-08-291-13/+4
| * | | Merge bug fix development tree (37098: "unpackaged files")Joerg Bruehe2008-08-271-1/+27
| |\ \ \
| | * \ \ Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-271-1/+27
| | |\ \ \ | | | | |/ | | | |/|
| | | * | Bug#37098 Get rid of "Installed (but unpackaged)" files in the RPM buildJoerg Bruehe2008-08-251-0/+23
* | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-105-4/+49
|\ \ \ \ \ | |/ / / /
| * | | | Better fix of build-tags, merged from local 5.0-bugteam .Chad MILLER2008-08-061-2/+5
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#37201: make tags doesn't work in bazaar server treesChad MILLER2008-08-061-2/+5
| * | | | Merge from local 5.0-bugteam.Chad MILLER2008-08-061-1/+1
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| |
| | * | Bug#37201: make tags doesn't work in bazaar server treesChad MILLER2008-08-061-1/+1
| | |/
| * | Up-merge of merges, some criss-cross resolved with --weave.Timothy Smith2008-07-193-0/+9
| |\ \ | | |/
| | * Use skip-federated by default in all example configs.Jonathan Perkin2008-06-105-0/+15
| | * Merge bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2008-03-261-5/+28
| | |\
| | * \ Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.0-buildunknown2008-03-191-0/+4
| | |\ \
| * | | | Makefile.am:unknown2008-04-081-2/+4
| * | | | mysql.spec.sh:unknown2008-04-021-0/+4
| * | | | mysql.spec.sh:unknown2008-03-311-1/+35
* | | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-289-8/+523
|\ \ \ \ \ | |/ / / /
| * | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-261-5/+28
| |\ \ \ \
| | * \ \ \ Merge zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.0-buildunknown2008-03-261-5/+28
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Suggestion of Tim. Avoid unnecessary sleep.unknown2008-03-191-1/+1
| | | * | | Bug#30378: mysql.server needs to skip wait_for_pid() when mysqld \unknown2008-03-191-4/+27
| * | | | | Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-5.1-buildunknown2008-03-191-0/+4
| |\ \ \ \ \
| | * \ \ \ \ Merge ramayana.hindu.god:/home/tsmith/m/bk/build/50unknown2008-03-191-0/+4
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | / | | | | |_|/ | | | |/| |
| | | * | | Merge ramayana.hindu.god:/home/tsmith/m/bk/b25486/50unknown2008-03-191-0/+4
| | | |\ \ \ | | | | |/ / | | | |/| |
| | | | * | Bug #25486: mysqld_multi.server.sh missing from buildsunknown2008-03-101-0/+4
| * | | | | Merge trift2.:/MySQL/M50/man8-5.0unknown2008-03-191-0/+6
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | Merge trift2.:/MySQL/M41/man8-4.1unknown2008-03-191-0/+6
| | |\ \ \ | | | |/ / | | |/| |