summaryrefslogtreecommitdiff
path: root/mysys
Commit message (Expand)AuthorAgeFilesLines
* merge 5.5Vladislav Vaintroub2012-02-277-32/+780
|\
| * because of the high cost associated with fake symdir resolution, disable sym...Vladislav Vaintroub2012-02-271-11/+5
| * Merge MWL#192: non-blocking client library into MariaDB.unknown2012-02-262-1/+718
| |\
| | * MWL#192 after-merge fixes.unknown2012-02-231-7/+7
| | * Merge latest MariaDB 5.5 into MWL#192: Non-blocking client library.unknown2012-02-224-11/+29
| | |\
| | * \ Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-212-1/+718
| | |\ \
| | | * | fix typo.unknown2012-01-071-1/+1
| | | * | MWL#192: non-blocking client API, after-review fixes.unknown2012-01-061-87/+35
| | | * | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-203-1/+751
| * | | | 5.3 mergeSergei Golubchik2012-02-241-12/+31
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Fixed lp:933719, "Assertion open_tables == 0 ... " in THD::restore_backup_ope...Michael Widenius2012-02-231-11/+30
| * | | | 5.3 mergeSergei Golubchik2012-02-211-8/+9
| |\ \ \ \ | | |/ / /
| | * | | 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
| * | | | | | | fix the include guards and add missing gplv2 headersSergei Golubchik2012-02-172-0/+17
* | | | | | | | address second round review commentsVladislav Vaintroub2012-02-161-3/+1
* | | | | | | | mergeVladislav Vaintroub2012-02-081-3/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | Cherry-picked fix for solaris compilation from 5.2Vladislav Vaintroub2012-02-021-3/+3
| | |_|_|_|/ / | |/| | | | |
* | | | | | | mergeVladislav Vaintroub2012-01-2430-136/+433
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | portability fixes for FreeBSD 8 and 9Vladislav Vaintroub2012-01-231-2/+4
| * | | | | | - Always compile my_new.cc and safemalloc.c with mysysVladislav Vaintroub2012-01-202-10/+7
| * | | | | | Fix embedded build on Windows.Vladislav Vaintroub2012-01-201-1/+1
| * | | | | | - Fix rpl_checksum test. Use basename of file in error messages, not the oVladislav Vaintroub2012-01-203-13/+56
| * | | | | | MDEV-69 SET optimizer_switch = REPLACE(...) causes ER_WRONG_VALUE_FOR_VARSergei Golubchik2012-01-171-31/+43
| * | | | | | mysql-5.5 mergeSergei Golubchik2012-01-161-61/+274
| |\ \ \ \ \ \
| | * | | | | | Bug#11761576 54082: HANDLE_SEGFAULT MAKES USE OF UNSAFE FUNCTIONSTor Didriksen2011-12-021-61/+273
| * | | | | | | 5.3 mergeSergei Golubchik2012-01-1327-28/+58
| |\ \ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | * | | | | | 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
| | | | | |\ \ \
| | | | | * \ \ \ Updated/added copyright headersKent Boortz2011-07-037-798/+260
| | | | | |\ \ \ \
| | | | * | | | | | Fix gcc 4.6 warnings about assigned but not used variables.unknown2011-10-271-3/+2
| | * | | | | | | | Patch to get MariaDB to compile on CYGWIN; By Guenter KnaufMichael Widenius2011-12-022-2/+7
* | | | | | | | | | merge 5.5Vladislav Vaintroub2012-01-112-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | moved ha_maria::implicit_commit() calls aroundSergei Golubchik2012-01-061-2/+2
| * | | | | | | | | fixes for opensolaris compilation failuresSergei Golubchik2012-01-051-1/+1
* | | | | | | | | | MDEV-82 : Fix place in thr_lock.c where wait-end callback was called without ...Vladislav Vaintroub2012-01-101-1/+7
* | | | | | | | | | mergeVladislav Vaintroub2011-12-291-3/+3
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | Fix compile errorVladislav Vaintroub2011-12-271-1/+1
| * | | | | | | | | Fixed lp:909051 Options --debug and --disable-debug are known but ambiguous i...Michael Widenius2011-12-272-4/+4
* | | | | | | | | | mergeVladislav Vaintroub2011-12-2610-23/+539
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | * remove WITH_DEBUG from CMakeLists.txtSergei Golubchik2011-12-151-17/+5
| * | | | | | | | | rename debug variable to debug_dbug, to make test pass in release buildsSergei Golubchik2011-12-151-1/+1