brian@zim.(none)
5d1d27c016
Final patch to remove the last of the OS2 support.
2006-04-15 18:17:32 -07:00
knielsen@mysql.com
cc57e4e01b
Manual merge.
2006-03-28 10:07:03 +02:00
knielsen@mysql.com
bc6628d27f
Some changes to make it possible to build for Windows with CMake from
...
a normal 'make dist' source .tar.gz.
2006-03-24 22:50:56 +01:00
gluh@mysql.com
c9d4d6aa29
5.0 -> 5.1 merge
2006-03-21 16:26:47 +04:00
cmiller@calliope.local
34638c283a
No longer leak file descriptors in mysql_close. Fixes Bug#15846.
2006-03-17 18:46:34 +01:00
Reggie@xgeek.
11979eec94
Moved cmake scripts into the proper directories
2006-03-15 10:22:12 -06:00
jimw@mysql.com
f8afbe6f0c
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-11-29 15:33:58 -08:00
gluh@eagle.intranet.mysql.r18.ru
4b6a94ffb4
Fix for bug#14221 SSL support breaks going from OpenSSL 0.9.7i to 0.9.8a
...
added SSL_library_init()
2005-11-29 12:15:48 +04: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)
68fa03258a
Merge neptunus.(none):/home/msvensson/mysql/bug12985/my50-bug12985
...
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
2005-10-28 11:45:30 +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
monty@mysql.com
6f5baa1eba
Merge mysql.com:/home/my/mysql-4.1
...
into mysql.com:/home/my/mysql-5.0
2005-10-13 20:18:37 +03:00
monty@mysql.com
829a4831b1
Fixes during review of new code
2005-10-13 19:24:01 +03:00
jani@ua141d10.elisa.omakaista.fi
2dd1e4f94e
Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-4.1-tmp
...
into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
2005-10-13 18:23:53 +03:00
jimw@mysql.com
c8a6c2c614
Fix wait_timeout (and kill) handling on Mac OS X by cleaning up how
...
signal handlers are set up, the blocking flags for sockets are set,
and which thread-related functions are used. (Bug #8731 )
2005-10-11 09:12:12 -07:00
evgen@moonbone.local
7e733a889e
Merge moonbone.local:/work/12887-bug-4.1-mysql
...
into moonbone.local:/work/12887-bug-5.0-mysql
2005-09-15 22:54:59 +04:00
jimw@mysql.com
af4d71f734
Merge mysql.com:/home/jimw/my/mysql-4.1-12723
...
into mysql.com:/home/jimw/my/mysql-4.1-clean
2005-09-15 10:00:25 -07: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
SergeyV@selena.
784582b857
Merge selena.:H:/MYSQL/src/#05588-mysql-4.0
...
into selena.:H:/MYSQL/src/#05588-mysql-4.1
2005-09-07 14:59:41 +04:00
msvensson@neptunus.(none)
8c0f7f82d9
Bug #11286 yassl incompatible with "load data infile"
...
- Make sure that mysqltest always uses ssl when connecting to the server.
- Pass a i32-bit int variable as argument to FIONREAD ioctl.
2005-09-01 11:46:43 +02:00
jimw@mysql.com
89decf6aa9
Fix shared memory connection handling on Windows. (Bug #12723 )
2005-08-31 15:04:25 -07:00
SergeyV@selena.
e82e15b051
Fixes bug #5588 . vio_was_interrupted() function was added to detect
...
read timeout properly on win32.
2005-08-30 19:19:28 +04:00
lars@mysql.com
6db2602ad0
Merge mysql.com:/home/bkroot/mysql-4.1
...
into mysql.com:/home/bk/mysql-5.0
2005-07-13 02:13:04 +02:00
reggie@linux.site
c31d71c065
Fixed some vio code that was using ___WIN__ instead of __WIN__
2005-07-12 10:31:09 -06:00
bar@mysql.com
2204effda1
Merge mysql.com:/usr/home/bar/mysql-4.1
...
into mysql.com:/usr/home/bar/mysql-5.0
2005-07-12 13:18:25 +05:00
brian@zim.(none)
61db785682
Merge baker@bk-internal.mysql.com:/home/bk/mysql-4.1
...
into zim.(none):/home/brian/mysql/mysql-4.1
2005-07-06 15:55:49 -07:00
brian@zim.(none)
8c9dd56b0e
Typo for debug code. Bug #11705
2005-07-06 15:54:02 -07:00
kent@mysql.com
8e3b393d5c
Merge
2005-07-06 00:06:11 +02:00
kent@mysql.com
a7be42163a
Makefile.am:
...
Added -I$(top_builddir)/include for searching
generated header files, when builddir != srcdir
2005-07-05 23:24:48 +02:00
jimw@mysql.com
99e35c84ac
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-20 15:02:45 -07:00
svoj@mysql.com
685c844fc4
WL#2286 - Compile MySQL w/YASSL support
...
Fix for link failures on boxes with non-gnu compiler.
2005-06-12 18:18:46 +05:00
jimw@mysql.com
6b1a9f64bb
Fix Windows build warning and file missing from projects.
2005-06-08 01:25:06 +02:00
jimw@mysql.com
5a271e2c12
Merge mysql.com:/home/jimw/my/mysql-4.1-clean
...
into mysql.com:/home/jimw/my/mysql-5.0-clean
2005-06-01 16:13:24 -07:00
jimw@mysql.com
bd7775866c
Fix timeouts with SSL on Windows, and also sync the fastsend
...
implementation with normal socket behavior. (Bug #8572 )
2005-05-24 11:02:39 -07:00
konstantin@mysql.com
d8859b2ee2
Fixes for numerous compatibility problems in yaSSL.
2005-05-20 18:35:49 +04:00
rburnett@bk-internal.mysql.com
ad6de2c05a
Merge bk-internal.mysql.com:/users/rburnett/bug9721
...
into bk-internal.mysql.com:/users/rburnett/mysql-5.0
2005-05-06 15:15:48 +02:00
rburnett@bk-internal.mysql.com
e4523c2319
Bug #9721 net_write_timeout not used on Windows
...
viosocket.c:
Use ?: syntax to simplify code for setting both timeouts
2005-05-06 15:08:10 +02:00
rburnett@bk-internal.mysql.com
e7d7c0f236
Bug #9721 net_write_timeout not used on Windows
...
Added an extra parameter to all calls to timeout().
1 means we want to set the write timeout
0 means we wnat to set the read timeout
viossl.c:
Add which parameter to ssl timeout routine
vio_priv.h:
Added which parameter to vio_ignore_timeout and vio_ssl_timeout
violite.h:
Add which parameter to vio_timeout sigs
net_serv.cc:
Use proper which code in call to vio_timeout to set the proper timeout
viosocket.c:
Set the appropriate timeout in vio_timeout
2005-05-05 17:17:57 +02:00
ramil@mysql.com
e9dbf09dfc
Merge
2005-03-30 17:07:40 +05:00
serg@serg.mylan
1b4a815637
Fedora now defines read(2)/write(2) as macros.
...
Argh!
2005-03-29 23:31:56 +02: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
monty@mysql.com
38d1a42481
Merge with 4.1
2005-02-15 17:12:13 +02:00
monty@mysql.com
44ceb84cdc
Merge with 4.0
2005-02-15 14:49:52 +02:00
monty@mysql.com
788a2658a3
Better bug fix for #5569 : "Incorrect "Access Denied" error with SAME login DIFFERENT host"
...
This fixes also the reverse lookup bug introduced by the previous patch
2005-02-15 14:42:13 +02:00
monty@mysql.com
422c2eb868
4.1 -> 5.0 merge
2005-02-03 13:18:30 +02:00
jimw@mysql.com
5f0c4ff140
Merge fixes for #8248 , #5569 .
2005-02-02 08:21:11 -08:00
jimw@mysql.com
94da57dc65
Always call vio_in_addr() so that thd->remote is
...
always initialized. (Bug #5569 )
2005-01-25 12:06:55 -08:00
konstantin@mysql.com
013a6f50c2
Merge mysql.com:/home/kostja/work/mysql-4.1-5787
...
into mysql.com:/home/kostja/work/mysql-5.0-root
2005-01-25 02:54:17 +03:00