diff --git a/mariadb-5.1.47.tar.bz2 b/mariadb-5.1.47.tar.bz2
deleted file mode 100644
index 7ef586c..0000000
--- a/mariadb-5.1.47.tar.bz2
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:127eaf2c00f933d78c7fc3b7434abcb7e278d79082cd1ec63f6655c48bfcd329
-size 17342793
diff --git a/mariadb-5.1.49.tar.bz2 b/mariadb-5.1.49.tar.bz2
new file mode 100644
index 0000000..72cc12b
--- /dev/null
+++ b/mariadb-5.1.49.tar.bz2
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e1589bb8f50c46ecb4a103350db0fca5e7649233f67e0d67a143a12c5154429a
+size 18602560
diff --git a/mariadb.changes b/mariadb.changes
index 9ead07c..9b8f0f7 100644
--- a/mariadb.changes
+++ b/mariadb.changes
@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Aug 12 11:54:38 CEST 2010 - mhrusecky@suse.cz
+
+- updated to MariaDB 5.1.49
+  - based on MySQL 5.1.49 maintenance update
+  - changelog:
+    http://kb.askmonty.org/v/mariadb-5149-changelog
+  - release notes:
+    http://kb.askmonty.org/v/mariadb-5149-release-notes
+
 -------------------------------------------------------------------
 Wed Jun  2 10:38:05 CEST 2010 - mhrusecky@suse.cz
 
diff --git a/mariadb.spec b/mariadb.spec
index e13109d..9394dfe 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -20,7 +20,7 @@
 # Few definitions which will alter build
 %define prefered   0
 %define cluster    0
-%define srv_vers   5.1.47
+%define srv_vers   5.1.49
 
 %if %{?rel:0}%{!?rel:1}
 %define rel 1
@@ -31,7 +31,7 @@
 
 Name:           mariadb
 Summary:        A True Multiuser, Multithreaded SQL Database Server
-Version:        5.1.47
+Version:        5.1.49
 Release:        0
 License:        GPLv2 ; with additional permissions: EXCEPTIONS-CLIENT
 Group:          Productivity/Databases/Servers
