Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge mysql.com:/usr/home/bar/mysql-5.0 | bar@mysql.com | 2006-04-06 | 1 | -29/+0 |
|\ | |||||
| * | Moving mysql_get_server_version() from libmysql.c to client.c, | bar@mysql.com | 2006-04-06 | 1 | -29/+0 |
* | | Merge mysql.com:/Users/kent/mysql/bk/tmp_merge | kent@mysql.com | 2006-04-05 | 2 | -5/+6 |
|\ \ | |/ | |||||
| * | yassl link problem fixed | serg@serg.mylan | 2006-04-03 | 2 | -5/+6 |
* | | Merge | kent@mysql.com | 2006-04-04 | 1 | -1/+5 |
|\ \ | |/ | |||||
| * | Makefile.am, yassl.m4: | kent@mysql.com | 2006-04-01 | 1 | -1/+5 |
* | | Manual merge. | knielsen@mysql.com | 2006-03-28 | 3 | -5/+181 |
|\ \ | |||||
| * | | Some changes to make it possible to build for Windows with CMake from | knielsen@mysql.com | 2006-03-24 | 3 | -3/+177 |
| * | | Define USE_TLS when compiling libmysql.dll, to avoid crashing when | knielsen@mysql.com | 2006-03-22 | 1 | -2/+4 |
* | | | fixed merge problem (bk commit - 5.1 tree (anozdrin:1.2163) | georg@lmy002.wdf.sap.corp | 2006-03-21 | 1 | -1/+2 |
|/ / | |||||
* | | Fix Windows CMake compilation after merge of Magnuses ssl patch. | knielsen@mysql.com | 2006-03-16 | 1 | -1/+1 |
* | | CMake Windows comp_error dependency fix after last push. | knielsen@mysql.com | 2006-03-16 | 1 | -1/+1 |
* | | Fix Windows CMake dependency problem. | knielsen@mysql.com | 2006-03-16 | 1 | -1/+1 |
* | | Moved cmake scripts into the proper directories | Reggie@xgeek. | 2006-03-15 | 1 | -0/+53 |
* | | Merge mysql.com:/mnt/hda4/home/alik/MySQL/devel/5.0-tree | anozdrin@mysql.com | 2006-03-10 | 1 | -1/+0 |
|\ \ | |/ | |||||
| * | Undo the patch for Bug#16144 "mysql_stmt_attr_get type error", | konstantin@mysql.com | 2006-03-04 | 1 | -1/+1 |
| * | Fixes to embedded server to be able to run tests with it | monty@mysql.com | 2006-02-24 | 1 | -6/+6 |
| * | Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 | msvensson@neptunus.(none) | 2006-02-21 | 1 | -1/+5 |
| |\ | |||||
* | \ | Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057 | msvensson@neptunus.(none) | 2006-02-21 | 1 | -1/+5 |
|\ \ \ | | |/ | |/| | |||||
| * | | Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways | msvensson@neptunus.(none) | 2006-02-16 | 1 | -1/+5 |
* | | | Merge mysql.com:/home/jimw/my/mysql-5.0-clean | jimw@mysql.com | 2006-02-15 | 1 | -2/+33 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0 | msvensson@neptunus.(none) | 2006-02-15 | 1 | -0/+1 |
| |\ \ | |||||
| * \ \ | Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013 | msvensson@neptunus.(none) | 2006-02-13 | 1 | -2/+33 |
| |\ \ \ | |||||
| | * | | | Bug#14013 mysql_stmt_store_result() bombs if a cursor is open | msvensson@neptunus.(none) | 2006-02-10 | 1 | -2/+33 |
| | | |/ | | |/| | |||||
* | | | | Merge mysql.com:/home/jimw/my/mysql-5.0-clean | jimw@mysql.com | 2006-02-15 | 1 | -0/+1 |
|\ \ \ \ | | |_|/ | |/| | | |||||
| * | | | Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000' | msvensson@devsrv-b.mysql.com | 2006-02-15 | 1 | -0/+1 |
| |/ / | |||||
* | | | Automerge | serg@serg.mylan | 2006-02-15 | 1 | -6/+0 |
|\ \ \ | |||||
| * | | | dbug changes: | serg@serg.mylan | 2006-02-14 | 1 | -6/+0 |
* | | | | Merge mysql.com:/home/kostja/mysql/tmp_merge | konstantin@mysql.com | 2006-02-08 | 1 | -0/+6 |
|\ \ \ \ | |/ / / |/| / / | |/ / | |||||
| * | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2006-02-02 | 1 | -0/+6 |
| |\ \ | |||||
| | * | | fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection re... | andrey@lmy004. | 2006-02-01 | 1 | -0/+6 |
* | | | | Merge mysql.com:/home/kostja/mysql/tmp_merge | konstantin@mysql.com | 2006-02-02 | 3 | -2/+3 |
|\ \ \ \ | |/ / / | |||||
| * | | | Merge mysql.com:/opt/local/work/mysql-4.1-root | konstantin@mysql.com | 2006-01-18 | 3 | -2/+3 |
| |\ \ \ | | |/ / | |||||
| | * | | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error": | konstantin@mysql.com | 2006-01-17 | 1 | -1/+1 |
| | * | | BUG#3074: Unversioned symbols in shared library | svoj@april.(none) | 2006-01-17 | 2 | -1/+2 |
* | | | | Merge mysql.com:/home/kostja/mysql/tmp_merge | konstantin@mysql.com | 2006-02-02 | 1 | -1/+1 |
|\ \ \ \ | |/ / / | |||||
| * | | | many warnings (practically safe but annoying) corrected | serg@serg.mylan | 2006-01-03 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Big patch to make embedded-server working in 5.x | holyfoot@deer.(none) | 2006-01-04 | 1 | -6/+6 |
|/ / | |||||
* | | Include libyassl.la and libtaocrypt.la in libmysqlclient.la | msvensson@neptunus.(none) | 2005-11-28 | 1 | -2/+2 |
* | | Merge | kent@mysql.com | 2005-11-04 | 1 | -16/+16 |
|\ \ | |/ | |||||
| * | Makefile.am, configure.in: | kent@mysql.com | 2005-09-24 | 1 | -16/+16 |
* | | BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking | msvensson@neptunus.(none) | 2005-10-27 | 1 | -1/+1 |
* | | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking | msvensson@neptunus.(none) | 2005-10-18 | 1 | -1/+1 |
* | | Merging | hf@deer.(none) | 2005-08-04 | 1 | -0/+7 |
|\ \ | |/ | |||||
| * | Fix for bug #12177 (errorlog file isn't closed) | hf@deer.(none) | 2005-08-04 | 1 | -0/+7 |
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-7003 | jimw@mysql.com | 2005-08-02 | 1 | -1/+1 |
|\ \ | |||||
| * | | Add my_str_malloc and _free function pointers to strings library | jimw@mysql.com | 2005-06-24 | 1 | -1/+1 |
* | | | Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0 | schwenke@alpha.xl.local | 2005-07-31 | 1 | -1/+0 |
|\ \ \ | |||||
| * | | | fixed two bugs that break Windows build | schwenke@alpha.xl.local | 2005-07-29 | 1 | -1/+0 |
* | | | | Cleanups during review of new code | monty@mysql.com | 2005-07-28 | 1 | -6/+1 |
|/ / / |