Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
* | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -2/+10 |
|\ | |||||
| * | two crashes in the TC_LOG_MMAP: | Sergei Golubchik | 2010-03-24 | 1 | -2/+10 |
* | | merged | Sergei Golubchik | 2010-03-15 | 1 | -133/+366 |
|\ \ | |/ | |||||
| * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -132/+366 |
| |\ | |||||
| | * | Backport Bug#37148 to 5.1 | He Zhenxing | 2010-01-24 | 1 | -2/+2 |
| | * | BUG#46364 MyISAM transbuffer problems (NTM problem) | Alfranio Correia | 2010-01-20 | 1 | -7/+16 |
| | * | Manual merge. | Davi Arnaut | 2009-12-18 | 1 | -4/+4 |
| | |\ | |||||
| | | * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 1 | -4/+4 |
| | * | | BUG#49638 binlog_index fails in mysql-trunk-merge | Alfranio Correia | 2009-12-16 | 1 | -6/+6 |
| | * | | bug#49536 - deadlock on rotate_and_purge when using expire_logs_days | He Zhenxing | 2009-12-15 | 1 | -6/+17 |
| | * | | BUG#45292 orphan binary log created when starting server twice | Alfranio Correia | 2009-12-04 | 1 | -110/+324 |
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -2/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -2/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | merge | Kristofer Pettersson | 2009-11-20 | 1 | -2/+1 |
| | |\ \ | |||||
| | | * | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -2/+1 |
* | | | | | Merge bug fixes from 5.1 | Michael Widenius | 2010-01-04 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed bug in tc.log recovery code that caused crash_commit_before to sometime... | Michael Widenius | 2010-01-04 | 1 | -1/+1 |
* | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -35/+36 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -36/+37 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | BUG#34582: mysql-5.1-bugteam-bug-branch --> mysql-5.1-bugteam-latest | Luis Soares | 2009-10-23 | 1 | -3/+5 |
| | |\ \ \ | |||||
| | | * | | | BUG#34582: FLUSH LOGS does not close and reopen the binlog index | Luis Soares | 2009-10-20 | 1 | -3/+5 |
| | | |/ / | |||||
| | * | | | Post-fix for BUG#47287. | Alfranio Correia | 2009-10-22 | 1 | -1/+0 |
| | |/ / | |||||
| | * | | Bug #40877: multi statement execution fails in 5.1.30 | Georgi Kodinov | 2009-10-16 | 1 | -2/+2 |
| | * | | BUG#47678 Changes to n-tables that happen early in a trans. are only flushed ... | Alfranio Correia | 2009-10-06 | 1 | -2/+5 |
| | * | | BUG#47287 RBR: replication diff on basic case with txn- and non-txn tables in... | Alfranio Correia | 2009-10-06 | 1 | -9/+16 |
| | * | | Fix for bug#47130: misplaced or redundant check for null pointer? | Ramil Kalimullin | 2009-09-11 | 1 | -6/+2 |
* | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -2/+23 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -2/+23 |
| |\ \ \ | |||||
| | * \ \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+23 |
| | |\ \ \ | | | |/ / | |||||
| | | * | | Merge from 5.0 for 43414 | Staale Smedseng | 2009-08-28 | 1 | -1/+2 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-08-28 | 1 | -1/+2 |
| | | * | | BUG#28976 Mixing trans and non-trans tables in one transaction results in inc... | Alfranio Correia | 2009-08-27 | 1 | -1/+21 |
* | | | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 1 | -1/+2 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+2 |
| |/ / / | |||||
* | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -15/+53 |
|/ / / | |||||
* | | | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -5/+36 |
|\ \ \ | |||||
| * | | | Updated documentation files to reflect MariaDB and not the Maria storage engi... | Michael Widenius | 2009-09-03 | 1 | -5/+36 |
* | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -55/+193 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | BUG#46129 Failing mixed stm (with trans and non-trans tables) causes wrong se... | Alfranio Correia | 2009-07-18 | 1 | -17/+33 |
| * | | Bug#44834 strxnmov is expected to behave as you'd expect | Sergey Glukhov | 2009-06-19 | 1 | -2/+2 |
| * | | BUG#43929 binlog corruption when max_binlog_cache_size is exceeded | Alfranio Correia | 2009-06-18 | 1 | -23/+118 |
| * | | Bug #45387 Information about statement id for prepared | Staale Smedseng | 2009-06-12 | 1 | -1/+4 |
| * | | Merge BUG#41948 | He Zhenxing | 2009-05-31 | 1 | -22/+38 |
| |\ \ | |||||
| | * | | BUG#41948 Query_log_event constructor needlessly contorted | He Zhenxing | 2009-05-30 | 1 | -20/+38 |
| * | | | Merge BUG#43263 from 5.0-bugteam to 5.1-bugteam | He Zhenxing | 2009-05-31 | 1 | -3/+5 |
| |\ \ \ | | |/ / | |/| / | | |/ | |||||
| | * | BUG#43263 BEGIN skipped in some replicate-do-db cases | He Zhenxing | 2009-05-31 | 1 | -3/+3 |
| | * | BUG#37145 Killing a statement doing DDL may log binlog event with error code ... | He Zhenxing | 2009-03-27 | 1 | -5/+10 |
| | * | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 1 | -2/+2 |
| * | | Bug#43706: libmysqld segfaults when re-intialised | Davi Arnaut | 2009-04-09 | 1 | -0/+5 |