Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.20' into 10.0-galera | Nirbhay Choubey | 2015-06-21 | 1 | -8/+33 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -8/+33 |
| |\ | |||||
| | * | MDEV-8124 mysqlcheck: --auto-repair runs REPAIR TABLE instead of REPAIR VIEW ... | Sergei Golubchik | 2015-06-03 | 1 | -3/+19 |
| | * | MDEV-8123 mysqlcheck: new --process-views option conflicts with --quick, --ex... | Sergei Golubchik | 2015-06-03 | 1 | -5/+13 |
* | | | Merge tag 'mariadb-10.0.19' into 10.0-galera | Nirbhay Choubey | 2015-05-09 | 1 | -34/+166 |
|\ \ \ | |/ / | |||||
| * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -34/+166 |
| |\ \ | | |/ | |||||
| | * | post-merge fixes | Sergei Golubchik | 2015-04-29 | 1 | -89/+77 |
| | * | quote table name in mysql_check:is_view. increment version too | Daniel Black | 2015-04-14 | 1 | -2/+4 |
| | * | mysqlcheck fix-view-algorithm -> upgrade-views | Daniel Black | 2015-04-14 | 1 | -12/+39 |
| | * | Add --fix-tables option to mysql-check | Daniel Black | 2015-04-13 | 1 | -3/+19 |
| | * | Corrections to mysqlcheck | Daniel Black | 2015-04-12 | 1 | -27/+88 |
| | * | mysql-upgrade -> fix-view-algorithm as mysqlcheck option | Daniel Black | 2015-04-12 | 1 | -13/+13 |
| | * | Get my_getop to parse opt_mysql_upgrade in mysqlcheck | Daniel Black | 2015-04-12 | 1 | -5/+12 |
| | * | MDEV-6916: Upgrade from MySQL to MariaDB breaks already created views | Oleksandr Byelkin | 2015-04-12 | 1 | -7/+38 |
* | | | Merge branch '10.0' into 10.0-galera | Nirbhay Choubey | 2015-02-18 | 1 | -13/+21 |
|\ \ \ | |/ / | |||||
| * | | 5.5 merge | Sergei Golubchik | 2015-01-29 | 1 | -13/+21 |
| |\ \ | | |/ | |||||
| | * | MDEV-6128:[PATCH] mysqlcheck wrongly escapes '.' in table names | unknown | 2015-01-28 | 1 | -13/+21 |
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | bzr merge -rtag:mariadb-10.0.14 maria/10.0/ | Nirbhay Choubey | 2014-09-28 | 1 | -8/+14 |
|\ \ \ \ | |/ / / | |||||
| * | | | If one uses 3 --verbose options to mysql_upgrade or mysqlcheck one will now g... | Michael Widenius | 2014-08-14 | 1 | -8/+14 |
* | | | | bzr merge -r4346 maria/10.0 (maria-10.0.13) | Nirbhay Choubey | 2014-08-11 | 1 | -0/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-6535 Ordering of mysql_upgrade tasks is not optimal | Sergei Golubchik | 2014-08-06 | 1 | -0/+10 |
* | | | | Merge of patch for MDEV#5786. | Nirbhay Choubey | 2014-07-11 | 1 | -0/+6 |
|/ / / | |||||
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -1/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -0/+1 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -0/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -0/+1 |
* | | | | MDEV-5281 Partitioning issue after upgrade from 10.0.3-1 to 10.0.5-1 | Sergei Golubchik | 2013-11-28 | 1 | -10/+31 |
* | | | | MDEV-5241: Collation incompatibilities with MySQL-5.6 | Michael Widenius | 2013-11-09 | 1 | -1/+3 |
* | | | | Client attributes | unknown | 2013-10-03 | 1 | -0/+3 |
* | | | | MDEV-4786 merge 10.0-monty -> 10.0 | Sergei Golubchik | 2013-08-12 | 1 | -46/+6 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
|\ \ \ \ | |||||
| * | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -29/+62 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -29/+62 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -29/+61 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2013-02-26 | 1 | -1/+1 |
| | | |\ | |||||
| | | * \ | Bug#14521864: MYSQL 5.1 TO 5.5 BUGS PARTITIONING | Mattias Jonsson | 2013-01-30 | 1 | -28/+62 |
| | | |\ \ | | | | |/ | |||||
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -2/+4 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -2/+2 |
| * | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -2/+4 |
| |/ / / | |||||
* | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -10/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -10/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -2/+2 |
* | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+4 |
|/ / / | |||||
* | | | MDEV-186 Client programs throw warnings about memory loss when executed with ... | Sergei Golubchik | 2012-03-23 | 1 | -0/+2 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+5 |
|\ \ \ | |||||
| * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+4 |
| |\ \ \ |