Commit graph

266 commits

Author SHA1 Message Date
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)
a51668c74c Bug#17208 SSL: client does not verify server certificate
- Add new function 'ssl_verify_server_cert' which is used if we are 
   connecting to the server with SSL. It will compare the hostname in 
   the server's cert against the hostname that we used when connecting 
   to the server. Will reject the connection if hostname does not match.
 - Add new option "OPT_SSL_VERIFY_SERVER_CERT" to be passed to mysql_options
   which will turn on checking of servers cert.
 - Add new argument "ssl-verify-server-cert" to all mysql* clients which 
   will activate the above option.
 - Generate a new server cert with 1024 bits that has "localhost" as the server name.
2006-04-18 17:58:27 +02:00
brian@zim.(none)
5d1d27c016 Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
msvensson@neptunus.(none)
d66ac94911 Fix up patch 2006-04-12 14:06:05 +02:00
msvensson@neptunus.(none)
e5712d8413 Merge neptunus.(none):/home/msvensson/mysql/mysql-5.0
into  neptunus.(none):/home/msvensson/mysql/bug17208/my50-bug17208
2006-04-12 12:52:34 +02:00
msvensson@neptunus.(none)
24a6dd64b5 Update implementation of new function 'mysql_get_ssl_cipher' after review 2006-04-10 12:23:20 +02:00
msvensson@neptunus.(none)
bed57fcf7e Merge bk-internal:/home/bk/mysql-5.1-new
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
2006-04-07 11:36:28 +02:00
msvensson@neptunus.(none)
98904a8caa Add new function mysql_get_ssl_cipher to libmysl and use it from client to avoid dependency on SSL libs from mysql client. 2006-04-07 11:26:21 +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
14846536a4 client.c:
Bug#18830 incompatibility new libraries with old server
  Additional 5.0 fix:
  applying the same patch to client.c.
2006-04-06 12:43:13 +05:00
monty@mysql.com
3dcbbb7c4d Safer fix for Bug #18435 "5.0.19 libmysqlclient not ABI-compatible with 5.0.18"
This fixes the problem if someone is using struct MYSQL as part of another structure together with a shared
library
2006-03-27 12:02:23 +03:00
monty@mysql.com
905dfa0375 Make usage of the MYSQL struct in shared libraries compatible with MySQL 5.0.17 and
5.0.18 by not reseting or accessing the info_buffer member
2006-03-23 00:37:40 +02:00
msvensson@neptunus.(none)
aa3abd1550 Cleanup SSL implementation
Remove duplicate code
Merge common functions
Enforce MySQL coding standard
2006-03-10 16:41:14 +01: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)
a6c508dbf3 Merge neptunus.(none):/home/msvensson/mysql/bug15719/my50-bug15719
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0
2006-01-30 11:02:09 +01:00
msvensson@neptunus.(none)
41c6fee874 Bug #15719 MYSQL_OPT_RECONNECT option is modified by mysql_real_connect
- Move init of "reconnect" variable to mysql_init 
 - Add test case to mysql_client_test.
