summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* merge from 5.2unknown2012-08-241-3/+51
|\
| * Merge from 5.1.unknown2012-08-241-3/+51
| |\
| | * MDEV-382: Incorrect quotingunknown2012-08-241-3/+51
* | | Merge 5.2->5.3Sergey Petrunya2012-06-181-55/+197
|\ \ \ | |/ /
| * | Fixed LP bug #1008293.Igor Babaev2012-06-111-55/+197
* | | 5.2 mergeSergei Golubchik2012-05-201-2/+3
|\ \ \ | |/ /
| * | 5.1 mergeSergei Golubchik2012-05-181-1/+4
| |\ \ | | |/
| | * merge with mysql-5.1.63Sergei Golubchik2012-05-171-1/+4
| | |\
| | | * merge mysql-5.1->mysql-5.1-securityGeorgi Kodinov2012-03-081-1/+1
| | | |\
| | | | * Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2012-03-061-1/+1
| | | * | Bug#13635833: MULTIPLE CRASHES IN FOREIGN KEY CODE WITH CONCURRENT DDL/DMLAnnamalai Gurusami2012-03-011-1/+5
| | | |/
* | | | mergeSergei Golubchik2012-04-052-2/+4
|\ \ \ \ | |/ / /
| * | | mergeSergei Golubchik2012-04-052-2/+4
| |\ \ \ | | |/ /
| | * | mysql-5.1.62 mergeSergei Golubchik2012-04-052-2/+4
| | |\ \ | | | |/
| | | * Updated/added copyright headersKent Boortz2012-02-152-2/+2
| | | |\
| | | | * Updated/added copyright headersMySQL Build Team2012-02-153-5/+3
| | | | * Fix for BUG#13596377: MYSQL CRASHES ON STARTUP ON FREEBSD IN PB2Ramil Kalimullin2012-01-301-4/+6
| | | | * Merge from mysql-5.0.94-releaseSunanda Menon2011-07-061-1/+16
| | | | |\
| | | | * \ Updated/added copyright headersKent Boortz2011-06-307-294/+111
| | | | |\ \
| | | * | | | Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8...Alexander Barkov2012-01-231-0/+2
* | | | | | | Compatibility fixes by U OrsiniMichael Widenius2012-03-301-1/+1
* | | | | | | Fixed lp:963603 "Assertion `lock_type != TL_UNLOCK && (lock_type == TL_IGNORE...Michael Widenius2012-03-261-0/+3
* | | | | | | mergeSergei Golubchik2012-03-211-186/+8
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mergeSergei Golubchik2012-03-211-186/+8
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | restore my_safe_printf_stderr for "crash-safe sigsegv handler"Sergei Golubchik2012-03-141-186/+8
* | | | | | | Merge 5.2->5.3unknown2012-03-141-11/+7
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | mergeVladislav Vaintroub2012-03-121-11/+7
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | LP953714: Fix formatting of the crash messages in signal/exception handlerVladislav Vaintroub2012-03-121-11/+7
* | | | | | | Merge 5.2->5.3Igor Babaev2012-02-261-0/+9
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Fixed LP bug #939866.Igor Babaev2012-02-251-0/+9
| * | | | | | mergeVladislav Vaintroub2012-02-201-1/+1
| |\ \ \ \ \ \ | | |/ / / / /
* | | | | | | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope...Michael Widenius2012-02-231-11/+30
* | | | | | | Merge with MariaDB 5.2Michael Widenius2012-02-211-77/+294
|\ \ \ \ \ \ \
| * \ \ \ \ \ \ Merge with 5.1Michael Widenius2012-02-201-1/+1
| |\ \ \ \ \ \ \ | | |/ / / / / / | |/| / / / / / | | |/ / / / /
| | * | | | | Fixed compiler warningsMichael Widenius2012-02-201-1/+1
| * | | | | | Merge with MariaDB 5.1 and MySQL 5.1.61Michael Widenius2012-02-201-77/+294
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Merge with MYSQL 5.1.61Michael Widenius2012-02-201-77/+294
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-65/+276
* | | | | | | Merge 5.2->5.3 in preparation for the release of mariadb-5.3.4-rc.Igor Babaev2012-02-011-3/+3
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | MDEV-106 my_gethwaddr() does not compile on Solaris 11Sergei Golubchik2012-01-231-3/+3
* | | | | | | Merge with 5.2.Michael Widenius2011-12-1150-105/+230
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | Merge with MariaDB 5.1Michael Widenius2011-11-2450-108/+235
| |\ \ \ \ \ \ | | |/ / / / /
| | * | | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2150-105/+230
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge from mysql-5.1.58-releaseKaren Langford2011-07-061-11/+10
| | | |\ \ \ \
| | | | * \ \ \ Merged 5.0-security->5.1-securityGeorgi Kodinov2011-05-041-11/+10
| | | | |\ \ \ \ | | | | | | |_|/ | | | | | |/| |
| | | | | * | | Bug #11764517: 57359: POSSIBLE TO CIRCUMVENT SECURE_FILE_PRIV Georgi Kodinov2011-04-281-1/+16
| | | | | | |/ | | | | | |/|
| | | | | * | Post-push fix for Bug 11896296Magne Mahre2011-03-221-0/+1
| | | | | * | Bug#11896296 REMOVE LGPL LICENSED FILES IN MYSQL 5.0Magne Mahre2011-03-227-291/+108
| | | * | | | Updated/added copyright headersKent Boortz2011-07-037-798/+260
| | | |\ \ \ \ | | | | |/ / /
| | | * | | | Updated/added copyright headersKent Boortz2011-06-3050-100/+230
| | | |\ \ \ \ | | | | | |_|/ | | | | |/| |