summaryrefslogtreecommitdiff
path: root/libmysql
Commit message (Collapse)AuthorAgeFilesLines
* Merge mysql.com:/home/my/mysql-4.1monty@mysql.com2006-06-301-4/+3
|\ | | | | | | into mysql.com:/home/my/mysql-5.0
| * bug #20152: mysql_stmt_execute() overwrites parameter bufferskroki@mysql.com2006-06-301-4/+3
| | | | | | | | | | | | | | | | When using a parameter bind MYSQL_TYPE_DATE in a prepared statement, the time part of the MYSQL_TIME buffer was written to zero in mysql_stmt_execute(). The param_store_date() function in libmysql.c worked directly on the provided buffer. Changed to use a copy of the buffer.
| * libmysql.c:bar@mysql.com2006-04-061-0/+3
| | | | | | | | | | Bug#18830: incompatibility new libraries with old server Don't execute SET NAMES with pre-4.1 server.
| * Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-03-051-1/+1
| | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1.
* | Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_initmsvensson@shellback.(none)2006-05-311-1/+1
| | | | | | | | | | | | | | - Include prefix files that renames all public functions in yaSSLs OpenSSL API to ya<function_name>. They will otherwise conflict with OpenSSL functions if loaded by an application that uses OpenSSL as well as libmysqlclient with yaSSL support.
* | Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfixknielsen@mysql.com2006-05-151-1/+1
|\ \ | | | | | | | | | into mysql.com:/usr/local/mysql/tmp-5.0
| * | Fix two Valgrind memory leak warnings.knielsen@mysql.com2006-05-151-1/+1
| | |
* | | Remove valgrind and compiler warningsmsvensson@neptunus.(none)2006-05-081-0/+1
| | | | | | | | | | | | Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
* | | Backport fix for mysql client not using SSl library directlymsvensson@neptunus.(none)2006-04-221-0/+1
|/ / | | | | | | | | - Add function mysql_get_ssl_cipher - Use function mysql_get_ssl_cipher from mysql
* | Merge 192.168.0.20:mysql/bug15069/my50-bug15069msvensson@neptunus.(none)2006-04-101-0/+1
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug#15069 [patch] my_print_defaults does'nt care --sysconfdirmsvensson@shellback.(none)2006-04-101-0/+1
| | | | | | | | | | | | | | | | | | | | | - Grab the path from "configure --sysconfdir=<path>" and set it as the first place to look for my.cnf files Do this both in Makefiles for libmysql and mysys - Patch provided by Francesco Riosa. Thank you!
* | | Moving mysql_get_server_version() from libmysql.c to client.c,bar@mysql.com2006-04-061-29/+0
| | | | | | | | | | | | as it is now required by mysql_set_character_set()
* | | yassl link problem fixedserg@serg.mylan2006-04-032-5/+6
| | |
* | | Makefile.am, yassl.m4:kent@mysql.com2006-04-011-1/+5
|/ / | | | | | | | | | | Enable automake to determine dependency on yaSSL, by explicitly listing the .la files in Makefile.am, instead of using 'yassl_libs_with_path', bug#18273
* | Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",konstantin@mysql.com2006-03-041-1/+1
| | | | | | | | | | | | | | it breaks binary compatibility. The patch will be left intact in 5.1. Warning: this changeset should be null-merged into 5.1. A separate commit in order to push into the release clone of 5.0.19.
* | Fixes to embedded server to be able to run tests with itmonty@mysql.com2006-02-241-6/+6
| | | | | | | | (Needed for "list of pushes" web page and autopush)
* | Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057msvensson@neptunus.(none)2006-02-211-1/+5
|\ \ | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different waysmsvensson@neptunus.(none)2006-02-161-1/+5
| | | | | | | | | | | | - Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST
* | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0msvensson@neptunus.(none)2006-02-151-0/+1
|\ \ \ | | | | | | | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'msvensson@devsrv-b.mysql.com2006-02-151-0/+1
| | | | | | | | | | | | | | | | - Init sql_state in mysql_stmt_init
* | | | Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013msvensson@neptunus.(none)2006-02-131-2/+33
|\ \ \ \ | |/ / / |/| | | | | | | into neptunus.(none):/home/msvensson/mysql/mysql-5.0
| * | | Bug#14013 mysql_stmt_store_result() bombs if a cursor is openmsvensson@neptunus.(none)2006-02-101-2/+33
| |/ / | | | | | | | | | | | | | | | - Add code to 'mysql_stmt_store_result' to allow it to be called on a prepared statement with open server side cursor. - Add tests to mysql_client_test that uses 'mysql_stmt_store_result'
* | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-02-021-0/+6
|\ \ \ | | |/ | |/| | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * | fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection ↵andrey@lmy004.2006-02-011-0/+6
| | | | | | | | | | | | reset)
* | | Merge mysql.com:/opt/local/work/mysql-4.1-rootkonstantin@mysql.com2006-01-183-2/+3
|\ \ \ | |/ / | | | | | | into mysql.com:/opt/local/work/mysql-5.0-root
| * | A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":konstantin@mysql.com2006-01-171-1/+1
| | | | | | | | | | | | use the right type in mysql_stmt_attr_get
| * | BUG#3074: Unversioned symbols in shared librarysvoj@april.(none)2006-01-172-1/+2
| | | | | | | | | | | | libmysqlclient versioning when linked with GNU ld.
* | | many warnings (practically safe but annoying) correctedserg@serg.mylan2006-01-031-1/+1
| |/ |/|
* | Include libyassl.la and libtaocrypt.la in libmysqlclient.la msvensson@neptunus.(none)2005-11-281-2/+2
| |
* | Mergekent@mysql.com2005-11-041-16/+16
|\ \ | |/
| * Makefile.am, configure.in:kent@mysql.com2005-09-241-16/+16
| | | | | | | | Enable "make distcheck" to work
* | BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linkingmsvensson@neptunus.(none)2005-10-271-1/+1
| | | | | | | | | | - Remove yassl_libsfrom CLIENT_LIBS var - Add yassl_libs to libmysql and libmysqld
* | Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linkingmsvensson@neptunus.(none)2005-10-181-1/+1
| | | | | | | | | | - Use yassl_includes and yassl_libs instead of openssl_includes and openssl_libs to avoid that mysql_config returns that libyassl and libtaocrypt are needed for linking.
* | 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
| | | | | | | | 4.1 version of the patch
* | Merge mysql.com:/home/jimw/my/mysql-5.0-7003jimw@mysql.com2005-08-021-1/+1
|\ \ | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | Add my_str_malloc and _free function pointers to strings libraryjimw@mysql.com2005-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | which will by default exit(1) if malloc() fails, but can be set to do something else by the calling program does, which mysqld does to use my_malloc(..., MYF(MY_FAE)) instead. Also checks allocation in conf_to_src utility program. (Bug #7003)
* | | Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0schwenke@alpha.xl.local2005-07-311-1/+0
|\ \ \ | | | | | | | | | | | | into alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
| * | | fixed two bugs that break Windows buildschwenke@alpha.xl.local2005-07-291-1/+0
| | | |
* | | | Cleanups during review of new codemonty@mysql.com2005-07-281-6/+1
|/ / / | | | | | | | | | Ensure mysql_close() is called if mysql_set_character_set() fails
* | | Merge mysql.com:/usr/home/bar/mysql-4.1.b10201bar@mysql.com2005-07-261-0/+1
|\ \ \ | | |/ | |/| | | | into mysql.com:/usr/home/bar/mysql-5.0
| * | fix for bug #7924.georg@lmy002.wdf.sap.corp2005-07-251-0/+2
| | | | | | | | | | | | | | | | | | added export symbols mysql_server_init and mysql_server_end to allow client to connect to external and embedded server using the same code (required for Connector/OO.org). (Backport from 5.0 - cs. 1.35)
| * | minor fix (backport from 5.0) - changed function prototype/definitiongeorg@lmy002.wdf.sap.corp2005-07-191-2/+3
| | |
* | | Merge mysql.com:/home/jimw/my/mysql-5.0-5906jimw@mysql.com2005-07-191-2/+3
|\ \ \ | | | | | | | | | | | | into mysql.com:/home/jimw/my/mysql-5.0-clean
| * | | Fix number to date conversion so it always honors the NO_ZERO_DATE,jimw@mysql.com2005-07-181-2/+3
| | | | | | | | | | | | | | | | NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906)
* | | | Fixes to previous changesetmonty@mishka.local2005-07-181-1/+1
| | | | | | | | | | | | | | | | get_defaults_file() -> get_defaults_options()
* | | | Merge bk-internal.mysql.com:/home/bk/mysql-5.0monty@mishka.local2005-07-181-0/+1
|\ \ \ \ | | | | | | | | | | | | | | | into mishka.local:/home/my/mysql-5.0
| * | | | Cleanups during reviewmonty@mishka.local2005-07-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Changed defaults option --instance to --defaults-group-suffix Changed option handling to allow --defaults-file, --defaults-extra-file and --defaults-group-suffix to be given in any order Changed MYSQL_INSTANCE to MYSQL_GROUP_SUFFIX mysql_print_defaults now understands --defaults-group-suffix Remove usage of my_tempnam() (not safe function) if( -> if ( and while( to while (
* | | | | Restore previous used client charset in mysql_reconnectgeorg@lmy002.wdf.sap.corp2005-07-161-33/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved mysql_set_character_set function to client.c Changed function prototype for mysql_set_character_set (as suggested by Konstantin)
* | | | | Fix for bug #11037.georg@lmy002.wdf.sap.corp2005-07-151-3/+12
| | | | | | | | | | | | | | | | | | | | | | | | | When all rows are fetched subsequent calls to mysql_stmt_fetch return now MYSQL_NO_DATA instead of errorcode 1.