Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge with MariaDB 5.2 | Michael Widenius | 2012-02-21 | 1 | -77/+294 |
|\ | |||||
| * | Merge with 5.1 | Michael Widenius | 2012-02-20 | 1 | -1/+1 |
| |\ | |||||
| | * | Fixed compiler warnings | Michael Widenius | 2012-02-20 | 1 | -1/+1 |
| * | | Merge with MariaDB 5.1 and MySQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -77/+294 |
| |\ \ | | |/ | |||||
| | * | Merge with MYSQL 5.1.61 | Michael Widenius | 2012-02-20 | 1 | -77/+294 |
| | |\ | |||||
| | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2011-11-30 | 1 | -65/+276 |
* | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc. | Igor Babaev | 2012-02-01 | 1 | -3/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | MDEV-106 my_gethwaddr() does not compile on Solaris 11 | Sergei Golubchik | 2012-01-23 | 1 | -3/+3 |
* | | | | Merge with 5.2. | Michael Widenius | 2011-12-11 | 50 | -105/+230 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge with MariaDB 5.1 | Michael Widenius | 2011-11-24 | 50 | -108/+235 |
| |\ \ \ | | |/ / | |||||
| | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged) | Michael Widenius | 2011-11-21 | 50 | -105/+230 |
| | |\ \ | | | |/ | |||||
| | | * | Merge from mysql-5.1.58-release | Karen Langford | 2011-07-06 | 1 | -11/+10 |
| | | |\ | |||||
| | | | * | Merged 5.0-security->5.1-security | Georgi Kodinov | 2011-05-04 | 1 | -11/+10 |
| | | | |\ | |||||
| | | | | * | Bug #11764517: 57359: POSSIBLE TO CIRCUMVENT SECURE_FILE_PRIV | Georgi Kodinov | 2011-04-28 | 1 | -1/+16 |
| | | | | * | Post-push fix for Bug 11896296 | Magne Mahre | 2011-03-22 | 1 | -0/+1 |
| | | | | * | Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0 | Magne Mahre | 2011-03-22 | 7 | -291/+108 |
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-07-03 | 7 | -798/+260 |
| | | |\ \ \ | | | | |/ / | |||||
| | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 50 | -100/+230 |
| | | |\ \ \ | |||||
| | | | * | | | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 28 | -55/+82 |
| | | | | |/ | | | | |/| | |||||
| | * | | | | Fix gcc 4.6 warnings about assigned but not used variables. | unknown | 2011-10-27 | 1 | -3/+2 |
* | | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter Knauf | Michael Widenius | 2011-12-02 | 2 | -2/+7 |
* | | | | | | Fix bug lp:869036 | unknown | 2011-11-17 | 1 | -0/+90 |
* | | | | | | merge 5.2 | Vladislav Vaintroub | 2011-10-19 | 2 | -2/+7 |
|\ \ \ \ \ \ | |||||
| * \ \ \ \ \ | merge from 5.1 | Vladislav Vaintroub | 2011-10-19 | 1 | -0/+3 |
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / / | |||||
| | * | | | | Fix endless loop in my_gethwaddr() | Vladislav Vaintroub | 2011-10-19 | 1 | -0/+3 |
| * | | | | | Fixed wrong info message for mysqld --general-log | Michael Widenius | 2011-10-16 | 1 | -2/+4 |
* | | | | | | Fix of building on Mac OS. | unknown | 2011-10-18 | 1 | -3/+2 |
* | | | | | | Compiler warning about assigned but not used variables fixed. | unknown | 2011-10-18 | 1 | -5/+4 |
* | | | | | | merge | Sergei Golubchik | 2011-10-11 | 2 | -21/+86 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | merge with 5.1 | Sergei Golubchik | 2011-10-07 | 2 | -21/+86 |
| |\ \ \ \ \ | | |/ / / / | |||||
| | * | | | | my_gethwaddr() on Solaris and Windows | Sergei Golubchik | 2011-10-04 | 2 | -21/+86 |
* | | | | | | portability fix: avoid anonymous structs and unions in C | Sergei Golubchik | 2011-09-22 | 1 | -60/+60 |
* | | | | | | Merge with 5.2 | Michael Widenius | 2011-09-10 | 3 | -6/+6 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed that automatic killing of delayed insert thread (in flush, alter table ... | Michael Widenius | 2011-09-09 | 1 | -5/+3 |
| * | | | | | Fixed lp:814238 "safe_mutex issues must be assertions in debug binary" | Michael Widenius | 2011-09-02 | 2 | -1/+3 |
* | | | | | | Merge 5.2->5.3 | unknown | 2011-09-02 | 8 | -24/+49 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Added logging of all errors from my_read/my_write/my_pread/my_pwrite/my_open ... | Michael Widenius | 2011-09-02 | 7 | -22/+48 |
| * | | | | | Fixed non critical buffer overflow bug in open_binary_frm() that could cause ... | Michael Widenius | 2011-09-01 | 1 | -1/+1 |
* | | | | | | merge Windows performance patches into 5.3 | Vladislav Vaintroub | 2011-07-05 | 28 | -405/+1468 |
|\ \ \ \ \ \ | |||||
| * | | | | | | set errno to EBADF, if file descriptor < 0 in my_write() | Vladislav Vaintroub | 2011-06-26 | 1 | -2/+2 |
| * | | | | | | Fix "make dist" : add my_winfile.c and my_winerr.c to EXTRA_DIST list | Vladislav Vaintroub | 2011-06-19 | 1 | -1/+1 |
| * | | | | | | add missing DBUG_RETURN | Vladislav Vaintroub | 2011-06-19 | 1 | -1/+1 |
| * | | | | | | fix compile error on *nix | Vladislav Vaintroub | 2011-06-19 | 1 | -2/+2 |
| * | | | | | | merge | Vladislav Vaintroub | 2011-06-12 | 3 | -44/+363 |
| |\ \ \ \ \ \ | |||||
| | * | | | | | | Backport fix for MySQL bug #56405 : | Vladislav Vaintroub | 2011-06-12 | 3 | -44/+363 |
| | |/ / / / / | |||||
| * | | | | | | Backport Fix for Bug#24509 - 2048 file descriptor limit on windows needs incr... | Vladislav Vaintroub | 2011-06-12 | 24 | -391/+1122 |
| |/ / / / / | |||||
* | | | | | | Merge with 5.2 to get bug fixes for thr_lock | Michael Widenius | 2011-06-06 | 1 | -42/+70 |
|\ \ \ \ \ \ | |/ / / / / | |||||
| * | | | | | Fixed lock sorting and lock check issues with thr_lock that caused warnings w... | Michael Widenius | 2011-06-06 | 1 | -42/+70 |
* | | | | | | Fix compile errors and warnings and test errors introduced by microseconds push. | Vladislav Vaintroub | 2011-05-28 | 1 | -23/+14 |
* | | | | | | Merge with 5.1-microseconds | Michael Widenius | 2011-05-28 | 7 | -259/+74 |
|\ \ \ \ \ \ |