Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 |
| | | |\ \ \ \ | | | | |/ / / | |||||
| | | | * | | | BUG#38826 Race in MYSQL_LOG::purge_logs is impossible to debug in production | Luis Soares | 2008-12-04 | 1 | -79/+133 |
| | * | | | | | merging 5.1-bt to a local tree. | Andrei Elkin | 2008-12-08 | 1 | -57/+4 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Bug #40116: Uncommited changes are replicated and stay on slave | Mats Kindahl | 2008-12-03 | 1 | -57/+4 |
| | * | | | | | | Bug #40221 Replication failure on RBR + UPDATE the primary key | Andrei Elkin | 2008-12-02 | 1 | -5/+13 |
| | | |/ / / / | | |/| | | | | |||||
| | * | | | | | Auto merge | Kristofer Pettersson | 2008-10-21 | 1 | -7/+2 |
| | |\ \ \ \ \ | |||||
| | * | | | | | | Bug#39451 Debug builds broken with Sun Studio compiler | Kristofer Pettersson | 2008-10-10 | 1 | -1/+1 |
| * | | | | | | | merge: 5.1 -> 5.1-rpl | Luis Soares | 2009-01-08 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | | | |||||
| | * | | | | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| | | |_|/ / / | | |/| | | | | |||||
| * | | | | | | Merging 5.1 main into 5.1-rpl | Mats Kindahl | 2008-10-23 | 1 | -6/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| * | | | | | | Merging 5.1 main into 5.1-rpl. | Mats Kindahl | 2008-10-06 | 1 | -0/+26 |
| |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| * | | | | | | BUG#38734 rpl_server_id2 sync_with_master failed | He Zhenxing | 2008-09-28 | 1 | -2/+3 |
| * | | | | | | Fixning compiler warnings. Fixing build failure for valgrind platform. | Mats Kindahl | 2008-08-22 | 1 | -2/+0 |
| * | | | | | | Bug #34707: Row based replication: slave creates table within wrong database | Mats Kindahl | 2008-08-19 | 1 | -2/+2 |
* | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -9/+9 |
| |_|_|_|_|/ |/| | | | | | |||||
* | | | | | | Merge with base MySQL-5.1-maria | Michael Widenius | 2008-12-03 | 1 | -8/+3 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -8/+3 |
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | |||||
| | * | | | | | Bug#39451 Debug builds broken with Sun Studio compiler | Kristofer Pettersson | 2008-10-21 | 1 | -1/+1 |
| | | |_|/ / | | |/| | | | |||||
| | * | | | | Bug #34707: Row based replication: slave creates table within wrong database | Mats Kindahl | 2008-10-08 | 1 | -2/+2 |
| | * | | | | Fix for BUG#31612 | Guilhem Bichot | 2008-10-06 | 1 | -5/+0 |
| | | |/ / | | |/| | | |||||
* | | | | | WL#3262 add mutex lock order checking to safemutex (also called safe_mutex_de... | Michael Widenius | 2008-12-03 | 1 | -1/+6 |
|/ / / / | |||||
* | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -52/+139 |
|\ \ \ \ | |/ / / | |||||
| * | | | Bug #32709: Assertion failed: trx_data->empty(), file log.cc | Mats Kindahl | 2008-09-03 | 1 | -0/+26 |
| |/ / | |||||
| * | | sql/log.cc: | Kristofer Pettersson | 2008-07-22 | 1 | -3/+4 |
| |\ \ | | |/ | |||||
| * | | Corrected merge misstake. | Kristofer Pettersson | 2008-07-21 | 1 | -36/+75 |