summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Moving LP BUG#794005 to 5.3 + fixing INSERT of multi-table view.unknown2012-02-031-1/+1
* 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
| | | | |\
| | | | * \ 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-031-7/+6
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | | |\ \ \ \ | | | | |_|/ / | | | |/| | |
| | | | * | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| | | | | |/ | | | | |/|
* | | | | | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-5/+5
* | | | | | 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
| | |\ \ \ \ \ \ | | | | |_|_|_|/ | | | |/| | | |
| | | * | | | | Fix for Bug#11765141 - "58072: LOAD DATA INFILE: LEAKS IO CACHE MEMORY WHEN E...Guilhem Bichot2011-04-071-5/+4
| | | * | | | | Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS ...Sergey Glukhov2011-04-151-1/+1
| | | | |_|/ / | | | |/| | |
* | | | | | | 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
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MySQL 5.1.55Michael Widenius2011-02-201-42/+50
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | mergeGeorgi Kodinov2010-12-171-0/+7
| | | |\ \ \ \
| | | | * | | | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-301-0/+7
| | | * | | | | Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses o...Kristofer Pettersson2010-12-161-42/+43
| | | |/ / / /
| * | | | | | Merge with alias as StringMichael Widenius2011-02-281-5/+10
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-5/+10
* | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-1/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge with MySQL 5.1.52Michael Widenius2010-11-231-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | | Bug #56709: Memory leaks at running the 5.1 test suiteAlexey Kopytov2010-09-221-7/+5
* | | | | | Added TRASH() to table->record[0] to find out if we access not initialzed data.Michael Widenius2010-11-271-1/+1
* | | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-5/+10
|/ / / / /
* | | | | 5.1.51 mergeSergei Golubchik2010-10-191-0/+8
|\ \ \ \ \ | |/ / / /
| * | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-08-031-0/+8
| * | | | Revert patch for BUG#34283. Causing lots of test failures in PB2,Luis Soares2010-07-301-8/+0
| * | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-07-301-0/+8
* | | | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-25/+39
|\ \ \ \ \ | |/ / / /
| * | | | Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-7/+6
| * | | | Bug #51876: crash/memory underrun when loading data with ucs2Georgi Kodinov2010-07-141-23/+33
* | | | | Fixed warnings and build failures after last pushMichael Widenius2010-08-021-3/+3
* | | | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+4
|\ \ \ \ \ | |/ / / /
| * | | | MergeGeorgi Kodinov2010-06-091-0/+4
| |\ \ \ \
| | * | | | Bug #52512: Assertion `! is_set()' in Diagnostics_area::set_ok_status Georgi Kodinov2010-04-071-0/+4
| * | | | | Bug#53189 Table map version unused and can be removedHe Zhenxing2010-05-081-2/+0
* | | | | | restore the unintentinally broken ABISergei Golubchik2010-07-231-1/+1
| |_|/ / / |/| | | |