Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Maria WL#61 | unknown | 2010-04-01 | 1 | -0/+17 |
* | merged | Sergei Golubchik | 2010-03-15 | 1 | -69/+138 |
|\ | |||||
| * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -69/+138 |
| |\ | |||||
| | * | post-push patch for bug#47343. | Mattias Jonsson | 2010-01-19 | 1 | -0/+1 |
| | * | Bug#47343: InnoDB fails to clean-up after lock wait timeout on | Mattias Jonsson | 2010-01-18 | 1 | -18/+44 |
| | * | Bug#48846: Too much time spent in ha_partition::records_in_range if not able ... | Mattias Jonsson | 2009-11-17 | 1 | -51/+93 |
* | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -23/+159 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -23/+159 |
| |\ \ | | |/ | |||||
| | * | merge into mysql-5.1-bugteam | Mattias Jonsson | 2009-10-09 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Bug#46922: crash when adding partitions and open_files_limit | Mattias Jonsson | 2009-10-08 | 1 | -1/+1 |
| | * | | Bug#44059: Incorrect cardinality of indexes on a partitioned table | Mattias Jonsson | 2009-10-08 | 1 | -7/+27 |
| | * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -1/+1 |
| | * | | Bug #45840 read_buffer_size allocated for each partition when | Anurag Shekhar | 2009-09-17 | 1 | -3/+49 |
| | |/ | |||||
| | * | merge | Mattias Jonsson | 2009-09-12 | 1 | -13/+82 |
| | |\ | |||||
| | | * | Bug#35845: unneccesary call to ha_start_bulk_insert for not used partitions | Mattias Jonsson | 2009-09-04 | 1 | -13/+82 |
| | * | | Automerge | Mikael Ronstrom | 2009-09-07 | 1 | -2/+2 |
| | |\ \ | | | |/ | |||||
| | | * | Bug#45823 Assertion failure in file row/row0mysql.c line 1386 | V Narayanan | 2009-09-04 | 1 | -2/+2 |
| | * | | Fix to ensure that all subpartitions gets deleted before renaming starts, BUG... | Mikael Ronstrom | 2009-09-07 | 1 | -0/+1 |
| | |/ | |||||
* | | | Merge of the patch introducing virtual columns into maria-5.2 | Igor Babaev | 2009-11-11 | 1 | -1/+1 |
|\ \ \ | |||||
| * \ \ | Merge | Igor Babaev | 2009-11-09 | 1 | -33/+0 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge Mysql 5.1.39 merge into MariaDB trunk | unknown | 2009-11-06 | 1 | -33/+0 |
| | |\ \ | |||||
| | | * \ | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -33/+0 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Bug#46639: 1030 (HY000): Got error 124 from storage engine on | Mattias Jonsson | 2009-08-21 | 1 | -33/+0 |
| * | | | | Merge of the latest 5.1 changes. | Igor Babaev | 2009-10-26 | 1 | -1/+1 |
| |\ \ \ \ | | |/ / / | |||||
| * | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Automatic merge with 5.1 | Michael Widenius | 2009-10-28 | 1 | -1/+1 |
|\ \ \ \ | | |/ / | |/| | | |||||
| * | | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+1 |
| |/ / | |||||
* | | | This is based on the userstatv2 patch from Percona and OurDelta. | Michael Widenius | 2009-10-19 | 1 | -40/+46 |
|/ / | |||||
* | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -10/+50 |
|\ \ | |/ | |||||
| * | Fix for BUG#45816 - assertion failure with index containing double | Satya B | 2009-08-06 | 1 | -1/+1 |
| * | auto-merge | Tatiana A. Nurnberg | 2009-07-31 | 1 | -9/+42 |
| |\ | |||||
| | * | Bug#30102: Rename table does corrupt tables with partition files on failure | Anurag Shekhar | 2009-07-24 | 1 | -9/+37 |
| | * | Bug#35111 - Truncate a MyISAM partitioned table does not reset | Satya B | 2009-07-08 | 1 | -0/+5 |
| * | | Bug#40281, partitioning the general log table crashes the server | Tatiana A. Nurnberg | 2009-07-31 | 1 | -0/+7 |
| |/ | |||||
* | | Fixed problems in merge | Michael Widenius | 2009-05-19 | 1 | -2/+2 |
|\ \ | |||||
| * | | We are now using Valgrind rather than purify, and have for quite some time. | unknown | 2009-05-06 | 1 | -2/+2 |
* | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -2/+3 |
|\ \ \ | |/ / |/| | | |||||
| * | | merge of 5.1-main into 5.1-maria. MyISAM changes are propagated to Maria except | Guilhem Bichot | 2009-04-01 | 1 | -2/+3 |
| |\ \ | | |/ | |||||
| | * | Backport of patch for bug#40003 from 6.0 to 5.1, | Mattias Jonsson | 2009-02-20 | 1 | -2/+3 |
| * | | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -5/+35 |
| |\ \ | | |/ | |||||
* | | | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -5/+35 |
|\ \ \ | | |/ | |/| | |||||
| * | | merge | Mattias Jonsson | 2009-01-07 | 1 | -3/+3 |
| |\ \ | |||||
| | * | | Bug#36312: InnoDB DATA_FREE BUG? | Mattias Jonsson | 2008-12-19 | 1 | -3/+3 |
| * | | | merged 5.1-main -> 5.1-bugteam | Georgi Kodinov | 2009-01-05 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |/| | | |||||
| | * | | Merge main 5.1 into 5.1-build | Joerg Bruehe | 2008-12-10 | 1 | -1/+35 |
| | |\ \ | |||||
| | * \ \ | Merge from mysql-5.1.30-release | unknown | 2008-11-27 | 1 | -2/+3 |
| | |\ \ \ | |||||
| | | * | | | mysql-test/r/partition.result | Build Team | 2008-11-25 | 1 | -1/+2 |
| | | * | | | Added "Sun Microsystems, Inc." to copyright headers on files modified | Build Team | 2008-11-10 | 1 | -1/+1 |
| * | | | | | post push fix for bug#40595 | Mattias Jonsson | 2008-12-16 | 1 | -0/+30 |
| * | | | | | Bug#40515: Query on a partitioned table does not return | Mattias Jonsson | 2008-12-04 | 1 | -1/+1 |
| | |_|/ / | |/| | | |