Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
|\ | |||||
| * | merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
| |\ | |||||
| | * | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 1 | -1/+1 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 1 | -1/+1 |
| | | * | Fixes required to build on AIX | Karen Langford | 2012-01-11 | 1 | -1/+1 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 3 | -5/+8 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 4 | -7/+9 |
| |\ \ \ | | |/ / | |||||
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 3 | -5/+8 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 1 | -16/+161 |
| | | |\ | |||||
| | | * | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 2 | -3/+6 |
| | * | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -2/+1 |
* | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -2/+1 |
* | | | | | portability fix: avoid anonymous structs and unions in C | Sergei Golubchik | 2011-09-22 | 1 | -120/+120 |
* | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 2 | -5/+5 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
* | | | | | Merge with dynamic column code | Michael Widenius | 2011-05-12 | 2 | -1/+796 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | Adding support for Dynamic columns (WL#34): | Michael Widenius | 2011-05-08 | 2 | -1/+796 |
* | | | | | Automatic merge with 5.1 | Michael Widenius | 2011-05-08 | 3 | -3/+16 |
|\ \ \ \ \ | | |_|/ / | |/| | | | |||||
| * | | | | Improved 'make test-unit' time slightly | Michael Widenius | 2011-05-05 | 3 | -3/+16 |
* | | | | | Automatic merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -1/+1 |
|\ \ \ \ \ | |/ / / / | |||||
| * | | | | Fix compile errors: | Vladislav Vaintroub | 2011-05-02 | 1 | -1/+1 |
* | | | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-05-03 | 1 | -14/+160 |
|\ \ \ \ \ | |/ / / / | | / / / | |/ / / |/| | | | |||||
| * | | | Merge with MySQL 5.1.57/58 | Michael Widenius | 2011-05-02 | 1 | -14/+160 |
| |\ \ \ | | | |/ | | |/| | |||||
| | * | | Followup to Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -1/+1 |
| | * | | Bug #11752069 (former bug 43152) | Jon Olav Hauglid | 2011-02-16 | 1 | -14/+159 |
| | |/ | |||||
* | | | merge | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
| * | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 1 | -3/+0 |
* | | | merge with 5.1 | Michael Widenius | 2010-11-30 | 1 | -3/+0 |
|\ \ \ | |/ / | |||||
| * | | Fixed compiler and gmake warnings | Michael Widenius | 2010-11-29 | 1 | -3/+0 |
* | | | merge with 5.1 | Sergei Golubchik | 2010-09-11 | 1 | -7/+0 |
|\ \ \ | |/ / | |||||
| * | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 1 | -7/+0 |
| |\ \ | | |/ | |||||
| | * | Bug#22320: my_atomic-t unit test fails | Davi Arnaut | 2010-07-05 | 2 | -212/+0 |
* | | | Merge with 5.1 | Michael Widenius | 2010-04-01 | 1 | -1/+1 |
|\ \ \ | |/ / | |||||
| * | | Removed compiler warning | Michael Widenius | 2010-03-30 | 1 | -1/+1 |
* | | | mwl:98 - libservices | Sergei Golubchik | 2010-03-03 | 2 | -1/+157 |
|/ / | |||||
* | | Fixed compiler warnings & failing test cases | Michael Widenius | 2010-01-28 | 1 | -1/+1 |
* | | Merge with maria-5.1-federatedx; A patch to fix bugs in federatedx and enable... | Michael Widenius | 2009-12-03 | 1 | -1/+1 |
|\ \ | |||||
| * \ | Merge with MySQL 5.1, with following additions: | Michael Widenius | 2009-11-11 | 1 | -1/+9 |
| |\ \ | | |/ | |||||
* | | | After-merge fix for MySQL 5.1.41 merge into MariaDB: Fix incorrect merge brea... | unknown | 2009-11-26 | 1 | -3/+1 |
* | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 1 | -1/+9 |
|\ \ \ | |/ / |/| / | |/ | |||||
| * | automerge | Georgi Kodinov | 2009-10-04 | 1 | -2/+9 |
| |\ | |||||
| | * | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -2/+9 |
| * | | Bug #43414 Parenthesis (and other) warnings compiling MySQL | Staale Smedseng | 2009-09-23 | 1 | -1/+1 |
| |/ | |||||
* | | Fixed compiler warning message | Michael Widenius | 2009-10-26 | 1 | -1/+2 |
* | | Trivial fixes for windows compile failures | Sergey Petrunya | 2009-09-01 | 1 | -0/+1 |
* | | Avoid compiler warnings on windows | Michael Widenius | 2009-03-20 | 1 | -0/+7 |
* | | Bug#41092 Maria: timeout in waiting_threads-t | Sergei Golubchik | 2009-02-12 | 1 | -39/+44 |
* | | compilation fixes | Sergei Golubchik | 2009-01-19 | 1 | -0/+2 |
* | | post-review fixes | Sergei Golubchik | 2009-01-15 | 4 | -15/+27 |
* | | warnings on windows | Sergei Golubchik | 2008-10-21 | 1 | -2/+2 |
* | | compiler warnings on winx86 | Sergei Golubchik | 2008-10-07 | 1 | -2/+2 |