9 Commits

Author	SHA1	Message	Date
Sergei Golubchik	edab37cd68	5.3 merge	2012-02-21 20:51:56 +01:00
Michael Widenius	038b739c98	Merge with MariaDB 5.1 and MySQL 5.1.61	2012-02-20 17:49:21 +02:00
Sergei Golubchik	ac3c60d552	report innodb_file_per_table, innodb_flush_log_at_trx_commit, innodb_flush_method	2012-01-04 20:10:15 +01:00
Vladislav Vaintroub	64e308e28d	Fix build and packaging on Windows: ... - build executables we have in 5.3 (mysql_install_db.exe, mysq_upgrade_service.exe, upgrade wizard), and MSI - add some missing headers to windows specific source files. This needs to be done since 5.5 is using WIN32_LEAN_AND_MEAN preprocessor constant thus windows.h no more includes whiole Windows - do not deliver perl scripts (mysql_install_db.pl & friends) -they do not work, are not documented, and we have native executables for this functionality. do not pack echo.exe, replace.exe into MSI, they are not needed. Do not build resolveip on Windows, it is not used. - precache results of of system checks in cmake/os/WindowsCache.cmake (like it is alreay done for majority of tests to speed up cmake run with VS) - make feedback plugin DEFAULT on Windows (so MSI works if user enables plugin), fix null pointer access in PSI_register	2011-11-26 23:07:53 +01:00
Sergei Golubchik	d2755a2c9c	5.3->5.5 merge	2011-11-22 18:04:38 +01:00
Sergei Golubchik	0d6a25fcc8	5.1-5.2 merge	2011-11-13 08:30:03 +01:00
Sergei Golubchik	f967575457	increase feedback plugin version	2011-11-12 18:40:51 +01:00
Sergei Golubchik	d94ad2ad40	fix feedback plugin for 5.2	2011-10-08 19:00:00 +02:00
Sergei Golubchik	031e78dd5b	merge feedback plugin	2011-10-04 16:03:10 +02:00