summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* WL#2360 Performance schemaMarc Alff2010-01-061-6/+7
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-7/+11
|\
| * Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-20/+548
| |\
| * | Bug #43913 rpl_cross_version can't pass on conflicts complainig clash with ...unknown2009-11-281-6/+11
* | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-021-0/+1
|\ \ \
| * \ \ Manual resolving for the following filesAndrei Elkin2009-12-011-0/+1
| |\ \ \ | | |_|/ | |/| |
| | * | merging from 5.1 to rep+2 starting at gca(5.1, next-mr) == build@mysql.com-20...Andrei Elkin2009-11-301-10/+29
| | |\ \ | | | |/
| | * | manual merge: mysql-5.1-rep+2 (bug tree) --> mysql-5.1-rep+2 (latest)Luis Soares2009-11-131-0/+1
| | |\ \
| | | * | BUG#48048: Deprecated constructs need removal in BetonyLuis Soares2009-11-041-0/+1
* | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-14/+18
|/ / / /
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-5/+25
|\ \ \ \ | | |_|/ | |/| |
| * | | BUG#48297: Schema name is ignored when LOAD DATA is written into Luis Soares2009-10-271-5/+25
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-051-5/+4
|\ \ \ \ | |/ / /
| * | | Bug #40877: multi statement execution fails in 5.1.30Georgi Kodinov2009-10-161-5/+4
| |/ /
* | | Merging mysql-next-mr-merge to mysql-next-mr.Alexander Barkov2009-10-211-2/+525
|\ \ \
| * | | WL#1397 convert XML -> SQLAlexander Barkov2009-10-121-2/+525
* | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-10-141-13/+101
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Bug#43746: YACC return wrong query string when parse 'load data infile' sql s...Tatiana A. Nurnberg2009-09-281-13/+101
| |/
* | WL#2110 (SIGNAL)Marc Alff2009-09-101-18/+23
|/
* 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
* | auto-mergeIgnacio Galarza2009-03-171-3/+26
|\ \
| * | BUG#38174 secure-file-priv breaks LOAD DATA INFILE replication in statement modeAlfranio Correia2009-02-211-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
* | 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 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
* | 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
| * | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.0-rplunknown2007-05-281-3/+3
| |\ \
| | * | BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not f...unknown2007-05-071-3/+3
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-06-011-20/+20
|\ \ \ \
| * \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-20/+20
| |\ \ \ \