Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -0/+12 |
|\ | |||||
| * | Bug#49534: multitable IGNORE update with sql_safe_updates | Martin Hansson | 2010-02-10 | 1 | -0/+12 |
* | | Implement new type-of-operation-aware metadata locks. | Dmitry Lenev | 2010-02-01 | 1 | -5/+6 |
* | | Backport of: | Konstantin Osipov | 2009-12-03 | 1 | -2/+2 |
|/ | |||||
* | Merge 5.0 -> 5.1 | Matthias Leich | 2009-02-09 | 1 | -27/+47 |
|\ | |||||
| * | 2. Slice of fix for Bug#42003 tests missing the disconnect of connections <> ... | Matthias Leich | 2009-02-05 | 1 | -21/+34 |
* | | Merge 5.0 -> 51. of fix for bug 26890 | Matthias Leich | 2008-11-25 | 1 | -46/+11 |
|\ \ | |/ | |||||
| * | Fix for Bug#26890 main.multi_update times out | Matthias Leich | 2008-11-19 | 1 | -46/+11 |
* | | manual merge for bug_29136, bug#29309. | aelkin/elkin@koti.dsl.inet.fi | 2007-10-13 | 1 | -2/+6 |
* | | Merge koti.dsl.inet.fi:/home/elkin/MySQL/TEAM/FIXES/5.0/bug29136-mdelete | aelkin/elkin@koti.dsl.inet.fi | 2007-10-13 | 1 | -0/+34 |
|\ \ | |/ | |||||
| * | Bug #29136 erred multi-delete on trans table does not rollback the statement | aelkin/elkin@koti.dsl.inet.fi | 2007-10-13 | 1 | -0/+34 |
* | | Fixes to tests and test results. | mats@kindahl-laptop.dnsalias.net | 2007-06-19 | 1 | -3/+4 |
* | | Bug #27716 multi-update did partially and has not binlogged | aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi | 2007-06-04 | 1 | -5/+10 |
* | | Merge dsl-hkibras1-ff5dc300-70.dhcp.inet.fi:/home/elkin/MySQL/TEAM/BARE/5.0 | aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi | 2007-06-02 | 1 | -0/+40 |
|\ \ | |/ | |||||
| * | Bug #27716 multi-update did partially and has not binlogged | aelkin/elkin@dsl-hkibras1-ff5dc300-70.dhcp.inet.fi | 2007-06-01 | 1 | -0/+41 |
* | | Updated row result, and fix for Windows build. | brian@zim.(none) | 2006-08-14 | 1 | -1/+1 |
* | | Manually merged | evgen@moonbone.local | 2006-06-18 | 1 | -0/+8 |
|\ \ | |/ | |||||
| * | Manually merged | evgen@moonbone.local | 2006-05-29 | 1 | -0/+8 |
| |\ | |||||
| | * | Fixed bug#19225: unchecked error results in server crash | evgen@moonbone.local | 2006-05-29 | 1 | -0/+8 |
* | | | This changeset is largely a handler cleanup changeset (WL#3281), but includes... | monty@mysql.com | 2006-06-04 | 1 | -0/+30 |
* | | | Table definition cache, part 2 | monty@mysql.com | 2005-11-23 | 1 | -0/+6 |
|/ / | |||||
* | | Merge mysql.com:/home/my/mysql-4.1 | monty@mysql.com | 2005-07-28 | 1 | -0/+2 |
|\ \ | |/ | |||||
| * | Added end marker for tests to make future merges easier | monty@mysql.com | 2005-07-28 | 1 | -0/+1 |
* | | Cleanup tests and results after merge from 4.1 of embedded | jimw@mysql.com | 2005-04-04 | 1 | -0/+3 |
* | | Merge | monty@mysql.com | 2005-01-04 | 1 | -2/+2 |
|\ \ | |||||
| * \ | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY | monty@mysql.com | 2005-01-03 | 1 | -2/+2 |
| |\ \ | | |/ | |||||
| | * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2005-01-03 | 1 | -0/+2 |
| | |\ | |||||
| | * | | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag | monty@mysql.com | 2004-12-31 | 1 | -2/+2 |
* | | | | mysql-test/r/multi_update.result, mysql-test/t/multi_update.test | serg@sergbook.mysql.com | 2005-01-04 | 1 | -7/+2 |
|/ / / | |||||
* | | | manually merged | serg@sergbook.mysql.com | 2004-12-31 | 1 | -0/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | post-merge | serg@sergbook.mysql.com | 2004-12-31 | 1 | -0/+2 |
| |/ | |||||
* | | After merge fixes | monty@mysql.com | 2004-12-31 | 1 | -0/+1 |
* | | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 1 | -0/+14 |
|\ \ | |/ | |||||
| * | Post-merge fixes | sergefp@mysql.com | 2004-12-11 | 1 | -4/+10 |
| * | Fix for BUG#5837 merged from 4.0 | sergefp@mysql.com | 2004-12-11 | 1 | -0/+9 |
| |\ | |||||
| | * | Fix for BUG#5837 - attempt 3. | sergefp@mysql.com | 2004-12-11 | 1 | -0/+9 |
* | | | postreview fixes | bell@sanja.is.com.ua | 2004-11-08 | 1 | -0/+32 |
* | | | new lock for multiupdate: | bell@sanja.is.com.ua | 2004-11-05 | 1 | -3/+1 |
* | | | Fixes after merge with 4.1 | monty@mysql.com | 2004-11-03 | 1 | -1/+3 |
* | | | merge with 4.1 | monty@mysql.com | 2004-10-29 | 1 | -3/+17 |
|\ \ \ | |/ / | |||||
| * | | After merge fixes | monty@mysql.com | 2004-10-07 | 1 | -3/+8 |
| * | | Merge with 4.0 for 4.1 release | monty@mysql.com | 2004-10-06 | 1 | -2/+0 |
| |\ \ | | |/ | |||||
| | * | Bug#4118: multi-table UPDATE takes WRITE lock on read table | antony@ltantony.rdg.cyberkinetica.homeunix.net | 2004-10-03 | 1 | -2/+0 |
| * | | check that table used in multi-update is unique added (BUG#5455) | bell@sanja.is.com.ua | 2004-09-08 | 1 | -0/+11 |
* | | | After merge fixes | monty@mysql.com | 2004-07-15 | 1 | -2/+2 |
* | | | Merge with 4.1 | monty@mysql.com | 2004-07-12 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Bug#4338: mysql-test-run fails if compiled with non-latin1 character set | bar@mysql.com | 2004-07-08 | 1 | -1/+1 |
* | | | Merge with 4.1.3-beta | monty@mysql.com | 2004-07-07 | 1 | -0/+1 |
|\ \ \ | |/ / | |||||
| * | | if exists should not be used inside test | bell@sanja.is.com.ua | 2004-05-28 | 1 | -0/+1 |
* | | | Merge 4.1 -> 5.0 | pem@mysql.com | 2004-05-07 | 1 | -2/+39 |
|\ \ \ | |/ / |