summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * | | | WL#3817: Simplify string / memory area types and make things more consistent ...unknown2007-05-101-20/+20
* | | | | | Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rplunknown2007-05-281-3/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | BUG#17233 : LOAD DATA INFILE: failure causes mysqld dbug_assert, binlog not f...unknown2007-05-081-3/+3
| |/ / / /
* | | | | Merge olga.mysql.com:/home/igor/mysql-5.0-optunknown2007-05-081-0/+4
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Bug#27670: LOAD DATA does not set CURRENT_TIMESTAMP default value for aunknown2007-05-091-0/+4
| |/ /
| * | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.0unknown2007-04-121-8/+9
| |\ \
| * \ \ Merge bk-internal.mysql.com:/data0/bk/mysql-5.0unknown2007-04-031-8/+8
| |\ \ \
* | \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-04-101-8/+8
|\ \ \ \ \
| * \ \ \ \ Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-marvelunknown2007-04-031-8/+8
| |\ \ \ \ \
| | * \ \ \ \ Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0-marvelunknown2007-03-291-8/+8
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | Bug #27395 OPTION_STATUS_NO_TRANS_UPDATE is not preserved at the end of SF()unknown2007-03-231-8/+8
* | | | | | | Merge mysql.com:/d2/hf/mrg/mysql-5.0-optunknown2007-04-091-7/+8
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-5.0-optunknown2007-04-071-7/+8
| |\ \ \ \ \ \
| | * | | | | | Bug#27586: Wrong autoinc value assigned by LOAD DATA in theunknown2007-04-071-7/+8
| | | |_|_|/ / | | |/| | | |
| * | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.0unknown2007-04-051-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Bug #26242 UPDATE with subquery and triggers failing with cluster tablesunknown2007-04-041-1/+1
* | | | | | | Merge mysql.com:/windows/Linux_space/MySQL/mysql-5.1unknown2007-04-041-1/+1
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | |
| * | | | | | Merge from 5.0unknown2007-04-041-1/+1
* | | | | | | Merge moonbone.local:/mnt/gentoo64/work/bk-trees/mysql-5.0-optunknown2007-03-311-2/+1
|\ \ \ \ \ \ \ | | |/ / / / / | |/| | / / / | |_|_|/ / / |/| | | | |
| * | | | | Bug#23233: 0 as LAST_INSERT_ID() after INSERT .. ON DUPLICATE in the unknown2007-03-301-2/+1
| | |_|/ / | |/| | |
| * | | | Merge bk@192.168.21.1:mysql-5.0unknown2007-03-081-1/+1
| |\ \ \ \
| * \ \ \ \ Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0unknown2007-03-011-3/+9
| |\ \ \ \ \
* | \ \ \ \ \ Merge bk@192.168.21.1:mysql-5.1unknown2007-03-081-1/+1
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge mysql.com:/home/hf/work/mrg/mysql-5.0-optunknown2007-03-081-1/+1
| |\ \ \ \ \ \ \ | | | |_|/ / / / | | |/| | / / / | | |_|_|/ / / | |/| | | | |