summaryrefslogtreecommitdiff
path: root/sql/sql_load.cc
Commit message (Expand)AuthorAgeFilesLines
* Bug#34043: Server loops excessively in _checkchunk() when safemalloc is enabledDavi Arnaut2010-07-081-2/+2
* 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
| | |_|/ | |/| |
* | | | Committing on behalf or Dmitry Lenev:Konstantin Osipov2010-04-281-2/+8
|/ / /
* | | WL#5030: Split and remove mysql_priv.hMats Kindahl2010-03-311-1/+14
|/ /
* | Followup to Bug#45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-241-1/+1
* | Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+6
|\ \
| * \ 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 next-mr -> next-4284.Konstantin Osipov2010-02-051-3/+3
|\ \ \ \ | |/ / /
| * | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-131-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
* | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-14/+18
* | | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2010-02-031-6/+7
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ / | |/| | | | | | | |
| * | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-061-6/+7
| |/ / / / / / / /
* | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-7/+11
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | 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
| |\ \ \ \ \ \ \ \
| * | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-14/+18
| | |_|/ / / / / / | |/| | | | | | |
* | | | | | | | | Merge next-mr -> next-4284Konstantin Osipov2009-12-031-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
| | |\ \ \ \ \ \ | | | |/ / / / /
View Lorry Controller Status