summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| | | | |\
| | | | | * weave merge of mysql-5.1->mysql-5.1-securityGeorgi Kodinov2011-05-101-6/+5
| | | | | |\
| | | | * | \ Updated/added copyright headersKent Boortz2011-07-031-7/+6
| | | | |\ \ \ | | | | | | |/ | | | | | |/|
* | | | | | | 5.3->5.5 mergeSergei Golubchik2011-11-221-6/+6
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-5/+5
* | | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-8/+11
|\ \ \ \ \ \ \
| * | | | | | | Bug#12727287: Maintainer mode compilation fails with gcc 4.6Davi Arnaut2011-07-071-1/+3
| * | | | | | | Merge from mysql-5.5.14-releaseunknown2011-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
| | | | |/ / / / / / | | | |/| | | | | |
* | | | | | | | | | merge with 5.3Sergei Golubchik2011-10-191-12/+60
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | | | |
| * | | | | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-3/+43
| * | | | | | | | | MergeIgor Babaev2011-05-201-2/+5
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-2/+5
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-2/+5
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-2/+5
| * | | | | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-11/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / | |/| | | | | | | | / / / | | | |_|_|_|_|_|_|/ / / | | |/| | | | | | | | |
| | * | | | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-11/+6
| | |\ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / | | | |/| | | | | | | |
| | | * | | | | | | | | Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-11/+6
| | | |\ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|/ | | | | |/| | | | | | |
| * | | | | | | | | | | Merge with 5.2Michael Widenius2011-03-091-42/+50
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Merge with 5.1 to get in changes from MySQL 5.1.55Michael Widenius2011-02-281-42/+50
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
View Lorry Controller Status