Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 15 | -71/+2138 |
|\ | |||||
| * | MDEV-4865 Change related to --log option/variable was merged partially | Sergei Golubchik | 2013-08-13 | 1 | -4/+2 |
| * | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 5 | -66/+171 |
| |\ | |||||
| | * | MDEV-4757 Change mysql.slow_log.event_time from TIMESTAMP to TIMESTAMP(6) | Sergei Golubchik | 2013-07-15 | 1 | -1/+1 |
| | * | Fix fix_priv_tables.test: make mysql_system_tables_fix.sql to not modify user... | Sergey Petrunya | 2013-07-04 | 1 | -0/+3 |
| | * | Fix typo in scripts/mysql_system_tables_fix.sql | Sergey Petrunya | 2013-07-04 | 1 | -1/+1 |
| | * | MDEV-4058 | unknown | 2013-06-27 | 1 | -4/+3 |
| | * | Fixed some merge issues: | Michael Widenius | 2013-06-18 | 2 | -7/+8 |
| | * | More merge fixes: | Michael Widenius | 2013-06-16 | 4 | -58/+160 |
| * | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 3 | -5/+5 |
| |\ \ | |||||
| | * \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 3 | -4/+4 |
| | |\ \ | |||||
| | | * \ | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 3 | -4/+4 |
| | | |\ \ | |||||
| | | | * \ | Merge of patch for Bug#12671635 from mysql-5.1. | Nirbhay Choubey | 2013-03-21 | 1 | -2/+2 |
| | | | |\ \ | |||||
| | | | | * | | Bug#12671635 HELP-TABLEFORMAT DOESN'T MATCH HELP-FILES | Nirbhay Choubey | 2013-03-21 | 1 | -2/+2 |
| | | | | * | | Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 3 | -3/+3 |
| | | | | * | | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 7 | -7/+7 |
| | | | * | | | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 3 | -3/+3 |
| | * | | | | | MDEV-4483: CHANGE MASTER TO master_use_gtid=xxx looses old-style coordinates. | unknown | 2013-06-07 | 1 | -1/+1 |
* | | | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -6/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -6/+9 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -6/+9 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -6/+9 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | Merge from mysq-5.1 to mysql-5.5 | Sujatha Sivakumar | 2013-02-19 | 1 | -5/+9 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | Bug#11746817:MYSQL_INSTALL_DB CREATES WILDCARD GRANTS WHEN | Sujatha Sivakumar | 2013-02-19 | 1 | -5/+9 |
* | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 3 | -17/+231 |
|/ / / / / / | |||||
* | | | | | | Merge 10.0-base -> 10.0 | unknown | 2013-05-28 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-26: Global transaction ID. | unknown | 2013-05-22 | 1 | -1/+1 |
* | | | | | | Merge 10.0-base -> 10.0 | Igor Babaev | 2013-04-17 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 10.0-base -> mwl253 | Igor Babaev | 2013-04-15 | 2 | -2/+7 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 10.0-base -> mwl253. | Igor Babaev | 2013-03-31 | 4 | -7/+14 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Added the type of histogram for mwl #253. | Igor Babaev | 2013-03-30 | 1 | -1/+1 |
| * | | | | | | | Added histogams for table columns. | Igor Babaev | 2013-03-25 | 1 | -1/+1 |
* | | | | | | | | Merge 10.0-base -> 10.0 (GTID). | unknown | 2013-04-17 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| * | | | | | | | MDEV-26: Global transaction ID. First alpha release. | unknown | 2013-04-15 | 2 | -2/+7 |
| |\ \ \ \ \ \ \ | | |_|/ / / / / | |/| | | | | | | |||||
| | * | | | | | | MDEV-26: Global transaction ID. | unknown | 2013-01-25 | 1 | -2/+1 |
| | * | | | | | | MDEV-26: Global transaction id: Intermediate commit. | unknown | 2012-11-15 | 1 | -0/+6 |
| | |/ / / / / | |||||
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 4 | -7/+14 |
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | / | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2013-03-27 | 4 | -7/+14 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | MDEV-4068 rpm scriptlet chown command dangerous | Sergei Golubchik | 2013-03-06 | 4 | -4/+4 |
| | * | | | Automatic merge | Michael Widenius | 2013-03-01 | 1 | -1/+8 |
| | |\ \ \ | |||||
| | | * | | | Added support for --crash-script in mysqld_safe. | Michael Widenius | 2013-02-28 | 1 | -1/+8 |
| | * | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -2/+2 |
| | |\ \ \ \ | | | |/ / / | | |/| / / | | | |/ / | |||||
| | | * | | Merge of patch for Bug#16046140 from mysql-5.1. | Nirbhay Choubey | 2012-12-27 | 1 | -2/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#16046140 BIN/MYSQLD_SAFE: TEST: ARGUMENT EXPECTED | Nirbhay Choubey | 2012-12-27 | 1 | -2/+2 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 9 | -1508/+1561 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 9 | -434/+513 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-3952 Incompatible change in MariaDB-5.5.28a-client rpm adds mytop when n... | Sergei Golubchik | 2013-01-20 | 1 | -1/+1 |
| | * | | | mysql-5.5.29 merge | Sergei Golubchik | 2013-01-15 | 1 | -23/+25 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Bug#11764559: UMASK IS IGNORED BY ERROR LOG | Tatjana Azundris Nuernberg | 2012-10-17 | 2 | -1/+56 |
| | | |\ \ | |||||
| | | * | | | Bug #13548161: MYSQLD_SAFE IMPROVEMENTS FOR 5.5 ALLWAYS SETS PLUGIN_DIR | Georgi Kodinov | 2012-08-27 | 1 | -23/+25 |