Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2018-05-05 | 11 | -30/+76 |
|\ | |||||
| * | Squashed commit of connect/10.0: | Sergei Golubchik | 2018-04-26 | 11 | -30/+76 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-10-26 | 7 | -85/+18 |
|\ \ | |/ | |||||
| * | Squashed commit of the following: | Vicențiu Ciorbaru | 2017-10-26 | 7 | -85/+18 |
* | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-09-19 | 35 | -541/+3939 |
|\ \ | |/ | |||||
| * | Merge connect/10.0 into 10.0 | Vicențiu Ciorbaru | 2017-09-19 | 35 | -541/+3939 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -1/+1 |
|\ \ | |/ | |||||
| * | Merge connect/10.0 into 10.0 | Vicențiu Ciorbaru | 2017-08-01 | 6 | -3/+195 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-05-20 | 1 | -3/+1 |
|\ \ | |/ | |||||
| * | Fix MDEV-12142 crash when creating CSV table | Olivier Bertrand | 2017-03-06 | 1 | -3/+1 |
* | | Merge 10.0 into 10.1 | Marko Mäkelä | 2017-03-09 | 2 | -0/+338 |
|\ \ | |/ | |||||
| * | Commit changes made for version 10.1 | Olivier Bertrand | 2017-01-17 | 2 | -0/+338 |
* | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -3/+3 |
|\ \ | |/ | |||||
| * | - MDEV-11051 place Java classes ApacheInterface and JdbcInterface into single... | Olivier Bertrand | 2016-11-14 | 1 | -3/+3 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 2 | -20/+21 |
|\ \ | |/ | |||||
| * | Change jdbc test to reflect girls.txt LF ending | Olivier Bertrand | 2016-07-15 | 1 | -1/+1 |
| * | All changes made on 10.1 for last 11 commits | Olivier Bertrand | 2016-07-14 | 2 | -20/+21 |
* | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-06-28 | 4 | -0/+620 |
|\ \ | |/ | |||||
| * | - Possibly fix MDEV-10179 Reset remote tables when re-opening | Olivier Bertrand | 2016-06-13 | 4 | -0/+620 |
* | | MDEV-9949 Connect Engine: long SRCDEF leads to broken table | Sergei Golubchik | 2016-05-05 | 1 | -0/+13 |
* | | Merge branch 'connect/10.1' into 10.1 | Sergei Golubchik | 2016-05-05 | 1 | -14/+79 |
|\ \ | |||||
| * | | - Fix an error causing MYSQL table to fail saying "no result set" | Olivier Bertrand | 2016-04-24 | 2 | -14/+400 |
| * | | - Fix MDEV-9779. Connection was not recognized in the option list. | Olivier Bertrand | 2016-03-24 | 1 | -0/+25 |
* | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 3 | -0/+351 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-04-26 | 3 | -13/+378 |
| |\ \ | |||||
| | * | | - Fix an error causing MYSQL table to fail saying "no result set" | Olivier Bertrand | 2016-04-25 | 1 | -0/+321 |
| | * | | - Fix MDEV-9779. Connection was not recognized in the option list. | Olivier Bertrand | 2016-03-24 | 1 | -0/+25 |
| | * | | - Fix crash when sorting a TBL table with thread=yes. | Olivier Bertrand | 2016-03-16 | 1 | -1/+1 |
| | * | | - Fix MDEV-9603 compiler error. | Olivier Bertrand | 2016-03-16 | 1 | -13/+32 |
| * | | | MDEV-9610 Trigger on normal table can't insert into CONNECT engine table - Ac... | Sergei Golubchik | 2016-04-26 | 1 | -0/+5 |
* | | | | Merge branch 'connect/10.1' into 10.1 | Sergei Golubchik | 2016-03-21 | 1 | -13/+32 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | - Fix crash when sorting a TBL table with thread=yes. | Olivier Bertrand | 2016-03-17 | 1 | -1/+1 |
| * | | | - Fix MDEV-9603 compiler error. | Olivier Bertrand | 2016-03-16 | 1 | -13/+32 |
| * | | | - Fix to MDEV-9542 Connect was not handling NULLs in the answer | Olivier Bertrand | 2016-02-15 | 5 | -2463/+2463 |
| * | | | - Fix to MDEV-9446 (using Json UDFs when CONNECT is not installed) | Olivier Bertrand | 2016-01-25 | 1 | -1/+3 |
* | | | | MDEV-9739 Assertion `m_status == DA_ERROR || m_status == DA_OK' failed in Dia... | Sergei Golubchik | 2016-03-19 | 1 | -0/+12 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-02-23 | 7 | -2465/+2467 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2016-02-16 | 7 | -2465/+2467 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | - Fix to MDEV-9542 Connect was not handling NULLs in the answer | Olivier Bertrand | 2016-02-15 | 6 | -2464/+2464 |
| | * | | - Change SQL_NTS to 0 when the string is NULL | Olivier Bertrand | 2016-01-25 | 1 | -1/+3 |
* | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2015-12-21 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge branch 'connect/10.0' into 10.0 | Sergei Golubchik | 2015-12-13 | 8 | -71/+1212 |
| |\ \ \ | | |/ / | |||||
| | * | | Commit updating CONNECT from the 10.1 version | Olivier Bertrand | 2015-12-04 | 9 | -81/+1236 |
* | | | | Merge branch 'connect/10.1' into 10.1 | Sergei Golubchik | 2015-12-21 | 2 | -87/+725 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Merge branch 'ob-10.1' into 10.1 | Olivier Bertrand | 2015-12-09 | 2 | -87/+725 |
| |\ \ \ | |||||
| | * | | | Remove warning on Linux | Olivier Bertrand | 2015-12-04 | 2 | -83/+725 |
| | * | | | Make changes required by version 10.1.9 (see Sergei's mmail): | Olivier Bertrand | 2015-11-22 | 1 | -4/+0 |
* | | | | | Post-merge fixes for Connect engine | Sergei Golubchik | 2015-11-19 | 1 | -1/+1 |
* | | | | | Merge branch 'connect/10.1' into 10.1 | Sergei Golubchik | 2015-11-19 | 4 | -62/+653 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix of error and warnings when compiling on linux | Buggynours | 2015-10-25 | 1 | -0/+100 |
| |/ / / |