Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge tag 'mariadb-10.0.19' into 10.1 | Sergei Golubchik | 2015-06-01 | 1 | -1/+4 |
|\ | |||||
| * | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-05-04 | 1 | -1/+4 |
| |\ | |||||
| | * | MDEV-7883 Segmentation failure when running mysqladmin -u root -p | Sergei Golubchik | 2015-04-27 | 1 | -0/+3 |
* | | | Merge 10.0.14 into 10.1 | Sergei Golubchik | 2014-10-15 | 1 | -5/+58 |
|\ \ \ | |/ / | |||||
| * | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -5/+58 |
| |\ \ | | |/ | |||||
| | * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -5/+58 |
| | |\ | |||||
| | | * | Bug #18163964 PASSWORD IS VISIBLE WHILE CHANGING IT FROM | Arun Kuruvila | 2014-05-16 | 1 | -4/+56 |
* | | | | SHOW and FLUSH for I_S tables. | Sergei Golubchik | 2014-10-11 | 1 | -4/+1 |
|/ / / | |||||
* | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -1/+2 |
|\ \ \ | |||||
| * \ \ | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -1/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix for MDEV-5547: Bad error message when moving very old .frm files to Maria... | Michael Widenius | 2014-01-22 | 1 | -1/+2 |
* | | | | Client attributes | unknown | 2013-10-03 | 1 | -0/+3 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -1/+2 |
|\ \ \ \ | |||||
| * | | | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -1/+2 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Fix for Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER | Murthy Narkedimilli | 2013-03-19 | 1 | -1/+1 |
| * | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -7/+5 |
| |\ \ \ | | |/ / | |||||
* | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -7/+5 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -7/+5 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -3/+4 |
| | |\ \ | |||||
| | | * | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -3/+3 |
| | * | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5 | Georgi Kodinov | 2012-07-05 | 1 | -0/+13 |
* | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -6/+49 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-10-04 | 1 | -6/+49 |
| |/ / / | |||||
* | | | | 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/+3 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -4/+8 |
|\ \ \ | |||||
| * \ \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | move safemalloc out of dbug. | Sergei Golubchik | 2011-12-12 | 1 | -9/+8 |
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+2 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Manual merge from mysql-5.1. | Alexander Nozdrin | 2011-07-22 | 1 | -2/+2 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Manual merge from mysql-5.0. | Alexander Nozdrin | 2011-07-22 | 1 | -4/+3 |
| | |\ \ \ | |||||
| | | * | | | For for Bug#12696072: FIX OUTDATED COPYRIGHT NOTICES IN RUNTIME RELATED CLIENT | Alexander Nozdrin | 2011-07-22 | 1 | -7/+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 | -1/+2 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -0/+3 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+3 |
| | |\ \ \ \ | | | | |/ / | | | |/| | | |||||
| * | | | | | Ensure that all clients reads the appropriate 'client', client-mariadb and 'm... | Michael Widenius | 2011-03-18 | 1 | -1/+2 |
* | | | | | | fix memory leaks and other problems found by safemalloc | Sergei Golubchik | 2011-07-10 | 1 | -0/+1 |
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -12/+25 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fixed cast warnings in introducing the pluggable authentication client | Georgi Kodinov | 2011-06-06 | 1 | -2/+2 |
| * | | | | | Fix for BUG#59894 | Guilhem Bichot | 2011-02-11 | 1 | -3/+4 |
| * | | | | | Bug#58139 : default-auth option not recognized in MySQL standard | Nirbhay Choubey | 2011-01-16 | 1 | -2/+2 |
| * | | | | | Merge of fix for bug#58221 from mysql-5.1 -> mysql-5.5. | Nirbhay Choubey | 2011-01-16 | 1 | -0/+3 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Bug#58221 : mysqladmin --sleep=x --count=x keeps looping | Nirbhay Choubey | 2011-01-16 | 1 | -0/+3 |
| * | | | | | Remove configuration preprocessor symbols 'THREAD' | Magne Mahre | 2011-01-11 | 1 | -3/+1 |