Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into merge-wip | Sergei Golubchik | 2015-01-31 | 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 |
* | | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -8/+24 |
|\ \ \ \ | |/ / / | |||||
| * | | | If one uses 3 --verbose options to mysql_upgrade or mysqlcheck one will now g... | Michael Widenius | 2014-08-14 | 1 | -8/+14 |
| * | | | MDEV-6535 Ordering of mysql_upgrade tasks is not optimal | Sergei Golubchik | 2014-08-06 | 1 | -0/+10 |
* | | | | cleanup: galera misc cleanups | Sergei Golubchik | 2014-10-10 | 1 | -7/+2 |
* | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 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 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -1/+1 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-07-22 | 1 | -1/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 1 | -6/+3 |
| | |\ \ \ | |||||
| | | * | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 1 | -7/+3 |
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -7/+2 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -6/+26 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fixes BUG#60976 "Crash, valgrind warning and memory leak with partitioned arc... | Michael Widenius | 2011-06-11 | 1 | -5/+25 |
| * | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
| | |_|_|/ | |/| | | | |||||
* | | | | | adding DBUG_ENTER/DBUG_RETURN tags that were useful when fixing memory leaks | Sergei Golubchik | 2011-07-10 | 1 | -40/+73 |