Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge fix. | Jan Lindström | 2013-09-09 | 1 | -0/+6 |
* | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -75/+74 |
|\ | |||||
| * | cosmetic fixes | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 |
| * | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -25/+23 |
| |\ | |||||
| | * | Fixes for innodb suite, merging tests from 5.6. | Sergei Golubchik | 2013-07-15 | 1 | -1/+0 |
| | * | merge of 2876.430.11 & 2876.430.1 | unknown | 2013-06-27 | 1 | -3/+3 |
| | * | A fix of unions with duplicate rows and returning bug fix for lp:732124 union... | unknown | 2013-06-26 | 1 | -1/+1 |
| | * | Fixed memory leaks. alias.test now runs clean with valgrind | Michael Widenius | 2013-06-20 | 1 | -2/+1 |
| | * | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -1/+1 |
| | * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -21/+21 |
| * | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -47/+48 |
| |\ \ | |||||
| | * \ | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -47/+48 |
| | |\ \ | |||||
| | | * \ | mysql-5.5.32 merge | Sergei Golubchik | 2013-07-16 | 1 | -48/+46 |
| | | |\ \ | |||||
| | | | * | | Bug#14261010: ON DUPLICATE KEY UPDATE CRASHES THE SERVER | Chaithra Gopalareddy | 2013-03-30 | 1 | -40/+45 |
* | | | | | | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+1 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+1 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | strmake_buf(X,Y) helper, equivalent to strmake(X,Y,sizeof(X)-1) | Sergei Golubchik | 2013-04-17 | 1 | -2/+1 |
* | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -0/+39 |
|/ / / / / | |||||
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -6/+6 |
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | | |||||
| * | | | cleanup: merge two mutually dependent function arguments into one, | Sergei Golubchik | 2013-04-09 | 1 | -2/+2 |
| * | | | Speed up connection time: | Michael Widenius | 2013-03-20 | 1 | -4/+4 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -24/+65 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -8/+42 |
| |\ \ \ | | |/ / | |||||
| | * | | 5.3 merge | Sergei Golubchik | 2013-01-28 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * \ | 5.2 merge | Sergei Golubchik | 2013-01-28 | 1 | -1/+1 |
| | | |\ \ | |||||
| | | | * | | compilation error with -Wuninitialized -Werror | Sergei Golubchik | 2013-01-28 | 1 | -1/+1 |
| | * | | | | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -0/+29 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 1 | -0/+29 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Corrected the fix for bug mdev-3938. | Igor Babaev | 2013-01-16 | 1 | -2/+2 |
| | | | * | | Fixed bug mdev-3938. | Igor Babaev | 2013-01-15 | 1 | -0/+29 |
| | | * | | | 5.2->5.3 merge | Sergei Golubchik | 2013-01-10 | 1 | -3/+2 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | 5.1 merge | Sergei Golubchik | 2013-01-10 | 1 | -3/+2 |
| | | | |\ \ | |||||
| | | | | * \ | mysql-5.1.67 merge | Sergei Golubchik | 2013-01-09 | 1 | -3/+2 |
| | | | | |\ \ | |||||
| | | | | | * | | BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIER | Rohit Kalhans | 2012-09-22 | 1 | -10/+9 |
| | | * | | | | | merge from 5.2 | unknown | 2012-08-24 | 1 | -7/+7 |
| | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | * | | | | Merge from 5.1. | unknown | 2012-08-24 | 1 | -7/+7 |
| | | | |\ \ \ \ | | | | | |/ / / | |||||
| | | | | * | | | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -7/+7 |
| | | | * | | | | Fix check of view updatability in case of underlying view changes its updatab... | unknown | 2012-02-03 | 1 | -4/+13 |
| | * | | | | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -6/+3 |
| | * | | | | | | Fixed some race conditons and bugs related to killed queries | Michael Widenius | 2013-01-11 | 1 | -1/+4 |
| | * | | | | | | Fix for MDEV-4009: main.delayed sporadically fails with "query 'REPLACE DELAY... | Michael Widenius | 2013-01-10 | 1 | -0/+4 |
| * | | | | | | | fix the failing federated.federated_innodb test: | Sergei Golubchik | 2013-01-23 | 1 | -0/+1 |
| * | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -16/+22 |
* | | | | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -92/+68 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 1 | -13/+0 |
| * | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | Fixed bug mdev-3888. | Igor Babaev | 2012-12-04 | 1 | -1/+2 |
| * | | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetime | unknown | 2012-12-13 | 1 | -1/+3 |
| * | | | | | | | Merge mdev-452 with the latest 10.0-base. | unknown | 2012-10-18 | 1 | -78/+64 |
| |\ \ \ \ \ \ \ |