summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.2' into 10.2-mdev9864Galina Shalygina2016-05-081-146/+164
* 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
* Merge remote-tracking branch 'origin/10.1' into 10.2Alexander Barkov2015-12-291-5/+12
|\
| * 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
* | MDEV-8715 - Obsolete sql_alloc() in favor of THD::alloc() and thd_alloc()Sergey Vojtovich2015-11-261-4/+4
* | cleanup: remove Field->stored_in_db, Create_field->stored_in_dbSergei Golubchik2015-11-241-1/+1
|/
* 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
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
| | | * | | | 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
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | |
| | | | * | | | Bug#11902767/Bug#60580: Statement improperly replicated crashes slave SQL threadTatjana Azundris Nuernberg2011-05-121-3/+2
| | | * | | | | bug#59085 recommitMattias Jonsson2011-02-101-4/+3
| | | * | | | | BUG#59267 LOAD DATA LOCAL INFILE not executed on slave with SBRAlfranio Correia2011-01-121-1/+3
| | | * | | | | mergeGeorgi Kodinov2010-12-171-0/+7
| | | |\ \ \ \ \ | | | | |/ / / /
| | | | * | | | BUG#46166Luis Soares2010-12-071-0/+7
| | | | |\ \ \ \ | | | | | | |/ / | | | | | |/| |
| | | | | * | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-301-0/+7
| | | * | | | | merge 5.1-security => 5.5-securityKristofer Pettersson2010-12-161-42/+41
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | / / | | | | | |/ / | | | | |/| |
| | | | * | | Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses o...Kristofer Pettersson2010-12-161-42/+43
| | | | |/ /
| | | * | | Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.Alexey Kopytov2010-10-021-6/+5
| | | |\ \ \ | | | | |/ /
| | | | * | Bug #56709: Memory leaks at running the 5.1 test suiteAlexey Kopytov2010-09-221-7/+5
View Lorry Controller Status