5 Commits

Author	SHA1	Message	Date
Marc Alff	0b9accfbe6	Merge mysql-next-mr (revno 2965) --> mysql-next-mr-marc	2010-01-27 09:34:13 -07:00
Marc Alff	a47998cccc	Fixed merge problem (naming of CRYPTO_dynlock_value::lock in the tests)	2010-01-21 17:57:57 -07:00
Marc Alff	cc8caa7d9e	Bug#50513 Build failure with ifdef HAVE_OPENSSL + ifndef HAVE_YASSL ... When compiling wiht ./configure --with-ssl=/usr, which used OPEN_SSL but not YASSL, the code in sql/mysqld.cc failed to build because of an incomplete performance schema instrumentation. This fix implements properly the instrumentation for the rwlock used in openssl_lock_t. Verified that the code builds, and the ssl + performance schema tests do pass.	2010-01-21 11:06:03 -07:00
Sergey Vojtovich	ec59b40adc	Merge backport of WL#3771 with mysql-next-mr.	2010-01-19 20:42:25 +04:00
Marc Alff	67a48e1a4c	WL#2360 Performance schema ... Part V: performance schema implementation	2010-01-11 18:47:27 -07:00