summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* auto-mergeTatjana Azundris Nuernberg2011-05-121-6/+5
|\
| * merge from 5.1Guilhem Bichot2011-04-261-5/+4
| |\
| | * Fix for Bug#11765141 - "58072: LOAD DATA INFILE: LEAKS IO CACHE MEMORY WHEN E...Guilhem Bichot2011-04-071-5/+4
| * | 5.1 -> 5.5 mergeSergey Glukhov2011-04-151-1/+1
| |\ \ | | |/
| | * Bug#11765139 58069: LOAD DATA INFILE: VALGRIND REPORTS INVALID MEMORY READS ...Sergey Glukhov2011-04-151-1/+1
| | * mergeGeorgi Kodinov2010-12-171-0/+7
| | |\
* | | \ auto-mergeTatjana Azundris Nuernberg2011-05-121-3/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Bug#11902767/Bug#60580: Statement improperly replicated crashes slave SQL threadTatjana Azundris Nuernberg2011-05-121-3/+2
* | | | bug#59085 recommitMattias Jonsson2011-02-101-4/+3
* | | | BUG#59267 LOAD DATA LOCAL INFILE not executed on slave with SBRAlfranio Correia2011-01-121-1/+3
* | | | mergeGeorgi Kodinov2010-12-171-0/+7
|\ \ \ \ | |/ / /
| * | | BUG#46166Luis Soares2010-12-071-0/+7
| |\ \ \ | | | |/ | | |/|
| | * | BUG#46166: MYSQL_BIN_LOG::new_file_impl is not propagating error Luis Soares2010-11-301-0/+7
* | | | merge 5.1-security => 5.5-securityKristofer Pettersson2010-12-161-42/+41
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | Bug58747 57359 patch: breaks secure_file_priv+not secure yet+still accesses o...Kristofer Pettersson2010-12-161-42/+43
| |/
* | Manual merge from mysql-5.1-bugteam into mysql-5.5-bugteam.Alexey Kopytov2010-10-021-6/+5
|\ \ | |/
| * Bug #56709: Memory leaks at running the 5.1 test suiteAlexey Kopytov2010-09-221-7/+5
* | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...2010-08-031-0/+8
|\ \ | |/
| * Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...2010-08-031-0/+8
* | Manual merge from mysql-5.1-bugteam into mysql-trunk-merge.Luis Soares2010-07-301-8/+0
|\ \ | |/
| * 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...2010-07-301-0/+8
|\ \ | |/
| * Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...2010-07-301-0/+8
* | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-8/+7
|\ \ | |/
| * Bug#45288: pb2 returns a lot of compilation warnings on linuxDavi Arnaut2010-07-201-7/+6
* | Merge of mysql-trunk-bugfixing into mysql-trunk-merge.Davi Arnaut2010-07-151-3/+3
|\ \
| * | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-1/+1
| * | Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* | | mergeGeorgi Kodinov2010-07-141-23/+33
|\ \ \ | |/ / |/| / | |/
| * Bug #51876: crash/memory underrun when loading data with ucs2Georgi Kodinov2010-07-141-23/+33
* | mergeGeorgi Kodinov2010-06-091-0/+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 #49829 Many "hides virtual function" warnings with SunStudioTor Didriksen2010-05-311-3/+3
* | | Auto-merge from mysql-trunk.Alexander Nozdrin2010-05-281-16/+7
|\ \ \
| * \ \ Manual merge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-111-2/+0
| |\ \ \ | | |/ /
| | * | Bug#53189 Table map version unused and can be removedHe Zhenxing2010-05-081-2/+0
| * | | Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-05-071-7/+4
| |\ \ \ | | |/ /
| | * | Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-05-031-7/+4
| * | | Manual merge of local mysql-trunk-merge with bk-internal.Alexey Kopytov2010-05-071-1/+1
| |\ \ \
| | * \ \ Manual merge from mysql-trunk.Alexander Nozdrin2010-05-071-1/+1
| | |\ \ \
| * | \ \ \ Manual merge of mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2010-04-301-3/+1
| |\ \ \ \ \ | | |/ / / / | |/| | / / | | | |/ / | | |/| |
| | * | | AutomergeKristofer Pettersson2010-04-161-5/+3
| | |\ \ \ | | | | |/ | | | |/|
| | * | | Bug#50373 --secure-file-priv=""Kristofer Pettersson2010-04-161-3/+1
| * | | | Manual merge of mysql-5.1-bugteam toAlexey Kopytov2010-04-191-1/+14
| |\ \ \ \
| * \ \ \ \ Manual merge of mysql-5.1-bugteam into mysql-trunk-merge.Alexey Kopytov2010-04-021-5/+3
| |\ \ \ \ \ | | | |_|/ / | | |/| | |
| | * | | | Bug#51377 Crash in information_schema / processlist on concurrent DDL wo...Alexey Botchkov2010-03-091-5/+3
| | | |/ / | | |/| |
| | * | | Backport Bug#37148 to 5.1He Zhenxing2010-01-241-14/+18
* | | | | Merge trunk -> trunk-runtime.Konstantin Osipov2010-05-131-1/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Bug#51571 load xml infile causes server crashAlexander Barkov2010-05-051-1/+1
| | |_|/ | |/| |