Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge maria-5.1 -> maria-5.1-table-elimination | Sergey Petrunya | 2009-08-14 | 1 | -0/+1 |
|\ | |||||
| * | MWL#17: Table elimination | Sergey Petrunia | 2009-06-25 | 1 | -0/+1 |
* | | Merge of Percona XtraDB into MariaDB. | unknown | 2009-06-11 | 1 | -0/+15 |
|\ \ | |/ |/| | |||||
| * | XtraDB after-merge fix: Fix building from storage/xtradb/ instead of storage/... | unknown | 2009-06-09 | 1 | -0/+15 |
* | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -0/+2 |
|\ \ | |/ |/| | |||||
| * | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -0/+2 |
| |\ | |||||
| | * | Bug#40446 - mysql-test-run --gcov is broken | Ingo Struewing | 2009-02-27 | 1 | -0/+2 |
| * | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -0/+4 |
| |\ \ | | |/ | |||||
* | | | Ignore generated file event-config.h | Michael Widenius | 2009-03-18 | 1 | -0/+1 |
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -0/+5 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | merge 5.1 --> 5.1-rpl | Alfranio Correia | 2008-12-13 | 1 | -0/+25 |
| |\ | |||||
| * \ | Merge 5.1 main -> 5.1-rpl | He Zhenxing | 2008-09-06 | 1 | -0/+3 |
| |\ \ | |||||
| * | | | Add doxygen files to .bzrignore | Sven Sandberg | 2008-07-24 | 1 | -0/+3 |
| * | | | Merge 5.1->5.1-rpl | Magnus Svensson | 2008-05-30 | 1 | -0/+9 |
| |\ \ \ | |||||
| * \ \ \ | Merge pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-rpl | unknown | 2008-02-28 | 1 | -8/+9 |
| |\ \ \ \ | |||||
| | * | | | | Add C version of safe_process | unknown | 2008-01-18 | 1 | -0/+1 |
* | | | | | | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -1258/+98 |
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | | | |||||
| * | | | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -0/+12 |
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | |||||
| * | | | | | Added versioning of Maria index | Michael Widenius | 2008-06-26 | 1 | -0/+1 |
| * | | | | | Cleanup & Ignore | Michael Widenius | 2008-06-02 | 1 | -1258/+31 |
| * | | | | | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -13/+20 |
| |\ \ \ \ \ | |||||
| * | | | | | | Merge of changes in MyISAM since December 16 -> April 1 | unknown | 2008-04-01 | 1 | -0/+1 |
| * | | | | | | Fixed problems with ma_test2 and mi_test2 on high-byte-first system | unknown | 2008-02-21 | 1 | -0/+1 |
| * | | | | | | ignore: | unknown | 2008-02-03 | 1 | -0/+1 |
| * | | | | | | storage/maria/unittest/ma_test_all-t | unknown | 2008-01-29 | 1 | -0/+3 |
| * | | | | | | Allow index on 'CHAR(0) NULL' columns | unknown | 2008-01-21 | 1 | -0/+1 |
| * | | | | | | Windows fixes | unknown | 2008-01-10 | 1 | -0/+5 |
| * | | | | | | after merge | unknown | 2007-12-28 | 1 | -0/+1 |
| * | | | | | | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -0/+54 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Added error HA_ERR_FILE_TOO_SHORT to be used when files are shorter than expe... | unknown | 2007-12-04 | 1 | -0/+2 |
| | * | | | | | | make maria more pluggable | unknown | 2007-10-12 | 1 | -0/+3 |
| | * | | | | | | Fixed merge problems. | unknown | 2007-09-27 | 1 | -0/+4 |
| | * | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -0/+52 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Added maria_commit() and maria_begin() to be used with external tests | unknown | 2007-08-29 | 1 | -0/+3 |
| | | * | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-07-07 | 1 | -0/+50 |
| | | |\ \ \ \ \ \ | |||||
| | | | * \ \ \ \ \ | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-07-04 | 1 | -0/+1 |
| | | | |\ \ \ \ \ \ | |||||
| | | | | * | | | | | | After merge fixes | unknown | 2007-07-01 | 1 | -0/+1 |
| | | | * | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -2/+51 |
| | | | |\ \ \ \ \ \ \ | | | | | |/ / / / / / | |||||
| | | | | * | | | | | | Fixed LSN codding to allow code all | unknown | 2007-06-15 | 1 | -0/+1 |
| | | | | * | | | | | | Fixed that ma_test_all works with -T (simple transaction/logging support) | unknown | 2007-06-04 | 1 | -0/+2 |
| | | | | * | | | | | | After merge fixes | unknown | 2007-04-19 | 1 | -0/+9 |
| | | | | * | | | | | | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-04-05 | 1 | -0/+9 |
| | | | | |\ \ \ \ \ \ | |||||
| | | | | | * | | | | | | Fixed that maria.test works | unknown | 2007-04-05 | 1 | -0/+9 |
| | | | | * | | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -0/+28 |
| | | | | |\ \ \ \ \ \ \ | | | | | | |/ / / / / / | |||||
| | | | | | * | | | | | | After merge fixes | unknown | 2007-01-26 | 1 | -0/+15 |
| | | | | | * | | | | | | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -0/+13 |
| | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -0/+13 |
| | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-10-10 | 1 | -0/+13 |
| | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -0/+13 |
| | | | | | | | | |\ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -0/+13 |
| | | | | | | | | | |\ \ \ \ \ \ |