Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 5.5-merge | Sergei Golubchik | 2011-07-02 | 1 | -3/+68 |
|\ | |||||
| * | Bug#11926811 / Bug#60625 Illegal mix of collations | Alexander Barkov | 2011-04-08 | 1 | -0/+25 |
| * | merge | Mattias Jonsson | 2011-01-28 | 1 | -1/+1 |
| |\ | |||||
| | * | Update of copyright headers for files I changed this year. | Mattias Jonsson | 2011-01-27 | 1 | -1/+1 |
| * | | Manual merge from 5.1 | Mattias Jonsson | 2011-01-10 | 1 | -1/+41 |
| |\ \ | | |/ | |||||
| | * | merge | Mattias Jonsson | 2011-01-04 | 1 | -1/+41 |
| | |\ | |||||
| | | * | Bug#54483: valgrind errors when making warnings for | Mattias Jonsson | 2010-12-22 | 1 | -1/+1 |
| | | * | Bug#54483: valgrind errors when making warnings for multiline inserts into pa... | Mattias Jonsson | 2010-12-22 | 1 | -1/+41 |
| * | | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -1/+1 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -1/+1 |
| * | | | merge | Georgi Kodinov | 2010-11-26 | 1 | -1/+1 |
| |\ \ \ | | |/ / | |||||
| | * | | Bug#54484 explain + prepared statement: crash and Got error -1 from storage e... | Sergey Glukhov | 2010-10-18 | 1 | -1/+1 |
| * | | | merge | Georgi Kodinov | 2010-08-13 | 1 | -0/+1 |
* | | | | merge. | Sergei Golubchik | 2010-11-25 | 1 | -5/+99 |
|\ \ \ \ | |||||
| * \ \ \ | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * \ \ \ | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -0/+1 |
| | |\ \ \ \ | |||||
| | | * \ \ \ | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -0/+1 |
| | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| * | | | | | | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -1/+16 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -1/+1 |
| | * | | | | | Automerge with 5.1 | Michael Widenius | 2010-08-25 | 1 | -0/+15 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly... | Michael Widenius | 2010-08-23 | 1 | -0/+15 |
| * | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -12/+28 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | merged | Sergei Golubchik | 2010-03-15 | 1 | -0/+28 |
| | |\ \ \ \ \ | | | |/ / / / | |||||
| | | * | | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 1 | -0/+28 |
| | | |\ \ \ \ | |||||
| | * | \ \ \ \ | merge 5.1->5.2 | unknown | 2010-02-01 | 1 | -11/+0 |
| | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | * | | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -11/+0 |
| | | |\ \ \ \ \ | |||||
| | * | \ \ \ \ \ | merge 5.1-> 5.2 | unknown | 2009-12-08 | 1 | -1/+0 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | * | | | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ | |||||
| * | | | | | | | | | Subquery optimizations: non-semijoin materialization | Sergey Petrunya | 2010-01-28 | 1 | -2/+6 |
| * | | | | | | | | | Backport of subquery optimizations to 5.3. | Sergey Petrunya | 2010-01-17 | 1 | -0/+1 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge | Igor Babaev | 2009-11-09 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |||||
| | * | | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+1 |
| | |\ \ \ \ \ \ \ | |||||
| * | | | | | | | | | The main commit of Andrey Zhakov's patch introducing vurtual(computed) columns. | Igor Babaev | 2009-10-16 | 1 | -0/+75 |
| |/ / / / / / / / | |||||
| * | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -2/+8 |
| |\ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | merge of 5.1-main into 5.1-maria. Myisam->Maria change propagation will follow. | Guilhem Bichot | 2009-02-12 | 1 | -2/+7 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, my... | Guilhem Bichot | 2008-12-10 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | Merge of 5.1-main into 5.1-maria. There were no changes to storage/myisam, or... | Guilhem Bichot | 2008-11-21 | 1 | -12/+40 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ | Merge mysql.com:/home/my/mysql-5.1 | unknown | 2008-04-28 | 1 | -33/+58 |
| | |\ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ | Merge a88-113-38-195.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-main | unknown | 2007-12-16 | 1 | -2/+1 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ \ \ | Merge bk-internal.mysql.com:/home/bk/mysql-maria | unknown | 2007-10-10 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | * | | | | | | | | | | | | Moved randomize and my_rnd under mysys | unknown | 2007-10-09 | 1 | -1/+1 |
| | | * | | | | | | | | | | | | | Merge hynda.mysql.fi:/home/my/mysql-5.1-main | unknown | 2007-09-27 | 1 | -1/+0 |
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / | |||||
| | | | * | | | | | | | | | | | | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1 | unknown | 2007-06-27 | 1 | -1/+0 |
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2007-02-28 | 1 | -1/+0 |
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-20 | 1 | -1/+0 |
| | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-12-18 | 1 | -1/+0 |
| | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean | unknown | 2006-10-10 | 1 | -1/+0 |
| | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-for-maria | unknown | 2006-09-07 | 1 | -1/+0 |
| | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | | | | | | | | | * \ \ \ \ \ \ \ \ \ \ \ | Merge gbichot3.local:/home/mysql_src/mysql-5.1-2 | unknown | 2006-08-09 | 1 | -1/+0 |
| | | | | | | | | | |\ \ \ \ \ \ \ \ \ \ \ \ |