Commit graph

4 commits

Author SHA1 Message Date
Sergey Vojtovich
90c9641a8a MDEV-7331 - information_schema.user_variables 2016-02-26 18:35:14 +04:00
Monty
b2f8d7b410 Merge branch '10.1' into 10.2
Conflicts:
	VERSION
	cmake/plugin.cmake
	config.h.cmake
	configure.cmake
	plugin/server_audit/server_audit.c
	sql/sql_yacc.yy
2016-02-06 18:14:54 +02:00
Sergey Vojtovich
253be36c0f MDEV-7376 - Removal of the tool "mysql_zap" 2015-11-26 11:34:18 +04:00
Sergei Golubchik
679aa122bf fix debian packaging for 10.2 2015-11-23 16:02:56 +01:00
Renamed from debian/mariadb-server-10.1.files.in (Browse further)