Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
* | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -0/+7 |
|\ \ \ | |||||
| * \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+7 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#42790 Test 'main.innodb' fails from "InnoDB: Error: in ALTER TABLE" | Narayanan V | 2009-03-05 | 1 | -0/+7 |
* | | | | Merge with mysql-maria tree | Michael Widenius | 2009-02-19 | 1 | -5/+12 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -153/+157 |
| |\ \ \ | | |/ / | |||||
* | | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -162/+159 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-23 | 1 | -148/+153 |
| |\ \ \ | |||||
| | * \ \ | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * \ \ \ | BUG#38826 | Luis Soares | 2008-12-11 | 1 | -7/+7 |
| | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | * | | | Fix PB warnings for parenthesis and valgrind leak report. | Luis Soares | 2008-12-11 | 1 | -6/+7 |
| | * | | | | push to 5.1-buteam tree. | Luis Soares | 2008-12-10 | 1 | -85/+135 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | BUG#38826 Race in MYSQL_LOG::purge_logs is impossible to debug in production | Luis Soares | 2008-12-04 | 1 | -85/+135 |
| | | |\ \ \ \ | | | | |/ / / |