| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge | Igor Babaev | 2013-08-06 | 1 | -1/+4 |
|\ |
|
| * | MWL#205 DELETE with result set (mdev-3814) | Igor Babaev | 2013-08-06 | 1 | -1/+4 |
* | | MDEV-4660 SHUTDOWN command | Sergei Golubchik | 2013-06-24 | 1 | -0/+1 |
* | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -4/+5 |
|\ \ |
|
| * \ | 5.3 merge. | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| |\ \ |
|
| | * \ | 5.2 merge | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| | |\ \ |
|
| | | * \ | 5.1 merge | Sergei Golubchik | 2013-05-20 | 1 | -1/+1 |
| | | |\ \ |
|
| | | | * | | MDEV-4326 fix. | unknown | 2013-04-09 | 1 | -1/+1 |
| * | | | | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -3/+4 |
| |\ \ \ \ \ |
|
| | * | | | | | Bug#11757464:SERVER CRASH IN RECURSIVE CALL WHEN OOM | Nisha Gopalakrishnan | 2013-01-15 | 1 | -3/+4 |
* | | | | | | | cleanup: | Sergei Golubchik | 2013-01-23 | 1 | -1/+1 |
* | | | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -4/+4 |
* | | | | | | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 1 | -2/+20 |
|\ \ \ \ \ \ \
| |/ / / / / /
| | | | | | /
| |_|_|_|_|/
|/| | | | | |
|
| * | | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -2/+12 |
| |\ \ \ \ \
| | | |/ / /
| | |/| | | |
|
| | * | | | | MDEV-3810 fix. | unknown | 2012-11-09 | 1 | -2/+12 |
| | * | | | | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 1 | -0/+8 |
| | |\ \ \ \
| | | | |/ /
| | | |/| | |
|
| | | * | | | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 1 | -0/+8 |
| | | |\ \ \
| | | | | |/
| | | | |/| |
|
| | | | * | | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 1 | -0/+8 |
| | | | |\ \ |
|
| | * | | \ \ | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -0/+8 |
| | |\ \ \ \ \
| | | |/ / / / |
|
| | | * | | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -0/+8 |
| | | |\ \ \ \
| | | | |/ / / |
|
| | | | * | | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -0/+8 |
| | | | |\ \ \ |
|
| | * | | \ \ \ | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -3/+3 |
| | |\ \ \ \ \ \
| | | |/ / / / / |
|
| | | * | | | | | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -3/+3 |
| | | |\ \ \ \ \
| | | | |/ / / / |
|
| | | | * | | | | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -3/+3 |
| | | | |\ \ \ \ |
|
| * | | | \ \ \ \ | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -0/+8 |
| |\ \ \ \ \ \ \ \
| | | |_|_|_|_|_|/
| | |/| | | | | | |
|
| | * | | | | | | | Merge from 5.1 to 5.5 | Praveenkumar Hulakund | 2012-07-26 | 1 | -0/+8 |
| | |\ \ \ \ \ \ \
| | | | |_|_|_|_|/
| | | |/| | | | | |
|
| | | * | | | | | | BUG#13868860 - LIMIT '5' IS EXECUTED WITHOUT ERROR WHEN '5' | Praveenkumar Hulakund | 2012-07-26 | 1 | -0/+8 |
| | | | |_|_|_|/
| | | |/| | | | |
|
| | | * | | | | | Backport 5.5=>5.1 Patch for Bug#13805127: | Tor Didriksen | 2012-04-18 | 1 | -0/+8 |
| | | | |_|_|/
| | | |/| | | |
|
* | | | | | | | SHOW EXPLAIN: merge to 10.0-base. | Sergey Petrunya | 2012-10-06 | 1 | -0/+1 |
|\ \ \ \ \ \ \ |
|
| * \ \ \ \ \ \ | MWL#182: SHOW EXPLAIN: Merge 5.3->5.5 | Sergey Petrunya | 2012-05-16 | 1 | -0/+1 |
| |\ \ \ \ \ \ \
| | |/ / / / / /
| |/| | | | | | |
|
| | * | | | | | | MWL#182: Explain running statements: merge with 5.3-main (needs fixing) | Sergey Petrunya | 2012-01-03 | 1 | -0/+1 |
| | |\ \ \ \ \ \ |
|
| | | * \ \ \ \ \ | MWL#182: Explain running statements | Sergey Petrunya | 2011-10-27 | 1 | -0/+1 |
| | | |\ \ \ \ \ \ |
|
| | | | * | | | | | | MWL#182: Explain running statements | Sergey Petrunya | 2011-08-23 | 1 | -0/+1 |
* | | | | | | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -0/+2 |
|/ / / / / / / / / |
|
* | | | | | | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -3/+11 |
|\ \ \ \ \ \ \ \ \
| | |_|_|/ / / / /
| |/| | | | | | | |
|
| * | | | | | | | | Patch for Bug#13805127: Stored program cache produces wrong result in same THD. | Tor Didriksen | 2012-03-29 | 1 | -0/+8 |
| * | | | | | | | | Merge from 5.1 to 5.5 | Praveenkumar Hulakund | 2012-02-29 | 1 | -3/+3 |
| |\ \ \ \ \ \ \ \
| | | |_|_|/ / / /
| | |/| | | | | | |
|
| | * | | | | | | | Bug#12601974 - STORED PROCEDURE SQL_MODE=NO_BACKSLASH_ESCAPES IGNORED AND BRE... | Praveenkumar Hulakund | 2012-02-29 | 1 | -3/+3 |
* | | | | | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / / |
|
| * | | | | | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \
| | |/ / / / / / / |
|
* | | | | | | | | | merge with mysql-5.5.21 | Sergei Golubchik | 2012-03-09 | 1 | -0/+6 |
|\ \ \ \ \ \ \ \ \
| |/ / / / / / / / |
|
| * | | | | | | | | Fixed bug#11753187 (formerly known as bug 44585): SP_CACHE BEHAVES AS | Dmitry Shulga | 2012-01-25 | 1 | -0/+6 |
* | | | | | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \
| | |_|_|_|_|/ / /
| |/| | | | | | | |
|
| * | | | | | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view. | unknown | 2012-02-03 | 1 | -2/+2 |
| | |_|/ / / / /
| |/| | | | | | |
|
* | | | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -4/+1 |
|\ \ \ \ \ \ \ \
| |/ / / / / / / |
|
| * | | | | | | | Rewrite IGNORE handling: | Michael Widenius | 2011-12-11 | 1 | -3/+0 |
| * | | | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -11/+11 |
| |\ \ \ \ \ \ \
| | |_|_|/ / / /
| |/| | | | / /
| | | |_|_|/ /
| | |/| | | | |
|
| | * | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -11/+11 |
| | |\ \ \ \ \
| | | | |_|_|/
| | | |/| | | |
|
| | | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -11/+11 |
| | | |\ \ \ \
| | | | | |/ /
| | | | |/| | |
|
* | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+0 |
|\ \ \ \ \ \ \
| |/ / / / / / |
|