Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge serg.mylan:/usr/home/serg/Abk/mysql-5.0 | serg@serg.mylan | 2005-02-18 | 1 | -6/+5 |
|\ | |||||
| * | manually merged | serg@serg.mylan | 2005-02-14 | 1 | -6/+5 |
| |\ | |||||
| | * | query_id and my_xid -> ulonglong | serg@serg.mylan | 2005-01-27 | 1 | -4/+3 |
| | * | XA (not completely polished out yet) | serg@serg.mylan | 2005-01-16 | 1 | -2/+2 |
* | | | Bug#8147 | acurtis@pcgem.rdg.cyberkinetica.com | 2005-02-17 | 1 | -0/+4 |
|\ \ \ | |/ / |/| | | |||||
| * | | Fix for failing INSERT IGNORE in test ndb_insert | mskold@mysql.com | 2005-01-25 | 1 | -5/+5 |
* | | | Review fixed | monty@mysql.com | 2005-02-02 | 1 | -8/+3 |
* | | | BUG#6034 - Error code 124: Wrong medium type. | ingo@mysql.com | 2005-01-19 | 1 | -4/+43 |
* | | | Fix for failing INSERT IGNORE | mskold@mysql.com | 2005-01-10 | 1 | -5/+5 |
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2005-01-06 | 1 | -45/+47 |
|\ \ \ | |||||
| * | | | First stage of table definition cache | monty@mysql.com | 2005-01-06 | 1 | -45/+47 |
* | | | | fixed bugs in view code with prepared statemnts | bell@sanja.is.com.ua | 2005-01-04 | 1 | -3/+1 |
|/ / / | |||||
* | | | After merge fixes | monty@mysql.com | 2005-01-04 | 1 | -12/+9 |
* | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY | monty@mysql.com | 2005-01-03 | 1 | -19/+21 |
|\ \ \ | |/ / | |||||
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | monty@mysql.com | 2004-12-31 | 1 | -16/+19 |
| |\ \ | |||||
| | * | | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag | monty@mysql.com | 2004-12-31 | 1 | -16/+19 |
* | | | | Better handling of ensuring that setup_tables() are not called twice | monty@mysql.com | 2005-01-03 | 1 | -6/+0 |
* | | | | Remove clear_insert_values() because it was far from trivial to handle the cl... | monty@mysql.com | 2005-01-03 | 1 | -2/+0 |
* | | | | manually merged | serg@sergbook.mysql.com | 2004-12-31 | 1 | -3/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | better fix for bug#7242 (crash in prepared INSERT ... UPDATE) | serg@serg.mylan | 2004-12-24 | 1 | -5/+4 |
| |/ / | |||||
* | | | After merge fixes | monty@mysql.com | 2004-12-31 | 1 | -17/+26 |
* | | | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 1 | -19/+26 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | WL#2274 - INSERT..SELECT..UPDATE | acurtis@pcgem.rdg.cyberkinetica.com | 2004-12-13 | 1 | -12/+15 |
| * | Merge bk-internal.mysql.com:/home/bk/mysql-4.1 | dlenev@mysql.com | 2004-12-09 | 1 | -1/+0 |
| |\ | |||||
| | * | Fix for bug #6765 "Implicit access to time zone description | dlenev@brandersnatch.localdomain | 2004-12-09 | 1 | -1/+0 |
* | | | After merge fixes | monty@mysql.com | 2004-12-06 | 1 | -11/+16 |
* | | | Merge with 4.1 | monty@mysql.com | 2004-12-06 | 1 | -33/+37 |
|\ \ \ | |/ / | |||||
| * | | Merge | jimw@mysql.com | 2004-12-03 | 1 | -30/+21 |
| |\ \ | |||||
| | * \ | Merge bk-internal.mysql.com:/home/bk/mysql-4.1/ | serg@serg.mylan | 2004-12-03 | 1 | -26/+17 |
| | |\ \ | |||||
| | | * | | sql/sql_class.h | serg@serg.mylan | 2004-12-03 | 1 | -26/+17 |
| | | |/ | |||||
| | * | | Bug#6391 (binlog-do-db rules ignored) | mats@mysql.com | 2004-12-03 | 1 | -4/+4 |
| | |/ | |||||
| * | | Merge | jimw@mysql.com | 2004-12-03 | 1 | -0/+12 |
| |\ \ | | |/ | |/| | |||||
| | * | Prevent adding 'CREATE TABLE .. SELECT' query to the binary log when the | jimw@mysql.com | 2004-12-03 | 1 | -0/+13 |
* | | | post-merge fix | bell@sanja.is.com.ua | 2004-11-25 | 1 | -15/+23 |
* | | | merge | bell@sanja.is.com.ua | 2004-11-21 | 1 | -31/+123 |
|\ \ \ | |||||
| * | | | post merge | bell@sanja.is.com.ua | 2004-11-21 | 1 | -1/+1 |
| * | | | merge | bell@sanja.is.com.ua | 2004-11-11 | 1 | -35/+128 |
| |\ \ \ | |||||
| | * | | | postmerge fix | bell@sanja.is.com.ua | 2004-10-05 | 1 | -1/+5 |
| | * | | | merge | bell@sanja.is.com.ua | 2004-10-05 | 1 | -34/+123 |
| | |\ \ \ | |||||
| | | * | | | support of join view updateability (WL#1809) | bell@sanja.is.com.ua | 2004-09-15 | 1 | -30/+113 |
| | | * | | | fixed merged view fields names (BUG#5147) | bell@sanja.is.com.ua | 2004-09-14 | 1 | -7/+13 |
* | | | | | | merged | serg@serg.mylan | 2004-11-20 | 1 | -2/+4 |
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | |||||
| * | | | | | Fix for bug#4312 ndb table, wrong behaviour on insert .. on duplicate key .. | mskold@mysql.com | 2004-11-18 | 1 | -2/+5 |
* | | | | | | now my_printf_error is not better then my_error, but my_error call is shorter | bell@sanja.is.com.ua | 2004-11-13 | 1 | -26/+11 |
* | | | | | | merge | bell@sanja.is.com.ua | 2004-11-12 | 1 | -38/+44 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | post-review fixes | bell@sanja.is.com.ua | 2004-11-12 | 1 | -23/+15 |
| * | | | | | merge | bell@sanja.is.com.ua | 2004-10-28 | 1 | -8/+11 |
| |\ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge sanja.is.com.ua:/home/bell/mysql/bk/mysql-5.0 | bell@sanja.is.com.ua | 2004-10-20 | 1 | -27/+41 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | errors without code removed | bell@sanja.is.com.ua | 2004-10-20 | 1 | -27/+41 |
| | | |_|/ / / | | |/| | | | | |||||
* | | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2004-11-09 | 1 | -2/+2 |
|\ \ \ \ \ \ \ |