summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria...Michael Widenius2014-01-224-4/+12
* mysql-5.5.34 mergeSergei Golubchik2013-11-191-1/+1
|\
| * Bug #16776528 RACE CONDITION CAN CAUSE MYSQLD TO REMOVE SOCKET FILE ERRANTLYVenkata Sidagam2013-09-091-32/+0
| * Bug #16776528 RACE CONDITION CAN CAUSE MYSQLD TO REMOVE SOCKET FILE ERRANTLYAnirudh Mangipudi2013-08-121-0/+32
| |\
| | * Bug #16776528 RACE CONDITION CAN CAUSE MYSQLD TO REMOVE SOCKET FILE ERRANTLYAnirudh Mangipudi2013-08-121-0/+32
* | | MDEV-5186 /usr/bin/mysqld_safe doesn't have NUMA options supportSergei Golubchik2013-11-111-0/+68
* | | MDEV-4979 mysqld_safe section in my.cnf doesn't have mariadb equivalentSergei Golubchik2013-09-191-1/+1
* | | remove PBXTSergei Golubchik2013-08-302-6/+1
* | | mysql-5.5.32 mergeSergei Golubchik2013-07-163-4/+4
|\ \ \ | |/ /
| * | Merge of patch for Bug#12671635 from mysql-5.1.Nirbhay Choubey2013-03-211-2/+2
| |\ \ | | |/
| | * Bug#12671635 HELP-TABLEFORMAT DOESN'T MATCH HELP-FILESNirbhay Choubey2013-03-211-2/+2
| | * Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-193-3/+3
| | * Updated/added copyright headers.Murthy Narkedimilli2013-02-257-7/+7
| * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADERMurthy Narkedimilli2013-03-193-3/+3
* | | mysql-5.5.31 mergeSergei Golubchik2013-05-071-6/+9
|\ \ \ | |/ /
| * | Merge from mysq-5.1 to mysql-5.5Sujatha Sivakumar2013-02-191-5/+9
| |\ \ | | |/
| | * Bug#11746817:MYSQL_INSTALL_DB CREATES WILDCARD GRANTS WHENSujatha Sivakumar2013-02-191-5/+9
* | | MDEV-4068 rpm scriptlet chown command dangerousSergei Golubchik2013-03-064-4/+4
* | | Automatic mergeMichael Widenius2013-03-011-1/+8
|\ \ \
| * | | Added support for --crash-script in mysqld_safe.Michael Widenius2013-02-281-1/+8
* | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesetsSergei Golubchik2013-02-281-2/+2
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge of patch for Bug#16046140 from mysql-5.1.Nirbhay Choubey2012-12-271-2/+2
| |\ \ | | |/
| | * Bug#16046140 BIN/MYSQLD_SAFE: TEST: ARGUMENT EXPECTEDNirbhay Choubey2012-12-271-2/+2
* | | MDEV-3952 Incompatible change in MariaDB-5.5.28a-client rpm adds mytop when n...Sergei Golubchik2013-01-201-1/+1
* | | mysql-5.5.29 mergeSergei Golubchik2013-01-151-23/+25
|\ \ \ | |/ /
| * | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| |\ \
| * | | Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR Georgi Kodinov2012-08-271-23/+25
| * | | Bug #14181049: MYSQL_INSTALL_DB.PL CREATES EMPTY SYSTEM TABLES FOR MYSQL Georgi Kodinov2012-08-241-3/+18
* | | | 5.3 mergeSergei Golubchik2013-01-153-1/+73
|\ \ \ \
| * \ \ \ 5.2->5.3 mergeSergei Golubchik2013-01-103-1/+73
| |\ \ \ \
| | * \ \ \ 5.1 mergeSergei Golubchik2013-01-103-1/+73
| | |\ \ \ \
| | | * \ \ \ mysql-5.1.67 mergeSergei Golubchik2013-01-093-4/+74
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | | * | | Automerge into main 5.1Joerg Bruehe2012-10-191-3/+18
| | | | |\ \ \ | | | | | |_|/ | | | | |/| |
| | | | | * | Backport this change from MySQL 5.5 to 5.1:Joerg Bruehe2012-09-111-3/+18
| | | | * | | Bug#11764559: UMASK IS IGNORED BY ERROR LOGTatjana Azundris Nuernberg2012-10-172-1/+56
| | | | |/ /
* | | | | | Buildbot fixes and cleanups:Michael Widenius2013-01-111-3/+3
* | | | | | Fixed problem with failing mysql_upgrade when proc table was not correct.Michael Widenius2013-01-115-406/+411
* | | | | | Automatic mergeMichael Widenius2012-12-161-4/+4
|\ \ \ \ \ \
| * | | | | | Removed extra '+' from some lines (remains of old merge)Michael Widenius2012-12-141-4/+4
* | | | | | | 5.3->5.5 mergeSergei Golubchik2012-11-222-2/+2
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| * | | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-092-8/+20
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-082-8/+20
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-062-8/+20
| | | |\ \ \ \ | | | | | |/ / | | | | |/| |
* | | | | | | MDEV-3826 compilation of client programs fail: m_string.h tries to include <m...Sergei Golubchik2012-11-151-6/+5
* | | | | | | Fix the incorrect mergeSergei Golubchik2012-10-191-2/+3
* | | | | | | 5.3 mergeSergei Golubchik2012-10-181-22/+28
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mergeSergei Golubchik2012-09-271-1/+3
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | mergeSergei Golubchik2012-09-261-1/+3
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | always force the language in mysql_install_dbSergei Golubchik2012-09-261-1/+3
| * | | | | | mergeSergei Golubchik2012-09-241-21/+25
| |\ \ \ \ \ \ | | |/ / / / /