Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge 10.1 into 10.2 | Marko Mäkelä | 2019-04-03 | 1 | -1/+0 |
|\ | |||||
| * | Remove unused declarations | Marko Mäkelä | 2019-04-03 | 3 | -4/+0 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2018-06-21 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 |
| |\ | |||||
| | * | Merge branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-06-12 | 1 | -1/+1 |
| | |\ | |||||
| | | * | MDEV-16342 SHOW ENGINES: MyISAM description is useless | Sergei Golubchik | 2018-06-11 | 1 | -1/+1 |
* | | | | Merge branch 'github/10.1' into 10.2 | Sergei Golubchik | 2018-02-06 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'github/10.0' into 10.1 | Sergei Golubchik | 2018-02-02 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge remote-tracking branch '5.5' into 10.0 | Vicențiu Ciorbaru | 2018-01-24 | 1 | -1/+1 |
| | |\ \ | | | |/ | |||||
| | | * | Correct TRASH() macro usage | Sergei Golubchik | 2018-01-22 | 1 | -1/+1 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -5/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-10-22 | 1 | -5/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-10-18 | 1 | -5/+4 |
| | |\ \ | | | |/ | |||||
| | | * | MDEV-13459 Warnings, when compiling with gcc-7.x | Sergei Golubchik | 2017-10-17 | 2 | -5/+6 |
* | | | | MDEV-13844 : Fix Windows warnings. Fix DBUG_PRINT. | Vladislav Vaintroub | 2017-09-28 | 1 | -9/+9 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 4 | -25/+39 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-12725 select on federated table crashes server | Sergei Golubchik | 2017-08-08 | 4 | -25/+37 |
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -0/+2 |
| |\ \ \ | | |/ / | |||||
| | * | | MDEV-12824 GCC 7 warning: this statement may fall through [-Wimplicit-fallthr... | Sergei Golubchik | 2017-07-20 | 1 | -0/+2 |
* | | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-26 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-11311 Create federated table does not work as expected. | Sergei Golubchik | 2017-05-24 | 1 | -1/+1 |
* | | | | MDEV-11597 Assertion when doing select from virtual column with impossible value | Monty | 2017-01-11 | 1 | -1/+1 |
* | | | | fix build and some warnings | kevg | 2016-11-24 | 2 | -3/+0 |
* | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -17/+9 |
| | |\ \ | |||||
| | | * | | - Fix an error causing MYSQL table to fail saying "no result set" | Olivier Bertrand | 2016-04-25 | 1 | -17/+9 |
* | | | | | MDEV-6353 my_ismbchar() and my_mbcharlen() refactoring | Alexander Barkov | 2016-05-17 | 1 | -2/+1 |
|/ / / / | |||||
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Fix spelling: occurred, execute, which etc | Otto Kekäläinen | 2016-03-04 | 1 | -1/+1 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -33/+38 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-12-13 | 1 | -33/+38 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | MDEV-8313 Got an error writing communication packets | Sergei Golubchik | 2015-12-07 | 1 | -0/+19 |
| | * | | federatedx small cleanup | Sergei Golubchik | 2015-12-07 | 1 | -33/+19 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-11-19 | 1 | -0/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | remove unneded #include's that had a dubious explanation | Sergei Golubchik | 2015-10-24 | 1 | -0/+1 |
* | | | | cleanup: use enum_binlog_checksum_alg, not uint8 | Sergei Golubchik | 2015-09-04 | 1 | -0/+1 |
* | | | | - Renaming variables so that they don't shadow others (After this patch one c... | Monty | 2015-07-06 | 1 | -1/+1 |
* | | | | Merge tag 'mariadb-10.0.20' into 10.1 | Sergei Golubchik | 2015-06-27 | 1 | -23/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2015-06-11 | 1 | -23/+23 |
| |\ \ \ | | |/ / | | | / | | |/ | |/| | |||||
| | * | CRLF->LF | Sergei Golubchik | 2015-06-02 | 2 | -27/+27 |
* | | | cleanup: freshen up CREATE SERVER code | Sergei Golubchik | 2014-12-04 | 1 | -7/+7 |
* | | | Merge branch '10.0' into bb-10.1-merge | Sergei Golubchik | 2014-12-02 | 5 | -4/+5 |
|\ \ \ | |/ / | |||||
| * | | 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 | 5 | -0/+5 |
| * | | MDEV-5120 Test suite test maria-no-logging fails | Michael Widenius | 2014-09-30 | 4 | -4/+4 |
* | | | cleanup: remove table->status from some engines | Sergei Golubchik | 2014-10-01 | 1 | -8/+0 |
|/ / | |||||
* | | 5.5 merge | Sergei Golubchik | 2014-05-09 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | typo in FederatedX. HA_READ_AFTER_KEY is not a valid index flag. | Sergei Golubchik | 2014-04-14 | 1 | -1/+1 |
* | | remove append_escaped(), use String::append_for_single_quote() instead | Sergei Golubchik | 2014-03-26 | 1 | -3/+3 |