Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge. | Sergei Golubchik | 2010-11-25 | 1 | -15/+38 |
|\ | |||||
| * | 5.2 merge | Sergei Golubchik | 2010-10-28 | 1 | -22/+4 |
| |\ | |||||
| | * | merge with 5.1 | Sergei Golubchik | 2010-10-25 | 1 | -22/+4 |
| | |\ | |||||
| | | * | 5.1.51 merge | Sergei Golubchik | 2010-10-19 | 1 | -22/+4 |
| | | |\ | |||||
| * | | \ | Merge 5.2->5.3 | Sergey Petrunya | 2010-10-10 | 1 | -10/+54 |
| |\ \ \ \ | | |/ / / | |||||
| | * | | | Automatic merge | Michael Widenius | 2010-10-01 | 1 | -4/+18 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Change some my_bool in C++ classes and a few functions to bool to detect wron... | Michael Widenius | 2010-09-24 | 1 | -4/+18 |
| | * | | | Fixed bugs (mostly on sparc) that caused crashes in mysql-test-run | Michael Widenius | 2010-09-03 | 1 | -3/+2 |
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -1/+18 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | * | | | Fix for LP#612894 Some aggregate functions (such as MIN MAX) work incorrectly... | Michael Widenius | 2010-08-23 | 1 | -2/+16 |
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -2/+2 |
| | |\ \ \ | |||||
| * | | | | | Subquery cache (MWL#66) added. | unknown | 2010-07-10 | 1 | -0/+1 |
| * | | | | | MariaDB 5.2 -> MariaDB 5.3 merge | Sergey Petrunya | 2010-06-26 | 1 | -7/+9 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -7/+9 |
| | |\ \ \ \ | |||||
| | * | | | | | Fixed compiler warnings and sporadic failures in test cases | Michael Widenius | 2010-03-28 | 1 | -4/+4 |
| * | | | | | | Merge MariaDB-5.2 -> MariaDB 5.3 | Sergey Petrunya | 2010-03-20 | 1 | -230/+59 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 1 | -231/+59 |
| | |\ \ \ \ \ | |||||
| | * \ \ \ \ \ | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+2 |
| | |\ \ \ \ \ \ | |||||
| * | | | | | | | | BUG#31480: Incorrect result for nested subquery when executed via semi join | Sergey Petrunya | 2010-02-12 | 1 | -1/+1 |
| |/ / / / / / / | |||||
| * | | | | | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ | Merge lp:maria -> lp:~maria-captains/maria/maria-5.1-merge | Sergey Petrunya | 2009-09-15 | 1 | -6/+1 |
| |\ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-22 | 1 | -1/+1 |
| | * | | | | | | | | MWL#17: Table elimination | Sergey Petrunia | 2009-06-10 | 1 | -5/+0 |
| * | | | | | | | | | Merge MySQL->MariaDB | Sergey Petrunya | 2009-09-08 | 1 | -6/+14 |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| | | | | | | | | |||||
| * | | | | | | | | | bzr merge from guilhem's maria tree to our local 5.1 | Michael Widenius | 2009-04-25 | 1 | -1/+2 |
| |\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ \ | Merge with base MySQL 5.1 | Michael Widenius | 2009-02-15 | 1 | -2/+1 |
| |\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | Fixed compiler warnings found by gcc 4.3.2 | Michael Widenius | 2009-01-31 | 1 | -6/+6 |
* | | | | | | | | | | | | Automerge. | Alexey Kopytov | 2010-08-30 | 1 | -20/+0 |
|\ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | |||||
| * | | | | | | | | | | | Bug #54465: assert: field_types == 0 || field_types[field_pos] | Alexey Kopytov | 2010-08-27 | 1 | -20/+0 |
* | | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-20 | 1 | -1/+18 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / | |||||
| * | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-20 | 1 | -1/+18 |
| |\ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|/ | | |/| | | | | | | | | | |||||
| | * | | | | | | | | | | Bug #54476: crash when group_concat and 'with rollup' in | Alexey Kopytov | 2010-07-23 | 1 | -1/+18 |
| | | |_|_|_|_|_|_|_|/ | | |/| | | | | | | | | |||||
* | | | | | | | | | | | merge | Georgi Kodinov | 2010-08-17 | 1 | -2/+4 |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / | |||||
| * | | | | | | | | | | Bug #55580 : segfault in read_view_sees_trx_id | Georgi Kodinov | 2010-08-13 | 1 | -2/+4 |
| |/ / / / / / / / / | |||||
* | | | | | | | | | | Bug#49771: Incorrect MIN/MAX for date/time values. | Evgeny Potemkin | 2010-07-19 | 1 | -3/+2 |
* | | | | | | | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge. | Davi Arnaut | 2010-06-10 | 1 | -2/+2 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / | |||||
| * | | | | | | | | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -2/+2 |
| | |_|_|_|_|_|_|/ | |/| | | | | | | | |||||
* | | | | | | | | | Bug#53445: Build with -Wall and fix warnings that it generates | Davi Arnaut | 2010-05-31 | 1 | -4/+8 |
* | | | | | | | | | Manual merge of mysql-5.1-bugteam to | Alexey Kopytov | 2010-04-19 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | WL#5030: Split and remove mysql_priv.h | Mats Kindahl | 2010-03-31 | 1 | -1/+1 |
* | | | | | | | | | | Manual merge of mysql-5.1-bugteam into mysql-trunk-merge. | Alexey Kopytov | 2010-04-03 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| / / / / / / / / | |/ / / / / / / / | |||||
| * | | | | | | | | Fix for bug#52397: another crash with explain extended and group_concat | Ramil Kalimullin | 2010-03-31 | 1 | -1/+1 |
* | | | | | | | | | Manual merge of mysql-trunk into mysql-trunk-merge. | Alexey Kopytov | 2010-03-24 | 1 | -12/+30 |
|\ \ \ \ \ \ \ \ \ | |||||
| * \ \ \ \ \ \ \ \ | Manual merge from mysql-next-mr. | Alexander Nozdrin | 2010-03-01 | 1 | -5/+3 |
| |\ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | WL#2649 Number-to-string conversions | Alexander Barkov | 2010-02-11 | 1 | -5/+3 |
| * | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2010-02-24 | 1 | -1/+3 |
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / | |/| | | | | | | | | | |||||
| * | | | | | | | | | | Bug#48920: COUNT DISTINCT returns 1 for NULL values when in a | Jorgen Loland | 2010-01-04 | 1 | -0/+7 |
| * | | | | | | | | | | WL#4738 streamline/simplify @@variable creation process | Sergei Golubchik | 2009-12-22 | 1 | -3/+3 |
| * | | | | | | | | | | Post-merge fix. | Evgeny Potemkin | 2009-12-14 | 1 | -1/+2 |
| * | | | | | | | | | | Manual merge from mysql-trunk-merge. | Alexander Nozdrin | 2009-12-12 | 1 | -231/+59 |
| |\ \ \ \ \ \ \ \ \ \ |