Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch '10.2' into bb-10.2-ext | Sergei Golubchik | 2017-08-25 | 1 | -2/+2 |
|\ | |||||
| * | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-08-17 | 1 | -2/+2 |
| |\ | |||||
| | * | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2017-08-08 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Merge remote-tracking branch 'origin/5.5' into 10.0 | Vicențiu Ciorbaru | 2017-07-25 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2017-07-18 | 1 | -1/+1 |
| | | | |\ | |||||
| | | | | * | Bug#16212207 - LOAD XML INFILE PERFORMANCE WITH INDENTED | Shishir Jaiswal | 2017-05-23 | 1 | -1/+3 |
| | | | | * | Bug#16212207 - LOAD XML INFILE PERFORMANCE WITH INDENTED | Shishir Jaiswal | 2017-05-16 | 1 | -1/+8 |
| | * | | | | MDEV-13179 main.errors fails with wrong errno | Monty | 2017-08-07 | 1 | -1/+1 |
* | | | | | | A post-merge fix: loadxml failed on Windows (due to a wrong parameter to my_e... | Alexander Barkov | 2017-05-27 | 1 | -6/+6 |
* | | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-ext | Alexander Barkov | 2017-05-26 | 1 | -47/+77 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2017-05-09 | 1 | -47/+77 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | MDEV-12696 Crash with LOAD XML and non-updatable VIEW column | Sergei Golubchik | 2017-05-09 | 1 | -12/+29 |
| | * | | | | Merge branch '10.0' 10.1 | Sergei Golubchik | 2017-04-28 | 1 | -39/+39 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2017-04-21 | 1 | -39/+39 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55 | Sergei Golubchik | 2017-04-11 | 1 | -39/+39 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | Bug #24595937: INCORRECT BEHAVIOR WHEN LOADING DATA TO VIEW | Sreeharsha Ramanavarapu | 2016-12-13 | 1 | -0/+18 |
| | * | | | | Merge branch '10.0' into 10.1 | Vicențiu Ciorbaru | 2017-01-16 | 1 | -11/+3 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Merge remote-tracking branch 'origin/5.5' into 10.0 | vicentiu | 2017-01-06 | 1 | -11/+3 |
| | | |\ \ \ | | | | |/ / | |||||
| | | | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-12-22 | 1 | -49/+28 |
| | | | |\ \ | | | | | |/ | |||||
| | | | | * | BUG#24487120 - SLAVE'S SLAVE_SQL_RUNNING IS STOPPED DURING | Thayumanavar S | 2016-10-28 | 1 | -49/+28 |
* | | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext | Alexander Barkov | 2017-05-05 | 1 | -37/+24 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | MDEV-12696 Crash with LOAD XML and non-updatable VIEW column | Alexander Barkov | 2017-05-05 | 1 | -37/+24 |
* | | | | | | Changing field::field_name and Item::name to LEX_CSTRING | Monty | 2017-04-23 | 1 | -8/+8 |
|/ / / / / | |||||
* | | | | | Revert "bugfix: UPDATE and virtual BLOBs" | Monty | 2017-01-11 | 1 | -6/+0 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-12-29 | 1 | -1/+50 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-12-11 | 1 | -46/+146 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo... | Alexander Barkov | 2016-11-29 | 1 | -45/+144 |
| | * | | | MDEV-11348 LOAD DATA LOCAL INFILE crashes the server on loading a backslash f... | Alexander Barkov | 2016-11-25 | 1 | -1/+2 |
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-08-25 | 1 | -27/+48 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-08-10 | 1 | -27/+48 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-08-03 | 1 | -28/+49 |
| | | |\ \ | | | | |/ | |||||
| | | | * | BUG#23080148 - BACKPORT BUG 14653594 AND BUG 20683959 TO | Thayumanavar S | 2016-06-20 | 1 | -28/+49 |
* | | | | | bugfix: remove broken insert t values () optimization | Sergei Golubchik | 2016-12-12 | 1 | -2/+0 |
* | | | | | bugfix: UPDATE and virtual BLOBs | Sergei Golubchik | 2016-12-12 | 1 | -0/+6 |
* | | | | | cleanup: avoid Field::field_index | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | | | cleanup: reorder TABLE members | Sergei Golubchik | 2016-12-12 | 1 | -1/+1 |
* | | | | | Merge branch '10.1' into 10.2 | Sergei Golubchik | 2016-06-30 | 1 | -2/+3 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge branch '10.0' into 10.1 | Sergei Golubchik | 2016-05-04 | 1 | -2/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge branch '5.5' into 10.0 | Sergei Golubchik | 2016-04-26 | 1 | -2/+3 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge branch 'mysql/5.5' into 5.5 | Sergei Golubchik | 2016-04-20 | 1 | -2/+3 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #16912362 LOAD DATA INFILE CLAIMS TO BE HOLDING | Ajo Robert | 2016-01-28 | 1 | -1/+2 |
* | | | | | MDEV-7563 Support CHECK constraint as in (or close to) SQL Standard | Michael Widenius | 2016-06-30 | 1 | -22/+7 |
* | | | | | Merge branch '10.2' into bb-10.2-mdev9543 | Sergei Petrunia | 2016-04-07 | 1 | -203/+256 |
|\ \ \ \ \ | |||||
| * | | | | | MDEV-9874 LOAD XML INFILE does not handle well broken multi-byte characters | Alexander Barkov | 2016-04-06 | 1 | -47/+71 |
| * | | | | | MDEV-9823 LOAD DATA INFILE silently truncates incomplete byte sequences | Alexander Barkov | 2016-04-06 | 1 | -26/+22 |
| * | | | | | Clean-up: Adding a class Term_string to share some LOAD DATA code | Alexander Barkov | 2016-04-04 | 1 | -90/+85 |
| * | | | | | Clean-up: Changing READ_INFO to use a String object instead of | Alexander Barkov | 2016-04-02 | 1 | -62/+48 |
| * | | | | | MDEV-9842 LOAD DATA INFILE does not work well with a TEXT column when using sjis | Alexander Barkov | 2016-04-02 | 1 | -1/+2 |
| * | | | | | MDEV-9811 LOAD DATA INFILE does not work well with gbk in some cases | Alexander Barkov | 2016-03-31 | 1 | -21/+72 |
* | | | | | | This is the consolidated patch for mdev-8646:bb-10.2-mdev8646 | Igor Babaev | 2016-02-09 | 1 | -5/+8 |
|/ / / / / |