summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Expand)AuthorAgeFilesLines
* Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-mdmsvensson@neptunus.(none)2006-05-121-0/+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
| | * Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+1
| | * Merge 192.168.0.20:mysql/bug15069/my50-bug15069msvensson@neptunus.(none)2006-04-101-0/+1
| | |\
* | | | Rename cmakelists.txt -> CMakeLists.txtmsvensson@neptunus.(none)2006-05-121-1/+1
* | | | performing a set of bk mv on each CMakeLists.txt file to try and restore the ...reggie@big_geek.2006-05-111-0/+0
|/ / /
* | | Final patch to remove the last of the OS2 support. brian@zim.(none)2006-04-154-29/+4
* | | Merge 192.168.0.10:mysql/mysql-5.1msvensson@shellback.2006-04-111-0/+147
|\ \ \
| * | | Make line endings consistent, use Unix formatmsvensson@shellback.2006-04-101-0/+147
* | | | Merge 192.168.0.20:mysql/bug15069/my51-bug15069msvensson@neptunus.(none)2006-04-101-0/+1
|\ \ \ \
| * \ \ \ Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069msvensson@shellback.(none)2006-04-101-0/+1
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | Bug#15069 [patch] my_print_defaults does'nt care --sysconfdirmsvensson@shellback.(none)2006-04-101-0/+1
* | | | | Update implementation of new function 'mysql_get_ssl_cipher' after reviewmsvensson@neptunus.(none)2006-04-101-0/+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
* | | | Merge mysql.com:/Users/kent/mysql/bk/tmp_mergekent@mysql.com2006-04-052-5/+6
|\ \ \ \ | |/ / /
| * | | yassl link problem fixedserg@serg.mylan2006-04-032-5/+6
* | | | Mergekent@mysql.com2006-04-041-1/+5
|\ \ \ \ | |/ / /
| * | | Makefile.am, yassl.m4:kent@mysql.com2006-04-011-1/+5
| | |/ | |/|
* | | Manual merge.knielsen@mysql.com2006-03-283-5/+181
|\ \ \
| * | | Some changes to make it possible to build for Windows with CMake fromknielsen@mysql.com2006-03-243-3/+177
| * | | Define USE_TLS when compiling libmysql.dll, to avoid crashing whenknielsen@mysql.com2006-03-221-2/+4
* | | | fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) georg@lmy002.wdf.sap.corp2006-03-211-1/+2
|/ / /
* | | Fix Windows CMake compilation after merge of Magnuses ssl patch.knielsen@mysql.com2006-03-161-1/+1
* | | CMake Windows comp_error dependency fix after last push.knielsen@mysql.com2006-03-161-1/+1
* | | Fix Windows CMake dependency problem.knielsen@mysql.com2006-03-161-1/+1
| |/ |/|
* | Moved cmake scripts into the proper directoriesReggie@xgeek.2006-03-151-0/+53
* | 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-023-2/+3
|\ \ \ \ | |/ / /
| * | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-01-183-2/+3
| |\ \ \ | | |/ /
| | * | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-01-171-1/+1
| | * | BUG#3074: Unversioned symbols in shared librarysvoj@april.(none)2006-01-172-1/+2
* | | | Merge mysql.com:/home/kostja/mysql/tmp_mergekonstantin@mysql.com2006-02-021-1/+1
|\ \ \ \ | |/ / /