| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 10.0-base merge | Sergei Golubchik | 2013-01-31 | 3 | -5/+5 |
| |\ | |||||
| | * | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 2 | -3/+3 |
| | * | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 3 | -5/+5 |
| * | | Merge 10.0-base -> 10.0. | Igor Babaev | 2013-01-10 | 1 | -3/+0 |
| |\ \ | |/ | |||||
| | * | Merge 5.5-mwl248 -> 10.0-base | Igor Babaev | 2013-01-08 | 1 | -3/+0 |
| | |\ | |||||
| | | * | Fixed some compiler warnings | Michael Widenius | 2012-12-19 | 1 | -3/+0 |
| * | | | Merge MariaDB 10.0-base to MariaDB 10.0 | unknown | 2012-12-18 | 9 | -253/+1 |
| |\ \ \ | |/ / | |||||
| | * | | remove HAVE_EXPLICIT_TEMPLATE_INSTANTIATION | Sergei Golubchik | 2012-12-17 | 8 | -252/+0 |
| | * | | Merge mariadb-5.5 -> 10.0-base. | Igor Babaev | 2012-12-16 | 19 | -77/+84 |
| | |\ \ | | |/ | |||||
| | | * | 5.3->5.5 merge | Sergei Golubchik | 2012-11-22 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Merge MariaDB 5.1.66 -> 5.2 -> 5.3 | unknown | 2012-11-09 | 4 | -41/+5 |
| | | | |\ | |||||
| | | | | * | Merge MariaDB 5.1.66 -> 5.2.12 | unknown | 2012-11-08 | 4 | -41/+5 |
| | | | | |\ | |||||
| | | | | | * | Merge MySQL 5.1.66 -> MariaDB 5.1.65 | unknown | 2012-11-06 | 4 | -41/+5 |
| | | | | | |\ | |||||
| * | | | | | \ | merge with 5.5 | Sergei Golubchik | 2012-11-03 | 19 | -76/+83 |
| |\ \ \ \ \ \ \ | | |/ / / / / | |/| | | | | | |||||
| | * | | | | | | 5.3 merge | Sergei Golubchik | 2012-10-18 | 1 | -2/+6 |
| | |\ \ \ \ \ \ | | | |/ / / / | | |/| | | | | |||||
| | | * | | | | | merge | Sergei Golubchik | 2012-09-27 | 1 | -2/+6 |
| | | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | | * | | | | Merge from 5.1 | unknown | 2012-09-27 | 1 | -2/+6 |
| | | | |\ \ \ \ | | | | | |/ / | | | | |/| | | |||||
| | | | | * | | | Fix incorrect assembler in Taocrypt which causes crashes on i386 with certain... | unknown | 2012-09-27 | 1 | -2/+6 |
| | | * | | | | | 5.2 merge. | Sergei Golubchik | 2012-08-22 | 1 | -0/+4 |
| | | |\ \ \ \ \ | | | |/ / / / | |||||
| | | | * | | | | 5.1 merge | Sergei Golubchik | 2012-08-22 | 1 | -0/+4 |
| | | | |\ \ \ \ | | | | |/ / / | |||||
| | | | | * | | | merge with MySQL 5.1.65 | Sergei Golubchik | 2012-08-22 | 1 | -0/+4 |
| | | | | |\ \ \ | |||||
| | * | | | \ \ \ | mysql-5.5.28 | Sergei Golubchik | 2012-10-16 | 18 | -74/+77 |
| | |\ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE | Venkata Sidagam | 2012-08-11 | 1 | -1/+1 |
| | | |\ \ \ \ \ \ \ | | | | |_|_|_|_|/ | | | |/| | | | | | |||||
| | | | * | | | | | | Bug #13115401: -SSL-KEY VALUE IS NOT VALIDATED AND IT ALLOWS INSECURE | Venkata Sidagam | 2012-08-11 | 1 | -1/+1 |
| | | * | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1. | Nirbhay Choubey | 2012-08-07 | 1 | -2/+3 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUST | Nirbhay Choubey | 2012-08-07 | 1 | -2/+3 |
| | | * | | | | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R | Harin Vadodaria | 2012-08-07 | 1 | -37/+0 |
| | | |\ \ \ \ \ \ \ | | | |/ / / / / / | |||||
| | | | * | | | | | | Bug#14068244: INCOMPATIBILITY BETWEEN LIBMYSQLCLIENT/LIBMYSQLCLIENT_R | Harin Vadodaria | 2012-08-07 | 2 | -38/+1 |
| | | | | |_|_|/ / | | | |/| | | | | |||||
| | | * | | | | | | Bug#13904906: YASSL PRE-AUTH CRASH WITH 5.1.62, 5.5.22 | Harin Vadodaria | 2012-07-24 | 16 | -35/+74 |
| * | | | | | | | | disable x86 asm version of taocrypt arc4 code for gcc, | Sergei Golubchik | 2012-10-30 | 1 | -0/+4 |
| * | | | | | | | | 10.0-base -> 10.0-monty | Sergei Golubchik | 2012-10-19 | 3 | -4/+6 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | | | |||||
| | * | | | | | | | Automatic merge with 5.5 | Michael Widenius | 2012-09-01 | 3 | -4/+6 |
| | |\ \ \ \ \ \ \ | | |/ / / / / / | |||||
| | | * | | | | | | Fixed compiler warnings | Michael Widenius | 2012-08-17 | 1 | -1/+1 |
| | | * | | | | | | merge with MySQL 5.5.27 | Sergei Golubchik | 2012-08-09 | 1 | -0/+4 |
| | | |\ \ \ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | | merge 5.1->5.5 | Georgi Kodinov | 2012-05-15 | 1 | -0/+4 |
| | | | |\ \ \ \ \ | | | | |/ / / / | |||||
| | | | | * | | | | Bug #11761822: yassl rejects valid certificate which openssl accepts | Georgi Kodinov | 2012-05-15 | 1 | -0/+4 |
| | | * | | | | | | MDEV-419 ensure that all HAVE_XXX constants can be set by cmake | Sergei Golubchik | 2012-07-31 | 1 | -3/+1 |
| * | | | | | | | | Fixing test cases | Michael Widenius | 2012-08-23 | 2 | -3/+17 |
| * | | | | | | | | More fixes | Michael Widenius | 2012-08-17 | 1 | -3/+3 |
| * | | | | | | | | Next part of merge. See TODO for details | Michael Widenius | 2012-08-14 | 13 | -93/+251 |
| |/ / / / / / / | |||||
| * | | | | | | | Fixes after Serg's review of %M extenstions | Michael Widenius | 2012-06-17 | 1 | -3/+2 |
| * | | | | | | | Merge with 5.5 | Michael Widenius | 2012-05-31 | 1 | -2/+2 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | Building RPMs with CPack | Sergei Golubchik | 2012-05-22 | 1 | -2/+2 |
| * | | | | | | | Added text for errno in error messages by: | Michael Widenius | 2012-05-30 | 1 | -2/+2 |
| |/ / / / / / | |||||
| * | | | | | | Fixed some simple warnings on Windows. | Vladislav Vaintroub | 2012-04-13 | 1 | -3/+3 |
| * | | | | | | merge | Sergei Golubchik | 2012-04-07 | 1 | -1/+4 |
| |\ \ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | | merge | Sergei Golubchik | 2012-04-05 | 99 | -941/+2110 |
| | |\ \ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | | merge | Sergei Golubchik | 2012-04-05 | 99 | -941/+2110 |
| | | |\ \ \ \ | | | | |_|/ | | | |/| | | |||||
| | | | * | | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 99 | -941/+2110 |
| | | | |\ \ \ | | | | | |/ | | | | |/| | |||||
| | * | | | | | merge | Sergei Golubchik | 2012-03-30 | 1 | -1/+1 |
| | |\ \ \ \ \ | | |/ / / / | |||||
 |
index : delta/mariadb-git.git | |
| github.com: MariaDB/server.git |
| summaryrefslogtreecommitdiff |