summaryrefslogtreecommitdiff
path: root/include/mysql.h
Commit message (Expand)AuthorAgeFilesLines
* dirty mergeOleksandr Byelkin2019-02-071-1/+1
|\
| * Merge 10.1 into 10.2Marko Mäkelä2019-02-031-1/+1
| |\
| | * Merge 10.1 into 10.1Marko Mäkelä2019-02-021-1/+1
| | |\
| | | * Merge branch '5.5' into 10.0Oleksandr Byelkin2019-01-281-1/+1
| | | |\
| | | | * Crude "auto-load-data-local-infile" modemariadb-5.5.63Sergei Golubchik2019-01-271-1/+1
* | | | | MDEV-14792 INSERT without column list into table with explicit versioning col...Aleksey Midenkov2018-01-011-1/+0
|/ / / /
* | | | Merge branch '10.1' into 10.2Sergei Golubchik2017-03-301-0/+4
|\ \ \ \ | |/ / /
| * | | small plugin API related fixesSergei Golubchik2017-03-101-0/+4
| |/ /
* | | MDEV-11066 use MySQL terminology for "virtual columns"Sergei Golubchik2016-12-121-0/+6
* | | MDEV-10421 duplicate CHECK CONSTRAINTs.Alexey Botchkov2016-09-061-0/+1
* | | Revert "MDEV-9293 Connector/C integration"Vladislav Vaintroub2016-08-191-1/+4
* | | MDEV-9293 Connector/C integrationVladislav Vaintroub2016-08-191-4/+1
* | | General spell fixing in comments and stringsOtto Kekäläinen2016-06-081-1/+1
|/ /
* | MDEV-8450: PATCH] Wrong macro expansion in Query_cache::send_result_to_client()Oleksandr Byelkin2015-09-061-2/+2
* | Merge branch '5.5' into 10.0Sergei Golubchik2015-02-181-0/+6
|\ \ | |/
| * MDEV-7419 Function cli_safe_read not exportedmariadb-5.5.42Sergei Golubchik2015-02-131-0/+6
* | 5.5 mergeSergei Golubchik2015-01-211-0/+1
|\ \ | |/
| * MDEV-6671 mysql_server_end breaks OpenSSLSergei Golubchik2015-01-191-0/+1
* | Client attributesunknown2013-10-031-0/+2
* | 10.0-base mergeSergei Golubchik2013-07-181-1/+8
|\ \
| * \ 5.5 mergeSergei Golubchik2013-07-171-1/+4
| |\ \ | | |/
| | * MDEV-4573 UNINSTALL PLUGIN misleading error message for non-dynamic pluginsSergei Golubchik2013-06-131-0/+1
| | * MDEV-4574 Missing connection option MYSQL_ENABLE_CLEARTEXT_PLUGINSergei Golubchik2013-06-111-1/+3
* | | 10.0-base mergeSergei Golubchik2013-06-061-1/+2
|\ \ \ | |/ /
| * | 5.5 mergeSergei Golubchik2013-06-061-1/+2
| |\ \ | | |/
| | * mysql-5.5.31 mergeSergei Golubchik2013-05-071-1/+2
| | |\
| | | * Updated/added copyright headersMurthy Narkedimilli2013-02-261-1/+1
| | | |\
| | | * | Bug #12998841: libmysql divulges plaintext password upon request in 5.5Georgi Kodinov2012-07-051-1/+2
* | | | | 10.0-base mergeSergei Golubchik2013-04-181-3/+4
|\ \ \ \ \ | |/ / / /
| * | | | Changed the client library to only mark memory as THREAD_SPECIFIC if one has ...Michael Widenius2013-04-171-2/+2
| * | | | cleanup:Sergei Golubchik2013-01-231-2/+2
| * | | | MDEV-4011 Added per thread memory counting and usageMichael Widenius2013-01-231-2/+2
| |/ / /
* | | | Merge MariaDB 10.0-base to MariaDB 10.0unknown2012-12-181-6/+5
|\ \ \ \ | |/ / /
| * | | MDEV-3868 : windows client compilation issuesVladislav Vaintroub2012-11-201-6/+5
| * | | 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
* | | | fixes for test failuresSergei Golubchik2012-09-271-3/+3
* | | | Next part of merge. See TODO for detailsMichael Widenius2012-08-141-2/+6
|/ / /
* | | Merge MWL#192: Non-blocking client library, into MariaDB 5.5.unknown2012-02-211-3/+154
|\ \ \
| * | | MWL#192: non-blocking client API, after-review fixes.unknown2012-01-061-25/+20
| * | | MWL#192: Non-blocking client API for libmysqlclient.unknown2011-09-201-3/+157
* | | | 5.3 mergeSergei Golubchik2012-01-131-1/+2
|\ \ \ \
| * \ \ \ Merge with 5.2.Michael Widenius2011-12-111-2/+4
| |\ \ \ \
| | * \ \ \ Merge with MariaDB 5.1Michael Widenius2011-11-241-2/+4
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Initail merge with MySQL 5.1 (XtraDB still needs to be merged)Michael Widenius2011-11-211-2/+4
| | | |\ \ \ | | | | | |/ | | | | |/|
* | | | | | mysql-5.5.18 mergeSergei Golubchik2011-11-031-2/+2
|\ \ \ \ \ \ | | |_|_|_|/ | |/| | | |
| * | | | | Updated/added copyright headersKent Boortz2011-06-301-2/+2
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+4
| | |\ \ \ \
| | | * | | | Updated/added copyright headersKent Boortz2011-06-301-2/+3
* | | | | | | merge with 5.3Sergei Golubchik2011-10-191-1/+2
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |