Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merged | Sergei Golubchik | 2010-03-15 | 9 | -60/+100 |
|\ | |||||
| * | Automerge MySQL 5.1.44 merge into latest MariaDB trunk. | unknown | 2010-03-10 | 8 | -59/+96 |
| |\ | |||||
| | * | Merge MySQL 5.1.44 into MariaDB. | unknown | 2010-03-04 | 8 | -59/+96 |
| | |\ | |||||
| | | * | WL#5154 Remove deprecated 4.1 features | Magne Mahre | 2010-01-21 | 1 | -0/+9 |
| | | * | Manual merge. | Davi Arnaut | 2009-12-18 | 2 | -3/+3 |
| | | |\ | |||||
| | | | * | Bug#48983: Bad strmake calls (length one too long) | Davi Arnaut | 2009-12-17 | 2 | -3/+3 |
| | | * | | merge mysql-5.0-bugteam to mysql-5.1-bugteam | Satya B | 2009-12-17 | 1 | -1/+5 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fix for Bug#37408 - Compressed MyISAM files should not require/use mmap() | Satya B | 2009-12-17 | 1 | -1/+5 |
| | | * | | Bug#49134 5.1 server segfaults with 2byte collation file | Alexander Barkov | 2009-12-15 | 1 | -1/+2 |
| | | * | | Bug #45058 init_available_charsets uses double checked locking | Staale Smedseng | 2009-12-12 | 3 | -53/+57 |
| | | * | | Merge from 5.0 | Staale Smedseng | 2009-12-06 | 1 | -1/+20 |
| | | |\ \ | | | | |/ | |||||
| * | | | | Added count of my_sync calls (to SHOW STATUS) | Michael Widenius | 2010-03-09 | 1 | -0/+3 |
| |/ / / | |||||
* | | | | merge 5.1->5.2 | unknown | 2010-02-01 | 4 | -14/+10 |
|\ \ \ \ | |/ / / | |||||
| * | | | Patch set contributed by Alex Budovski (MCA) | Michael Widenius | 2010-01-29 | 1 | -1/+1 |
| * | | | Merge with fixes for compiler warnings and 2 fixed test cases | Michael Widenius | 2010-01-28 | 1 | -1/+1 |
| * | | | Merge with MySQL 5.1.42 | Michael Widenius | 2010-01-15 | 2 | -10/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | Move DBG_* macros to after the variable declaration section in a | Kent Boortz | 2009-11-25 | 1 | -2/+2 |
| | * | | Additional fix for bug #45613: handle failures from my_hash_insert | Georgi Kodinov | 2009-11-23 | 1 | -1/+0 |
| | * | | merge | Kristofer Pettersson | 2009-11-20 | 1 | -0/+1 |
| | |\ \ | |||||
| | | * | | Bug#45613 handle failures from my_hash_insert | Kristofer Pettersson | 2009-11-20 | 1 | -0/+1 |
| | * | | | merge | Georgi Kodinov | 2009-11-20 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | * | | | | Bug#46043 mysqld --skip-innodb does not skip InnoDB | Kristofer Pettersson | 2009-11-09 | 1 | -11/+11 |
| * | | | | | Removed compiler warnings | Michael Widenius | 2010-01-06 | 1 | -2/+4 |
* | | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as const | Michael Widenius | 2010-01-06 | 2 | -78/+75 |
* | | | | | | Merge bug fixes from 5.1 | Michael Widenius | 2010-01-04 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed bug in my_uuid() that caused failures on hpux and ia64 | Michael Widenius | 2010-01-04 | 1 | -1/+1 |
* | | | | | | merge 5.1-> 5.2 | unknown | 2009-12-08 | 20 | -168/+205 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Merge MySQL 5.1.41 into MariaDB trunk, including a number of after-merge fixes. | unknown | 2009-11-30 | 14 | -123/+175 |
| |\ \ \ \ \ | |||||
| | * | | | | | Added more general support for sorting 2 characters as one (contractions) | Michael Widenius | 2009-11-30 | 1 | -0/+4 |
| | * | | | | | Merge the last bit of MySQL 5.1.41 into MariaDB. | unknown | 2009-11-18 | 1 | -1/+1 |
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | | | |||||
| | | * | | | | Use C comments in C code | unknown | 2009-11-05 | 1 | -1/+1 |
| | | |/ / / | |||||
| | * | | | | Merge with MySQL 5.1, with following additions: | unknown | 2009-11-16 | 13 | -123/+171 |
| | |\ \ \ \ | | | |/ / / | |||||
| | | * | | | Bug#46586: When using the plugin interface the type "set" for options caused ... | Tatiana A. Nurnberg | 2009-10-27 | 2 | -2/+7 |
| | | |/ / | |||||
| | | * | | Upmerge a Windows compile fix from 5.0 to 5.1. | Joerg Bruehe | 2009-10-16 | 1 | -1/+1 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Compile fix for Windows: | Joerg Bruehe | 2009-10-16 | 1 | -1/+1 |
| | | * | | Upmerge (automerge) into 5.1 | Joerg Bruehe | 2009-10-09 | 1 | -0/+4 |
| | | |\ \ | | | | |/ | |||||
| | | | * | Fix bug#47923 New "mf_keycache.c" requires thread support | Joerg Bruehe | 2009-10-08 | 1 | -0/+4 |
| | | | * | Bug#47768 pthread_cond_timedwait() is broken on windows | Kristofer Pettersson | 2009-10-06 | 1 | -1/+1 |
| | | | * | Merge bug#42850 to 5.0 | Magnus Blåudd | 2009-09-28 | 1 | -3/+4 |
| | | | |\ | |||||
| | | * | | | Bug#47857 strip_sp function in mysys/mf_strip.c never used and cause name clash | Magnus Blåudd | 2009-10-06 | 3 | -47/+2 |
| | | * | | | Automerg | Kristofer Pettersson | 2009-10-06 | 4 | -4/+41 |
| | | |\ \ \ | |||||
| | | | * \ \ | automerge | Georgi Kodinov | 2009-10-04 | 1 | -2/+10 |
| | | | |\ \ \ | |||||
| | | | | * | | | Fix bug#46980 | Joerg Bruehe | 2009-09-17 | 1 | -2/+10 |
| | | | * | | | | auto-merge | Ingo Struewing | 2009-10-01 | 2 | -0/+30 |
| | | | |\ \ \ \ | | | |/ / / / / | |||||
| | | | * | | | | WL#4259 - Debug Sync Facility | Ingo Struewing | 2009-09-29 | 2 | -0/+30 |
| | | * | | | | | Merge bug#42850 to 5.1 | Magnus Blåudd | 2009-09-28 | 1 | -3/+4 |
| | | |\ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | | * | | | | Merge bug#42850 to 5.0 | Magnus Blåudd | 2009-09-28 | 1 | -3/+4 |
| | | | |\ \ \ \ | | | | | |_|/ / | | | | |/| | / | | | | | | |/ | | | | | |/| | |||||
| | | | | * | | Bug#42850 race condition in my_thr_init.c | Magnus Blåudd | 2009-09-24 | 1 | -3/+4 |
| | | | * | | | fixed compilation warnings | Georgi Kodinov | 2009-09-24 | 1 | -1/+1 |
| | | * | | | | Automerge. | Alexey Kopytov | 2009-09-18 | 1 | -1/+1 |
| | | |\ \ \ \ |