Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.0-galera into 10.1 | Sergei Golubchik | 2015-02-06 | 1 | -1/+1 |
|\ | |||||
| * | bzr merge -rtag:mariadb-10.0.15 maria/10.0 | Nirbhay Choubey | 2014-12-05 | 1 | -1/+1 |
| |\ | |||||
| * | | MDEV-6740 : Galera crash in rpl_sql_thread_info/cached_charset_compare | Nirbhay Choubey | 2014-09-22 | 1 | -1/+5 |
| * | | bzr merge -rtag:mariadb-10.0.12 maria/10.0 | Nirbhay Choubey | 2014-06-19 | 1 | -1/+1 |
| |\ \ | |||||
| * \ \ | * bzr merge -rtag:mariadb-10.0.9 maria/10.0 | Nirbhay Choubey | 2014-03-26 | 1 | -3/+3 |
| |\ \ \ | |||||
| * \ \ \ | Merge MariaDB-10.0.7 revision 3961. | Jan Lindström | 2014-01-25 | 1 | -2/+19 |
| |\ \ \ \ | |||||
| * \ \ \ \ | merge with MariaDB 5.6 bzr merge lp:maria --rtag:mariadb-10.0.6 | Seppo Jaakola | 2013-12-04 | 1 | -6/+37 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge 10.0 to galera-10.0 | Jan Lindström | 2013-09-03 | 1 | -46/+72 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | Merged with lp:maria revision #3766 | Seppo Jaakola | 2013-07-13 | 1 | -6/+7 |
| |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | Initial merge result with mariaDB 10: lp:maria | Seppo Jaakola | 2013-07-13 | 1 | -1/+19 |
* | | | | | | | | | cleanup: comments referring to non-extistent Item classes | Sergei Golubchik | 2014-12-04 | 1 | -1/+1 |
* | | | | | | | | | MDEV-6980 OUT parameters in PREPARE | Sergei Golubchik | 2014-12-04 | 1 | -29/+0 |
* | | | | | | | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -1/+1 |
| | |_|_|_|_|_|/ | |/| | | | | | | |||||
* | | | | | | | | MDEV-5231: Per query variables from Percona Server (rewritten) | Oleksandr Byelkin | 2014-11-11 | 1 | -3/+5 |
* | | | | | | | | MDEV-6603 SBR failure upon executing a prepared statement with input placehol... | Sergei Golubchik | 2014-10-10 | 1 | -0/+2 |
* | | | | | | | | cleanup: query rewrites for Item_param and Item_splocal | Sergei Golubchik | 2014-10-10 | 1 | -41/+31 |
* | | | | | | | | MDEV-5317 Compound statement / anonymous blocks | Sergei Golubchik | 2014-10-10 | 1 | -6/+11 |
* | | | | | | | | MDEV-5317 out parameters in PREPARE "SELECT ... INTO" | Sergei Golubchik | 2014-10-10 | 1 | -0/+29 |
* | | | | | | | | cleanup: galera merge, simple changes | Sergei Golubchik | 2014-10-01 | 1 | -0/+2 |
* | | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-27 | 1 | -1/+23 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | MDEV-6247: Merge 10.0-galera to 10.1. | Jan Lindström | 2014-08-26 | 1 | -1/+23 |
| |/ / / / / / / | |||||
* | | | | | | | | MDEV-6575: main.view --ps-protocol fails in ANALYZE code | Sergei Petrunia | 2014-08-13 | 1 | -1/+18 |
* | | | | | | | | Made sql_log_slow a session variable | Monty | 2014-08-09 | 1 | -1/+1 |
|/ / / / / / / | |||||
* | | | | | | | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron... | Sergei Golubchik | 2014-05-13 | 1 | -1/+1 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -2/+2 |
* | | | | | | 10.0-base merge | Sergei Golubchik | 2014-02-03 | 1 | -1/+1 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | 5.5 merge | Sergei Golubchik | 2014-02-01 | 1 | -1/+1 |
| |\ \ \ \ \ | |||||
| | * \ \ \ \ | MySQL-5.5.35 merge | Sergei Golubchik | 2014-01-22 | 1 | -1/+1 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Bug#16346241 - SERVER CRASH IN ITEM_PARAM::QUERY_VAL_STR | Neeraj Bisht | 2013-08-28 | 1 | -1/+1 |
* | | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-12-16 | 1 | -2/+19 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | / | |_|_|_|_|_|/ |/| | | | | | | |||||
| * | | | | | | 5.5 merge | Sergei Golubchik | 2013-11-23 | 1 | -2/+19 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | mysql-5.5.34 merge | Sergei Golubchik | 2013-11-19 | 1 | -2/+19 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Fix for bug#14188793 - "DEADLOCK CAUSED BY ALTER TABLE DOEN'T CLEAR | Dmitry Lenev | 2013-08-20 | 1 | -1/+18 |
* | | | | | | | 10.0-base merge | Sergei Golubchik | 2013-11-13 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | 5.5. merge | Sergei Golubchik | 2013-11-13 | 1 | -4/+4 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | MDEV-4824 userstats - wrong user statistics | Sergei Golubchik | 2013-11-11 | 1 | -4/+4 |
* | | | | | | | merge 10.0-base -> 10.0 | unknown | 2013-10-29 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge 5.5->10.0-base | unknown | 2013-10-29 | 1 | -1/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge 5.3->5.5 | unknown | 2013-10-29 | 1 | -1/+7 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | MDEV-5143: update of a joined table with a nested subquery with a syntax erro... | unknown | 2013-10-21 | 1 | -1/+7 |
* | | | | | | | | merge 10.0-base -> 10.0 | unknown | 2013-10-17 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | Merge 5.5 -> 10.0-base | Alexander Barkov | 2013-10-16 | 1 | -0/+6 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | * | | | | | | MDEV-4981: Account for queries handled by query-cache in USER_STATISTICS (and... | unknown | 2013-10-16 | 1 | -0/+6 |
* | | | | | | | | Merge 10.0-base -> 10.0 | Sergey Petrunya | 2013-10-16 | 1 | -0/+16 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| * | | | | | | | MDEV-5117: Explain for a query executed as a PS is not written into the slow log | Sergey Petrunya | 2013-10-15 | 1 | -2/+15 |
| * | | | | | | | MDEV-3798: EXPLAIN UPDATE/DELETE | Sergey Petrunya | 2013-10-05 | 1 | -3/+3 |
| * | | | | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-08-24 | 1 | -0/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-27 | 1 | -0/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * | | | | | | | [SHOW] EXPLAIN UPDATE/DELETE, code re-structuring | Sergey Petrunya | 2013-06-21 | 1 | -2/+1 |