mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 20:12:31 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions
mariadb/vio
History
Jan Lindström 9a5787db51 Merge commit '96badb16afcf' into 10.0 
Conflicts:
	client/mysql_upgrade.c
	mysql-test/r/func_misc.result
	mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
	mysql-test/suite/innodb/r/innodb-fk.result
	mysql-test/t/subselect_sj_mat.test
	sql/item.cc
	sql/item_func.cc
	sql/log.cc
	sql/log_event.cc
	sql/rpl_utility.cc
	sql/slave.cc
	sql/sql_class.cc
	sql/sql_class.h
	sql/sql_select.cc
	storage/innobase/dict/dict0crea.c
	storage/innobase/dict/dict0dict.c
	storage/innobase/handler/ha_innodb.cc
	storage/xtradb/dict/dict0crea.c
	storage/xtradb/dict/dict0dict.c
	storage/xtradb/handler/ha_innodb.cc
	vio/viosslfactories.c
2015-08-03 23:09:43 +03:00
..
docs
CMakeLists.txt 5.5.39 merge 2014-08-07 18:06:56 +02:00
test-ssl.c Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
test-sslclient.c Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
test-sslserver.c Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
vio.c MDEV-8096 vio timeouts are multiplied by 1000 for ssl 2015-05-05 21:56:46 +02:00
vio_priv.h More fixes 2012-08-17 16:46:34 +03:00
viopipe.c MDEV-3822 :10.0-serg fails on windows buildslaves 2012-11-04 21:04:04 +01:00
vioshm.c Next part of merge. See TODO for details 2012-08-14 17:23:34 +03:00
viosocket.c MDEV-8014 MariaDB client can hang in an infinite loop 2015-05-03 14:43:34 +02:00
viossl.c remove ssl debugging report_errors() function that was sometimes destroying the state 2014-12-01 22:24:58 +01:00
viosslfactories.c Merge commit '96badb16afcf' into 10.0 2015-08-03 23:09:43 +03:00
viotest-ssl.c Bug 16395495 - OLD FSF ADDRESS IN GPL HEADER 2013-03-19 13:29:12 +01:00
viotest-sslconnect.cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00
viotest.cc Updated/added copyright headers 2011-06-30 17:37:13 +02:00