Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -5/+6 |
|\ | |||||
| * | post-merge fixes | Sergei Golubchik | 2015-04-29 | 1 | -3/+4 |
* | | MDEV-6984 Can't migrate from MySQL 5.6.21 to MariaDB 10 | Sergei Golubchik | 2014-11-19 | 1 | -4/+5 |
* | | Automatic merge from 5.5 | Michael Widenius | 2014-08-19 | 1 | -3/+4 |
|\ \ | |/ | |||||
* | | MDEV-6535 Ordering of mysql_upgrade tasks is not optimal | Sergei Golubchik | 2014-08-06 | 1 | -7/+8 |
* | | 10.0-base merge (roles) | Sergei Golubchik | 2013-10-29 | 1 | -0/+1 |
|\ \ | |||||
| * | | Fixes for mysql-test failures | Sergei Golubchik | 2013-10-18 | 1 | -0/+1 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+0 |
|\ \ \ | |||||
| * | | | Fix a number of tests: | Sergey Petrunya | 2013-07-05 | 1 | -4/+0 |
* | | | | 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 (GTID). | unknown | 2013-04-17 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | | / / | |/ / |/| | | |||||
| * | | MDEV-26: Global transaction ID | unknown | 2013-03-26 | 1 | -0/+1 |
* | | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -0/+3 |
|\ \ \ | |/ / | |||||
| * | | Changed the names of the system tables for statistical data: | Igor Babaev | 2012-12-05 | 1 | -3/+3 |
| * | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -0/+3 |
| |\ \ | | |/ | |/| | |||||
| | * | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -0/+3 |
* | | | Fixing test cases | Michael Widenius | 2012-08-23 | 1 | -0/+5 |
|/ / | |||||
* | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+1 |
|\ \ | |||||
| * | | Bug #57916: Fix the naming of the proxy_priv table | Georgi Kodinov | 2010-11-02 | 1 | -1/+1 |
| * | | merge | Georgi Kodinov | 2010-10-04 | 1 | -6/+2 |
| |\ \ | |||||
| | * | | Bug #56494 Segfault in upgrade_shared_lock_to_exclusive() for | Jon Olav Hauglid | 2010-09-22 | 1 | -6/+2 |
| * | | | WL#1054: Pluggable authentication support | Georgi Kodinov | 2010-08-09 | 1 | -0/+1 |
| |/ / | |||||
* | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -0/+1 |
| |/ |/| | |||||
* | | Fixed build failures | Michael Widenius | 2010-09-06 | 1 | -6/+9 |
|/ | |||||
* | Bug#49823: mysql_upgrade fatal error due to general_log / slow_low CSV NULL | Davi Arnaut | 2010-02-26 | 1 | -0/+47 |