Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | merge from 5.2 | unknown | 2012-08-24 | 1 | -3/+51 |
|\ | |||||
| * | Merge from 5.1. | unknown | 2012-08-24 | 1 | -3/+51 |
| |\ | |||||
| | * | MDEV-382: Incorrect quoting | unknown | 2012-08-24 | 1 | -3/+51 |
* | | | Merge 5.2->5.3 | Sergey Petrunya | 2012-06-18 | 1 | -55/+197 |
|\ \ \ | |/ / | |||||
| * | | Fixed LP bug #1008293. | Igor Babaev | 2012-06-11 | 1 | -55/+197 |
* | | | 5.2 merge | Sergei Golubchik | 2012-05-20 | 1 | -2/+3 |
|\ \ \ | |/ / | |||||
| * | | 5.1 merge | Sergei Golubchik | 2012-05-18 | 1 | -1/+4 |
| |\ \ | | |/ | |||||
| | * | merge with mysql-5.1.63 | Sergei Golubchik | 2012-05-17 | 1 | -1/+4 |
| | |\ | |||||
| | | * | merge mysql-5.1->mysql-5.1-security | Georgi Kodinov | 2012-03-08 | 1 | -1/+1 |
| | | |\ | |||||
| | | | * | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONS | Tor Didriksen | 2012-03-06 | 1 | -1/+1 |
| | | * | | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DML | Annamalai Gurusami | 2012-03-01 | 1 | -1/+5 |
| | | |/ | |||||
* | | | | merge | Sergei Golubchik | 2012-04-05 | 2 | -2/+4 |
|\ \ \ \ | |/ / / | |||||
| * | | | merge | Sergei Golubchik | 2012-04-05 | 2 | -2/+4 |
| |\ \ \ | | |/ / | |||||
| | * | | mysql-5.1.62 merge | Sergei Golubchik | 2012-04-05 | 2 | -2/+4 |
| | |\ \ | | | |/ | |||||
| | | * | Updated/added copyright headers | Kent Boortz | 2012-02-15 | 2 | -2/+2 |
| | | |\ | |||||
| | | | * | Updated/added copyright headers | MySQL Build Team | 2012-02-15 | 3 | -5/+3 |
| | | | * | Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2 | Ramil Kalimullin | 2012-01-30 | 1 | -4/+6 |
| | | | * | Merge from mysql-5.0.94-release | Sunanda Menon | 2011-07-06 | 1 | -1/+16 |
| | | | |\ | |||||
| | | | * \ | Updated/added copyright headers | Kent Boortz | 2011-06-30 | 7 | -294/+111 |
| | | | |\ \ | |||||
| | | * | | | | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8... | Alexander Barkov | 2012-01-23 | 1 | -0/+2 |
* | | | | | | | Compatibility fixes by U Orsini | Michael Widenius | 2012-03-30 | 1 | -1/+1 |
* | | | | | | | Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE... | Michael Widenius | 2012-03-26 | 1 | -0/+3 |
* | | | | | | | merge | Sergei Golubchik | 2012-03-21 | 1 | -186/+8 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge | Sergei Golubchik | 2012-03-21 | 1 | -186/+8 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler" | Sergei Golubchik | 2012-03-14 | 1 | -186/+8 |
* | | | | | | | Merge 5.2->5.3 | unknown | 2012-03-14 | 1 | -11/+7 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | merge | Vladislav Vaintroub | 2012-03-12 | 1 | -11/+7 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
| | * | | | | | LP953714: Fix formatting of the crash messages in signal/exception handler | Vladislav Vaintroub | 2012-03-12 | 1 | -11/+7 |
* | | | | | | | Merge 5.2->5.3 | Igor Babaev | 2012-02-26 | 1 | -0/+9 |
|\ \ \ \ \ \ \ | |/ / / / / / | |||||
| * | | | | | | Fixed LP bug #939866. | Igor Babaev | 2012-02-25 | 1 | -0/+9 |
| * | | | | | | merge | Vladislav Vaintroub | 2012-02-20 | 1 | -1/+1 |
| |\ \ \ \ \ \ | | |/ / / / / | |||||
* | | | | | | | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope... | Michael Widenius | 2012-02-23 | 1 | -11/+30 |
* | | | | | | | 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 |
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| | |