summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Manual merge from mysql-trunk-merge.Alexander Nozdrin2010-01-191-0/+6
|\
| * Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-01-151-0/+6
| |\
| | * BUG#49479: Slave stops with syntax error: LOAD DATA event without Luis Soares2009-12-061-0/+6
* | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-6/+7
|\ \ \
| * | | WL#2360 Performance schemaMarc Alff2010-01-061-6/+7
* | | | merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-3/+3
|\ \ \ \ | |/ / / |/| | |
| * | | merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-3/+3
| |\ \ \ | | |_|/ | |/| |
| | * | mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-10/+30
| | |\ \
| | * \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-13/+101
| | |\ \ \
| | * | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-2/+2
| | * | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-1/+1
| | |\ \ \ \
| | | * \ \ \ Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-1/+1
| | | |\ \ \ \
| | | | * | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-1/+1
* | | | | | | | 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 ...2009-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-btanozdrin/alik@quad.opbmk2008-03-281-14/+42
|\ \ | |/
| * Fix for Bug#35469: server crash with LOAD DATA INFILE to a VIEW.anozdrin/alik@quad.opbmk2008-03-281-14/+42
* | Merge magare.gmz:/home/kgeorge/mysql/autopush/B26461-5.0-optgkodinov/kgeorge@magare.gmz2008-03-211-1/+1
|\ \ | |/
| * Bug #26461: Intrinsic data type bool (1 byte) redefined to BOOL (4 bytes)gkodinov/kgeorge@macbook.gmz2008-03-211-1/+1
* | Rename send_ok to my_ok. Similarly to my_error, it only records the status,kostja@dipika.(none)2008-02-191-1/+1
* | A fix and a test case for Bug#12713 "Error in a stored function called from kostja@dipika.(none)2008-02-191-10/+0
* | Manual merge 5.0-rpl -> 5.1-rpl.aelkin/elkin@koti.dsl.inet.fi2007-10-301-44/+5
* | Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug27571_asyn_killed_...aelkin/elkin@koti.dsl.inet.fi2007-10-301-3/+55
|\ \ | |/
View Lorry Controller Status