summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge xiphis.org:/usr/home/antony/work2/p2-bug10109.3acurtis@xiphis.org2005-08-101-6/+25
|\
| * Bug#10109acurtis@xiphis.org2005-08-071-11/+25
* | Fix crash in 'INSERT DELAYED' statement that failed due to ajimw@mysql.com2005-08-011-1/+3
* | Get rid of checking for ETIME return value of pthread_cond_timedwait.konstantin@mysql.com2005-07-141-1/+1
* | Mergekent@mysql.com2005-07-131-1/+1
|\ \
| * | sql_insert.cc:kent@mysql.com2005-07-081-1/+1
* | | sql_insert.cc:reggie@linux.site2005-07-111-1/+1
* | | Fix typos that crept into ChangeSet for fix for Bug #11045.jimw@mysql.com2005-07-061-1/+1
* | | Merge jwinstead@production.mysql.com:my/mysql-5.0-11045jimw@mysql.com2005-07-061-1/+1
|\ \ \ | |/ / |/| |
| * | Clean up warnings and build problems on Windows. (Bug #11045)jimw@mysql.com2005-06-181-1/+1
* | | After merge fixesmonty@mysql.com2005-07-041-29/+22
* | | Merge with 4.1monty@mysql.com2005-07-031-25/+60
|\ \ \ | | |/ | |/|
| * | Move reset of insert_values to ensure it's done also during error conditionsmonty@mysql.com2005-06-281-0/+4
| * | Better bug fix for:monty@mishka.local2005-06-271-9/+25
* | | Name resolution context added (BUG#6443)bell@sanja.is.com.ua2005-07-011-56/+118
* | | Fix for bug #10886 mergeevgen@moonbone.local2005-06-221-1/+4
|\ \ \ | |/ /
| * | Merge epotemkin@bk-internal.mysql.com:/home/bk/mysql-4.1evgen@moonbone.local2005-06-211-4/+15
| |\ \
| | * | Fix bug #10886 - INSERT ... SELECT ... ON DUPLICATE KEY UPDATE produces bad r...evgen@moonbone.local2005-06-211-4/+15
* | | | Merge svojtovich@bk-internal.mysql.com:/home/bk/mysql-5.0svoj@mysql.com2005-06-221-2/+2
|\ \ \ \
| * | | | WL#2286 - Compile MySQL w/YASSL supportsvoj@mysql.com2005-06-221-2/+2
* | | | | Manual merge of patch for bug#11060 "Server crashes on calling storeddlenev@mysql.com2005-06-201-4/+16
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Fix for bug #11060 "Server crashes on re-execution of prepared dlenev@brandersnatch.localdomain2005-06-201-1/+12
| |/ /
* | | WL#2286 - Compile MySQL w/YASSL supportsvoj@mysql.com2005-06-191-2/+2
| |/ |/|
* | Merge with 4.1monty@mysql.com2005-06-071-4/+4
|\ \ | |/
| * Move USE_PRAGMA_IMPLEMENTATION to proper placemonty@mysql.com2005-06-031-4/+4
* | Ensure that we reset auto-increment cache if we have to do an UPDATE becasue ...monty@mysql.com2005-06-061-0/+12
* | mergemonty@mysql.com2005-06-051-1/+2
|\ \
| * | Code cleanups during code reviewsmonty@mysql.com2005-06-011-1/+2
* | | Merge of 4.1->5.0. This contained the fixes for GCC 4.0brian@zim.(none)2005-06-011-1/+1
|\ \ \ | | |/ | |/|
| * | Mergebrian@zim.(none)2005-06-011-1/+1
| |\ \
| | * | Mainly cleanups for gcc 4.0. Some small pieces from looking at -Wall. Removed...brian@zim.(none)2005-06-011-1/+1
* | | | Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statem...ingo@mysql.com2005-06-011-6/+18
|\ \ \ \ | |/ / / | | | / | |_|/ |/| |
| * | Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statem...ingo@mysql.com2005-05-311-6/+18
| |\ \ | | |/ | |/|
| | * Bug#10224 - ANALYZE TABLE crashing with simultaneous CREATE ... SELECT statem...ingo@mysql.com2005-05-311-6/+18
| | * Bug#7823 - FLUSH TABLES WITH READ LOCK + INSERT DELAYED = deadlockingo@mysql.com2005-04-271-20/+55
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0konstantin@mysql.com2005-05-301-1/+1
|\ \ \
| * | | Preparatory (and the most problematic) patch for Bug#7306konstantin@mysql.com2005-05-301-1/+1
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-05-251-3/+4
|\ \ \ \ | |/ / / |/| | |
| * | | Cleanup's during reviewmonty@mysql.com2005-05-251-3/+4
* | | | Manual merge of patch fixing several trigger related bugs with main tree.dlenev@mysql.com2005-05-241-40/+123
|\ \ \ \ | |/ / / |/| | |
| * | | Fix for bugs:dlenev@brandersnatch.localdomain2005-05-241-40/+123
* | | | Fixes to merge from 4.1jimw@mysql.com2005-05-181-1/+1
* | | | Resolve merge from 4.1jimw@mysql.com2005-05-181-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#10400 - Improperly-defined MERGE table crashes with INSERT ... ON DUPLICA...ingo@mysql.com2005-05-181-1/+1
* | | | Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0ramil@mysql.com2005-05-181-1/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | a fix (bug #6267: ENUM ... NOT NULL w/o default treated differently than othe...ramil@ram-book.(none)2005-05-131-1/+2
* | | | Manual mergeigor@rurik.mysql.com2005-05-101-6/+2
|\ \ \ \ | |/ / / |/| | |
| * | | Many files:igor@rurik.mysql.com2005-05-101-6/+2
* | | | Mergeantony@ltantony.mysql.com2005-05-071-0/+4
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#9725 - "disapearing query/hang" and "unknown error" with "on duplicate ke...antony@ltantony.mysql.com2005-05-071-0/+4