diff --git a/.cvsignore b/.cvsignore
index a37cd26..b89c219 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-mysql-5.1.39.tar.gz
+mysql-5.1.40.tar.gz
diff --git a/mysql-plugin-bug.patch b/mysql-plugin-bug.patch
index 35e79d4..a1b909a 100644
--- a/mysql-plugin-bug.patch
+++ b/mysql-plugin-bug.patch
@@ -11,14 +11,13 @@ platform-dependent results, with the "expected" results being arguably the
 wrong ones.  This is upstream at http://bugs.mysql.com/bug.php?id=46895
 
 
-diff -Naur mysql-5.1.39.orig/mysql-test/t/disabled.def mysql-5.1.39/mysql-test/t/disabled.def
---- mysql-5.1.39.orig/mysql-test/t/disabled.def	2009-09-04 13:01:56.000000000 -0400
-+++ mysql-5.1.39/mysql-test/t/disabled.def	2009-09-23 19:23:42.000000000 -0400
-@@ -13,4 +13,6 @@
- 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.40.orig/mysql-test/t/disabled.def mysql-5.1.40/mysql-test/t/disabled.def
+--- mysql-5.1.40.orig/mysql-test/t/disabled.def	2009-10-06 14:21:05.000000000 -0400
++++ mysql-5.1.40/mysql-test/t/disabled.def	2009-11-10 13:01:50.000000000 -0500
+@@ -14,3 +14,6 @@
  query_cache_28249        : Bug#43861 2009-03-25 main.query_cache_28249 fails sporadically
- init_connect             : Bug#44920 2009-07-06 pcrews MTR not processing master.opt input properly on Windows.  *Must be done this way due to the nature of the bug*
--
+ partition_innodb_builtin : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
+ partition_innodb_plugin  : Bug#32430 2009-09-25 mattiasj Waiting for push of Innodb changes
 +#
 +plugin_load         : gives wrong answer on PPC64
 +outfile_loaddata    : gives different results on different platforms
diff --git a/mysql.init b/mysql.init
index 9d400b6..327ed8b 100644
--- a/mysql.init
+++ b/mysql.init
@@ -66,9 +66,11 @@ start(){
 	chmod 0755 "$datadir"
 	# Pass all the options determined above, to ensure consistent behavior.
 	# In many cases mysqld_safe would arrive at the same conclusions anyway
-	# but we need to be sure.
+	# but we need to be sure.  (An exception is that we don't force the
+	# log-error setting, since this script doesn't really depend on that,
+	# and some users might prefer to configure logging to syslog.)
 	/usr/bin/mysqld_safe   --datadir="$datadir" --socket="$socketfile" \
-		--log-error="$errlogfile" --pid-file="$mypidfile" \
+		--pid-file="$mypidfile" \
 		--user=mysql >/dev/null 2>&1 &
 	ret=$?
 	# Spin for a maximum of N seconds waiting for the server to come up.
diff --git a/mysql.spec b/mysql.spec
index fc46e99..7e53ba8 100644
--- a/mysql.spec
+++ b/mysql.spec
@@ -1,6 +1,6 @@
 Name: mysql
-Version: 5.1.39
-Release: 4%{?dist}
+Version: 5.1.40
+Release: 1%{?dist}
 Summary: MySQL client programs and shared libraries
 Group: Applications/Databases
 URL: http://www.mysql.com
@@ -649,6 +649,12 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Tue Nov 10 2009 Tom Lane <tgl@redhat.com> 5.1.40-1
+- Update to MySQL 5.1.40, for various fixes described at
+  http://dev.mysql.com/doc/refman/5.1/en/news-5-1-40.html
+- Do not force the --log-error setting in mysqld init script
+Resolves: #533736
+
 * Sat Oct 17 2009 Tom Lane <tgl@redhat.com> 5.1.39-4
 - Replace kluge fix for ndbd sparc crash with a real fix (mysql bug 48132)
 
diff --git a/sources b/sources
index ee00ff8..aebe584 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-55a398daeb69a778fc46573623143268  mysql-5.1.39.tar.gz
+32e7373c16271606007374396e6742ad  mysql-5.1.40.tar.gz