summaryrefslogtreecommitdiff
path: root/sql/sql_insert.cc
Commit message (Expand)AuthorAgeFilesLines
* Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0serg@serg.mylan2005-02-181-6/+5
|\
| * manually mergedserg@serg.mylan2005-02-141-6/+5
| |\
| | * query_id and my_xid -> ulonglongserg@serg.mylan2005-01-271-4/+3
| | * XA (not completely polished out yet)serg@serg.mylan2005-01-161-2/+2
* | | Bug#8147acurtis@pcgem.rdg.cyberkinetica.com2005-02-171-0/+4
|\ \ \ | |/ / |/| |
| * | Fix for failing INSERT IGNORE in test ndb_insertmskold@mysql.com2005-01-251-5/+5
* | | Review fixedmonty@mysql.com2005-02-021-8/+3
* | | BUG#6034 - Error code 124: Wrong medium type.ingo@mysql.com2005-01-191-4/+43
* | | Fix for failing INSERT IGNOREmskold@mysql.com2005-01-101-5/+5
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2005-01-061-45/+47
|\ \ \
| * | | First stage of table definition cachemonty@mysql.com2005-01-061-45/+47
* | | | fixed bugs in view code with prepared statemntsbell@sanja.is.com.ua2005-01-041-3/+1
|/ / /
* | | After merge fixesmonty@mysql.com2005-01-041-12/+9
* | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEYmonty@mysql.com2005-01-031-19/+21
|\ \ \ | |/ /
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1monty@mysql.com2004-12-311-16/+19
| |\ \
| | * | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flagmonty@mysql.com2004-12-311-16/+19
* | | | Better handling of ensuring that setup_tables() are not called twicemonty@mysql.com2005-01-031-6/+0
* | | | Remove clear_insert_values() because it was far from trivial to handle the cl...monty@mysql.com2005-01-031-2/+0
* | | | manually mergedserg@sergbook.mysql.com2004-12-311-3/+1
|\ \ \ \ | |/ / /
| * | | better fix for bug#7242 (crash in prepared INSERT ... UPDATE)serg@serg.mylan2004-12-241-5/+4
| |/ /
* | | After merge fixesmonty@mysql.com2004-12-311-17/+26
* | | Merge with 4.1monty@mishka.local2004-12-221-19/+26
|\ \ \ | |/ / | | / | |/ |/|
| * WL#2274 - INSERT..SELECT..UPDATEacurtis@pcgem.rdg.cyberkinetica.com2004-12-131-12/+15
| * Merge bk-internal.mysql.com:/home/bk/mysql-4.1dlenev@mysql.com2004-12-091-1/+0
| |\
| | * Fix for bug #6765 "Implicit access to time zone description dlenev@brandersnatch.localdomain2004-12-091-1/+0
* | | After merge fixesmonty@mysql.com2004-12-061-11/+16
* | | Merge with 4.1monty@mysql.com2004-12-061-33/+37
|\ \ \ | |/ /
| * | Mergejimw@mysql.com2004-12-031-30/+21
| |\ \
| | * \ Merge bk-internal.mysql.com:/home/bk/mysql-4.1/serg@serg.mylan2004-12-031-26/+17
| | |\ \
| | | * | sql/sql_class.hserg@serg.mylan2004-12-031-26/+17
| | | |/
| | * | Bug#6391 (binlog-do-db rules ignored)mats@mysql.com2004-12-031-4/+4
| | |/
| * | Mergejimw@mysql.com2004-12-031-0/+12
| |\ \ | | |/ | |/|
| | * Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when thejimw@mysql.com2004-12-031-0/+13
* | | post-merge fixbell@sanja.is.com.ua2004-11-251-15/+23
* | | mergebell@sanja.is.com.ua2004-11-211-31/+123
|\ \ \
| * | | post mergebell@sanja.is.com.ua2004-11-211-1/+1
| * | | mergebell@sanja.is.com.ua2004-11-111-35/+128
| |\ \ \
| | * | | postmerge fixbell@sanja.is.com.ua2004-10-051-1/+5
| | * | | mergebell@sanja.is.com.ua2004-10-051-34/+123
| | |\ \ \
| | | * | | support of join view updateability (WL#1809)bell@sanja.is.com.ua2004-09-151-30/+113
| | | * | | fixed merged view fields names (BUG#5147)bell@sanja.is.com.ua2004-09-141-7/+13
* | | | | | mergedserg@serg.mylan2004-11-201-2/+4
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key ..mskold@mysql.com2004-11-181-2/+5
* | | | | | now my_printf_error is not better then my_error, but my_error call is shorterbell@sanja.is.com.ua2004-11-131-26/+11
* | | | | | mergebell@sanja.is.com.ua2004-11-121-38/+44
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | post-review fixesbell@sanja.is.com.ua2004-11-121-23/+15
| * | | | | mergebell@sanja.is.com.ua2004-10-281-8/+11
| |\ \ \ \ \
| * \ \ \ \ \ Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0bell@sanja.is.com.ua2004-10-201-27/+41
| |\ \ \ \ \ \
| | * | | | | | errors without code removedbell@sanja.is.com.ua2004-10-201-27/+41
| | | |_|/ / / | | |/| | | |
* | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com2004-11-091-2/+2
|\ \ \ \ \ \ \