Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | 10.0-base merge | Sergei Golubchik | 2014-02-26 | 1 | -2/+2 | |
|\ \ | ||||||
* | | | MDEV-5314 - Compiling fails on OSX using clang | Sergey Vojtovich | 2014-02-19 | 1 | -8/+8 | |
* | | | 10.0-monty merge | Sergei Golubchik | 2013-07-21 | 1 | -3/+3 | |
|\ \ \ | |/ / |/| | | ||||||
| * | | Temporary commit of 10.0-merge | Michael Widenius | 2013-03-26 | 1 | -3/+3 | |
* | | | 5.5 merge | Sergei Golubchik | 2013-06-06 | 1 | -2/+1 | |
|\ \ \ | | |/ | |/| | ||||||
| * | | Compilation warnings. | Sergei Golubchik | 2013-05-07 | 1 | -2/+1 | |
* | | | my_dir() cleanup | Sergei Golubchik | 2013-04-07 | 1 | -1/+1 | |
* | | | remove ULL() and LL(), because they're totally unnecessary | Sergei Golubchik | 2013-04-07 | 1 | -5/+5 | |
| |/ |/| | ||||||
* | | cleanup: use MYF() for mysys flags | Sergei Golubchik | 2013-01-23 | 1 | -3/+3 | |
* | | MDEV-4011 Added per thread memory counting and usage | Michael Widenius | 2013-01-23 | 1 | -3/+3 | |
|/ | ||||||
* | Fixed compile warnings | Michael Widenius | 2012-05-18 | 1 | -0/+2 | |
* | 5.3 merge | Sergei Golubchik | 2012-01-13 | 1 | -2/+4 | |
|\ | ||||||
| * | Merge with 5.2. | Michael Widenius | 2011-12-11 | 1 | -2/+4 | |
| |\ | ||||||
| | * | 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 | 1 | -6/+2 | |
| | |\ \ | | | |/ | ||||||
| | | * | Fixes for build failuers found by buildbot | Michael Widenius | 2011-11-24 | 1 | -0/+2 | |
* | | | | Fix Aria unit tests on Windows. | Vladislav Vaintroub | 2011-11-30 | 1 | -2/+14 | |
* | | | | 5.3->5.5 merge | Sergei Golubchik | 2011-11-22 | 1 | -7/+1 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | 5.2->5.3 merge | Sergei Golubchik | 2011-11-12 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * \ \ | 5.1->5.2 merge (gcc 4.6 warnings and apple hwaddress fixes). | unknown | 2011-10-27 | 1 | -6/+0 | |
| | |\ \ \ | | | |/ / | | |/| / | | | |/ | ||||||
| | | * | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -6/+0 | |
| * | | | Fix "unused variable addr" warning | Sergey Petrunya | 2011-11-02 | 1 | -2/+2 | |
| * | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -6/+0 | |
* | | | | fix the build and compiler warnings (few of which were real bugs) | Sergei Golubchik | 2011-10-29 | 1 | -10/+3 | |
* | | | | intptr should be unsigned | Sergei Golubchik | 2011-10-19 | 1 | -1/+1 | |
* | | | | safe_mutex deadlock detector post-merge fixes | Sergei Golubchik | 2011-10-19 | 1 | -0/+1 | |
* | | | | merge with 5.3 | Sergei Golubchik | 2011-10-19 | 1 | -241/+57 | |
|\ \ \ \ | |/ / / | ||||||
| * | | | Automerge 5.2->5.3 | unknown | 2011-07-31 | 1 | -0/+1 | |
| |\ \ \ | | |/ / | ||||||
| | * | | Merge with 5.1 | Michael Widenius | 2011-07-25 | 1 | -0/+1 | |
| | |\ \ | | | |/ | ||||||
| * | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 1 | -6/+8 | |
| * | | | Fix compile warning. | Vladislav Vaintroub | 2011-05-18 | 1 | -1/+1 | |
| * | | | Fix of compiler errors. | unknown | 2011-05-16 | 1 | -1/+1 | |
| * | | | Added more asserts to find out how maria.maria-big could have failed in build... | Michael Widenius | 2011-05-16 | 1 | -4/+11 | |
| |/ / | ||||||
| * | | Merge with 5.1 to get in changes from MySQL 5.1.55 | Michael Widenius | 2011-02-28 | 1 | -6/+15 | |
| |\ \ | | |/ | ||||||
| | * | Fixed bug that another thread used handler->s->id before it was recorded in t... | Michael Widenius | 2011-01-20 | 1 | -6/+15 | |
| * | | merge with 5.1-release | Michael Widenius | 2010-12-05 | 1 | -8/+0 | |
| |\ \ | | |/ | ||||||
| | * | The assert removed because it do not take into account case when previous and... | unknown | 2010-12-05 | 1 | -8/+0 | |
| * | | Merge with 5.1 | Michael Widenius | 2010-12-04 | 1 | -7/+16 | |
| |\ \ | | |/ | ||||||
| | * | Fixed compiler warning | Michael Widenius | 2010-12-04 | 1 | -0/+1 | |
| | * | Fixed compiler warnings. | Michael Widenius | 2010-12-03 | 1 | -6/+15 | |
| * | | Merge MariaDB 5.1->5.2 | unknown | 2010-11-19 | 1 | -207/+6 | |
| |\ \ | | |/ | ||||||
| | * | MWL#74: Shared libmysqld.so library. | unknown | 2010-11-17 | 1 | -233/+35 | |
| | * | Added option BACKUP_ALL to mysqld --myisam-recover to also get a backup of th... | Michael Widenius | 2010-11-07 | 1 | -3/+0 | |
* | | | use PSI wrappers in aria and other non-MySQL code | Sergei Golubchik | 2011-07-13 | 1 | -153/+166 | |
* | | | add safemalloc back | Sergei Golubchik | 2011-07-10 | 1 | -3/+1 | |
* | | | lots of post-merge changes | Sergei Golubchik | 2011-04-25 | 1 | -19/+18 | |
|/ / | ||||||
* | | rename maria to aria | Sergei Golubchik | 2010-09-12 | 1 | -10/+10 | |
* | | Fix of soft group commit (assigned LSN instead of file number). Found by Monty. | unknown | 2010-08-09 | 1 | -1/+1 | |
* | | Automerge mariadb 5.1 -> mariadb 5.2 | unknown | 2010-05-05 | 1 | -1/+2 | |
|\ \ | |/ |