summaryrefslogtreecommitdiff
path: root/include/mysql.h.pp
Commit message (Expand)AuthorAgeFilesLines
* 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
* | | | | | merge.Sergei Golubchik2010-11-251-48/+22
|\ \ \ \ \ \ | |_|/ / / / |/| | / / / | | |/ / / | |/| | |
| * | | | merge with 5.1Sergei Golubchik2010-09-111-1/+0
| |\ \ \ \ | | | |/ / | | |/| |
| | * | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-1/+0
| | |\ \ \
| * | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-32/+5
| * | | | | mergedSergei Golubchik2010-03-151-1/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | fix for a possible DoS in the my_net_skip_rest()Sergei Golubchik2010-02-231-1/+1
| * | | | | merge 5.1->5.2unknown2010-02-011-10/+0
| |\ \ \ \ \ | | |/ / / /
| | * | | | Merge with MySQL 5.1.42Michael Widenius2010-01-151-10/+0
| | |\ \ \ \
| * | | | | | Applied Antony T Curtis patch for declaring many CHARSET objects as constMichael Widenius2010-01-061-1/+1
| |/ / / / /
| * | | | | Merge with MySQL 5.1, with following additions:unknown2009-11-161-0/+10
| |\ \ \ \ \
| * | | | | | Added client functions:Michael Widenius2009-10-021-0/+2
| * | | | | | Added "pool-of-threads" handling (with libevent)Michael Widenius2009-03-131-2/+4
| * | | | | | Merged 5.1 with maria 5.1Michael Widenius2008-10-101-11/+8
* | | | | | | Auto-merge from mysql-5.1-bugteam.Dmitry Shulga2010-09-071-1/+2
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | |
| * | | | | Fixed bug #47485 - mysql_store_result returns a not NULL result setDmitry Shulga2010-09-071-1/+2
| | |_|_|/ | |/| | |
* | | | | Merge of mysql-5.1-bugteam into mysql-trunk-merge.Davi Arnaut2010-07-201-1/+0
|\ \ \ \ \ | |/ / / /
| * | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-201-1/+0
| | |_|/ | |/| |
* | | | Post-fix for Bug#52929 : replace uint with "unsigned int" in mysql.h.ppVladislav Vaintroub2010-07-051-3/+3
* | | | WL#4738 streamline/simplify @@variable creation processSergei Golubchik2009-12-221-0/+4
* | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-69/+14
|\ \ \ \ | |/ / / |/| | |
| * | | Manual merge from mysql-trunk-merge.Alexander Nozdrin2009-11-061-0/+10
| |\ \ \ | | | |/ | | |/|
| * | | Backport of revno 2630.28.10, 2630.28.31, 2630.28.26, 2630.33.1,Konstantin Osipov2009-10-221-1/+2
| * | | Backport of:Konstantin Osipov2009-10-161-62/+6
| * | | Introduce thd->query_cache_tls (threadKonstantin Osipov2009-10-131-1/+1
| * | | Backport to 5.4 the following changesets:Konstantin Osipov2009-10-091-5/+5
| | |/ | |/|
* | | Post-merge fix for bug 41728: revert fix that was pushed in mistake to 5.1 an...Davi Arnaut2009-11-241-10/+0
| |/ |/|
* | Automerge.Davi Arnaut2009-11-021-0/+10
|/