diff --git a/.cvsignore b/.cvsignore
index e298609..19af1d3 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.34.tar.gz
+mysql-5.1.35.tar.gz
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index c0a9295..c86ff5a 100644
--- a/mysql-plugin-bug.patch
+++ b/mysql-plugin-bug.patch
@@ -7,11 +7,11 @@ http://bugs.mysql.com/bug.php?id=42144
 For the moment, just disable this test.
 
 
-diff -Naur mysql-5.1.34.orig/mysql-test/t/disabled.def mysql-5.1.34/mysql-test/t/disabled.def
---- mysql-5.1.34.orig/mysql-test/t/disabled.def	2009-03-31 11:26:07.000000000 -0400
-+++ mysql-5.1.34/mysql-test/t/disabled.def	2009-05-15 20:02:24.000000000 -0400
-@@ -13,3 +13,5 @@
- innodb_bug39438          : BUG#42383 2009-01-28 lsoares "This fails in embedded and on windows.  Note that this test is not run on windows and on embedded in PB for main trees currently"
+diff -Naur mysql-5.1.35.orig/mysql-test/t/disabled.def mysql-5.1.35/mysql-test/t/disabled.def
+--- mysql-5.1.35.orig/mysql-test/t/disabled.def	2009-05-14 08:22:26.000000000 -0400
++++ mysql-5.1.35/mysql-test/t/disabled.def	2009-06-06 18:58:28.000000000 -0400
+@@ -15,3 +15,5 @@
+ 
  #concurrent_innodb_safelog: disabled for embedded server due to bug#43733 Select on processlist let the embedded server crash (concurrent_innodb_safelog).
  #concurrent_innodb_unsafelog: disabled for embedded server due to bug#43733.
 +#
diff --git a/mysql.init b/mysql.init
index 438f868..9d400b6 100644
--- a/mysql.init
+++ b/mysql.init
@@ -46,6 +46,15 @@ start(){
 	chmod 0640 "$errlogfile"
 	[ -x /sbin/restorecon ] && /sbin/restorecon "$errlogfile"
 	if [ ! -d "$datadir/mysql" ] ; then
+	    # First, make sure $datadir is there with correct permissions
+	    if [ ! -e "$datadir" -a ! -h "$datadir" ]
+	    then
+		mkdir -p "$datadir" || exit 1
+	    fi
+	    chown mysql:mysql "$datadir"
+	    chmod 0755 "$datadir"
+	    [ -x /sbin/restorecon ] && /sbin/restorecon "$datadir"
+	    # Now create the database
 	    action $"Initializing MySQL database: " /usr/bin/mysql_install_db --datadir="$datadir" --user=mysql
 	    ret=$?
 	    chown -R mysql:mysql "$datadir"
diff --git a/mysql.spec b/mysql.spec
index 8f1fcaf..fcd5cf8 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,5 +1,5 @@
 Name: mysql
-Version: 5.1.34
+Version: 5.1.35
 Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
@@ -639,6 +639,12 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Sat Jun  6 2009 Tom Lane <tgl@redhat.com> 5.1.35-1
+- Update to MySQL 5.1.35, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-35.html
+- Ensure that /var/lib/mysql is created with the right SELinux context
+Resolves: #502966
+
 * Fri May 15 2009 Tom Lane <tgl@redhat.com> 5.1.34-1
 - Update to MySQL 5.1.34, for various fixes described at
   http://dev.mysql.com/doc/refman/5.1/en/news-5-1-34.html
diff --git a/sources b/sources
index d0d6bc2..f21e3f6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-42493187729677cf8f77faeeebd5b3c2  mysql-5.1.34.tar.gz
+327bffc7a2a5fd4471fbbaab125275cd  mysql-5.1.35.tar.gz