Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 1 | -0/+1 |
* | MDEV-6661 PI() does not work well in UCS2/UTF16/UTF32 context | Alexander Barkov | 2014-09-01 | 1 | -7/+32 |
* | MDEV-6153 Trivial Lintian errors in MariaDB sources: spelling errors and wron... | Sergei Golubchik | 2014-05-13 | 1 | -1/+1 |
* | A joint patch for: | Alexander Barkov | 2014-03-23 | 1 | -40/+95 |
* | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+4 |
|\ | |||||
| * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+4 |
| |\ | |||||
| | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
| | * | Bug#12428404 MYSQLD.EXE CRASHES WHEN EXTRACTVALUE() IS CALLED WITH | Anirudh Mangipudi | 2013-11-25 | 1 | -0/+3 |
| | |\ | |||||
| | | * | Bug#12428404 MYSQLD.EXE CRASHES WHEN EXTRACTVALUE() IS CALLED | Anirudh Mangipudi | 2013-11-25 | 1 | -0/+3 |
| | | * | Updated/added copyright headers. | Murthy Narkedimilli | 2013-02-25 | 1 | -1/+1 |
* | | | | merge 10.0-base -> 10.0 | unknown | 2013-09-26 | 1 | -1/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge 5.3 -> 5.5 | unknown | 2013-09-25 | 1 | -1/+0 |
| |\ \ \ | |||||
| | * | | | MDEV-5039: incorrect Item_func_regex::update_used_tables() | unknown | 2013-09-25 | 1 | -1/+0 |
| | * | | | 5.2 -> 5.3 | Sergei Golubchik | 2013-02-28 | 1 | -1/+5 |
| | |\ \ \ | |||||
| | | * \ \ | 5.1 -> 5.2 merge | Sergei Golubchik | 2013-02-28 | 1 | -1/+5 |
| | | |\ \ \ | |||||
| | | | * \ \ | mysql-5.1 merge | Sergei Golubchik | 2013-02-28 | 1 | -1/+5 |
| | | | |\ \ \ | | | | | | |/ | | | | | |/| | |||||
* | | | | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -4/+4 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Finished merging wl5986 started by Igor. | unknown | 2013-06-19 | 1 | -2/+2 |
| * | | | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 1 | -2/+2 |
* | | | | | | | merge with mysql-5.5.30 minus few incorrect or not applicable changesets | Sergei Golubchik | 2013-02-28 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | / | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Auto-merge from mysql-5.1. | Ramil Kalimullin | 2012-12-14 | 1 | -1/+5 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Fix for BUG#15948580 UPDATE_XML() CRASHES THE SERVER. | Ramil Kalimullin | 2012-12-14 | 1 | -1/+5 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2013-01-15 | 1 | -0/+1 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | MDEV-3873 & MDEV-3876 & MDEV-3912 : Wrong result (extra rows) with ALL subquery | unknown | 2012-12-28 | 1 | -0/+1 |
| | |_|/ / | |/| | | | |||||
* | | | | | Added new status variables: | Michael Widenius | 2012-09-09 | 1 | -0/+2 |
* | | | | | mysql-5.5.22 merge | Sergei Golubchik | 2012-03-28 | 1 | -2/+1 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||||
| * | | | | Updated/added copyright headers | MySQL Build Team | 2012-02-16 | 1 | -1/+1 |
| |\ \ \ \ | | | |/ / | | |/| | | |||||
* | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+2 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -2/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -2/+4 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+2 |
| | |\ \ \ | |||||
* | | \ \ \ | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -3/+20 |
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | | | |||||
| * | | | | | Merge from mysql-5.5.14-release | unknown | 2011-07-06 | 1 | -2/+19 |
| |\ \ \ \ \ | |||||
| | * | | | | | Bug #12375190: UPDATEXML CRASHES ON SIMPLE INPUTS | Georgi Kodinov | 2011-05-03 | 1 | -2/+19 |
| * | | | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | / | | | |_|_|/ | | |/| | | | |||||
| | * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+4 |
| | | |_|/ | | |/| | | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merging from mysql-5.1-security | Alexander Barkov | 2010-11-11 | 1 | -2/+2 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#57257 Replace(ExtractValue(...)) causes MySQL crash | Alexander Barkov | 2010-11-11 | 1 | -2/+2 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -1/+10 |
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | |||||
| * | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -2/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -2/+4 |
| | |\ \ | | | |/ | |||||
| * | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -6/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -6/+3 |
| | |\ \ | |||||
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+9 |
| |/ / / | |||||
| * | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+2 |
| |\ \ \ | |||||
| * \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -1/+7 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -1/+7 |
| | |\ \ \ \ | |||||
| * | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -3/+6 |
| |/ / / / / |