summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* MDEV-15 Log SQL errors.Alexey Botchkov2012-03-144-8/+8
* MDEV-15 Log all SQL errors.Alexey Botchkov2012-03-148-1/+157
* alternative method of resolving addresses for safemalloc and crash handler.Sergei Golubchik2012-03-131-1/+5
* disable EXTRA_DEBUG in non-dbug buildsSergei Golubchik2012-03-131-0/+4
* merge with mysql-5.5.21Sergei Golubchik2012-03-091-0/+3
|\
| * Merging Bug#11752408 from mysql-5.1Alexander Barkov2012-01-231-0/+4
| |\
| | * Bug#11752408 - 43593: DUMP/BACKUP/RESTORE/UPGRADE TOOLS FAILS BECAUSE OF UTF8...Alexander Barkov2012-01-231-0/+4
| | * Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-11-301-4/+65
| * | merged bug #11754014Georgi Kodinov2012-01-171-3/+23
| |\ \
| | * | Bug #11754014: 45549: udf plugin_dir path separator inconsistency Georgi Kodinov2012-01-161-3/+23
* | | | mdev-20: INSTALL PLUGIN SONAMESergei Golubchik2012-03-051-2/+0
* | | | Fix build error on Ubuntu 11.10, if systemtap is installed.Vladislav Vaintroub2012-02-291-3/+20
* | | | merge 5.5Vladislav Vaintroub2012-02-2711-16/+592
|\ \ \ \
| * \ \ \ Merge MWL#192: non-blocking client library into MariaDB.unknown2012-02-269-7/+573
| |\ \ \ \
| | * | | | MWL#192 after-merge fixes.unknown2012-02-231-3/+3
| | * | | | Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.unknown2012-02-221-2/+18
| | |\ \ \ \
| | * | | | | Fix MWL#192 build error: Remove SSL special case for embedded server.unknown2012-02-222-3/+0
| | * | | | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-218-4/+573
| | |\ \ \ \ \
| | | * | | | | Fix non-ssl build.unknown2012-01-081-0/+2
| | | * | | | | MWL#192: non-blocking client API, after-review fixes.unknown2012-01-068-49/+86
| | | * | | | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-207-5/+531
| * | | | | | | disable safemalloc for valgrind builds.Sergei Golubchik2012-02-232-7/+1
| | |_|/ / / / | |/| | | | |
| * | | | | | fix the include guards and add missing gplv2 headersSergei Golubchik2012-02-171-2/+18
| |/ / / / /
* | | | | | further reduce diffs to 5.5, monty reviewVladislav Vaintroub2012-01-242-2/+12
* | | | | | mergeVladislav Vaintroub2012-01-2424-73/+150
|\ \ \ \ \ \ | |/ / / / /
| * | | | | portability fixes for FreeBSD 8 and 9Vladislav Vaintroub2012-01-231-4/+1
| * | | | | - Fix rpl_checksum test. Use basename of file in error messages, not the oVladislav Vaintroub2012-01-201-0/+1
| * | | | | fix the linking failure on windowsSergei Golubchik2012-01-181-2/+5
| * | | | | MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VARSergei Golubchik2012-01-171-4/+4
| * | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-1/+64
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-12-021-1/+64
| | | |/ / | | |/| |
| * | | | 5.3 mergeSergei Golubchik2012-01-1322-65/+78
| |\ \ \ \
| | * \ \ \ 5.2->5.3 mergeSergei Golubchik2011-12-125-22/+30
| | |\ \ \ \
| | | * | | | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-025-22/+30
| | * | | | | Merge with 5.2.Michael Widenius2011-12-1132-59/+184
| | |\ \ \ \ \ | | | |/ / / /
| | | * | | | Merge with 5.1 + fixes for build failures in 5.2Michael Widenius2011-11-291-0/+2
| | | |\ \ \ \
| | | | * | | | Fixed that maria-recover works as expected.Michael Widenius2011-11-291-0/+2
| | | * | | | | merge, fix Windows warningsVladislav Vaintroub2011-11-291-0/+3
| | | * | | | | Automatic mergeMichael Widenius2011-11-2428-58/+164
| | | |\ \ \ \ \
| | | | * \ \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-2428-58/+164
| | | | |\ \ \ \ \ | | | | | |/ / / /
| | | | | * | | | Merge with MySQL 5.1.60Michael Widenius2011-11-232-0/+11
| | | | | |\ \ \ \ | | | | | | | |_|/ | | | | | | |/| |
| | | | | * | | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-2128-60/+156
| | | | | |\ \ \ \
| | | * | | | | | | fix dialog plugin to work on windowsSergei Golubchik2011-11-222-0/+15
| | | |/ / / / / /
| | * | | | | | | Fixes for netware by Guenter KnaufMichael Widenius2011-12-021-0/+1
| | * | | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter KnaufMichael Widenius2011-12-021-0/+2
* | | | | | | | | mergeVladislav Vaintroub2011-12-264-12/+24
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | new configure option: NOT_FOR_DISTRIBUTIONSergei Golubchik2011-12-141-6/+5
| * | | | | | | | move safemalloc out of dbug.Sergei Golubchik2011-12-124-11/+6
| * | | | | | | | another backtrace resolver that prints source file name and line numberSergei Golubchik2011-12-111-0/+18
| * | | | | | | | win64 sysvar portability fixesSergei Golubchik2011-12-021-1/+1