summaryrefslogtreecommitdiff
path: root/libmysql/libmysql.c
Commit message (Expand)AuthorAgeFilesLines
* Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-08-121-7/+9
|\
| * Merge bk-internal.mysql.com:/home/bk/mysql-5.0kostja@bodhi.local2006-08-021-7/+9
| |\
| | * A fix and a test case for Bug#15752 "Lost connection to MySQL server kostja@bodhi.local2006-07-241-7/+9
* | | Merge rama.(none):/home/jimw/my/tmp_mergejimw@rama.(none)2006-07-281-8/+9
|\ \ \ | |/ /
| * | mergingholyfoot/hf@mysql.com/deer.(none)2006-07-181-2/+3
| * | Merge mysql.com:/home/hf/work/mysql-4.1.mrgholyfoot/hf@mysql.com/deer.(none)2006-07-181-6/+6
| |\ \ | | |/ | |/|
| | * Merge bk@192.168.21.1:mysql-4.1holyfoot/hf@mysql.com/deer.(none)2006-07-131-6/+7
| | |\
| | | * bug #16017 (memory leaks in embedded server)holyfoot@deer.(none)2006-06-011-6/+7
* | | | Merge bodhi.local:/opt/local/work/tmp_mergekostja@bodhi.local2006-07-131-4/+3
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2006-06-301-4/+3
| |\ \ \ | | |/ /
| | * | bug #20152: mysql_stmt_execute() overwrites parameter bufferskroki@mysql.com2006-06-301-4/+3
| | |/
| | * libmysql.c:bar@mysql.com2006-04-061-0/+3
| | * Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-03-051-1/+1
| * | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-151-1/+1
| |\ \
* | \ \ Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-161-1/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-151-1/+1
* | | | Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_mergemsvensson@neptunus.(none)2006-05-121-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-081-0/+1
| |/ /
* | | Final patch to remove the last of the OS2 support. brian@zim.(none)2006-04-151-1/+1
* | | Merge mysql.com:/usr/home/bar/mysql-5.0bar@mysql.com2006-04-061-29/+0
|\ \ \ | |/ /
| * | Moving mysql_get_server_version() from libmysql.c to client.c,bar@mysql.com2006-04-061-29/+0
* | | fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) georg@lmy002.wdf.sap.corp2006-03-211-1/+2
* | | Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-treeanozdrin@mysql.com2006-03-101-1/+0
|\ \ \ | |/ /
| * | Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",konstantin@mysql.com2006-03-041-1/+1
| * | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-6/+6
| * | Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057msvensson@neptunus.(none)2006-02-211-1/+5
| |\ \
* | \ \ Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057msvensson@neptunus.(none)2006-02-211-1/+5
|\ \ \ \ | | |/ / | |/| |
| * | | Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different waysmsvensson@neptunus.(none)2006-02-161-1/+5
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-02-151-2/+33
|\ \ \ \ | | |/ / | |/| |
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-02-151-0/+1
| |\ \ \
| * \ \ \ Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013msvensson@neptunus.(none)2006-02-131-2/+33
| |\ \ \ \
| | * | | | Bug#14013 mysql_stmt_store_result() bombs if a cursor is openmsvensson@neptunus.(none)2006-02-101-2/+33
| | | |/ / | | |/| |
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-cleanjimw@mysql.com2006-02-151-0/+1
|\ \ \ \ \ | | |_|/ / | |/| | |
| * | | | Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'msvensson@devsrv-b.mysql.com2006-02-151-0/+1
| |/ / /
* | | | Automergeserg@serg.mylan2006-02-151-6/+0
|\ \ \ \
| * | | | dbug changes:serg@serg.mylan2006-02-141-6/+0
* | | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-081-0/+6
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-02-021-0/+6
| |\ \ \ | | | |/ | | |/|
| | * | fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection re...andrey@lmy004.2006-02-011-0/+6
* | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-1/+1
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-01-181-1/+1
| |\ \ \ | | |/ /
| | * | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-01-171-1/+1
* | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-1/+1
|\ \ \ \ | |/ / /
| * | | many warnings (practically safe but annoying) correctedserg@serg.mylan2006-01-031-1/+1
| | |/ | |/|
* | | Big patch to make embedded-server working in 5.xholyfoot@deer.(none)2006-01-041-6/+6
|/ /
* | Merginghf@deer.(none)2005-08-041-0/+7
|\ \ | |/
| * Fix for bug #12177 (errorlog file isn't closed)hf@deer.(none)2005-08-041-0/+7
| * minor fix (backport from 5.0) - changed function prototype/definitiongeorg@lmy002.wdf.sap.corp2005-07-191-2/+3
* | Cleanups during review of new codemonty@mysql.com2005-07-281-6/+1
* | Merge mysql.com:/home/jimw/my/mysql-5.0-5906jimw@mysql.com2005-07-191-2/+3
|\ \