Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -0/+1 |
|\ | |||||
| * | mysql-5.5.37 selective merge | Sergei Golubchik | 2014-03-27 | 1 | -0/+1 |
| |\ | |||||
| | * | Bug#14117012 - CHILD PROCESS MYSQL UTILITIES PICKING UP LOCAL | Praveenkumar Hulakund | 2014-01-31 | 1 | -0/+1 |
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -10/+25 |
|\ \ \ | |/ / | |||||
| * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -10/+25 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -4/+3 |
|\ \ \ | |/ / | |||||
| * | | MDEV-5116 MariaDB upgrade breaks replication | Sergei Golubchik | 2013-11-11 | 1 | -4/+3 |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -4/+67 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -4/+67 |
| |\ \ | | |/ | |||||
| | * | Bug#16500013 : post-fix | Nirbhay Choubey | 2013-03-22 | 1 | -4/+8 |
| | * | Bug#16500013 : ADD VERSION CHECK TO MYSQL_UPGRADE | Nirbhay Choubey | 2013-03-21 | 1 | -2/+61 |
* | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+8 |
|\ \ \ | |/ / | |||||
| * | | Fixed problem with failing mysql_upgrade when proc table was not correct. | Michael Widenius | 2013-01-11 | 1 | -1/+8 |
* | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -4/+3 |
|\ \ \ | |/ / | |||||
| * | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -4/+3 |
| |\ \ | | |/ | |||||
| | * | 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 |
* | | | | Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6 | Michael Widenius | 2012-08-01 | 1 | -1/+20 |
|/ / / | |||||
* | | | MDEV-186 Client programs throw warnings about memory loss when executed with ... | Sergei Golubchik | 2012-03-23 | 1 | -1/+1 |
* | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -3/+2 |
|\ \ \ | |/ / | |||||
| * | | A patch for Bug#13023858 - MYSQL_UPGRADE PRINTS | Alexander Nozdrin | 2011-12-21 | 1 | -1/+0 |
| * | | Bug#11827359 60223: MYSQL_UPGRADE PROBLEM WITH | Nirbhay Choubey | 2011-11-15 | 1 | -0/+2 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -3/+4 |
|\ \ \ | |||||
| * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+6 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+6 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+4 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-07-22 | 1 | -0/+1 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 1 | -1/+4 |
| | |\ \ \ | |||||
| | | * | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 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/+4 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+5 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+4 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -2/+4 |
| | |_|_|/ | |/| | | | |||||
* | | | | | fix memory leaks and other problems found by safemalloc | Sergei Golubchik | 2011-07-10 | 1 | -1/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+16 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -2/+2 |
| * | | | | Bug#58139 : default-auth option not recognized in MySQL standard | Nirbhay Choubey | 2011-01-16 | 1 | -0/+11 |
| * | | | | Fix for Bug#57094 (Copyright notice incorrect?). | Alexander Nozdrin | 2010-10-06 | 1 | -1/+4 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -5/+10 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -30/+50 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | Fixed build failures | Michael Widenius | 2010-09-06 | 1 | -13/+16 |
| * | | | Nicer output for mysql_upgrade | Michael Widenius | 2010-09-05 | 1 | -8/+28 |
| * | | | Fix that one can run mysql_upgrade with long table names | Michael Widenius | 2010-09-03 | 1 | -0/+2 |
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -12/+12 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -13/+14 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+4 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -0/+27 |
| |\ \ \ \ \ \ |