summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Fix clang -Wunused-private-fieldMarko Mäkelä2019-04-031-3/+1
* Merge branch '10.0' into 10.1Oleksandr Byelkin2019-03-011-2/+8
|\
| * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-02-281-2/+8
| |\
| | * A cleanup in derived table handling: removing duplicate code from st_select_l...Alexander Barkov2019-02-281-1/+1
| | * MDEV-15950: LOAD DATA INTO compex_view crashedVarun Gupta2019-01-301-0/+5
| | * MDEV-15744: Assertion `derived->table' failed in mysql_derived_merge_for_insertVarun Gupta2019-01-291-2/+3
* | | Merge branch '10.0' into 10.1Sergei Golubchik2017-10-221-5/+5
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2017-10-181-5/+5
| |\ \ | | |/
| | * MDEV-9619: Assertion `null_ref_table' failed in virtual table_map Item_direct...Oleksandr Byelkin2017-10-131-5/+5
* | | 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
* | | | 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 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
* | | | 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-8605 MariaDB not use DEFAULT value even when inserted NULL for NOT NULLA...Sergei Golubchik2015-12-211-0/+3
* | | | cleanupSergei Golubchik2015-12-211-5/+9
* | | | Merge branch '10.0' into 10.1Sergei Golubchik2015-10-121-3/+10
|\ \ \ \ | |/ / /
| * | | Merge branch '5.5' into 10.0Sergei Golubchik2015-10-091-3/+10
| |\ \ \ | | |/ /
| | * | Merge remote-tracking branch 'mysql/5.5' into 5.5Sergei Golubchik2015-10-081-3/+10
| | |\ \ | | | |/
| | | * Bug #16171518 - LOAD XML DOES NOT HANDLE EMPTY ELEMENTSShishir Jaiswal2015-08-181-2/+9
| | | * Backport from trunk:Tor Didriksen2014-04-231-22/+31
| | | * Bug#11759519 - INFINITE HANG WITH 100% CPU USAGE WITH LOAD DATAPraveenkumar Hulakund2014-03-191-6/+13
| | | * Bug#17429677:LAST ARGUMENT OF LOAD DATA ...SET ...STATEMENTSujatha Sivakumar2013-10-161-0/+8
| | | * Bug#16753869:INCORRECT TRUNCATION OF LONG SET EXPRESSION INSujatha Sivakumar2013-06-241-5/+6
| | | * upmerge to bug#14548159Rohit Kalhans2012-09-221-19/+10
| | | |\
| | | | * BUG#14548159: NUMEROUS CASES OF INCORRECT IDENTIFIERRohit Kalhans2012-09-221-18/+10
| | | | * Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-9/+9
| | | | |\
| | | | | * weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-05-101-6/+5
| | | | | |\
| | | | * | \ Updated/added copyright headersKent Boortz2011-07-031-7/+6
| | | | |\ \ \ | | | | | | |/ | | | | | |/|