summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* 5.3->5.5 mergeSergei Golubchik2011-11-221-14/+14
|\
| * Automatic mergeMichael Widenius2011-09-261-17/+16
| |\
| | * Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-17/+16
| * | fix typo: binlog_annotate_rows_events -> binlog_annotate_row_eventsSergei Golubchik2011-09-231-1/+1
| |/
| * Merge with 5.2Michael Widenius2011-09-101-8/+9
| |\
| | * Fixed that automatic killing of delayed insert thread (in flush, alter table ...Michael Widenius2011-09-091-8/+9
* | | mergeSergei Golubchik2011-11-031-1/+1
|\ \ \
| * | | compilation warnings on WindowsSergei Golubchik2011-11-021-1/+1
* | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-9/+6
|\ \ \ \ | |/ / / |/| | |
| * | | backport from mysql-trunkGleb Shchepa2011-08-031-5/+0
| * | | 5.1 -> 5.5 mergeSergey Glukhov2011-08-021-2/+2
| |\ \ \
| | * | | Bug#11766594 59736: SELECT DISTINCT.. INCORRECT RESULT WITH DETERMINISTIC FUN...Sergey Glukhov2011-08-021-2/+2
| | * | | Updated/added copyright headersKent Boortz2011-07-031-2/+1
| | |\ \ \
| | * \ \ \ Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
| * | | | | | Updated/added copyright headersKent Boortz2011-07-041-2/+4
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-38/+110
|\ \ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| * | | | | | Fixed LP bug #825035.Igor Babaev2011-08-161-0/+1
| * | | | | | Fixed LP bug #794901.Igor Babaev2011-07-161-1/+1
| * | | | | | Merged the code of mwl 106 into the latest 5.3 with mwl 90 pushed.Igor Babaev2011-06-041-18/+70
| |\ \ \ \ \ \
| | * \ \ \ \ \ MergeIgor Babaev2011-05-201-18/+70
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merged the code of MWL#106 into 5.3Igor Babaev2011-05-161-18/+70
| | | |\ \ \ \ \ \
| | | | * \ \ \ \ \ Merge of the mwl106 tree into the latest 5.3 tree.Igor Babaev2010-09-231-18/+70
| | | | |\ \ \ \ \ \
| | | | | * | | | | | MWL#106: Backport optimizations for derived tables and views.Igor Babaev2010-05-261-18/+70
| * | | | | | | | | | Merge with 5.1-microsecondsMichael Widenius2011-05-281-7/+9
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | |
| | * | | | | | | | | db_low_byte_first is goneSergei Golubchik2011-05-201-3/+0
| | * | | | | | | | | wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-4/+9
| * | | | | | | | | | Merge with MariaDB 5.2Michael Widenius2011-05-101-2/+2
| |\ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / | |/| | | | | | | | / | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Merge with MariaDB 5.1Michael Widenius2011-05-031-1/+1
| | |\ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ Merge with MySQL 5.1.57/58Michael Widenius2011-05-021-1/+1
| | | |\ \ \ \ \ \ \ \ | | | | | |_|_|_|/ / / | | | | |/| | | | | |
| | * | | | | | | | | Merge Mariadb 5.1->5.2unknown2011-04-121-1/+1
| | |\ \ \ \ \ \ \ \ \ | | | |/ / / / / / / /
| | | * | | | | | | | Bug fix for lp:732124 union + limit returns wrong resultMichael Widenius2011-03-091-1/+1
| * | | | | | | | | | Merge various replication-related patches into MariaDB 5.3:unknown2011-04-081-0/+5
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge MariaDB 5.2.5 release into MariaDB-5.2-rpl.unknown2011-04-011-6/+8
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge with alias as StringMichael Widenius2011-02-281-6/+8
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Change TABLE->alias to String for less memory reallocationMichael Widenius2011-02-281-6/+8
| | * | | | | | | | | | | Merge Percona patch MWL#47 into mariadb 5.2-percona.unknown2011-01-101-0/+5
| | |/ / / / / / / / / /
| * | | | | | | | | | | Merge with 5.1-release.Michael Widenius2010-12-061-3/+1
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | merge with 5.1Michael Widenius2010-11-301-3/+1
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / | | |/| / / / / / / / / | | | |/ / / / / / / /
| | | * | | | | | | | Merge with MySQL 5.1.53Michael Widenius2010-11-251-3/+1
| | | |\ \ \ \ \ \ \ \ | | | | | |/ / / / / / | | | | |/| | | | | |
| * | | | | | | | | | Added TRASH() to table->record[0] to find out if we access not initialzed data.Michael Widenius2010-11-271-3/+7
| * | | | | | | | | | Code cleanup to get fewer reallocs() during execution.Michael Widenius2010-11-241-6/+8
| |/ / / / / / / / /
* | | | | | | | | | 5.5-mergeSergei Golubchik2011-07-021-128/+150
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / / | |/| | | | | | | |
| * | | | | | | | | Merge from 5.1.Guilhem Bichot2011-05-211-4/+3
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| | * | | | | | | | Fix for BUG#11755168 '46895: test "outfile_loaddata" fails (reproducible)'.Guilhem Bichot2011-05-161-4/+3
| | | |_|_|/ / / / | | |/| | | | | |
| * | | | | | | | merge mysql-5.1 --> mysql-5.5Alfranio Correia2011-01-311-1/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / /
| | * | | | | | | BUG#59338 Inconsistency in binlog for statements that don't change any rows S...Alfranio Correia2011-01-281-1/+1
| | | |_|/ / / / | | |/| | | | |
| | * | | | | | Bug#56423: Different count with SELECT and CREATE SELECT queriesMartin Hansson2010-10-071-3/+1
| * | | | | | | Bug #57666 Unclear warning with broken text in error log on INSERT DELAYEDunknown2010-11-291-62/+16
| * | | | | | | Merge from mysql-5.5-runtime to mysql-5.5-bugteamJon Olav Hauglid2010-11-181-38/+47
| |\ \ \ \ \ \ \