summaryrefslogtreecommitdiff
path: root/support-files
Commit message (Expand)AuthorAgeFilesLines
* merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6Seppo Jaakola2013-12-046-117/+61
|\
| * 10.0-base mergeSergei Golubchik2013-11-131-1/+1
| |\
| | * 5.5. mergeSergei Golubchik2013-11-131-1/+1
| | |\
| | | * MDEV-5030 RPM installation not running mysql_install_db if datadir existsSergei Golubchik2013-11-111-1/+1
| * | | Merge 10.0-base -> 10.0Sergey Petrunya2013-10-161-1/+1
| |\ \ \ | | |/ /
| | * | MDEV-3798: [SHOW] EXPLAIN UPDATE/DELETESergey Petrunya2013-10-151-1/+1
| | |\ \
| | | * \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-08-241-1/+1
| | | |\ \
| | | | * \ [SHOW] EXPLAIN UPDATE/DELETE, code re-structuringSergey Petrunya2013-06-271-1/+1
| | | | |\ \
| | | | | * | SHOW EXPLAIN UPDATE/DELETESergey Petrunya2013-06-171-1/+1
| * | | | | | update /etc/my.cnf.d/server.cnf to say 10.0, not 5.5Sergei Golubchik2013-09-251-7/+5
| |/ / / / /
| * | | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-184-102/+53
| |\ \ \ \ \ | | |/ / / / | |/| | | / | | | |_|/ | | |/| |
| | * | | merge with 5.5-tokudb tree. In particular:Sergei Golubchik2013-09-102-17/+3
| | |\ \ \
| | | * | | introduce sysconf2dir, install tokudb.conf there, both in rpm and debSergei Golubchik2013-09-101-3/+3
| | | * | | remove PBXTSergei Golubchik2013-08-301-14/+0
| | * | | | mysql-5.5.33 mergeSergei Golubchik2013-09-062-85/+50
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Updated spec file for Bug#17080138Balasubramanian Kandasamy2013-07-101-2/+12
| | | * | | Updated copyright year in the spec fileBalasubramanian Kandasamy2013-06-271-1/+1
| | | * | | - Spec file cleanup for 5.5.33 release to resolve rpm dependencies bugsBalasubramanian Kandasamy2013-06-271-1/+1
| | | * | | Cleaned up spec file for 5.5.33 releaseBalasubramanian Kandasamy2013-06-261-88/+42
| | | * | | Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8Tor Didriksen2013-06-141-1/+1
* | | | | | Merged revisions 3418..3424 from mariadb-galera-5.5Seppo Jaakola2013-10-071-0/+2
* | | | | | Merged revisions 3411..3417 from mariadb-galera-5.5Seppo Jaakola2013-10-072-1/+133
* | | | | | Merge 10.0 to galera-10.0Jan Lindström2013-09-0321-22/+489
|\ \ \ \ \ \ | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-07-1717-22/+27
| |\ \ \ \ \ | | |/ / / / | | | | / / | | |_|/ / | |/| | |
| | * | | mysql-5.5.32 mergeSergei Golubchik2013-07-1617-22/+27
| | |\ \ \
| | | * | | Updated copyright year informationBalasubramanian Kandasamy2013-05-131-1/+1
| | | * | | Adding fix for Bug#16798868Balasubramanian Kandasamy2013-05-131-0/+29
| | | * | | Updated spec file for Bug16488773Balasubramanian Kandasamy2013-05-061-30/+0
| | | |/ /
| | | * | Merge from mysql-5.5.31-releaseunknown2013-04-182-58/+125
| | | |\ \
| | | * \ \ Merging the changes for Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION.Murthy Narkedimilli2013-04-161-2/+1
| | | |\ \ \
| | | | * | | Bug 16633169 - MYSQL.INFO CONTAINS OUTDATED INFORMATION.Murthy Narkedimilli2013-04-161-2/+1
| | | * | | | local merge.Nirbhay Choubey2013-04-091-1/+7
| | | |\ \ \ \ | | | | |/ / /
| | | | * | | Backporting patch for bug#15852074.Nirbhay Choubey2013-04-091-1/+7
| | | | * | | Correcting the permissions of executable files.Murthy Narkedimilli2013-03-204-0/+0
| | | | * | | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1918-24/+24
| | | | * | | Updated/added copyright headers.Murthy Narkedimilli2013-02-254-4/+4
| | | | * | | Spec file change to work around cast ulonglong -> int.Joerg Bruehe2012-09-111-1/+6
| | | * | | | Correcting the permissions of the executable files.Murthy Narkedimilli2013-03-204-0/+0
| | | * | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-1916-20/+20
* | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-133-59/+127
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 5.5 mergeSergei Golubchik2013-06-063-59/+127
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | / | | |_|_|_|/ | |/| | | |
| | * | | | - Solaris fixes:Michael Widenius2013-05-151-0/+2
| | * | | | mysql-5.5.31 mergeSergei Golubchik2013-05-072-58/+125
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| | | * | | Reverted MySQL Release Engineering mail addressBalasubramanian Kandasamy2013-03-251-1/+1
| | | * | | Added SuSE RPM Build fixBalasubramanian Kandasamy2013-03-211-52/+106
| | | * | | Added fix for Bug#16445097Balasubramanian Kandasamy2013-03-061-6/+19
| | | |\ \ \
| | | | * | | Added fix for Bug#16445097Balasubramanian Kandasamy2013-03-061-6/+19
| | | * | | | Updated Code for Bug#16235828 and Bug#16298542Balasubramanian Kandasamy2013-03-052-27/+27
| | | |\ \ \ \ | | | | |/ / / | | | | | / / | | | | |/ / | | | |/| |
| | | | * | Updated Code for Bug#16235828Balasubramanian Kandasamy2013-03-051-6/+9
| | | | * | Updated mysql.spec.sh file for br16298542unknown2013-03-012-13/+8