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 | -3/+5 |
* | Ensure that fields declared with NOT NULL doesn't have DEFAULT values if not ... | Monty | 2015-08-18 | 1 | -1/+1 |
* | - Changed default values of query_prealloc_size and query_alloc_block_size | Monty | 2014-12-05 | 1 | -6/+6 |
* | MDEV-6999 Remove or deprecate unused variables | Sergei Golubchik | 2014-12-04 | 1 | -8/+0 |
* | 5.5 merge | Sergei Golubchik | 2014-09-16 | 1 | -0/+9 |
|\ | |||||
| * | MDEV-6673 I_S.SESSION_VARIABLES shows global values | Sergei Golubchik | 2014-08-31 | 1 | -0/+9 |
* | | 5.5.39 merge | Sergei Golubchik | 2014-08-07 | 1 | -0/+4 |
|\ \ | |/ | |||||
| * | mysql-5.5.39 merge | Sergei Golubchik | 2014-08-02 | 1 | -0/+4 |
| |\ | |||||
| | * | WL#7436: Deprecate and remove timed_mutexes system variable | Jon Olav Hauglid | 2014-06-19 | 1 | -0/+4 |
* | | | MDEV-5851 MySQL WL#5303 Romansh locale for DAYNAME, MONTHNAME, DATE_FORMAT | Alexander Barkov | 2014-04-24 | 1 | -5/+5 |
* | | | Increased back_log to 150, but not more than max_connections. | Michael Widenius | 2013-12-27 | 1 | -2/+2 |
* | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -2/+2 |
|\ \ \ | |||||
| * \ \ | merge 5.5 -> 10.0-base | unknown | 2013-08-20 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
* | | | | MDEV-4865 Change related to --log option/variable was merged partially | Sergei Golubchik | 2013-08-13 | 1 | -5/+0 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-07-18 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-07-17 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Fixed tests that failed on 32 bit because of my earlier fixes of 32 bit limits. | Michael Widenius | 2013-06-11 | 1 | -1/+1 |
* | | | | 10.0-base merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+5 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -1/+5 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.31 merge | Sergei Golubchik | 2013-05-07 | 1 | -1/+5 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Bug#16084594 USER_VAR ITEM IN 'LOAD FILE QUERY' WAS NOT | Venkatesh Duggirala | 2013-01-28 | 1 | -1/+1 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 1 | -10/+0 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | create sys_var::val_str(), sys_var::val_int(), sys_var::val_real(). | Sergei Golubchik | 2013-04-09 | 1 | -10/+0 |
* | | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -2/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -2/+2 |
| |/ / / | |||||
* | | | | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 1 | -2/+2 |
|\ \ \ \ | |/ / / | |||||
| * | | | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 1 | -2/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#14498355: DEPRECATION WARNINGS SHOULD NOT CONTAIN MYSQL VERSION | Martin Hansson | 2012-08-24 | 1 | -2/+2 |
* | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 1 | -0/+4 |
* | | | | Increased the version number to 10.0 | Michael Widenius | 2012-05-31 | 1 | -2/+2 |
|/ / / | |||||
* | | | pbxt suite is now a main-pbxt overlay | Sergei Golubchik | 2012-02-29 | 1 | -4/+4 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+0 |
|\ \ \ | |||||
| * \ \ | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+0 |
| |\ \ \ | |||||
* | | | | | after merge changes: | Sergei Golubchik | 2011-12-12 | 1 | -10/+10 |
* | | | | | 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 | -6/+37 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with 5.3 main | Michael Widenius | 2011-05-16 | 1 | -1/+1 |
| |\ \ \ \ | |||||
| * \ \ \ \ | Merge with MariaDB 5.2 | Michael Widenius | 2011-05-10 | 1 | -0/+52 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -0/+23 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| * | | | | Merge with 5.2 | Michael Widenius | 2011-03-09 | 1 | -0/+33 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -0/+33 |
| | |\ \ \ | |||||
| * | | | | | MWL #21: "index_merge: non-ROR intersection". | Igor Babaev | 2010-12-01 | 1 | -0/+1 |
| |/ / / / | |||||
* | | | | | post-merge fixes. | Sergei Golubchik | 2011-07-02 | 1 | -0/+1 |
* | | | | | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -0/+77 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | merge mysql-5.1->mysql-5.5 | Georgi Kodinov | 2011-03-28 | 1 | -24/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Fixed a test failure in embedded because of the fix for BUG#11766769 | Georgi Kodinov | 2011-03-28 | 1 | -23/+0 |