summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-5/+3
|\
| * Bug#51377 Crash in information_schema / processlist on concurrent DDL wo...Alexey Botchkov2010-03-091-5/+3
* | Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-14/+24
|\ \ | |/
| * Backport Bug#37148 to 5.1He Zhenxing2010-01-241-14/+18
| * BUG#49479: Slave stops with syntax error: LOAD DATA event without Luis Soares2009-12-061-0/+6
* | Merge with MySQL 5.1.42Michael Widenius2010-01-151-6/+11
|\ \ | |/
| * Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with ...unknown2009-11-281-6/+11
* | Merge with MySQL 5.1, with following additions:unknown2009-11-161-14/+121
|\ \ | |/
| * BUG#48297: Schema name is ignored when LOAD DATA is written into Luis Soares2009-10-271-5/+25
| * Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-5/+4
| * Bug#43746: YACC return wrong query string when parse 'load data infile' sql s...Tatiana A. Nurnberg2009-09-281-13/+101
* | Merge MySQL->MariaDBSergey Petrunya2009-09-081-5/+19
|\ \ | |/
| * Bug# 30946: mysqldump silently ignores --default-character-setGleb Shchepa2009-07-311-0/+11
| *-. Merge from 5.0-bugteamStaale Smedseng2009-06-171-4/+4
| |\ \
| | | * Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-171-4/+4
| | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL Staale Smedseng2009-06-101-4/+4
| | |/
| * | BUG#41948 Query_log_event constructor needlessly contortedHe Zhenxing2009-05-301-5/+8
* | | Fixed problems in mergeMichael Widenius2009-05-191-1/+1
|\ \ \
| * | | We are now using Valgrind rather than purify, and have for quite some time.unknown2009-05-061-1/+1
* | | | Merged with mysql-5.1 tree.Michael Widenius2009-04-251-2/+2
|\ \ \ \ | | |/ / | |/| |
| * | | auto-mergeIgnacio Galarza2009-03-171-3/+26
| |\ \ \
| * \ \ \ Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-131-2/+2
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#29125 Windows Server X64: so many compiler warningsIgnacio Galarza2009-02-101-2/+2
* | | | | bzr merge from guilhem's maria tree to our local 5.1Michael Widenius2009-04-251-3/+26
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria exceptGuilhem Bichot2009-04-011-3/+26
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | BUG#38174 secure-file-priv breaks LOAD DATA INFILE replication in statement modeAlfranio Correia2009-02-211-3/+26
| | |/ /
* | | | Fixed compiler warnings found by gcc 4.3.2Michael Widenius2009-01-311-7/+7
|/ / /
* | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or...Guilhem Bichot2008-11-211-1/+3
|\ \ \ | |/ /
| * | auto-mergeTatiana A. Nurnberg2008-09-171-1/+3
| |\ \ | | |/
| | * Bug#37114: sql_mode NO_BACKSLASH_ESCAPES does not work properly with LOAD DAT...Tatiana A. Nurnberg2008-09-171-1/+3
* | | Merge bk-internal.mysql.com:/home/bk/mysql-mariaunknown2008-05-291-1/+1
|\ \ \
| * | | WL#3138: Maria - fast "SELECT COUNT(*) FROM t;" and "CHECKSUM TABLE t"unknown2008-05-291-1/+1
* | | | Merge mysql.com:/home/my/mysql-5.1unknown2008-04-281-26/+44
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge quad.opbmk:/mnt/raid/alik/MySQL/devel/5.0-btunknown2008-03-281-14/+42
| |\ \ | | |/
| | * Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW.unknown2008-03-281-14/+42
| * | Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optunknown2008-03-211-1/+1
| |\ \ | | |/
| | * Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)unknown2008-03-211-1/+1
| * | Rename send_ok to my_ok. Similarly to my_error, it only records the status,unknown2008-02-191-1/+1
| * | A fix and a test case for Bug#12713 "Error in a stored function called from unknown2008-02-191-10/+0
* | | Fixed compiler warnings in a lot of filesunknown2008-02-131-5/+0
|/ /
* | Manual merge 5.0-rpl -> 5.1-rpl.unknown2007-10-301-44/+5
* | Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_...unknown2007-10-301-3/+55
|\ \ | |/
| * Bug #27571 asynchronousity in setting mysql_`query`::error andunknown2007-10-291-6/+20
* | Merge dl145j.mysql.com:/tmp/andrei/mysql-5.0-rplunknown2007-09-151-1/+1
|\ \ | |/
| * Bug #23333 stored function + non-transac table + transac table = breaks stmt-...unknown2007-08-211-1/+1
* | (Pushing for Andrei)unknown2007-07-301-10/+6
|\ \ | |/
| * (pushing for Andrei)unknown2007-07-301-10/+6
* | Merge magare.gmz:/home/kgeorge/mysql/work/mysql-5.0-optunknown2007-07-041-0/+1
|\ \ | |/
| * Merge gleb.loc:/home/uchum/work/bk/4.1-optunknown2007-07-041-0/+1
| |\
| | * Fixed bug #29294.unknown2007-07-031-0/+1