Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Added new status variables: | Michael Widenius | 2012-09-09 | 1 | -0/+3 |
* | 5.3 merge | Sergei Golubchik | 2012-08-31 | 1 | -1/+1 |
|\ | |||||
| * | MDEV-454 Addition of a time interval reduces the resulting value | Sergei Golubchik | 2012-08-29 | 1 | -1/+1 |
| * | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -0/+11 |
| |\ | |||||
| | * | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -0/+11 |
| | |\ | |||||
| | | * | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -0/+11 |
| | | |\ | |||||
* | | | \ | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -0/+11 |
|\ \ \ \ \ | |||||
| * \ \ \ \ | auto-merge | Gleb Shchepa | 2012-06-29 | 1 | -1/+1 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| | * | | | | minor update to make MSVS happy | Gleb Shchepa | 2012-06-29 | 1 | -1/+1 |
| * | | | | | manual merge (WL6219) | Gleb Shchepa | 2012-06-29 | 1 | -0/+11 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Backport of the deprecation warning from WL#6219: "Deprecate and remove YEAR(... | Gleb Shchepa | 2012-06-29 | 1 | -0/+11 |
* | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-06-14 | 1 | -2/+2 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge 5.5.24 back into main 5.5. | Joerg Bruehe | 2012-05-07 | 1 | -2/+14 |
| |\ \ \ \ \ | |||||
* | \ \ \ \ \ | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+13 |
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| * | | | | | | Bug#13871079 RQG_MYISAM_DML_ALTER_VALGRIND FAILS ON VALGRIND PN PB2 | Tor Didriksen | 2012-04-12 | 1 | -1/+13 |
| |/ / / / / | |||||
* | | | | | | mysql 5.5.23 merge | Sergei Golubchik | 2012-04-10 | 1 | -2/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Bug#13832953 MY_STRNXFRM_UNICODE: ASSERTION `SRC' FAILED. | MY_STRNXFRM_UNIC... | Alexander Barkov | 2012-03-20 | 1 | -2/+1 |
* | | | | | | Merge 5.3->5.5 | Igor Babaev | 2012-03-17 | 1 | -14/+60 |
|\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| * | | | | | Fixed bug lp:917689 "Archive table corruption crashing MariaDB signal 11" | Michael Widenius | 2012-03-13 | 1 | -13/+61 |
* | | | | | | mysql-5.5 merge | Sergei Golubchik | 2012-01-16 | 1 | -1/+2 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Backport from trunk of: | Tor Didriksen | 2011-08-19 | 1 | -1/+2 |
* | | | | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | |||||
| * | | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -11/+13 |
| |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | * | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 1 | -10/+12 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 1 | -10/+12 |
| | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | | | * | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -9/+11 |
| | | | |\ \ | |||||
| | | | * \ \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -2/+3 |
| | | | |\ \ \ | |||||
| | | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 1 | -1/+1 |
| | | | | * | | | automerge | Georgi Kodinov | 2011-01-07 | 1 | -1/+1 |
| | | | | |\ \ \ | |||||
| | | | | * | | | | backport: Bug #55568 from 5.1-security to 5.0-security | Gleb Shchepa | 2010-11-23 | 1 | -1/+1 |
* | | | | | | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-27 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / | |||||
| * | | | | | | | | bug 801466 ST_INTERSECTION() returns invalid value on empty intersection in m... | Alexey Botchkov | 2011-09-04 | 1 | -1/+1 |
* | | | | | | | | | merge | Sergei Golubchik | 2011-11-03 | 1 | -9/+9 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | compilation warnings on Windows | Sergei Golubchik | 2011-11-02 | 1 | -9/+9 |
* | | | | | | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 1 | -2/+5 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | / | | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
| * | | | | | | | | Updated/added copyright headers | Kent Boortz | 2011-07-04 | 1 | -2/+4 |
* | | | | | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -1627/+1128 |
|\ \ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | | | |||||
| * | | | | | | | | Merge of mwl #106 into 5.3. | Igor Babaev | 2011-06-15 | 1 | -0/+24 |
| |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed. | Igor Babaev | 2011-06-04 | 1 | -0/+24 |
| | |\ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ | Merge | Igor Babaev | 2011-05-20 | 1 | -0/+24 |
| | | |\ \ \ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ \ \ | Merged the code of MWL#106 into 5.3 | Igor Babaev | 2011-05-16 | 1 | -0/+24 |
| | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ | Merge of the mwl106 tree into the latest 5.3 tree. | Igor Babaev | 2010-09-23 | 1 | -0/+24 |
| | | | | |\ \ \ \ \ \ \ \ | |||||
| | | | | | * | | | | | | | | MWL#106: Backport optimizations for derived tables and views. | Igor Babaev | 2010-05-26 | 1 | -0/+24 |
| * | | | | | | | | | | | | | various fixes for buildbot failures | Sergei Golubchik | 2011-06-10 | 1 | -13/+4 |
| * | | | | | | | | | | | | | small optimization in Field_time_hires. | Sergei Golubchik | 2011-06-09 | 1 | -5/+8 |
| * | | | | | | | | | | | | | bugfixes: | Sergei Golubchik | 2011-06-09 | 1 | -2/+14 |
| * | | | | | | | | | | | | | merge with 5.1-micro | Sergei Golubchik | 2011-06-07 | 1 | -64/+175 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | revert a suggested "optimization" that introduced a bug | Sergei Golubchik | 2011-06-06 | 1 | -57/+171 |
| * | | | | | | | | | | | | | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 1 | -2/+2 |
| * | | | | | | | | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -1513/+885 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / | | | / / / / / / / / / / / | | |/ / / / / / / / / / / | |/| | | | | | | | | | | |