7 Commits

Author	SHA1	Message	Date
Sergei Golubchik	a2bcee626d	Merge branch '10.0' into 10.1	2015-12-21 21:24:22 +01:00
Daniel Black	98381cb21b	Correct comments before mysql_socket_{g|s}etfd to refer to the right function	2015-12-11 15:21:42 +01:00
Vladislav Vaintroub	73fc19bbcd	Fix warning about unused variable if FD_CLOEXEC is not defined	2015-11-24 14:11:16 +01:00
Sergei Golubchik	26f249f6db	compilation failures on Windows	2015-07-23 10:55:24 +02:00
Nirbhay Choubey	dced5146bd	Merge branch '10.0-galera' into 10.1	2015-07-14 16:05:29 -04:00
Michael Widenius	068c61978e	Temporary commit of 10.0-merge	2013-03-26 00:03:13 +02: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