Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-30 | 1 | -12/+17 |
|\ | |||||
| * | Merge branch 'connect/10.2' into 10.2 | Sergei Golubchik | 2017-10-26 | 1 | -11/+16 |
| |\ | |||||
| | * | - Fix a bug in TYPVAL<PSZ> compute causing it sometime not to be executed | Olivier Bertrand | 2017-10-16 | 1 | -0/+3 |
| | * | - Make another temporary fix for the compiler bug in CalculateArray | Olivier Bertrand | 2017-10-16 | 1 | -9/+13 |
| | * | - Update version number | Olivier Bertrand | 2017-10-15 | 1 | -10/+8 |
| * | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-10-24 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Various compier warnings | Sergei Golubchik | 2017-10-22 | 1 | -1/+1 |
| | * | | Merge connect/10.0 into 10.0 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -80/+332 |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-10-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-13384 - misc Windows warnings fixed | Vladislav Vaintroub | 2017-09-28 | 1 | -1/+1 |
* | | | | Merge 10.2 into bb-10.2-ext | Marko Mäkelä | 2017-09-20 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge remote-tracking branch 'connect/10.2' into 10.2bb-10.2-vicentiu2 | Vicențiu Ciorbaru | 2017-09-19 | 1 | -1/+1 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | - Set MONGO_ENABLED | Olivier Bertrand | 2017-08-31 | 1 | -1/+1 |
* | | | | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-08-25 | 1 | -53/+293 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -2/+4 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Merge connect/10.0 into 10.0 | Vicențiu Ciorbaru | 2017-08-01 | 1 | -28/+33 |
| * | | | Merge branch 'connect/10.2' into 10.2 | Sergei Golubchik | 2017-08-16 | 1 | -51/+289 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | - Fix bug returning pointer to a stack string | Olivier Bertrand | 2017-08-07 | 1 | -22/+44 |
| | * | | -- Add mutex for user_connect handling | Olivier Bertrand | 2017-07-21 | 1 | -1/+3 |
| | * | | -- Fix warnings from the new GCC 7 | Olivier Bertrand | 2017-07-19 | 1 | -0/+2 |
| | * | | -- Finalize work on MongoDB access | Olivier Bertrand | 2017-07-18 | 1 | -29/+241 |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-07-19 | 1 | -58/+77 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'connect/10.2' into 10.2 | Sergei Golubchik | 2017-07-13 | 1 | -58/+77 |
| |\ \ \ | | |/ / | |||||
| | * | | Fix gcc compiler warnings reported by Sergei | Olivier Bertrand | 2017-05-23 | 1 | -258/+263 |
* | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-06-15 | 1 | -201/+186 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge 10.1 into 10.2 | Marko Mäkelä | 2017-05-23 | 1 | -201/+186 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Fix wrong value of JSON column | Olivier Bertrand | 2017-05-11 | 1 | -236/+136 |
| | * | Fix MDEV-12142 crash when creating CSV table | Olivier Bertrand | 2017-03-06 | 1 | -12/+97 |
* | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -4/+5 |
|/ / | |||||
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-03-30 | 1 | -49/+60 |
|\ \ | |/ | |||||
| * | All changes made on 10.1 | Olivier Bertrand | 2017-02-16 | 1 | -49/+60 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-02-10 | 1 | -0/+47 |
|\ \ | |/ | |||||
| * | - Fix MDEV-11234. Escape quoting character. Should be doubled. | Olivier Bertrand | 2016-11-06 | 1 | -0/+47 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-09-09 | 1 | -4/+8 |
|\ \ | |/ | |||||
| * | All changes made on 10.1 for last 11 commits | Olivier Bertrand | 2016-07-14 | 1 | -4/+8 |
* | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -92/+353 |
|\ \ | |/ | |||||
| * | - Possibly fix MDEV-10179 Reset remote tables when re-opening | Olivier Bertrand | 2016-06-13 | 1 | -2/+2 |
| * | git90.msg + git91.msg | Olivier Bertrand | 2016-06-02 | 1 | -46/+251 |
| * | Merge branch '10.0' of https://github.com/MariaDB/server into 10.0 | Olivier Bertrand | 2016-05-22 | 1 | -6/+7 |
| |\ | |||||
| | * | Fixed failing test cases and compiler warnings | Monty | 2016-04-25 | 1 | -5/+6 |
| * | | Add all changes made on 10.1 | Olivier Bertrand | 2016-05-12 | 1 | -50/+105 |
* | | | Fixed compiler warnings and test failures found by buildbot | Monty | 2016-06-24 | 1 | -2/+1 |
* | | | Fixed compiler warnings and test failures found by buildbot | Monty | 2016-06-22 | 1 | -5/+5 |
| |/ |/| | |||||
* | | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-02-16 | 1 | -4/+53 |
|\ \ | |/ | |||||
| * | - Change SQL_NTS to 0 when the string is NULL | Olivier Bertrand | 2016-01-25 | 1 | -4/+53 |
* | | Backported fix for ccache | Monty | 2016-01-03 | 1 | -1/+1 |
|/ | |||||
* | - Serialize: Protect again eventual longjmp's. | Olivier Bertrand | 2015-12-08 | 1 | -12/+9 |
* | Fix memory error when a plain string argument is parsed. | Olivier Bertrand | 2015-12-05 | 1 | -3/+4 |
* | Fix memory error when a plain string argument is parsed. | Olivier Bertrand | 2015-12-05 | 1 | -6/+12 |
* | Fix memory error when a plain string argument is parsed. | Olivier Bertrand | 2015-12-05 | 1 | -510/+506 |