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
mariadb/vio
History
unknown 7b30dc9e00 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


BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
  Auto merged
BitKeeper/deleted/.del-NOTES~e926d3e6929ac052:
  Auto merged
BitKeeper/deleted/.del-client-req.pem~efd482e1d290d4d8:
  Auto merged
BitKeeper/deleted/.del-server-req.pem~16301893cacf1be4:
  Auto merged
client/client_priv.h:
  Auto merged
client/mysql.cc:
  Auto merged
client/mysqldump.c:
  Auto merged
client/mysqlimport.c:
  Auto merged
client/mysqltest.c:
  Auto merged
include/mysql.h:
  Auto merged
include/violite.h:
  Auto merged
libmysql/libmysql.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
mysql-test/r/information_schema.result:
  Auto merged
mysql-test/std_data/cacert.pem:
  Auto merged
mysql-test/std_data/client-cert.pem:
  Auto merged
mysql-test/std_data/client-key.pem:
  Auto merged
mysql-test/std_data/server-cert.pem:
  Auto merged
mysql-test/std_data/server-key.pem:
  Auto merged
mysql-test/t/disabled.def:
  Auto merged
mysql-test/t/information_schema.test:
  Auto merged
mysql-test/t/mysqldump.test:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql-common/client.c:
  Auto merged
storage/ndb/src/kernel/blocks/dbtc/DbtcInit.cpp:
  Auto merged
vio/vio.c:
  Auto merged
vio/viossl.c:
  Auto merged
vio/viosslfactories.c:
  Auto merged
mysql-test/Makefile.am:
  Manual merge.
2006-05-12 13:37:56 +03:00
..
docs Fixed searching after ssl directories. 2002-09-05 16:17:08 +03:00
.cvsignore Import changeset 2000-07-31 21:29:14 +02:00
CMakeLists.txt 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. 2006-05-11 11:29:08 -05:00
Makefile.am Rename cmakelists.txt -> CMakeLists.txt 2006-05-12 10:51:07 +02:00
test-ssl.c Remove valgrind and compiler warnings 2006-05-08 17:14:06 +02:00
test-sslclient.c Remove valgrind and compiler warnings 2006-05-08 17:14:06 +02:00
test-sslserver.c Remove valgrind and compiler warnings 2006-05-08 17:14:06 +02:00
vio.c Merge neptunus.(none):/home/msvensson/mysql/tmp/tmp_merge 2006-05-12 08:45:22 +02:00
vio_priv.h Cleanup SSL implementation 2006-03-10 16:41:14 +01:00
viosocket.c Final patch to remove the last of the OS2 support. 2006-04-15 18:17:32 -07:00
viossl.c Fix warnings 2006-05-04 10:30:08 +02:00
viosslfactories.c Fix after merge 5.0->5.1 2006-05-12 09:10:04 +02:00
viotest-ssl.c Fixes for Netware 2003-01-28 08:38:28 +02:00
viotest-sslconnect.cc Fixed for Ia64 + delayed key creation + a lot of small bug fixes 2000-08-15 20:09:37 +03:00
viotest.cc Fixed for Ia64 + delayed key creation + a lot of small bug fixes 2000-08-15 20:09:37 +03:00