holyfoot/hf@mysql.com/deer.(none)
00f56da9af
merging
2006-07-18 16:43:39 +05:00
holyfoot/hf@mysql.com/deer.(none)
bed7b69243
Merge mysql.com:/home/hf/work/mysql-4.1.mrg
...
into mysql.com:/home/hf/work/mysql-5.0.mrg
2006-07-18 14:52:29 +05:00
holyfoot/hf@mysql.com/deer.(none)
eddaafb12b
Merge bk@192.168.21.1:mysql-4.1
...
into mysql.com:/home/hf/work/mysql-4.1.16017
2006-07-13 22:32:18 +05:00
monty@mysql.com
2f86009c9e
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2006-06-30 19:15:18 +03:00
kroki@mysql.com
79ca4c1d55
bug #20152 : mysql_stmt_execute() overwrites parameter buffers
...
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.
2006-06-30 12:52:05 +04:00
holyfoot@deer.(none)
bc35c50063
bug #16017 (memory leaks in embedded server)
...
There actually was 3 different problems -
hash_user_connections wasn't cleaned
one strdupped database name wasn't freed
and stmt->mem_root wasn't cleaned as it was
replased with mysql->field_alloc for result
For the last one - i made the library using stmt's
fields to store result if it's the case.
2006-06-01 17:06:42 +05:00
msvensson@shellback.(none)
20217ba36f
Bug#19575 MySQL-shared-5.0.21-0.glibc23 causes segfault in SSL_library_init
...
- 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.
2006-05-31 16:19:06 +02:00
knielsen@mysql.com
b6ee2d2340
Merge mysql.com:/usr/local/mysql/mysql-5.0-vgfix
...
into mysql.com:/usr/local/mysql/tmp-5.0
2006-05-15 19:57:12 +02:00
knielsen@mysql.com
fc16aff742
Fix two Valgrind memory leak warnings.
2006-05-15 18:07:18 +02:00
msvensson@neptunus.(none)
b60540a862
Remove valgrind and compiler warnings
...
Add function 'vio_end' that will cleanup resources allocated by vio and the components it uses.
2006-05-08 17:14:06 +02:00
msvensson@neptunus.(none)
29ace143a1
Backport fix for mysql client not using SSl library directly
...
- Add function mysql_get_ssl_cipher
- Use function mysql_get_ssl_cipher from mysql
2006-04-22 00:48:13 +02:00
msvensson@neptunus.(none)
6b1f72c1a7
Merge 192.168.0.20:mysql/bug15069/my50-bug15069
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-04-10 15:13:30 +02:00
msvensson@shellback.(none)
475e1f6a53
Bug#15069 [patch] my_print_defaults does'nt care --sysconfdir
...
- 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!
2006-04-10 15:11:37 +02:00
bar@mysql.com
13b5cdb126
Moving mysql_get_server_version() from libmysql.c to client.c,
...
as it is now required by mysql_set_character_set()
2006-04-06 13:03:22 +05:00
bar@mysql.com
45a3bb57d6
libmysql.c:
...
Bug#18830: incompatibility new libraries with old server
Don't execute SET NAMES with pre-4.1 server.
2006-04-06 11:47:46 +05:00
serg@serg.mylan
a1bf113868
yassl link problem fixed
2006-04-03 12:07:18 +02:00
kent@mysql.com
f5a9cc17a1
Makefile.am, yassl.m4:
...
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
2006-04-01 01:24:28 +02:00
konstantin@mysql.com
2ea0b9b72c
Revert the changeset for Bug#16144 "mysql_stmt_attr_get type error":
...
it breaks binary compatibility. The patch will be left intact
in 5.1.
2006-03-05 00:38:54 +03:00
konstantin@mysql.com
951943c22a
Undo the patch for Bug#16144 "mysql_stmt_attr_get type error",
...
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.
2006-03-04 23:04:48 +03:00
monty@mysql.com
82b77cdd90
Fixes to embedded server to be able to run tests with it
...
(Needed for "list of pushes" web page and autopush)
2006-02-24 18:34:15 +02:00
msvensson@neptunus.(none)
e919f8e888
Merge neptunus.(none):/home/msvensson/mysql/bug14057/my50-bug14057
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-21 08:50:26 +01:00
msvensson@neptunus.(none)
56acf0a0c2
Bug#14057 mysql_ping() handles TCP and UNIX socket connections in different ways
...
- Retry the ping if reconnect is turned on and the error was CR_SERVER_LOST
2006-02-16 13:44:56 +01:00
msvensson@neptunus.(none)
12b23630db
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-15 20:16:33 +01:00
msvensson@devsrv-b.mysql.com
eb97818627
Bug#16143 mysql_stmt_sqlstate returns an empty string instead of '00000'
...
- Init sql_state in mysql_stmt_init
2006-02-15 13:45:03 +01:00
msvensson@neptunus.(none)
e486d81a52
Merge neptunus.(none):/home/msvensson/mysql/bug14013/my50-bug14013
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-02-13 10:56:45 +01:00
msvensson@neptunus.(none)
5000951ab4
Bug#14013 mysql_stmt_store_result() bombs if a cursor is open
...
- 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'
2006-02-10 14:50:29 +01:00
konstantin@mysql.com
98091b152a
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-02-02 18:17:18 +03:00
andrey@lmy004.
736faf4730
fix for bug #12744 (MYSQL_STMT operations cause seg fault after connection reset)
2006-02-01 20:35:16 +01:00
konstantin@mysql.com
d2bba04183
Merge mysql.com:/opt/local/work/mysql-4.1-root
...
into mysql.com:/opt/local/work/mysql-5.0-root
2006-01-18 15:15:09 +03:00
konstantin@mysql.com
19fd36e254
A fix and a test case for Bug#16144 "mysql_stmt_attr_get type error":
...
use the right type in mysql_stmt_attr_get
2006-01-17 23:19:43 +03:00
svoj@april.(none)
f84b301bd1
BUG#3074: Unversioned symbols in shared library
...
libmysqlclient versioning when linked with GNU ld.
2006-01-17 18:51:08 +04:00
serg@serg.mylan
14f94dc0ca
many warnings (practically safe but annoying) corrected
2006-01-03 17:54:54 +01:00
msvensson@neptunus.(none)
9a84dcc1ac
Include libyassl.la and libtaocrypt.la in libmysqlclient.la
2005-11-28 16:28:00 +01:00
kent@mysql.com
4742f585b1
Merge
2005-11-04 02:17:11 +01:00
msvensson@neptunus.(none)
bb571de368
BUG#12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- Remove yassl_libsfrom CLIENT_LIBS var
- Add yassl_libs to libmysql and libmysqld
2005-10-27 21:48:43 +02:00
msvensson@neptunus.(none)
0684dc1342
Bug #12985 Do-mysqlclient-test: Can't find -lyassl when linking
...
- 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.
2005-10-18 15:43:59 +02:00
kent@mysql.com
095efe48a5
Makefile.am, configure.in:
...
Enable "make distcheck" to work
2005-09-24 15:51:45 +02:00
hf@deer.(none)
1311d4dc79
Merging
2005-08-04 16:27:53 +05:00
hf@deer.(none)
39ef54fd8e
Fix for bug #12177 (errorlog file isn't closed)
...
4.1 version of the patch
2005-08-04 15:23:21 +05:00
jimw@mysql.com
97797d91fb
Merge mysql.com:/home/jimw/my/mysql-5.0-7003
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-02 16:50:09 -07:00
schwenke@alpha.xl.local
84c5ce61c5
Merge aschwenke@bk-internal.mysql.com:/home/bk/mysql-5.0
...
into alpha.xl.local:/home/schwenke/Work/MySQL/BK-internal-tree/mysql-5.0
2005-07-31 19:59:20 +02:00
schwenke@alpha.xl.local
4344cd39e0
fixed two bugs that break Windows build
2005-07-29 15:40:39 +02:00
monty@mysql.com
b3cbd0048f
Cleanups during review of new code
...
Ensure mysql_close() is called if mysql_set_character_set() fails
2005-07-28 16:10:14 +03:00
bar@mysql.com
0255803b4e
Merge mysql.com:/usr/home/bar/mysql-4.1.b10201
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-26 13:25:18 +05:00
georg@lmy002.wdf.sap.corp
5498a13751
fix for bug #7924 .
...
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)
2005-07-25 07:51:17 +02:00
jimw@mysql.com
d7fbff3ec5
Merge mysql.com:/home/jimw/my/mysql-5.0-5906
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-07-19 19:59:34 -07:00
georg@lmy002.wdf.sap.corp
21a88afeed
minor fix (backport from 5.0) - changed function prototype/definition
2005-07-19 17:12:00 +02:00
jimw@mysql.com
dd2f631ec4
Fix number to date conversion so it always honors the NO_ZERO_DATE,
...
NO_ZERO_IN_DATE, and INVALID_DATES bits of SQL_MODE. (Bug #5906 )
2005-07-18 16:12:44 -07:00
monty@mishka.local
21ae963205
Fixes to previous changeset
...
get_defaults_file() -> get_defaults_options()
2005-07-18 20:05:30 +03:00
monty@mishka.local
2278e0319c
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
...
into mishka.local:/home/my/mysql-5.0
2005-07-18 19:03:01 +03:00