summaryrefslogtreecommitdiff
path: root/include/mysql.h
Commit message (Expand)AuthorAgeFilesLines
* 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.0davi@endora.local2007-11-261-10/+0
|\ \ | |/
| * Bug#29592 SQL Injection issuedavi@mysql.com/endora.local2007-11-261-10/+0
* | Merge bk-internal:/home/bk/mysql-5.1-marveldf@pippilotta.erinye.com2007-08-031-23/+32
|\ \
| * | Add 'extension' field to all client library structures to make them extensiblemonty@mysql.com/nosik.monty.fi2007-07-301-23/+32
* | | Merge sin.intern.azundris.com:/home/tnurnberg/10776/50-10776tnurnberg@sin.intern.azundris.com2007-08-011-0/+4
|\ \ \ | |/ / |/| / | |/
| * Bug #10776: Failure to compile ndb ReadNodesConf.cpp on AIX 5.2tnurnberg@sin.intern.azundris.com2007-08-011-0/+4
* | Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1jani@a88-113-38-195.elisa-laajakaista.fi2007-05-241-8/+7
|\ \
| * | WL#3817: Simplify string / memory area types and make things more consistent ...monty@mysql.com/narttu.mysql.fi2007-05-101-8/+7
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.1serg@sergbook.mysql.com2007-04-161-1/+2
|\ \ \ | |/ / |/| |
| * | WL#2936antony@ppcg5.local2007-03-021-1/+2
* | | Bug #24121 Incorrect test for SSL_VERIFY_SERVER_CERTmsvensson@pilot.blaudden2007-03-271-1/+1
|/ /
* | Fixed compilations problems and warnings on windowsmonty@mysql.com/narttu.mysql.fi2007-02-231-1/+1
* | Merge mysql.com:/home/my/mysql-5.0monty@narttu.mysql.fi2007-01-271-1/+2
|\ \ | |/
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mysql.com/narttu.mysql.fi2007-01-221-1/+2
| |\
| | * Fixed compiler warnings detected by option -Wshadow and -Wunused:monty@mysql.com/narttu.mysql.fi2006-12-151-1/+2
| * | Merge siva.hindu.god:/usr/home/tim/m/bk/g50tsmith/tim@siva.hindu.god2006-12-261-2/+1
| |\ \
* | \ \ Merge siva.hindu.god:/usr/home/tim/m/bk/g51tsmith/tim@siva.hindu.god2006-12-261-1/+1
|\ \ \ \ | |/ / /
| * | | Merge shakedown.(none):/home/jpipes/dev/bug20246/my41-bug20246jpipes@shakedown.(none)2006-12-071-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Fix for Bug #20246 (enum mysql_enum_shutdown_level not well-defined in mysql_...jpipes@shakedown.(none)2006-12-061-1/+1
| | * | Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-11-161-6/+0
| | |\ \
| | | * | Bug #23427 (incompatible ABI change)holyfoot/hf@mysql.com/deer.(none)2006-10-241-6/+0
* | | | | Merge mysql.com:/home/kent/bk/main/mysql-5.0kent@kent-amd64.(none)2006-12-231-2/+1
|\ \ \ \ \ | | |_|_|/ | |/| | |
| * | | | Many files:kent@mysql.com/kent-amd64.(none)2006-12-231-2/+1
| |/ / /
* | | | This finishes the work (someone) started to remove FIELD_ types and use the E...brian@zim.(none)2006-12-011-2/+2
|/ / /
* | | Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1-maintmsvensson@neptunus.(none)2006-10-241-0/+11
|\ \ \ | |/ /
| * | WL#3462 Add testing of MySQL client ABI to prevent unintentional ABI breaksmsvensson@neptunus.(none)2006-10-241-0/+11
| |/
* | Bug #23427: incompatible ABI change in 5.0.26?cmiller@zippy.cornsilk.net2006-10-201-6/+0
* | Merge zippy.cornsilk.net:/home/cmiller/work/mysql/release/mysql-5.0-release_m...cmiller@zippy.cornsilk.net2006-08-251-1/+0
|\ \
| * | Bug#21543: 5.0.24 breaks ABI compatibility for python bindings: \cmiller@zippy.cornsilk.net2006-08-251-1/+0
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-1/+0
|\ \ \
| * | | A fix and a test case for Bug#15752 "Lost connection to MySQL server kostja@bodhi.local2006-07-241-1/+0
| |/ /
* | | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-3/+14
|\ \ \ | |/ / |/| / | |/
| * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-3/+14
| * minor fix (backport from 5.0) - changed function prototype/definitiongeorg@lmy002.wdf.sap.corp2005-07-191-1/+1
* | Merge neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208msvensson@neptunus.(none)2006-04-261-1/+3
|\ \
| * | Bug#17208 SSL: client does not verify server certificatemsvensson@neptunus.(none)2006-04-181-1/+3
* | | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+1
|/ /
* | Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"monty@mysql.com2006-03-271-0/+2
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-3/+6
* | compatibility define for Bug#15293serg@serg.mylan2005-12-051-0/+3
* | Merge mysql.com:/home/jimw/my/mysql-5.0-11787jimw@mysql.com2005-09-031-1/+1
|\ \
View Lorry Controller Status