summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
Commit message (Expand)AuthorAgeFilesLines
* Merge branch '10.0' into 10.1Sergei Golubchik2016-08-251-1/+1
|\
| * Fixed "Packets out of order" warning message on stdout in clients,Monty2016-08-211-1/+1
* | A clean-up after the patch for MDEV-8747 and MDEV-8749:Alexander Barkov2015-09-061-1/+1
* | MDEV-6152: Remove calls to current_thd while creating ItemMonty2015-09-011-2/+2
* | Merge tag 'mariadb-10.0.20' into 10.1Sergei Golubchik2015-06-271-7/+0
|\ \ | |/
| * Merge branch '5.5' into 10.0Sergei Golubchik2015-06-111-7/+0
| |\
| | * MDEV-8052 abi detection incorrect with clangSergei Golubchik2015-06-031-7/+0
* | | Merge branch '10.0' into 10.1Sergei Golubchik2015-03-071-2/+2
|\ \ \ | |/ /
| * | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-0/+2
| |\ \ |/ / / | | _
| * MDEV-7419 Function cli_safe_read not exportedmariadb-5.5.42Sergei Golubchik2015-02-131-0/+2
* | 5.5 mergeSergei Golubchik2015-01-211-0/+1
|\ \ | |/
| * MDEV-6671 mysql_server_end breaks OpenSSLSergei Golubchik2015-01-191-0/+1
* | Fixed assert in perfschema/pfs.cc::start_idle_wait_v1 when using performance ...Michael Widenius2014-07-191-5/+5
* | Client attributesunknown2013-10-031-0/+2
* | 10.0-base mergeSergei Golubchik2013-07-181-0/+5
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-171-1/+2
| |\ \ | | |/
| | * MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGINSergei Golubchik2013-06-111-1/+2
* | | Adding support for MySQL-5.6 temporal column types:Alexander Barkov2013-07-101-0/+3
* | | Adding the timezone plugin service, to convert betweenAlexander Barkov2013-05-241-0/+1
* | | 10.0-base mergeSergei Golubchik2013-04-181-4/+5
|\ \ \ | |/ /
| * | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ...Michael Widenius2013-04-171-3/+3
* | | 10.0-base mergeSergei Golubchik2013-01-311-2/+2
|\ \ \ | |/ /
| * | cleanup:Sergei Golubchik2013-01-231-2/+2
| * | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-4/+4
| |/
| * MDEV-3802. Millisecond timeout support in non-blocking client library.unknown2012-10-121-0/+1
* | MDEV-3802: Millisecond timeout support in non-blocking client library + fix i...unknown2012-10-121-0/+1
* | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-2/+6
|/
* a couple of minor post-5.5-merge cleanupsSergei Golubchik2012-03-261-3/+1
* Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-1/+133
|\
| * MWL#192: non-blocking client API, after-review fixes.unknown2012-01-061-9/+4
| * MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-201-1/+136
* | 5.3 mergeSergei Golubchik2012-01-131-0/+1
|\ \
| * \ 5.2->5.3 mergeSergei Golubchik2011-12-121-0/+1
| |\ \
| | * | 1. add --plugin-dir and --default-auth to mysqltest.Sergei Golubchik2011-12-021-0/+1
| | |/
* | | 5.3->5.5 mergeSergei Golubchik2011-11-221-2/+2
|\ \ \ | |/ /
| * | Added new options to KILL. New syntax is KILL [HARD|SOFT] [CONNECTION|QUERY] ...Michael Widenius2011-09-231-2/+2
* | | merge with 5.3Sergei Golubchik2011-10-191-2/+4
|\ \ \ | |/ /
| * | mergeVladislav Vaintroub2011-07-101-1/+1
| |\ \ | | |/
| | * mergeVladislav Vaintroub2011-07-101-1/+1
| * | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-1/+2
| * | Merge with 5.1-microsecondsMichael Widenius2011-05-281-1/+2
| |\ \ | | |/ | |/|
| | * wl#173 - temporal types with sub-second resolutionSergei Golubchik2011-03-011-1/+1
| * | merge with 5.1Michael Widenius2010-11-301-1/+2
| |\ \
| | * \ Merge with MySQL 5.1.52Michael Widenius2010-11-231-1/+2
| | |\ \ | | | |/
* | | | 5.5-mergeSergei Golubchik2011-07-021-4/+5
|\ \ \ \
| * | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTSAlexander Nozdrin2011-05-061-1/+2
| * | | | Fix for BUG#59894Guilhem Bichot2011-02-111-1/+1
| * | | | mergeGeorgi Kodinov2010-10-041-1/+2
| |\ \ \ \
| * | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-32/+5
* | | | | | lots of post-merge changesSergei Golubchik2011-04-251-1/+1