summaryrefslogtreecommitdiff
path: root/include/mysql.h
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \ \ \ \ \ \ | | |_|_|/ / / | |/| | | | |
| * | | | | | Added progress reporting for alter table, LOAD DATA INFILE and for aria table...Michael Widenius2011-07-011-1/+2
| | |_|_|/ / | |/| | | |
| * | | | | 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-5/+6
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | |
| * | | | | Patch for Bug#12374486 - SEVERE MEMORY LEAK IN PREPARED STATEMENTSAlexander Nozdrin2011-05-061-1/+3
| * | | | | WL#5665: Removal of the autotools-based build systemDavi Arnaut2010-11-201-4/+3
| * | | | | mergeGeorgi Kodinov2010-10-041-1/+2
| |\ \ \ \ \
| * | | | | | WL#1054: Pluggable authentication supportGeorgi Kodinov2010-08-091-46/+8
* | | | | | | merge.Sergei Golubchik2010-11-251-47/+11
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | merge with 5.1Sergei Golubchik2010-09-111-0/+2
| |\ \ \ \ \ | | | |/ / / | | |/| | |
| | * | | | Merge with MySQL 5.1.50Michael Widenius2010-08-271-0/+2
| | |\ \ \ \
| * | | | | | pluggable auth with plugin examplesSergei Golubchik2010-03-291-46/+8
| * | | | | | 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
* | | | | | | | 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-0/+2
|\ \ \ \ \ \ | |/ / / / /
| * | | | | Bug#52514: mysql 5.1 do_abi_check does not compile w/ gcc4.5Davi Arnaut2010-07-201-0/+2
| | |_|/ / | |/| | |
* | | | | WL#5486: Remove code for unsupported platformsDavi Arnaut2010-07-151-8/+0
* | | | | Manual merge from mysql-trunk.Alexander Nozdrin2009-12-111-123/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | 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-84/+6
| * | | | Backport of:Konstantin Osipov2009-10-161-35/+0
| * | | | Fix for BUG#42980 "Client doesn't set NUM_FLAG for DECIMAL and TIMESTAMP":Guilhem Bichot2009-09-301-3/+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
|\ \ \ | |/ / |/| / | |/
| * Bug#41728: Dropped symbol but no soname changeDavi Arnaut2009-09-291-0/+10
* | Merge mysql.com:/Users/davi/mysql/bugs/29592-5.0unknown2007-11-261-10/+0
|\ \ | |/
| * Bug#29592 SQL Injection issueunknown2007-11-261-10/+0
* | Merge bk-internal:/home/bk/mysql-5.1-marvelunknown2007-08-031-23/+32
|\ \
| * | Add 'extension' field to all client library structures to make them extensibleunknown2007-07-301-23/+32
* | | Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776unknown2007-08-011-0/+4
|\ \ \ | |/ / |/| / | |/
| * Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2unknown2007-08-011-0/+4
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1unknown2007-05-241-8/+7
|\ \
View Lorry Controller Status