Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | MDEV-6066: Merge new defaults from 5.6 and 5.7 (defaults changed, QC can be s... | Oleksandr Byelkin | 2015-09-04 | 1 | -0/+2 |
* | MDEV-6999 Remove or deprecate unused variables | Sergei Golubchik | 2014-12-04 | 1 | -4/+0 |
* | 5.5 merge | Sergei Golubchik | 2014-09-16 | 1 | -0/+8 |
|\ | |||||
| * | MDEV-6673 I_S.SESSION_VARIABLES shows global values | Sergei Golubchik | 2014-08-31 | 1 | -0/+8 |
* | | MDEV-5851 MySQL WL#5303 Romansh locale for DAYNAME, MONTHNAME, DATE_FORMAT | Alexander Barkov | 2014-04-24 | 1 | -2/+2 |
* | | MDEV-4865 Change related to --log option/variable was merged partially | Sergei Golubchik | 2013-08-13 | 1 | -10/+0 |
* | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -0/+3 |
|\ \ | |/ | |||||
| * | Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits. | Michael Widenius | 2013-06-11 | 1 | -0/+3 |
* | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -0/+12 |
|\ \ | |/ | |||||
| * | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -0/+12 |
| |\ | |||||
* | | | create sys_var::val_str(), sys_var::val_int(), sys_var::val_real(). | Sergei Golubchik | 2013-04-09 | 1 | -16/+0 |
|/ / | |||||
* | | pbxt suite is now a main-pbxt overlay | Sergei Golubchik | 2012-02-29 | 1 | -2/+2 |
* | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -1/+4 |
|\ \ | |||||
| * | | Allow one to block an account by using GRANT max_user_connections = -1 | Michael Widenius | 2011-09-26 | 1 | -1/+2 |
| * | | Merge with 5.2 | Michael Widenius | 2011-09-15 | 1 | -0/+2 |
| |\ \ | |||||
| | * | | Increased version number | Michael Widenius | 2011-09-13 | 1 | -0/+2 |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -9/+30 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -2/+41 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -1/+20 |
| | |\ \ | |||||
| * | \ \ | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+44 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+44 |
| | |\ \ \ | |||||
| * | | | | | MWL #21: "index_merge: non-ROR intersection". | Igor Babaev | 2010-12-01 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -1/+90 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-03-28 | 1 | -27/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fixed a test failure in embedded because of the fix for BUG#11766769 | Georgi Kodinov | 2011-03-28 | 1 | -25/+0 |
| * | | | | 5.1 -> 5.5 merge | Sergey Glukhov | 2011-03-28 | 1 | -0/+13 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug#11766424 59527: DECIMAL_BIN_SIZE: ASSERTION `SCALE >= 0 && PRECISION > 0... | Sergey Glukhov | 2011-03-28 | 1 | -0/+13 |
| * | | | | Merged bug #11766769 to 5.5. | Georgi Kodinov | 2011-03-25 | 1 | -0/+28 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Bug #11766769: 59959: SMALL VALUES OF --MAX-ALLOWED-PACKET | Georgi Kodinov | 2011-03-25 | 1 | -0/+26 |
| * | | | | Manual merge from mysql-5.1 for Bug#11764168 (56976: Severe denial | Dmitry Shulga | 2011-03-15 | 1 | -0/+5 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed Bug#11764168 "56976: SEVERE DENIAL OF SERVICE IN PREPARED STATEMENTS". | Dmitry Shulga | 2011-03-15 | 1 | -0/+5 |
| * | | | | Bug #59884: setting charset to 2048 crashes | Georgi Kodinov | 2011-02-10 | 1 | -0/+26 |
| * | | | | merge | Georgi Kodinov | 2011-02-02 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | merge to 5.1. | Georgi Kodinov | 2011-02-02 | 1 | -1/+1 |
| | |\ \ \ | | | |_|/ | | |/| | | |||||
| | | * | | Fixes for Bug #55755 and Bug #52315 part 2 | Georgi Kodinov | 2011-02-02 | 1 | -1/+1 |
| * | | | | merge some docs changes and a test case; null merge the code. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -0/+44 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Assorted post-merge fixes, clean-up, integration, compat with 5.6. | Tatiana A. Nurnberg | 2010-11-25 | 1 | -1/+4 |
| | * | | | Bug#43233: Some server variables are clipped during "update," not "check" stage | Tatiana A. Nurnberg | 2010-11-11 | 1 | -0/+41 |
* | | | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -0/+2 |
* | | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -12/+4 |
|\ \ \ \ \ | |/ / / / |/| | | / | | |_|/ | |/| | | |||||
| * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -1/+16 |
| |\ \ \ | | |/ / | |||||
| * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -0/+8 |
| |\ \ \ | |||||
| * \ \ \ | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+6 |
| |\ \ \ \ | |||||
| * | | | | | Fix multiple test suite failures in Buildbot due to races in the test cases o... | unknown | 2010-01-11 | 1 | -10/+0 |
| * | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -0/+25 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -0/+15 |
| |\ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -8/+116 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -44/+47 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
* | | | | | | | | | | | A pre-requisite patch for the fix for Bug#52044. | Konstantin Osipov | 2010-07-27 | 1 | -0/+26 |