summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* Bug #45225 Locking: hang if drop table with no timeoutJon Olav Hauglid2010-02-111-2/+10
* Merge next-mr -> next-4284.Konstantin Osipov2010-02-061-0/+3
|\
| * Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+3
| |\
| | * Merge backport of WL#3771 with mysql-next-mr.Sergey Vojtovich2010-01-191-0/+3
| | |\
| | | * Backport from 6.0-codebase.Sergey Vojtovich2009-12-151-0/+3
* | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-051-43/+51
|\ \ \ \ | |/ / /
| * | | merge mysql-next-mr --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-141-9/+9
| |\ \ \ | | |/ /
| * | | Manual merge from next-mr.unknown2010-01-121-3/+3
| |\ \ \
| * \ \ \ merge mysql-5.1-rep+2-delivery1 --> mysql-5.1-rpl-mergeAlfranio Correia2010-01-071-43/+51
| |\ \ \ \
| | * \ \ \ merge mysql-5.1-rep+3 --> mysql-5.1-rep+2-delivery1Alfranio Correia2009-12-171-45/+47
| | |\ \ \ \
| | | * \ \ \ mergin 5.1 -> rep+2 -> rep+3. create_table_from_dump issue will be merged on ...Andrei Elkin2009-11-301-8/+9
| | | |\ \ \ \
| | | * \ \ \ \ merging 5.1 main -> 5.1-rep+2 -> 5.1-rep+3; binlog_unsafe , rpl_mysql_upgrade...Andrei Elkin2009-11-101-39/+48
| | | |\ \ \ \ \
| | | * | | | | | WL#2687 WL#5072 BUG#40278 BUG#47175Alfranio Correia2009-11-031-14/+23
| | | * | | | | | merged fixes for BUG#39934 to 5.1-rpl+3Sven Sandberg2009-09-301-31/+24
| | | |\ \ \ \ \ \
| | | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-221-1/+1
| | | | * | | | | | Merged fix for BUG#39934 up a few revisions.Sven Sandberg2009-07-141-28/+21
| | | | |\ \ \ \ \ \
| | | | | * | | | | | BUG#39934: Slave stops for engine that only support row-based loggingSven Sandberg2009-07-141-28/+21
* | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-041-20/+31
* | | | | | | | | | | Merge next-mr -> next-4284-merge.Konstantin Osipov2010-02-041-9/+9
|\ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ / | |/| | | | | | | | |
| * | | | | | | | | | WL#2360 Performance schemaMarc Alff2010-01-111-9/+9
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-031-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-3/+3
| |/ / / / / / / /
* | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-1/+10
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | Manual merge from mysql-next-mr.Alexander Nozdrin2009-12-171-87/+90
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-171-1/+10
| |\ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ Automerge from mysql-5.1-bugteam to mysql-trunk-merge.Alexey Kopytov2009-12-171-1/+10
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Auto-merge.Ramil Kalimullin2009-12-171-1/+10
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Fix for bug#49465: valgrind warnings and incorrect live checksum...Ramil Kalimullin2009-12-171-1/+10
* | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2010-02-021-87/+106
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|/ / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge mysql-next-mr (revno 2942) --> mysql-next-mr-marcMarc Alff2009-12-161-0/+16
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-12-121-0/+16
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | | | | | | | | | | / | | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | |
| | | * | | | | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-35/+61
| | | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Manual merge from the mysql-5.1-bugteam.Alexey Kopytov2009-11-241-0/+16
| | | |\ \ \ \ \ \ \ \ \ | | | | | |/ / / / / / / | | | | |/| | | | | | |
| | | | * | | | | | | | Bug #47682 strange behaviour of INSERT DELAYEDJon Olav Hauglid2009-11-181-0/+16
| | | | | |_|_|_|_|_|/ | | | | |/| | | | | |
| * | | | | | | | | | Merge mysql-next-mr (revno 2936) --> mysql-next-mr-marcMarc Alff2009-12-111-20/+48
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Auto-merge from mysql-next-mr-bugfixing.Alexander Nozdrin2009-12-101-20/+31
| | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ Manual merge/pull from mysql-next-mr.Alexander Nozdrin2009-11-251-202/+203
| | | |\ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ Auto mergeHe Zhenxing2009-11-211-15/+5
| | | |\ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ Merge with next-mrKonstantin Osipov2009-11-201-9/+5
| | | | |\ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | Bug#32115: Bad use of Name_resolution_context from current LEX in partitioningMattias Jonsson2009-11-201-6/+0
| | | | | |_|_|_|/ / / / / / | | | | |/| | | | | | | | |
| | | * | | | | | | | | | | BUG#37148 Most callers of mysql_bin_log.write ignore the return resultHe Zhenxing2009-11-211-20/+31
| | | |/ / / / / / / / / /
| * | | | | | | | | | | | WL#2360 Performance schemaMarc Alff2009-12-091-87/+90
| | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Implementation of simple deadlock detection for metadata locks.Dmitry Lenev2009-12-301-1/+1
* | | | | | | | | | | | A prerequisite patch for the fix for Bug#46224Konstantin Osipov2009-12-221-2/+1
* | | | | | | | | | | | Bug #48724 Deadlock between INSERT DELAYED and FLUSH TABLESJon Olav Hauglid2009-12-171-21/+23
* | | | | | | | | | | | Merge next-mr -> next-4284.Konstantin Osipov2009-12-151-0/+17
|\ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| * | | | | | | | | | | Merge mysql-next-mr to mysql-next-mr-svoj.Sergey Vojtovich2009-12-091-0/+17
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / | |/| | | | | | | | | |
| | * | | | | | | | | | WL#4454 change sql_insert.cc::last_uniq_key to match keys in any orderV Narayanan2009-12-031-0/+17
| | | |/ / / / / / / / | | |/| | | | | | | |
* | | | | | | | | | | Backport of revno: 2617.68.37Jon Olav Hauglid2009-12-101-1/+1
* | | | | | | | | | | Backport of revno: 2617.71.1Jon Olav Hauglid2009-12-101-44/+35