Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | bzr merge -r4209 maria/10.0. | Nirbhay Choubey | 2014-05-21 | 1 | -4/+7 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -4/+7 |
| |\ | |||||
| | * | MDEV-5138 Numerous test failures in "mtr --ps --embedded". | Alexey Botchkov | 2014-04-15 | 1 | -4/+7 |
* | | | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -29/+29 |
|\ \ \ | |/ / | |||||
| * | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -26/+26 |
| |\ \ | |||||
| | * | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -21/+21 |
| | * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -5/+5 |
| * | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -3/+3 |
| |\ \ \ | |||||
| | * \ \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -3/+3 |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | |||||
| | | * | MDEV-4604 Wrong server status when sending out parameters | Sergei Golubchik | 2013-06-12 | 1 | -3/+3 |
* | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | Adding support for MySQL-5.6 temporal column types: | Alexander Barkov | 2013-07-10 | 1 | -2/+2 |
| |/ / | |||||
* | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+8 |
|/ / | |||||
* | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
|/ | |||||
* | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -2/+4 |
|\ | |||||
| * | merge bug#13708485 5.1->5.5 | Georgi Kodinov | 2012-06-29 | 1 | -1/+3 |
| |\ | |||||
| | * | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -1/+3 |
* | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | merge | Sergei Golubchik | 2012-04-05 | 1 | -2/+2 |
| |\ \ \ | |||||
| | * \ \ | merge | Sergei Golubchik | 2012-04-05 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * \ \ | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -2/+2 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| | | | |\ \ | |||||
* | | | | \ \ | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+2 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -3/+5 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -3/+5 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -3/+5 |
| | | |\ \ \ \ | | | | |/ / / | |||||
* | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -17/+13 |
|\ \ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | |||||
| * | | | | | | Auto-merge from mysql-5.1. | Alexander Nozdrin | 2011-07-15 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | | |_|_|/ / | | |/| | | | | |||||
| | * | | | | | Backport a fix for Bug#59060 (Valgrind warning in Protocol_text::store()). | Alexander Nozdrin | 2011-07-15 | 1 | -2/+2 |
| * | | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6 | Davi Arnaut | 2011-07-07 | 1 | -13/+9 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | |\ \ \ \ \ | | | | |_|_|/ | | | |/| | | | |||||
| | | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | * | | | | auto-merge | Ignacio Galarza | 2009-03-19 | 1 | -6/+17 |
| | | |\ \ \ \ | |||||
| | | | * | | | | fixed a typo | Georgi Kodinov | 2009-03-09 | 1 | -1/+1 |
| | | | * | | | | fixed a win32 compile warning | Georgi Kodinov | 2009-03-09 | 1 | -1/+2 |
| | | * | | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -3/+3 |
* | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -42/+73 |
|\ \ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | | | |||||
| * | | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table... | Michael Widenius | 2011-07-01 | 1 | -0/+50 |
| * | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -40/+17 |
| |\ \ \ \ \ \ \ | |||||
| | * | | | | | | | post-review changes 1 | Sergei Golubchik | 2011-05-19 | 1 | -2/+2 |
| | * | | | | | | | wl#173 - temporal types with sub-second resolution | Sergei Golubchik | 2011-03-01 | 1 | -34/+17 |
| | | |/ / / / / | | |/| | | | | | |||||
| * | | | | | | | Fixed bug when accessing wrong decimal value in dynamic string (Fixed lp:781233) | Michael Widenius | 2011-05-12 | 1 | -1/+1 |
| | |_|_|_|/ / | |/| | | | | | |||||
| * | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | |||||
| | * | | | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| * | | | | | | Make SQLString reallocation addaptive | Michael Widenius | 2010-11-08 | 1 | -0/+3 |
* | | | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -15/+15 |
* | | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -10/+11 |
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | | | |||||
| * | | | | | | Bug #36022 please log more information about "Sort aborted" queries | Tor Didriksen | 2011-02-02 | 1 | -8/+9 |
| * | | | | | | Implement a fix for Bug#57058 -- send SERVER_QUERY_WAS_SLOW over | Konstantin Osipov | 2010-11-12 | 1 | -2/+2 |