@@ -505,7 +505,7 @@ BuildMySQL() {
 		--with-atomic-ops=smp \
 %endif
 		--with-ssl=/usr \
-		--with-plugins=partition,csv,heap,myisam,ndbcluster,innobase \
+		--with-plugins=partition,csv,heap,myisam,ndbcluster \
 		HOSTNAME="/bin/hostname -f" \
 		"$@"
 	# Add this for MyISAM RAID support:
@@ -615,8 +615,6 @@ install -m 640 scripts/mysqlaccess.conf %buildroot/etc/mysqlaccess.conf
 install -m 644 "${DOCS[@]}" ${DOCDIR}
 install -m 755 %_sourcedir/rc.mysql-multi %buildroot/etc/init.d/mysql
 ln -sf ../../etc/init.d/mysql %buildroot/usr/sbin/rcmysql
-# this is used by the init script
-install -m 755 -d %buildroot/var/run/mysql
 # SuSEfirewall service description
 install -D -m 644 %_sourcedir/mysql.SuSEfirewall2 \
 	%buildroot/etc/sysconfig/SuSEfirewall2.d/services/mysql
@@ -659,7 +657,8 @@ rm -rf '%buildroot'/%_libdir/libmysqlclient*
 rm -rf '%buildroot'/%_libdir/libmariadbclient.{a,la,so}
 rm -rf '%buildroot'/%_libdir/libmariadbclient_r*.{a,la,so}
 rm -rf '%buildroot'/%_includedir  
-rm -rf '%buildroot'/%_datadir/man/*/mysql_config*  
+rm -rf '%buildroot'/%_datadir/man/*/mysql_config* 
+rm -rf '%buildroot'/%_bindir/mysql_config
 rm -rf '%buildroot'/%_datadir/aclocal
 %endif
 sed -i 's|doc/packages/mysql|doc/packages/%{name}|g' '%buildroot'/etc/init.d/mysql
@@ -818,7 +817,6 @@ fi
 /etc/init.d/mysql
 /usr/sbin/rcmysql
 /usr/share/mysql/
-%dir %attr(755,mysql,mysql)/var/run/mysql
 %dir %{_libdir}/mysql
 %{_libdir}/mysql/mysqld.sym
 %config /etc/sysconfig/SuSEfirewall2.d/services/mysql
diff --git a/mysql-plugins-avoid-version.patch b/mysql-plugins-avoid-version.patch
index 7d4c1cc..a487489 100644
--- a/mysql-plugins-avoid-version.patch
+++ b/mysql-plugins-avoid-version.patch
@@ -57,7 +57,7 @@ Index: storage/federatedx/Makefile.am
 @@ -19,7 +19,7 @@ noinst_HEADERS =	ha_federatedx.h federat
  
  EXTRA_LTLIBRARIES =	ha_federatedx.la
- pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
+ pkgplugin_LTLIBRARIES =	@plugin_federatedx_shared_target@
 -ha_federatedx_la_LDFLAGS =	-module -rpath $(pkgplugindir)
 +ha_federatedx_la_LDFLAGS =	-module -avoid-version -rpath $(pkgplugindir)
  ha_federatedx_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
@@ -93,12 +93,38 @@ Index: storage/xtradb/Makefile.am
 ===================================================================
 --- storage/xtradb/Makefile.am.orig
 +++ storage/xtradb/Makefile.am
-@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS=	$(AM_CFLAGS)
- EXTRA_LTLIBRARIES=	ha_innodb.la
- pkgplugin_LTLIBRARIES=	@plugin_innobase_shared_target@
+@@ -332,7 +332,7 @@ libxtradb_a_CFLAGS=	$(AM_CFLAGS)
+ EXTRA_LTLIBRARIES=	ha_xtradb.la
+ pkgplugin_LTLIBRARIES=	@plugin_xtradb_shared_target@
  
--ha_innodb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
-+ha_innodb_la_LDFLAGS=	-module -avoid-version -rpath $(pkgplugindir)
- ha_innodb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
- ha_innodb_la_SOURCES=	$(libinnobase_a_SOURCES)
+-ha_xtradb_la_LDFLAGS=	-module -rpath $(pkgplugindir)
++ha_xtradb_la_LDFLAGS=	-module -avoid-version -rpath $(pkgplugindir)
+ ha_xtradb_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_xtradb_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_xtradb_la_SOURCES=	$(libxtradb_a_SOURCES)
+Index: storage/federated/Makefile.am
+===================================================================
+--- storage/federated/Makefile.am.orig
++++ storage/federated/Makefile.am
+@@ -32,7 +32,7 @@ noinst_HEADERS =	ha_federated.h
+ 
+ EXTRA_LTLIBRARIES =	ha_federated.la
+ pkgplugin_LTLIBRARIES =	@plugin_federated_shared_target@
+-ha_federated_la_LDFLAGS =	-module -rpath $(pkgplugindir)
++ha_federated_la_LDFLAGS =	-module -avoid-version -rpath $(pkgplugindir)
+ ha_federated_la_CXXFLAGS=	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_federated_la_CFLAGS =	$(AM_CFLAGS) -DMYSQL_DYNAMIC_PLUGIN
+ ha_federated_la_SOURCES =	ha_federated.cc $(top_srcdir)/mysys/string.c
+Index: storage/innodb_plugin/Makefile.am
+===================================================================
+--- storage/innodb_plugin/Makefile.am.orig
++++ storage/innodb_plugin/Makefile.am
+@@ -331,7 +331,7 @@ libinnobase_a_CFLAGS=	$(AM_CFLAGS)
+ EXTRA_LTLIBRARIES=	ha_innodb_plugin.la
+ pkgplugin_LTLIBRARIES=	@plugin_innodb_plugin_shared_target@
+ 
+-ha_innodb_plugin_la_LDFLAGS=	-module -rpath $(pkgplugindir)
++ha_innodb_plugin_la_LDFLAGS=	-module -avoid-version -rpath $(pkgplugindir)
+ ha_innodb_plugin_la_CXXFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_CFLAGS=	$(AM_CFLAGS) $(INNODB_DYNAMIC_CFLAGS)
+ ha_innodb_plugin_la_SOURCES=	$(libinnobase_a_SOURCES)
diff --git a/rc.mysql-multi b/rc.mysql-multi
index 5c0b10e..9e6225f 100644
--- a/rc.mysql-multi
+++ b/rc.mysql-multi
@@ -264,6 +264,16 @@ else
 	log_upgrade_run="${log_base}-upgrade-run.log"
 	log_query="${log_base}-query.log"
 
+	if [ \! -d /var/run/mysql ]; then
+		mkdir -p /var/run/mysql
+		chown -R "$mysql_daemon_user:$mysql_daemon_group" /var/run/mysql
+		chmod 0755 /var/run/mysql
+	fi
+	[ "`ls -ld "/var/run/mysql" | grep "^drwx.-..-.[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
+		echo "Directory /var/run/mysql has strange rights"
+		rc_failed; rc_status -v; rc_exit;
+	}
+	
 	parse_arguments `$print_defaults $defaults mysqld mysql_server`
 	export TMPDIR="`cat /var/run/mysql/tmpdir 2> /dev/null`"
 
@@ -339,7 +349,10 @@ else
 			echo "`LANG="" date` - upgrading MySQL..." >> "$log_upgrade"
 			echo >> "$log_upgrade"
 			echo "Will update MySQL now, if you encounter any problems, please read following file:" | tee -a "$log_upgrade"
-			echo "	/usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"
+			echo "	/usr/share/doc/packages/mysql/README.SuSE" | tee -a "$log_upgrade"			[ "`ls -ld "$protected" | grep "^drwx------[[:blank:]]\+[0-9]\+[[:blank:]]\+$mysql_daemon_user[[:blank:]]\+$mysql_daemon_group[[:blank:]]\+.*"`" ] || {
+				echo "Can't create secure $protected" | tee -a "$log_upgrade"
+				rc_failed; rc_status -v; rc_exit;
+			}
 			# Check logs for inconsistencies
 			SRCLOGS=""
 			ALL_SRCLOGS=""