2006-01-26 11:20:59 +01:00
serg@serg.mylan
14f94dc0ca many warnings (practically safe but annoying) corrected 2006-01-03 17:54:54 +01:00
jimw@mysql.com
e228b43946 Fix value returned by mysql_warning_count() after fetching a prepared
statement that generated a warning. (Bug #15510)
2005-12-06 15:50:03 -08:00
konstantin@mysql.com
9fd6204ad1 Merge mysql.com:/opt/local/work/mysql-4.1-root
into  mysql.com:/opt/local/work/mysql-5.0-root
2005-11-25 13:57:13 +03:00
gluh@eagle.intranet.mysql.r18.ru
f0f8b9c658 Fix for bug#14780 memory leak for mysql 4.1.14 with openssl enabled 2005-11-21 16:09:26 +04:00
msvensson@neptunus.(none)
cb96f195c8 Improved testing of ssl and compression
- Added show status variable "compression" for checking that compression is turned on.
 - Updated show status variable "have_openssl" to be set to DISABLED if server supports ssl but it's not turned on to accept incoming ssl connections.  
 - Setup server to accept ssl connections from clients ig that is supported by server
 - New tests 
   - ssl - Run with ssl turned on
   - ssl_compress - Run with ssl and compression turned on
   - compress - Run with compression turned in 
 - Updated test 
   - openssl_1, rpl_openssl1 - Changed to run if server supports ssl
2005-10-04 15:43:55 +02:00
monty@mishka.mysql.fi
f348f62cc3 Added option --valgrind-mysqltest to mysql-test-run
Added flag to Field::store(longlong) to specify if value is unsigned.
This fixes bug #12750: Incorrect storage of 9999999999999999999 in DECIMAL(19, 0)
Fixed warning from valgrind in CREATE ... SELECT
Fixed double free of mysql.options if reconnect failed
2005-09-14 01:41:44 +03:00
jimw@mysql.com
a60ed0b75d Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-12 17:00:50 -07:00
SergeyV@selena.
33c3fedadc Fixes bug #5588. Additions after merge from 4.0. 2005-09-07 15:57:14 +04:00
jimw@mysql.com
3be42aabc5 Merge mysql.com:/home/jimw/my/mysql-5.0-11787
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-09-03 09:34:34 -07:00
jimw@mysql.com
a3eaf4eec2 Merge mysql.com:/home/jimw/my/mysql-4.1-clean
into  mysql.com:/home/jimw/my/mysql-5.0-clean
2005-08-15 12:37:45 -07:00
jimw@mysql.com
078e0c3902 Fix mysql_info() returning bad data in the results of a multi-statement
query that mixed statements that do and do not return info. (Bug #11688)
2005-08-10 18:32:17 -07: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
georg@lmy002.wdf.sap.corp
3e1ae2633a fix for bug#12001 2005-07-19 17:31:18 +02:00
georg@lmy002.wdf.sap.corp
53c630a524 Restore previous used client charset in mysql_reconnect
Moved mysql_set_character_set function to client.c
Changed function prototype for mysql_set_character_set (as suggested
by Konstantin)
2005-07-16 07:13:40 +02:00
jimw@mysql.com
bef1c77789 Make it possible to change reconnect setting with
mysql_options(..., MYSQL_OPT_RECONNECT, ...). (Bug #11787)
2005-07-06 16:29:31 -07:00
georg@lmy002.wdf.sap.corp
b64e6db5a4 fixes for windows 64-bit compiler warnings 2005-06-13 12:41:15 +02:00
monty@mysql.com
7d70579917 Fixed failing tests for not 32 bit intel machines
Fixed bug in mysql_stmt_fetch() when retrieving rows to return
2005-05-16 13:34:23 +03:00
konstantin@mysql.com
d0e24153b9 A fix and test case for Bug#9478 "mysql_stmt_attr_set mysql_stmt_execute"
(crash on attempt to re-execute a statement with an open cursor) + 
post-review fixes.
2005-05-12 11:16:12 +04:00
msvensson@neptunus.(none)
3416e42903 BUG#9391 mysqlshow prints incorrect "rows" information
- Removed use of mysql->extra_info
 - Removed unused function send_records_num
2005-04-13 12:22:20 +02:00
jimw@mysql.com
bb215f648b Merge 2005-04-04 23:03:56 -07:00
jimw@mysql.com
1f1c44779a Merge mysql.com:/home/jimw/my/mysql-4.1-8866
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-04-04 18:26:39 -07:00
jimw@mysql.com
9c86b35194 Fix reconnect when using prepared statements, and add
--disable_reconnect and --enable_reconnect to mysqltest
so that it can be tested properly. (Bug #8866)
2005-03-28 09:59:41 -08:00
konstantin@mysql.com
eeeedd31b9 Manual merge 2005-03-26 01:44:54 +03:00
konstantin@mysql.com
ff8017f0d3 A fix for Bug#8226 "Cannot connect via shared memory":
provide created shared memory objects with proper
access rights to make them usable when client and server
are running under different accounts. 
Post review fixes.
2005-03-26 01:21:52 +03:00
konstantin@mysql.com
0f1d024461 Porting of "buffered read" patch to 5.0 and post-review fixes.
The patch implements the idea suggested by Olaf van der Spek in 
thread "Client: many small reads?" (internals@lists.mysql.com).
Now small reads performed by the client library are buffered.
The buffering gives up to 2 times speedup when retrieving 
one-column tables.
2005-03-06 00:10:08 +03:00
patg@krsna.patg.net
4b7bc748ea WL #2094 Federated Storage Handler
This is the first changeset of suggested changes recommended in Kostja's 
review of my patch, 1.1846, which includes only functionality changes. 
Style changes/Documentation patch to follow.
2005-02-23 00:29:57 -08:00
patg@krsna.patg.net
e6352ee568 Merge 2005-02-20 14:20:05 -08:00
jani@ua141d10.elisa.omakaista.fi
3bc92ed9f5 Fixed Bug#7783, "mysql_free_result removes all resultsets (multi statements)". 2005-02-17 21:45:13 +02:00
patg@krsna.patg.net
0a48c5b5c2 WL# 2094
This patch contains all that my previous patch (1.1814) contained, with the addition of using cli_fetch_lengths for
handling binary data (Bar noted this on the review of 1.1814, Guilhem suggested using cli_fetch_lenghts by 
making available via removal of static in method definition and declaration in mysql.h, but
Konstantin had some reservations, but he said to commit the patch using this anyway,
and I suppose this can be discussed. I abandoned 1.1814 because Monty made a couple
fixes to my code as well as formatting changes, and I thought it would just be easier
to hand-edit my changes into a fresh clone and then make a patch. 

The reason for using cli_fetch_lengths is so that I can correctly get the length of
the field I am setting into the field. I was previously using 'strlen' but Bar pointed out this
won't correctly get the length of binary data and is also less effecient. Upon testing,
it was in fact verified that binary data in a blob table was being inserted correctly,
but not being retrieved correctly, all due to not having the correct value for the
field:

(*field)->store(row[x], strlen(row[x]), &my_charset_bin);

was changed to:

(*field)->store(row[x], lengths[x], &my_charset_bin);

lengths being a unsigned long pointer to the values of the field lengths from a 
MYSQL_ROW.

Since the server doesn't have the function "mysql_fetch_lengths" available, I tried 
to use "result->lengths", but this isn't set, so I finally successfully used 
cli_fetch_lenghts, which does give the correct lengths, and now the binary data gets
retrieved correctly.

I've also run the code through indent-ex and am using Brian's vimrc to ensure correct formatting!

This code passes the entire test suite, without any errors or warning on both my 
workstation and build.mysql.com
2005-02-06 09:40:07 -08:00
tomas@poseidon.ndb.mysql.com
c0b21df9ec Merge tulin@bk-internal.mysql.com:/home/bk/mysql-4.1
into poseidon.ndb.mysql.com:/home/tomas/mysql-5.0
2005-01-16 20:13:47 +01:00
serg@serg.mylan
8bea4729fc initialize mysql->charset in mysql_init 2005-01-16 16:38:38 +01:00
jimw@mysql.com
3d0e2e70c6 Merge 2005-01-11 05:10:08 +01:00
jimw@mysql.com
0d8bfc5f92 Replace all sprintf() calls with my_snprintf() in client.c. All of the
format strings (in all languages) already included field limits on the
specifiers, so this is just protection against future mistakes. (Bug #7556)
2005-01-09 02:19:42 +01:00
serg@sergbook.mysql.com
f472cec178 merged 2005-01-06 19:32:16 +02:00