Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -2/+2 |
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -42/+72 |
|\ | |||||
| * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -13/+112 |
| |\ | |||||
| | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -13/+112 |
| | |\ | |||||
| | | * | merge | Georgi Kodinov | 2010-08-20 | 1 | -0/+11 |
| | | |\ | |||||
| | | * | | WL#5370 Keep forward-compatibility when changing | unknown | 2010-08-18 | 1 | -13/+109 |
| * | | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -1/+2 |
| |\ \ \ \ | |||||
| | * | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+2 |
| * | | | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -0/+11 |
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -0/+11 |
| | |\ \ \ | | | | |/ | | | |/| | |||||
| | | * | | BUG#55625 RBR breaks on failing 'CREATE TABLE' | Alfranio Correia | 2010-08-02 | 1 | -0/+11 |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Fixed compiler warnings | Michael Widenius | 2010-08-04 | 1 | -2/+1 |
| | * | | | Fixes bug when we run bcmp() on row when the storage engine hasn't filled in ... | Michael Widenius | 2010-08-04 | 1 | -2/+3 |
| * | | | | merge with 5.1 | Sergei Golubchik | 2010-07-25 | 1 | -3/+3 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | restore the unintentinally broken ABI | Sergei Golubchik | 2010-07-23 | 1 | -3/+3 |
| * | | | | Fixed bug #607566. | Igor Babaev | 2010-07-19 | 1 | -3/+6 |
| * | | | | Fixed bug #603186. | Igor Babaev | 2010-07-15 | 1 | -2/+13 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -1/+1 |
| | |\ \ \ | | | |/ / | |||||
| * | | | | MWL#43 CREATE TABLE options (by Sanja) | Sergei Golubchik | 2010-04-08 | 1 | -9/+0 |
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 1 | -1/+3 |
| * | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -21/+41 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -21/+41 |
| | |\ \ \ | |||||
| * | \ \ \ | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -0/+16 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -0/+16 |
| | |\ \ \ \ | |||||
| * | \ \ \ \ | Merge with 5.1 | Michael Widenius | 2010-01-04 | 1 | -5/+6 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Fixed Bug#47017 rpl_timezone fails on PB-2 with mismatch error | Michael Widenius | 2009-12-04 | 1 | -5/+6 |
| * | | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -47/+61 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 1 | -47/+57 |
| | |\ \ \ \ \ | |||||
| | | * \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -47/+57 |
| | | |\ \ \ \ \ | |||||
| | * | | | | | | | Added protection around usage of thd->mysys_var | Michael Widenius | 2009-11-26 | 1 | -0/+2 |
| | |/ / / / / / | |||||
| | * | | | | | | Added error handling for my_seek() & my_tell() failures | Michael Widenius | 2009-11-07 | 1 | -0/+2 |
| * | | | | | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -23/+32 |
| |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | Merge | Igor Babaev | 2009-11-09 | 1 | -23/+29 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -23/+29 |
| | | |\ \ \ \ \ \ | |||||
| | * | | | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+3 |
| | |/ / / / / / / | |||||
| * | | | | | | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -4/+5 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -12/+62 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 1 | -2/+27 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -15/+4 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -14/+0 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria; MyISAM changes are also ported to Maria. | Guilhem Bichot | 2009-03-11 | 1 | -1/+4 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -1/+1 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / / / / | | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -4/+5 |
| | |/ / / / / / / / / / / | |/| | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Fixed issues in last push found by pushbuild | Michael Widenius | 2009-01-16 | 1 | -1/+4 |
| * | | | | | | | | | | | | Log queries to maria_log if compiled with EXTRA_DEBUG | Michael Widenius | 2009-01-16 | 1 | -0/+4 |
| * | | | | | | | | | | | | Fixed bugs from my latest patch found by pushbuild: | Michael Widenius | 2009-01-09 | 1 | -18/+32 |
| * | | | | | | | | | | | | Fixed bugs found by pushbuild | Michael Widenius | 2008-12-27 | 1 | -8/+16 |