summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into bb-10.2-extSergei Golubchik2017-08-251-2/+2
|\
| * Merge branch '10.1' into 10.2Sergei Golubchik2017-08-171-2/+2
| |\
| | * Merge branch '10.0' into 10.1Sergei Golubchik2017-08-081-1/+1
| | |\
| | | * Merge remote-tracking branch 'origin/5.5' into 10.0Vicențiu Ciorbaru2017-07-251-1/+1
| | | |\
| | | | * Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2017-07-181-1/+1
| | | | |\
| | | | | * Bug#16212207 - LOAD XML INFILE PERFORMANCE WITH INDENTEDShishir Jaiswal2017-05-231-1/+3
| | | | | * Bug#16212207 - LOAD XML INFILE PERFORMANCE WITH INDENTEDShishir Jaiswal2017-05-161-1/+8
| | * | | | MDEV-13179 main.errors fails with wrong errnoMonty2017-08-071-1/+1
* | | | | | A post-merge fix: loadxml failed on Windows (due to a wrong parameter to my_e...Alexander Barkov2017-05-271-6/+6
* | | | | | Merge tag 'mariadb-10.2.6' into bb-10.2-extAlexander Barkov2017-05-261-47/+77
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-05-091-47/+77
| |\ \ \ \ \ | | |/ / / /
| | * | | | MDEV-12696 Crash with LOAD XML and non-updatable VIEW columnSergei Golubchik2017-05-091-12/+29
| | * | | | Merge branch '10.0' 10.1Sergei Golubchik2017-04-281-39/+39
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge branch '5.5' into 10.0Sergei Golubchik2017-04-211-39/+39
| | | |\ \ \ | | | | |/ /
| | | | * | Merge remote-tracking branch 'mysql/5.5' into 5.5mariadb-5.5.55Sergei Golubchik2017-04-111-39/+39
| | | | |\ \ | | | | | |/
| | | | | * Bug #24595937: INCORRECT BEHAVIOR WHEN LOADING DATA TO VIEWSreeharsha Ramanavarapu2016-12-131-0/+18
| | * | | | Merge branch '10.0' into 10.1Vicențiu Ciorbaru2017-01-161-11/+3
| | |\ \ \ \ | | | |/ / /
| | | * | | Merge remote-tracking branch 'origin/5.5' into 10.0vicentiu2017-01-061-11/+3
| | | |\ \ \ | | | | |/ /
| | | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-12-221-49/+28
| | | | |\ \ | | | | | |/
| | | | | * BUG#24487120 - SLAVE'S SLAVE_SQL_RUNNING IS STOPPED DURINGThayumanavar S2016-10-281-49/+28
* | | | | | Merge remote-tracking branch 'origin/10.2' into bb-10.2-extAlexander Barkov2017-05-051-37/+24
|\ \ \ \ \ \ | |/ / / / /
| * | | | | MDEV-12696 Crash with LOAD XML and non-updatable VIEW columnAlexander Barkov2017-05-051-37/+24
* | | | | | Changing field::field_name and Item::name to LEX_CSTRINGMonty2017-04-231-8/+8
|/ / / / /
* | | | | Revert "bugfix: UPDATE and virtual BLOBs"Monty2017-01-111-6/+0
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-12-291-1/+50
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-12-111-46/+146
| |\ \ \ \ | | |/ / /
| | * | | MDEV-11343 LOAD DATA INFILE fails to load data with an escape character follo...Alexander Barkov2016-11-291-45/+144
| | * | | MDEV-11348 LOAD DATA LOCAL INFILE crashes the server on loading a backslash f...Alexander Barkov2016-11-251-1/+2
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-27/+48
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-08-101-27/+48
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-08-031-28/+49
| | | |\ \ | | | | |/
| | | | * BUG#23080148 - BACKPORT BUG 14653594 AND BUG 20683959 TOThayumanavar S2016-06-201-28/+49
* | | | | bugfix: remove broken insert t values () optimizationSergei Golubchik2016-12-121-2/+0
* | | | | bugfix: UPDATE and virtual BLOBsSergei Golubchik2016-12-121-0/+6
* | | | | cleanup: avoid Field::field_indexSergei Golubchik2016-12-121-1/+1
* | | | | cleanup: reorder TABLE membersSergei Golubchik2016-12-121-1/+1
* | | | | Merge branch '10.1' into 10.2Sergei Golubchik2016-06-301-2/+3
|\ \ \ \ \ | |/ / / /
| * | | | Merge branch '10.0' into 10.1Sergei Golubchik2016-05-041-2/+3
| |\ \ \ \ | | |/ / /
| | * | | Merge branch '5.5' into 10.0Sergei Golubchik2016-04-261-2/+3
| | |\ \ \ | | | |/ /
| | | * | Merge branch 'mysql/5.5' into 5.5Sergei Golubchik2016-04-201-2/+3
| | | |\ \ | | | | |/
| | | | * Bug #16912362 LOAD DATA INFILE CLAIMS TO BE HOLDINGAjo Robert2016-01-281-1/+2
* | | | | MDEV-7563 Support CHECK constraint as in (or close to) SQL StandardMichael Widenius2016-06-301-22/+7
* | | | | Merge branch '10.2' into bb-10.2-mdev9543Sergei Petrunia2016-04-071-203/+256
|\ \ \ \ \
| * | | | | MDEV-9874 LOAD XML INFILE does not handle well broken multi-byte charactersAlexander Barkov2016-04-061-47/+71
| * | | | | MDEV-9823 LOAD DATA INFILE silently truncates incomplete byte sequencesAlexander Barkov2016-04-061-26/+22
| * | | | | Clean-up: Adding a class Term_string to share some LOAD DATA codeAlexander Barkov2016-04-041-90/+85
| * | | | | Clean-up: Changing READ_INFO to use a String object instead ofAlexander Barkov2016-04-021-62/+48
| * | | | | MDEV-9842 LOAD DATA INFILE does not work well with a TEXT column when using sjisAlexander Barkov2016-04-021-1/+2
| * | | | | MDEV-9811 LOAD DATA INFILE does not work well with gbk in some casesAlexander Barkov2016-03-311-21/+72
* | | | | | This is the consolidated patch for mdev-8646:bb-10.2-mdev8646Igor Babaev2016-02-091-5/+8
|/ / / / /