| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -1/+1 |
| * | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -7/+7 |
| * | 5.5 merge | Sergei Golubchik | 2013-01-29 | 1 | -25/+31 |
| |\ | |||||
| | * | Merge 5.3->5.5 | Igor Babaev | 2013-01-23 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge 5.2->5.3 | Igor Babaev | 2013-01-21 | 1 | -2/+2 |
| | | |\ | |||||
| | | | * | Merge 5.1->5.2 | Igor Babaev | 2013-01-21 | 1 | -2/+2 |
| | | | |\ | |||||
| | | | | * | Fixed bug mdev-4063 (bug #56927). | Igor Babaev | 2013-01-21 | 1 | -2/+2 |
| | * | | | | Fixed crashing bug in GROUP_CONCAT with ROLLUP | Michael Widenius | 2013-01-11 | 1 | -9/+20 |
| | * | | | | MDEV-3987 uninitialized read in Item_cond::fix_fields leads to crash: select ... | Sergei Golubchik | 2013-01-08 | 1 | -15/+10 |
| * | | | | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -1/+2 |
| * | | | | | Merge 5.5->mwl248 | Igor Babaev | 2012-12-04 | 1 | -3/+3 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -3/+3 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | MDEV-736 LP:1004615 - Unexpected warnings "Encountered illegal value '' when ... | Sergei Golubchik | 2012-11-17 | 1 | -3/+3 |
| * | | | | | Merge 5.5 -> 5.5-mwl248. | Igor Babaev | 2012-06-26 | 1 | -0/+3 |
| |\ \ \ \ \ | |/ / / / | |||||
| | * | | | | Merge 5.3 -> 5.5 | Sergey Petrunya | 2012-06-20 | 1 | -0/+3 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 1 | -0/+3 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Fix of LP bug#992380 + revise fix_fields about missing with_subselect collection | unknown | 2012-05-22 | 1 | -0/+3 |
| * | | | | | Merge maria-5.3-mwl248 -> 5.5 = maria-5.5-mwl248. | Igor Babaev | 2012-03-19 | 1 | -3/+14 |
| |\ \ \ \ \ | |/ / / / |/| | | | | |||||
| | * | | | | Merged 5.3 changes into the mwl #248 tree. | Igor Babaev | 2012-03-09 | 1 | -2/+1 |
| | |\ \ \ \ | | |/ / / | |||||
| | * | | | | The main patch for the MWL#248 back-ported from | Igor Babaev | 2012-01-04 | 1 | -4/+4 |
| * | | | | | 5.3.4 merge | Sergei Golubchik | 2012-02-15 | 1 | -2/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -2/+1 |
| | |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | | * | | Fixed LP bug #777654. | Igor Babaev | 2011-12-28 | 1 | -2/+1 |
| * | | | | MDEV-135: work-around a GCC bug seen on Debian 5 "lenny" 64-bit. | unknown | 2012-02-06 | 1 | -1/+1 |
| * | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -0/+25 |
| |\ \ \ \ | |||||
| | * | | | | Bug#11750518 41090: ORDER BY TRUNCATES GROUP_CONCAT RESULT | Sergey Glukhov | 2011-10-12 | 1 | -0/+25 |
| * | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
| |\ \ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -4/+5 |
| | |\ \ \ \ | | | |/ / | | |/| | | |||||
| | | * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -4/+5 |
| | | |\ \ \ | | | | |/ | | | |/| | |||||
| | | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -4/+5 |
| | | | |\ \ | |||||
| | | | | * \ | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -3/+3 |
| | | | | |\ \ | |||||
| | | | | | * \ | weave merge of mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2011-05-10 | 1 | -5/+1 |
| | | | | | |\ \ | |||||
| | | | | * | \ \ | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -6/+2 |
| | | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| | | |||||
| * | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / | |||||
| | * | | | | | | | Fix of LP BUG#872775. | unknown | 2011-11-01 | 1 | -1/+3 |
| * | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -5/+6 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | | Merge from mysql-5.5.14-release | unknown | 2011-07-06 | 1 | -3/+3 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | weave merge of mysql-5.5->mysql-5.5-security | Georgi Kodinov | 2011-05-10 | 1 | -5/+1 |
| | | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | merge 5.1 => 5.5 : Bug#12329653 | Tor Didriksen | 2011-05-05 | 1 | -3/+3 |
| | | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|/ | | | |/| | | | | | | |||||
| | | | * | | | | | | | merge 5.0 => 5.1 : Bug#12329653 | Tor Didriksen | 2011-05-04 | 1 | -3/+3 |
| | | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | | | |||||
| | | | | * | | | | | | Bug#12329653 - EXPLAIN, UNION, PREPARED STATEMENT, CRASH, SQL_FULL_GROUP_BY | Tor Didriksen | 2011-05-04 | 1 | -3/+3 |
| | * | | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | / / / / / | | |_|_|/ / / / / | |/| | | | | | | | |||||
| * | | | | | | | | | Post-merge fixes: Fix problems in table_elim.test and enable it. | Sergey Petrunya | 2011-10-27 | 1 | -5/+14 |
| * | | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -17/+49 |
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / | |/| | | | | | | | |||||
| | * | | | | | | | | Fixed LP BUG#800696. | unknown | 2011-07-19 | 1 | -1/+10 |
| | * | | | | | | | | New status variables: Rows_tmp_read, Handler_tmp_update and Handler_tmp_write | Michael Widenius | 2011-06-27 | 1 | -1/+1 |
| | * | | | | | | | | various fixes for buildbot failures | Sergei Golubchik | 2011-06-10 | 1 | -1/+1 |
| | * | | | | | | | | bugfixes: | Sergei Golubchik | 2011-06-09 | 1 | -1/+1 |
| | * | | | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -7/+13 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * | | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -7/+7 |
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |