summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.5 mergeSergei Golubchik2014-11-191-12/+12
|\
| * MDEV-3940 Server crash or assertion `item->type() == Item::STRING_ITEM' failu...Sergei Golubchik2014-11-181-12/+12
* | MDEV-6849 ON UPDATE CURRENT_TIMESTAMP doesn't always workSergei Golubchik2014-11-131-0/+1
* | MDEV-5120 Test suite test maria-no-logging failsMichael Widenius2014-09-301-0/+1
* | 5.5.38 mergeSergei Golubchik2014-06-061-24/+40
|\ \ | |/
| * mysql-5.5.38 mergeSergei Golubchik2014-06-031-24/+40
| |\
| | * 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
* | | MDEV-9095: Executing triggers on slave in row-based replicationunknown2014-03-191-2/+2
* | | MDEV-5314 - Compiling fails on OSX using clangSergey Vojtovich2014-02-191-4/+4
* | | Fixes for CREATE_OR_REPLACEMichael Widenius2014-01-311-1/+2
* | | Merge from 10.0-base to 10.0 the feature MDEV-4506: Parallel replication.unknown2013-11-011-3/+3
|\ \ \
| * \ \ Merge MDEV-4506: Parallel replication into 10.0-base.unknown2013-11-011-3/+3
| |\ \ \
| | * | | MDEV-4506: Parallel replication: Intermediate commitunknown2013-07-121-3/+3
* | | | | 10.0-base merge.Sergei Golubchik2013-09-211-1/+2
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 merge and fixes for compiler/test errorsSergei Golubchik2013-09-181-1/+2
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | mysql-5.5.33 mergeSergei Golubchik2013-09-061-1/+2
| | |\ \ \ | | | | |/ | | | |/|
| | | * | 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
* | | | | | 10.0-monty mergeSergei Golubchik2013-07-211-22/+22
|\ \ \ \ \ \
| * | | | | | Applied all changes from Igor and SanjaMichael Widenius2013-06-151-21/+21
| * | | | | | Temporary commit of 10.0-mergeMichael Widenius2013-03-261-1/+1
* | | | | | | 10.0-base mergeSergei Golubchik2013-07-181-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| / / / / / | |/ / / / /
| * | | | | 5.5 mergeSergei Golubchik2013-07-171-1/+1
| |\ \ \ \ \ | | |/ / / / | | | | | / | | |_|_|/ | |/| | |
| | * | | MDEV-4718 Test "outfile_loaddata" fails on bigendian arches (ppc64)Sergei Golubchik2013-07-011-1/+1
* | | | | 10.0-base mergeSergei Golubchik2013-01-311-5/+5
|\ \ \ \ \ | |/ / / /
| * | | | 5.5 mergeSergei Golubchik2013-01-291-2/+2
| |\ \ \ \ | | |/ / /
| | * | | small cleanupsSergei Golubchik2013-01-151-2/+2
| * | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-3/+3
* | | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-29/+33
|\ \ \ \ \ | |/ / / /
| * | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-4/+17
| * | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-29/+20
| |\ \ \ \
| | * | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-29/+20
| | |/ / /
* | | | | small code cleanup taken from MySQL 5.6Sergei Golubchik2012-12-161-4/+1
|/ / / /
* | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-031-3/+3
|/ / /
* | | Merge from 5.3unknown2012-08-241-56/+34
|\ \ \
| * \ \ merge from 5.2unknown2012-08-241-55/+32
| |\ \ \
| | * \ \ Merge from 5.1.unknown2012-08-241-55/+32
| | |\ \ \
| | | * | | MDEV-382: Incorrect quotingunknown2012-08-241-55/+34
* | | | | | 5.3.4 mergeSergei Golubchik2012-02-151-1/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-1/+1
* | | | | | 5.3 mergeSergei Golubchik2012-01-131-2/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Merge with 5.2.Michael Widenius2011-12-111-12/+14
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with 5.1Michael Widenius2011-11-301-1/+1
| | |\ \ \ \ | | | |/ / /
| | | * | | Fixed compiler warningsMichael Widenius2011-11-301-1/+1
| | * | | | Merge with MariaDB 5.1Michael Widenius2011-11-241-11/+13
| | |\ \ \ \ | | | |/ / /
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-11/+13
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-9/+9
| | | | |\ \