summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* 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 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
* | | 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 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
* | | 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 '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 '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
* | | 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
| | | |\ \ \ | | | | | |/ | | | | |/|
| | * | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6Davi Arnaut2011-07-071-1/+3
| | * | | | Merge from mysql-5.5.14-releasehery.ramilison@oracle.com2011-07-061-5/+5
| | |\ \ \ \
| | | * \ \ \ merged mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-06-061-3/+2
| | | |\ \ \ \
| | | * \ \ \ \ weave merge of mysql-5.5->mysql-5.5-securityGeorgi Kodinov2011-05-101-6/+5
| | | |\ \ \ \ \
| | | * \ \ \ \ \ merge mysql-5.1-security->mysql-5.5-securityGeorgi Kodinov2011-05-041-5/+5
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | | * | | | | Merged 5.0-security->5.1-securityGeorgi Kodinov2011-05-041-9/+9
| | | | |\ \ \ \ \
| | | | | * | | | | Bug #11764517: 57359: POSSIBLE TO CIRCUMVENT SECURE_FILE_PRIV Georgi Kodinov2011-04-281-24/+24
| | * | | | | | | | Updated/added copyright headersKent Boortz2011-07-041-1/+2
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|/ / / | | | |/| | | | | |
| | * | | | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| | |\ \ \ \ \ \ \ \ | | | |/ / / / / / / | | |/| | | | | / / | | | | |_|_|_|/ / | | | |/| | | | |
| | | * | | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | | | * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | | | |/ / / | | | | |/| | |
| | * | | | | | auto-mergeTatjana Azundris Nuernberg2011-05-121-6/+5
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | | * | | | | merge from 5.1Guilhem Bichot2011-04-261-5/+4
| | | |\ \ \ \ \ | | | | | |_|_|/ | | | | |/| | |
| | | | * | | | Fix for Bug#11765141 - "58072: LOAD DATA INFILE: LEAKS IO CACHE MEMORY WHEN E...Guilhem Bichot2011-04-071-5/+4
| | | * | | | | 5.1 -> 5.5 mergeSergey Glukhov2011-04-151-1/+1
| | | |\ \ \ \ \ | | | | |/ / / / | | | | | | | / | | | | |_|_|/ | | | |/| | |
| | | | * | | Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS ...Sergey Glukhov2011-04-151-1/+1
| | | | |/ /
| | | | * | mergeGeorgi Kodinov2010-12-171-0/+7
| | | | |\ \
| | * | | \ \ auto-mergeTatjana Azundris Nuernberg2011-05-121-3/+2
| | |\ \ \ \ \ | | | |/ / / / | | |/| | | |
View Lorry Controller Status