summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.5-mergeSergei Golubchik2011-07-021-53/+57
|\
| * 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
| |\ \ | | |/
* | | merge.Sergei Golubchik2010-11-251-7/+7
|\ \ \
| * \ \ 5.1.51 mergeSergei Golubchik2010-10-191-0/+8
| |\ \ \
| * \ \ \ Merge with MySQL 5.1.50Michael Widenius2010-08-271-25/+39
| |\ \ \ \
| * | | | | Fixed warnings and build failures after last pushMichael Widenius2010-08-021-3/+3
| * | | | | Merge with MySQL 5.1.49Michael Widenius2010-08-021-2/+4
| |\ \ \ \ \
| * | | | | | restore the unintentinally broken ABISergei Golubchik2010-07-231-1/+1
| * | | | | | Merge with MySQL 5.1.47Michael Widenius2010-05-261-9/+4
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge MySQL 5.1.46 into MariaDB.unknown2010-04-281-5/+3
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge MySQL 5.1.44 into MariaDB.unknown2010-03-041-14/+24
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Merge with MySQL 5.1.42Michael Widenius2010-01-151-6/+11
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge with MySQL 5.1, with following additions:unknown2009-11-161-14/+121
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge MySQL->MariaDBSergey Petrunya2009-09-081-5/+19
| |\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ 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
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / / | |/| | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | Fixed compiler warnings in a lot of filesunknown2008-02-131-5/+0
* | | | | | | | | | | | | | | | | mysql-5.1 -> mysql-5.5 mergeSergei Golubchik2010-11-051-6/+4
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | | | / | | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | 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...unknown2010-08-031-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-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...unknown2010-07-301-0/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | Bug #34283 mysqlbinlog leaves tmpfile after termination if binlog contains l...unknown2010-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
View Lorry Controller Status