3 Commits

Author	SHA1	Message	Date
Michael Widenius	4712fb14b9	Fixed compiler warnings	2013-08-21 18:20:22 +03:00
Sergei Golubchik	cd5a6304b9	P_S test failures on 32-bit platforms: ... always use intptr type when casting a pointer to an integer to avoid sign expansion. or, at least, cast identically in socket_summary_by_instance and socket_instances	2012-10-29 16:30:06 +01:00
Michael Widenius	1d0f70c2f8	Temporary commit of merge of MariaDB 10.0-base and MySQL 5.6	2012-08-01 17:27:34 +03:00