summaryrefslogtreecommitdiff
path: root/scripts
Commit message (Expand)AuthorAgeFilesLines
* Merge 10.0 to galera-10.0Jan Lindström2013-09-0315-71/+2138
|\
| * MDEV-4865 Change related to --log option/variable was merged partiallySergei Golubchik2013-08-131-4/+2
| * 10.0-monty mergeSergei Golubchik2013-07-215-66/+171
| |\
| | * MDEV-4757 Change mysql.slow_log.event_time from TIMESTAMP to TIMESTAMP(6)Sergei Golubchik2013-07-151-1/+1
| | * Fix fix_priv_tables.test: make mysql_system_tables_fix.sql to not modify user...Sergey Petrunya2013-07-041-0/+3
| | * Fix typo in scripts/mysql_system_tables_fix.sqlSergey Petrunya2013-07-041-1/+1
| | * MDEV-4058unknown2013-06-271-4/+3
| | * Fixed some merge issues:Michael Widenius2013-06-182-7/+8
| | * More merge fixes:Michael Widenius2013-06-164-58/+160
| * | 10.0-base mergeSergei Golubchik2013-07-183-5/+5
| |\ \
| | * \ 5.5 mergeSergei Golubchik2013-07-173-4/+4
| | |\ \
| | | * \ 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
| | * | | | | MDEV-4483: CHANGE MASTER TO master_use_gtid=xxx looses old-style coordinates.unknown2013-06-071-1/+1
* | | | | | | Merged with lp:maria revision #3766Seppo Jaakola2013-07-131-6/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | 10.0-base mergeSergei Golubchik2013-06-061-6/+9
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | 5.5 mergeSergei Golubchik2013-06-061-6/+9
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | 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
* | | | | | | Initial merge result with mariaDB 10: lp:mariaSeppo Jaakola2013-07-133-17/+231
|/ / / / / /
* | | | | | Merge 10.0-base -> 10.0unknown2013-05-281-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-26: Global transaction ID.unknown2013-05-221-1/+1
* | | | | | Merge 10.0-base -> 10.0Igor Babaev2013-04-171-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge 10.0-base -> mwl253Igor Babaev2013-04-152-2/+7
| |\ \ \ \ \
| * \ \ \ \ \ Merge 10.0-base -> mwl253.Igor Babaev2013-03-314-7/+14
| |\ \ \ \ \ \
| * | | | | | | Added the type of histogram for mwl #253.Igor Babaev2013-03-301-1/+1
| * | | | | | | Added histogams for table columns.Igor Babaev2013-03-251-1/+1
* | | | | | | | Merge 10.0-base -> 10.0 (GTID).unknown2013-04-172-1/+6
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| * | | | | | | MDEV-26: Global transaction ID. First alpha release.unknown2013-04-152-2/+7
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | |
| | * | | | | | MDEV-26: Global transaction ID.unknown2013-01-251-2/+1
| | * | | | | | MDEV-26: Global transaction id: Intermediate commit.unknown2012-11-151-0/+6
| | |/ / / / /
* | | | | | | 10.0-base mergeSergei Golubchik2013-04-154-7/+14
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | |
| * | | | | 5.5 mergeSergei Golubchik2013-03-274-7/+14
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| | * | | 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
* | | | | 10.0-base mergeSergei Golubchik2013-01-319-1508/+1561
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-01-299-434/+513
| |\ \ \ \ | | |/ / /
| | * | | 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