Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -2/+2 |
* | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 1 | -11/+16 |
|\ | |||||
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -5/+10 |
| |\ | |||||
| | * | 5.3 merge | Sergei Golubchik | 2013-01-25 | 1 | -1/+4 |
| | |\ | |||||
| | | * | 5.2 merge | Sergei Golubchik | 2013-01-25 | 1 | -1/+4 |
| | | |\ | |||||
| | | | * | MDEV-3915 COM_CHANGE_USER allows fast password brute-forcing | Sergei Golubchik | 2013-01-25 | 1 | -1/+4 |
| | | * | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -2/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -2/+3 |
| | | | |\ | |||||
| | | | | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -2/+3 |
| | | | | |\ | |||||
| | | * | | \ | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -2/+4 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -2/+4 |
| | | | |\ \ \ | | | | | |/ / | |||||
| | | | | * | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -2/+4 |
| | | | | |\ \ | |||||
| | * | | | | | | Buildbot fixes and cleanups: | Michael Widenius | 2013-01-11 | 1 | -4/+6 |
| * | | | | | | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -4/+4 |
| * | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -6/+6 |
| * | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
* | | | | | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -2/+3 |
|\ \ \ \ \ \ \ \ | | |/ / / / / / | |/| | | | | | | |||||
| * | | | | | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -2/+3 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | * | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -1/+1 |
| | | | |_|_|_|/ | | | |/| | | | | |||||
* | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 1 | -24/+90 |
|\ \ \ \ \ \ \ \ | | |_|_|/ / / / | |/| | | | | | | |||||
| * | | | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -3/+22 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | SHOW EXPLAIN: merge with 5.5-main | Sergey Petrunya | 2012-10-06 | 1 | -3/+22 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Merge 5.5-main -> 5.5-show-explain | Sergey Petrunya | 2012-07-25 | 1 | -11/+39 |
| | | |\ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | MWL#182: Explain running statements | Sergey Petrunya | 2012-06-15 | 1 | -3/+22 |
| | | |\ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 | Sergey Petrunya | 2012-05-16 | 1 | -3/+22 |
| | | | |\ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ | MWL#182: Explain running statements: merge with 5.3-main (needs fixing) | Sergey Petrunya | 2012-01-03 | 1 | -3/+22 |
| | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ | MWL#182: Explain running statements | Sergey Petrunya | 2011-10-27 | 1 | -3/+22 |
| | | | | | |\ \ \ \ \ \ \ | |||||
| | | | | | | * | | | | | | | MWL#182: Explain running statements | Sergey Petrunya | 2011-09-24 | 1 | -3/+22 |
| * | | | | | | | | | | | | | Implementation of Multi-source replication (MDEV:253) | Michael Widenius | 2012-09-28 | 1 | -11/+31 |
| |/ / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -3/+5 |
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | undo the fix for MySQL Bug#12998841 | Sergei Golubchik | 2012-08-08 | 1 | -7/+1 |
| | | |_|_|_|_|/ / / / / | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Bug #12998841: libmysql divulges plaintext password upon request in 5.5 | Georgi Kodinov | 2012-07-05 | 1 | -1/+7 |
| | * | | | | | | | | | | merge bug#13708485 5.1->5.5 | Georgi Kodinov | 2012-06-29 | 1 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / / / | | | |/| | | | | | | | | |||||
| | | * | | | | | | | | | Bug #13708485: malformed resultset packet crashes client | Georgi Kodinov | 2012-06-28 | 1 | -1/+3 |
| | * | | | | | | | | | | Bug#14238406 NEW COMPILATION WARNINGS WITH GCC 4.7 (-WERROR=NARROWING) | Jon Olav Hauglid | 2012-06-29 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | |||||
| * | | | | | | | | | | | Allow multiple error codes inside a variable in --error command | Elena Stepanova | 2012-07-16 | 1 | -6/+27 |
| * | | | | | | | | | | | Export sys_errno and errno to variables | Elena Stepanova | 2012-07-16 | 1 | -0/+4 |
| * | | | | | | | | | | | Fixed MDEV-385: mysqltest running with continue-on-error crashes on a non-SQL... | Michael Widenius | 2012-07-10 | 1 | -1/+1 |
* | | | | | | | | | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+4 |
* | | | | | | | | | | | | Fixed compiler warnings | Michael Widenius | 2012-07-06 | 1 | -1/+1 |
|/ / / / / / / / / / / | |||||
* | | | | | | | | | | | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 1 | -4/+7 |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / |/| | | | | | | / / / | | |_|_|_|_|_|/ / / | |/| | | | | | | | | |||||
| * | | | | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 1 | -4/+7 |
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | | |||||
| | * | | | | | | | | 5.1 merge | Sergei Golubchik | 2012-06-01 | 1 | -4/+7 |
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | * | | | | | | | MDEV-256 lp:995501 - mysqltest attempts to parse Perl code inside a block | Sergei Golubchik | 2012-06-01 | 1 | -4/+7 |
| | | * | | | | | | | Fix main.merge testcase on Windows | Vladislav Vaintroub | 2011-12-01 | 1 | -1/+1 |
* | | | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-05-21 | 1 | -5/+40 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Merge 5.2->5.3 | unknown | 2012-05-11 | 1 | -5/+40 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |||||
| | * | | | | | | | | Fixed typo | unknown | 2012-05-10 | 1 | -1/+1 |
| | * | | | | | | | | MDEV-261 : mysqtest crashes when assigning variable to result of select , like | Vladislav Vaintroub | 2012-05-08 | 1 | -5/+40 |