summaryrefslogtreecommitdiff
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* MDEV-4058unknown2013-06-271-0/+21
* Fixed some wrong format strings.Michael Widenius2013-06-281-2/+1
* Applied all changes from Igor and SanjaMichael Widenius2013-06-152-0/+33
* Push a lot of small fixes to get larger parts to compileMichael Widenius2013-05-211-1/+1
* Temporary commit of 10.0-mergeMichael Widenius2013-03-2639-833/+1337
* fix for a valgrind builds.Sergei Golubchik2013-01-311-1/+1
* 10.0-base mergeSergei Golubchik2013-01-3118-100/+280
|\
| * 5.5 mergeSergei Golubchik2013-01-2911-68/+159
| |\
| | * MDEV-4065 thd_kill_statement serviceSergei Golubchik2013-01-187-26/+111
| | * remove thd_mark_as_hard_kill()Sergei Golubchik2013-01-154-15/+0
| | * Buildbot fixes and cleanups:Michael Widenius2013-01-112-7/+16
| | * Fixed some race conditons and bugs related to killed queriesMichael Widenius2013-01-114-0/+14
| | * MDEV-3846 REFRESH_CHECKPOINT and REFRESH_TABLE_STATS tokens share the same valueSergei Golubchik2013-01-091-32/+32
| * | my_alloca() when it's mapped to malloc() works most certainly MY_THREAD_SPECIFICSergei Golubchik2013-01-281-1/+1
| * | cleanup:Sergei Golubchik2013-01-231-1/+1
| * | cleanup:Sergei Golubchik2013-01-232-4/+4
| * | cleanup: remove unused init_dynamic_array and init_dynamic_array2 symbols,Sergei Golubchik2013-01-231-3/+2
| * | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-2310-23/+41
| * | The library interface fixed.unknown2013-01-091-8/+10
| * | pre-mergeunknown2012-12-232-15/+94
| |\ \
| | * | Post-post review fixes.unknown2012-12-231-17/+3
| | * | backport to 5.5 dyncol changes and names supportunknown2012-12-232-46/+71
| | * | MDEV-506 Cassandra dynamic columns accessunknown2012-09-281-1/+31
| | * | MDEV-377 Name support for dynamic columnsunknown2012-09-282-0/+38
* | | | Merge 10.0-base -> 10.0.Igor Babaev2013-01-103-1/+10
|\ \ \ \ | |/ / /
| * | | The patch for the task mdev-539.Igor Babaev2012-12-203-1/+10
* | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-184-10/+12
|\ \ \ \ | |/ / /
| * | | Merge mariadb-5.5 -> 10.0-base.Igor Babaev2012-12-167-12/+29
| |\ \ \ | | | |/ | | |/|
| | * | 5.3->5.5 mergeSergei Golubchik2012-11-221-1/+2
| | |\ \
| | | * \ Merge MariaDB 5.1.66 -> 5.2 -> 5.3unknown2012-11-091-4/+6
| | | |\ \
| | | | * \ Merge MariaDB 5.1.66 -> 5.2.12unknown2012-11-081-4/+6
| | | | |\ \
| | | | | * \ Merge MySQL 5.1.66 -> MariaDB 5.1.65unknown2012-11-061-4/+6
| | | | | |\ \
| | * | | | | | MDEV-3868 : windows client compilation issuesVladislav Vaintroub2012-11-202-9/+5
| | * | | | | | Fixed bug mdev-3851.Igor Babaev2012-11-111-0/+3
| * | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-12-131-1/+1
| * | | | | | | Merge mdev-452 with the latest 10.0-base.unknown2012-10-181-0/+2
| |\ \ \ \ \ \ \
| | * | | | | | | MDEV-452 Add full support for auto-initialized/updated timestamp and datetimeunknown2012-10-171-0/+2
* | | | | | | | | MDEV-3822 :10.0-serg fails on windows buildslavesVladislav Vaintroub2012-11-041-1/+0
* | | | | | | | | merge with 5.5Sergei Golubchik2012-11-034-4/+19
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | MDEV-531 : Warning: Forcing close of thread ... in rpl_binlog_indexVladislav Vaintroub2012-11-021-0/+6
| * | | | | | | | mysql-5.5.28Sergei Golubchik2012-10-162-3/+12
| |\ \ \ \ \ \ \ \
| | * | | | | | | | Bug#14549809 LINKING PROBLEM IN 5.5.28 BUILDS WITH THREADPOOL PLUGINTor Didriksen2012-08-281-18/+2
| | * | | | | | | | Merge of patch for Bug#13928675 from mysql-5.1.Nirbhay Choubey2012-08-071-8/+13
| | |\ \ \ \ \ \ \ \ | | | | |_|_|_|_|/ / | | | |/| | | | | |
| | | * | | | | | | Bug#13928675 MYSQL CLIENT COPYRIGHT NOTICE MUSTNirbhay Choubey2012-08-071-8/+13
| | * | | | | | | | Bug#13699303 - THREAD POOL PLUGIN IGNORES TIMEOUT.Thayumanavar2012-07-251-0/+22
| * | | | | | | | | MDEV-3802. Millisecond timeout support in non-blocking client library.unknown2012-10-122-0/+2
* | | | | | | | | | fix async client code for i386 (assembly)Sergei Golubchik2012-10-301-1/+1
* | | | | | | | | | 10.0-base -> 10.0-montySergei Golubchik2012-10-1915-110/+47
|\ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / | |/| | | | | | | |
| * | | | | | | | | Changed SHOW_FUNC variabels that don't return SHOW_ARRAY to SHOW_SIMPLE_FUNC.Michael Widenius2012-10-034-4/+4
| * | | | | | | | | Made max_relay_log_size depending on master connection.Michael Widenius2012-10-011-0/+1
| | |_|_|/ / / / / | |/| | | | | | |