Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | Asserting correct database name lettercase in | Sergei Golubchik | 2014-05-01 | 1 | -0/+2 |
* | another post-fix patch for MDEV-5850: MySQL Bug#21317: SHOW CREATE DATABASE d... | Sergei Golubchik | 2014-03-29 | 1 | -0/+3 |
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+1 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+1 |
| |\ | |||||
| | * | 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 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -3/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -3/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -3/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16865959 - PLEASE BACKPORT BUG 14749800. | Praveenkumar Hulakund | 2013-07-24 | 1 | -3/+4 |
* | | | | merge few bug fixes from 5.6 | Sergei Golubchik | 2013-07-17 | 1 | -7/+18 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+1 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -21/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | Switch automaticly to statement based replication for statements that can't g... | Michael Widenius | 2012-09-04 | 1 | -21/+12 |
| |/ / | |||||
* | | | more fixes for test cases | Sergei Golubchik | 2012-10-01 | 1 | -2/+4 |
* | | | fixes for test failures | Sergei Golubchik | 2012-09-27 | 1 | -6/+20 |
* | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -0/+4 |
|/ / | |||||
* | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -7/+10 |
|\ \ | |||||
| * \ | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -31/+42 |
| |\ \ | |||||
| | * \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -31/+42 |
| | |\ \ | |||||
| | | * \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -28/+34 |
| | | |\ \ | |||||
| * | | | | | Change TABLE->alias to String for less memory reallocation | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
* | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -1/+2 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | / / | | | |_|/ / | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
* | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -2/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Code cleanup to get fewer reallocs() during execution. | Michael Widenius | 2010-11-24 | 1 | -2/+2 |
| | |_|/ / / | |/| | | | | |||||
* | | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -59/+43 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Manual-merge of patch for bug#12546938 from mysql-5.1->mysql-5.5 | Dmitry Shulga | 2011-05-27 | 1 | -24/+29 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fixed bug#12546938 (formerly known as 61005) - CREATE IF NOT EXIST EVENT | Dmitry Shulga | 2011-05-27 | 1 | -25/+31 |
| * | | | | | Merge from 5.1. | Guilhem Bichot | 2011-05-21 | 1 | -2/+2 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'. | Guilhem Bichot | 2011-05-16 | 1 | -4/+4 |
| | | |/ / | | |/| | | |||||
| * | | | | Patch that refactors global read lock implementation and fixes | Dmitry Lenev | 2010-11-11 | 1 | -30/+12 |
| * | | | | Bug #44171 KILL ALTER EVENT can crash the server | Jon Olav Hauglid | 2010-08-26 | 1 | -3/+0 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -5/+10 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+1 |
| * | | | Fix for LP#588251: doStartTableScan() result not checked. | Michael Widenius | 2010-07-17 | 1 | -1/+6 |
| | |/ | |/| | |||||
| * | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+3 |
| |\ \ | | |/ | |||||
| * | | Removed compiler warnings | Michael Widenius | 2010-04-07 | 1 | -2/+3 |
| * | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -15/+28 |
| |\ \ | |||||
| * \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -5/+5 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -1/+37 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -2/+1 |
| |\ \ \ \ \ | |||||
| | * | | | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -2/+1 |
| * | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -24/+35 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -1/+1 |
| |\ \ \ \ \ \ | |||||
| * | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -1/+1 |