| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge with 5.1 | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed compiler warnings | Michael Widenius | 2011-11-30 | 1 | -1/+1 |
| * | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 14 | -28/+67 |
| |\ \ | |/ | |||||
| | * | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 14 | -28/+67 |
| | |\ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 14 | -28/+67 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 13 | -26/+39 |
| * | | | | merge 5.2 | Vladislav Vaintroub | 2011-03-10 | 1 | -2/+2 |
| |\ \ \ \ | |||||
| | * \ \ \ | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -2/+2 |
| | |\ \ \ \ | | |/ / / | |||||
| | | * | | | Merge with MySQL 5.1.55 | Michael Widenius | 2011-02-20 | 1 | -2/+2 |
| | | |\ \ \ | | | |/ / | |||||
| | | | * | | Merge | Kent Boortz | 2010-12-29 | 1 | -2/+2 |
| | | | |\ \ | | | | |/ | |||||
| | | | | * | - Added/updated copyright headers | Kent Boortz | 2010-12-28 | 1 | -2/+2 |
| * | | | | | MWL#55 : cherrypick MySQL 5.5 CMake/build improvements in order | Vladislav Vaintroub | 2011-01-29 | 1 | -2/+0 |
| |/ / / / | |||||
| * | | | | merge | Vladislav Vaintroub | 2010-12-06 | 2 | -4/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Bug#473914: mysql_client_test fail with in debug compilaton on windows x64 | Vladislav Vaintroub | 2010-12-06 | 2 | -4/+0 |
| * | | | | merge | Vladislav Vaintroub | 2010-12-02 | 1 | -1/+1 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Make maria 5.1 compilable on Visual Studio 2010 and remove Windows warnings | Vladislav Vaintroub | 2010-12-01 | 1 | -1/+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 | 2 | -6/+0 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.50 | Michael Widenius | 2010-08-27 | 2 | -6/+0 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Bug#45288: pb2 returns a lot of compilation warnings on linux | Davi Arnaut | 2010-07-20 | 1 | -3/+0 |
| * | | | | Merge with MariaDB 5.1.49 | Michael Widenius | 2010-08-05 | 1 | -37/+37 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge with MySQL 5.1.49 | Michael Widenius | 2010-08-02 | 1 | -37/+37 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Bug#42733: Type-punning warnings when compiling MySQL -- | Davi Arnaut | 2010-06-10 | 1 | -37/+37 |
| | * | | | force the generation of mysqlmanager.map file | Sergei Golubchik | 2010-07-24 | 1 | -0/+2 |
| * | | | | Automerge MariaDB 5.1->5.2. | unknown | 2010-07-09 | 1 | -0/+2 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Implement an NSIS based installer | Bo Thorsen | 2010-06-25 | 1 | -0/+2 |
| * | | | | merge 5.1->5.2 | Sergei Golubchik | 2010-06-01 | 1 | -15/+15 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | Merge MySQL 5.1.46 into MariaDB. | unknown | 2010-04-28 | 1 | -15/+15 |
| | |\ \ \ | | |/ / | |||||
| | | * | | Recommit of Bug#49447. | Staale Smedseng | 2010-02-04 | 1 | -15/+15 |
| * | | | | fixes for windows builds | Sergei Golubchik | 2010-04-02 | 2 | -2/+2 |
| * | | | | pluggable auth with plugin examples | Sergei Golubchik | 2010-03-29 | 2 | -3/+4 |
| |/ / / | |||||
| * | | | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 4 | -6/+6 |
| |\ \ \ | |/ / | |||||
| | * | | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-18 | 3 | -5/+5 |
| | * | | Manual merge. | Davi Arnaut | 2009-12-18 | 1 | -1/+1 |
| | |\ \ | | |/ | |||||
| | | * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 2 | -2/+2 |
| * | | | Merge MySQL 5.1.39 into MariaDB 5.1. | unknown | 2009-10-15 | 1 | -0/+12 |
| |\ \ \ | |/ / | |||||
| | * | | Merge from mysql-5.0-bugteam. | Davi Arnaut | 2009-08-13 | 1 | -0/+12 |
| | |\ \ | | |/ | |||||
| | | * | Bug#46013: rpl_extraColmaster_myisam fails on pb2 | Davi Arnaut | 2009-08-13 | 1 | -0/+12 |
| | | * | Merge from 5.0-bt | Staale Smedseng | 2009-06-29 | 1 | -2/+2 |
| | | * | merging | Alexey Botchkov | 2009-04-28 | 1 | -2/+1 |
| | | |\ | |||||
| | | | * | Bug#25058 ignored return codes in memory allocation functions | Alexey Botchkov | 2008-11-21 | 1 | -2/+1 |
| * | | | | Merged with mysql-5.1 tree. | Michael Widenius | 2009-04-25 | 6 | -6/+12 |
| |\ \ \ \ | |/ / / | |||||
| | * | | | auto-merge | Ignacio Galarza | 2009-03-19 | 3 | -2/+8 |
| | |\ \ \ | |||||
| | | * | | | Fix for bug #40552: Race condition around default_directories | Alexey Kopytov | 2009-02-27 | 3 | -2/+8 |
| | * | | | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-13 | 4 | -4/+4 |
| | |\ \ \ \ | | |/ / / | |/| / / | | |/ / | |||||
| | | * | | Bug#29125 Windows Server X64: so many compiler warnings | Ignacio Galarza | 2009-02-10 | 13 | -35/+62 |
| | | |/ | |||||
| * | | | post-review fixes | Sergei Golubchik | 2009-01-15 | 1 | -1/+1 |
| * | | | Merged 5.1 with maria 5.1 | Michael Widenius | 2008-10-10 | 1 | -382/+0 |
| |\ \ \ | |/ / | |||||
| | * | | merge | Vladislav Vaintroub | 2008-09-01 | 1 | -382/+0 |
| | |\ \ | | |/ | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |
path: root/server-tools