Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge from 4.1 | msvensson@neptunus.(none) | 2005-05-26 | 1 | -17/+16 |
|\ | |||||
| * | Cleanup during code review | monty@mysql.com | 2005-05-25 | 1 | -18/+18 |
* | | Merge | acurtis@xiphis.org | 2005-05-24 | 1 | -3/+30 |
|\ \ | |/ | |||||
| * | CSC#4944: Adding File_size to output of SHOW BINARY lOGS | lars@mysql.com | 2005-05-19 | 1 | -3/+30 |
* | | sql_repl.cc: | heikki@hundin.mysql.fi | 2005-04-27 | 1 | -13/+0 |
* | | Many files: | heikki@hundin.mysql.fi | 2005-04-20 | 1 | -0/+37 |
* | | WL#874 "Extended LOAD DATA". | dlenev@brandersnatch.localdomain | 2005-03-16 | 1 | -7/+6 |
* | | sql/log.cc | serg@serg.mylan | 2005-03-14 | 1 | -0/+4 |
* | | Merge bk-internal:/home/bk/mysql-5.0 | serg@serg.mylan | 2005-03-02 | 1 | -2/+5 |
|\ \ | |||||
| * \ | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | monty@mysql.com | 2005-02-28 | 1 | -1/+4 |
| |\ \ | |||||
| | * | | Fixed BUG#7646: Stored procedure hang if show binlog events | pem@mysql.comhem.se | 2005-02-28 | 1 | -1/+4 |
| * | | | merge with 4.1 | monty@mysql.com | 2005-02-28 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | Fixed wrong memory references found by purify | monty@mysql.com | 2005-02-28 | 1 | -1/+1 |
* | | | bug#8151 - truncate leaves a transaction open | serg@serg.mylan | 2005-03-02 | 1 | -1/+1 |
|/ / | |||||
* | | Review of new pushed code (XA & other) | monty@mysql.com | 2005-02-21 | 1 | -18/+28 |
* | | post-review fixes. Now ROLLBACK is done in Format_description_log_event | serg@serg.mylan | 2005-02-17 | 1 | -8/+4 |
* | | manually merged | serg@serg.mylan | 2005-02-14 | 1 | -157/+131 |
|\ \ | |||||
| * | | auto-ROLLBACK if binlog was not closed properly | serg@serg.mylan | 2005-02-09 | 1 | -100/+129 |
| * | | XA (not completely polished out yet) | serg@serg.mylan | 2005-01-16 | 1 | -57/+2 |
* | | | Merge with 4.1 tree to get fix for INSERT IGNORE ... ON DUPLICATE KEY | monty@mysql.com | 2005-01-03 | 1 | -2/+2 |
|\ \ \ | | |/ | |/| | |||||
| * | | Remove DUP_IGNORE from enum_duplicates and instead use a separate ignore flag | monty@mysql.com | 2004-12-31 | 1 | -2/+2 |
* | | | Merge with 4.1 | monty@mishka.local | 2004-12-22 | 1 | -5/+4 |
|\ \ \ | |/ / | | / | |/ |/| | |||||
| * | A change of behaviour of Seconds_Behind_Master from SHOW SLAVE STATUS. It's g... | guilhem@mysql.com | 2004-12-16 | 1 | -4/+4 |
| * | Fix for bug #6765 "Implicit access to time zone description | dlenev@brandersnatch.localdomain | 2004-12-09 | 1 | -1/+0 |
* | | Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1 | tomas@poseidon.ndb.mysql.com | 2004-11-26 | 1 | -2/+4 |
|\ \ | |/ | |||||
| * | Merge | mats@mysql.com | 2004-11-25 | 1 | -2/+4 |
| |\ | |||||
| | * | Fix for Bug#6148. Only rewind read position in binary log when the | mats@mysql.com | 2004-11-25 | 1 | -2/+4 |
* | | | 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 | -7/+5 |
* | | | merge | bell@sanja.is.com.ua | 2004-11-12 | 1 | -52/+52 |
|\ \ \ | |||||
| * | | | post-review fixes | bell@sanja.is.com.ua | 2004-11-12 | 1 | -13/+16 |
| * | | | changed function name to prevent injection wrong code from 4.1 (WL#2133) | bell@sanja.is.com.ua | 2004-10-20 | 1 | -2/+2 |
| * | | | errors without code removed | bell@sanja.is.com.ua | 2004-10-20 | 1 | -47/+44 |
* | | | | merge with 4.1 | monty@mysql.com | 2004-10-29 | 1 | -5/+8 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge with 4.0 for 4.1 release | monty@mysql.com | 2004-10-06 | 1 | -2/+0 |
| |\ \ | | |/ | |||||
| | * | Updating the headers on a few files to include GPL header. | brian@brian-akers-computer.local | 2004-09-08 | 1 | -2/+0 |
| | * | Backporting parts of | guilhem@mysql.com | 2004-03-10 | 1 | -1/+1 |
| | * | Undoing 2 parts of changeset 1.1730.1.1 : | guilhem@mysql.com | 2004-03-10 | 1 | -3/+3 |
| | * | Fixed memory leak in DROP DATABASE when using RAID tables (Bug #2882) | monty@mysql.com | 2004-03-10 | 1 | -7/+7 |
| * | | code clean-up | ram@gw.mysql.r18.ru | 2004-09-14 | 1 | -2/+2 |
| * | | A fix (bug #5546: mysqld crash on PURGE MASTER LOGS BEFORE '...' with log-bin... | ram@gw.mysql.r18.ru | 2004-09-14 | 1 | -2/+7 |
* | | | Port of cursors to be pushed into 5.0 tree: | konstantin@mysql.com | 2004-08-03 | 1 | -3/+6 |
* | | | Merge 4.1 -> 5.0. | pem@mysql.com | 2004-04-07 | 1 | -2/+0 |
|\ \ \ | |/ / | |||||
| * | | Optimizations | monty@mysql.com | 2004-03-15 | 1 | -2/+0 |
* | | | Merge gbichot@bk-internal.mysql.com:/home/bk/mysql-5.0 | guilhem@mysql.com | 2003-12-19 | 1 | -6/+6 |
|\ \ \ | |||||
| * \ \ | Merging lex-pointer change from 4.1 to 5.0. | pem@mysql.com | 2003-12-19 | 1 | -6/+6 |
| |\ \ \ | | |/ / | |||||
| | * | | THD::lex now points to THD::main_lex like in 5.0 | konstantin@oak.local | 2003-12-19 | 1 | -16/+16 |
* | | | | This is the final commit for Worklog tasks: | guilhem@gbichot2 | 2003-12-19 | 1 | -9/+12 |
* | | | | This will be pushed only after I fix the testsuite. | guilhem@gbichot2 | 2003-12-18 | 1 | -42/+168 |
|/ / / | |||||
* | | | Merge 4.1 to 5.0 | pem@mysql.com | 2003-12-01 | 1 | -8/+51 |
|\ \ \ | |/ / | |||||
| * | | Replication: | guilhem@gbichot2 | 2003-11-23 | 1 | -2/+5 |