mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-19 13:32:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
34333 commits 2784 branches 343 tags 1.6 GiB
Commit graph

149 commits

Author SHA1 Message Date
jani@a193-229-222-105.elisa-laajakaista.fi
dcd41ec846 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 13:37:56 +03:00
msvensson@neptunus.(none)
46f1f3ed2c Merge neptunus.(none):/home/msvensson/mysql/mysql-5.1-md 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 11:19:37 +02:00
msvensson@neptunus.(none)
40bfe246a9 Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
jani@a193-229-222-105.elisa-laajakaista.fi
9dffc3cd01 Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-5.1-new 
into  a193-229-222-105.elisa-laajakaista.fi:/home/my/bk/mysql-5.1-new-merge_060509
 2006-05-12 11:26:42 +03:00
msvensson@neptunus.(none)
de507975fa Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
msvensson@neptunus.(none)
47a578f4e4 Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.1
 2006-05-12 08:45:22 +02:00
reggie@big_geek.
67a692f998 performing a set of bk mv on each CMakeLists.txt file to try and restore the mixed case filenames since this seems to be required with Cmake 2.4 beta 1. 
This is being pushed to a private tree and tested before being sent to the mainline.
 2006-05-11 11:29:08 -05:00
jani@ua141d10.elisa.omakaista.fi
083f8455c7 Merge ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0 
into  ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.1-new
 2006-05-09 20:50:29 +03: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)
697069af2c Fix warnings 2006-05-04 10:30:08 +02:00
monty@mysql.com
343644dd5d Added support for key_block_size for key and table level (WL#602) 
Added support for key_block_size to MyISAM.
Simplify interface to 'new Key' to make it easier to add new key options.
mysqld option --new is used to define where key options are printed.
(In 5.3 we should move all key options to after key part definition to avoid problem with reserved names)
Fixed some compiler warnings and a memory leak in ssl
 2006-05-03 15:59:17 +03:00
msvensson@neptunus.(none)
e1b41812b7 Load CA certs before setting local certs. 
Make it possible to get the yaSSL error message printed in the DBUG log file.
 2006-05-03 14:09:08 +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
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
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
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