Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '5.5' into 10.1 | Vicențiu Ciorbaru | 2019-05-11 | 3 | -3/+3 |
|\ | |||||
| * | Update FSF Address | Vicențiu Ciorbaru | 2019-05-11 | 3 | -3/+3 |
* | | 5.5.40+ merge | Sergei Golubchik | 2014-10-09 | 1 | -0/+1 |
|\ \ | |/ | |||||
| * | MDEV-5120 Test suite test maria-no-logging fails | Sergei Golubchik | 2014-10-02 | 1 | -0/+1 |
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -2/+7 |
|\ \ | |/ | |||||
| * | Make THDVAR_INT variables to be signed in SELECT in SHOW | Sergei Golubchik | 2014-04-09 | 1 | -2/+7 |
* | | MDEV-5667 online alter and changed field/index options | Sergei Golubchik | 2014-03-02 | 2 | -67/+68 |
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -1/+2 |
|\ \ | |||||
| * \ | 5.5 merge | Sergei Golubchik | 2014-02-25 | 1 | -1/+2 |
| |\ \ | | |/ | |||||
| | * | MySQL-5.5.36 merge | Sergei Golubchik | 2014-02-17 | 1 | -1/+2 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Murthy Narkedimilli | 2014-01-06 | 1 | -1/+1 |
* | | | | 10.0-base merge. | Sergei Golubchik | 2013-09-21 | 1 | -2/+29 |
|\ \ \ \ | |/ / / | |||||
| * | | | 5.5 merge and fixes for compiler/test errors | Sergei Golubchik | 2013-09-18 | 1 | -2/+29 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.5.33 merge | Sergei Golubchik | 2013-09-06 | 1 | -2/+29 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#16194302: SUPPORT FOR FLOATING-POINT SYSTEM VARIABLES | Ashish Agarwal | 2013-05-19 | 1 | -2/+29 |
* | | | | MDEV-4786 - merge 10.0-monty - 10.0 | Sergey Vojtovich | 2013-08-01 | 1 | -2/+0 |
* | | | | more post-merge fixes: | Sergei Golubchik | 2013-07-21 | 1 | -2/+2 |
* | | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 2 | -124/+64 |
|\ \ \ \ | |||||
| * | | | | restore ha_example::check_if_incompatible_data(), create_info->fields_option_... | Sergei Golubchik | 2013-07-12 | 2 | -0/+85 |
| * | | | | Applied all changes from Igor and Sanja | Michael Widenius | 2013-06-15 | 2 | -186/+40 |
* | | | | | 10.0-base merge | Sergei Golubchik | 2013-04-15 | 2 | -33/+33 |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | |||||
| * | | | put status variables in the proper pluginname_ scope | Sergei Golubchik | 2013-04-09 | 1 | -1/+1 |
| * | | | MDEV-4022 table attributes with sysvar as a default value | Sergei Golubchik | 2013-04-09 | 1 | -0/+10 |
| * | | | * move bas_ext from the handler to the handlerton | Sergei Golubchik | 2013-04-07 | 2 | -32/+22 |
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 1 | -5/+0 |
|\ \ \ \ | |/ / / | |||||
| * | | | simplify the handler api - table_type() is no longer abstract, not even virtual | Sergei Golubchik | 2012-12-17 | 1 | -5/+0 |
* | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 2 | -2/+11 |
|\ \ \ \ | |/ / / | |||||
| * | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC. | Michael Widenius | 2012-10-03 | 1 | -2/+3 |
| |/ / | |||||
| * | | MDEV-399 Combinations defined in the base suite cannot be skipped by overlay | Sergei Golubchik | 2012-08-01 | 1 | -0/+8 |
* | | | Added support of thd->tx_read_only | Michael Widenius | 2012-08-07 | 1 | -2/+0 |
|/ / | |||||
* | | c | Sergei Golubchik | 2012-05-21 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Bug#11815557 60269: MYSQL SHOULD REJECT ATTEMPTS TO CREATE SYSTEM | unknown | 2012-04-11 | 1 | -0/+67 |
* | | 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 |
| |\ | |||||
* | | | Reduce size of windows MSI by approx. 50% | Vladislav Vaintroub | 2012-03-16 | 1 | -1/+1 |
* | | | mdev-20: INSTALL PLUGIN SONAME | Sergei Golubchik | 2012-03-05 | 1 | -7/+31 |
* | | | overlay support for mysql-test-run and mysqltest | Sergei Golubchik | 2012-02-23 | 13 | -0/+50 |
* | | | 5.3 merge | Sergei Golubchik | 2012-01-13 | 2 | -4/+7 |
|\ \ \ | |||||
| * | | | Fixed buildbot warnings | Michael Widenius | 2011-12-03 | 1 | -2/+1 |
| * | | | Fixed compiler warning | Michael Widenius | 2011-12-01 | 1 | -0/+2 |
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 4 | -6/+11 |
| |\ \ \ | |||||
| | * \ \ | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 4 | -6/+11 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
* | | | | | mysql-5.5.18 merge | Sergei Golubchik | 2011-11-03 | 2 | -5/+6 |
|\ \ \ \ \ | | |_|_|/ | |/| | | | |||||
| * | | | | Merging into mysql-5.5.16-release. | Mats Kindahl | 2011-08-15 | 1 | -1/+2 |
| * | | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -4/+4 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 4 | -6/+11 |
* | | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 2 | -34/+36 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | small enhancement of the create table options feature: | Sergei Golubchik | 2011-05-10 | 1 | -33/+36 |
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |
| |\ \ \ \ | | | |_|/ | | |/| | | |||||
| | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -2/+0 |