diff --git a/myodbc-null-string.patch b/myodbc-null-string.patch
new file mode 100644
index 0000000..22e0ac6
--- /dev/null
+++ b/myodbc-null-string.patch
@@ -0,0 +1,15 @@
+Avoid core dump if isql second or third argument is omitted.
+
+
+diff -Naur mysql-connector-odbc-5.1.5r1144.orig/util/stringutil.c mysql-connector-odbc-5.1.5r1144/util/stringutil.c
+--- mysql-connector-odbc-5.1.5r1144.orig/util/stringutil.c	2008-04-14 21:03:35.000000000 -0400
++++ mysql-connector-odbc-5.1.5r1144/util/stringutil.c	2009-02-16 14:28:59.000000000 -0500
+@@ -52,7 +52,7 @@
+   SQLINTEGER i, out_bytes;
+   my_bool free_str= FALSE;
+ 
+-  if (*len == SQL_NTS)
++  if (str && *len == SQL_NTS)
+     *len= strlen((char *)str);
+ 
+   if (!str || *len == 0)
diff --git a/mysql-connector-odbc.spec b/mysql-connector-odbc.spec
index a8ceeb1..f5703ac 100644
--- a/mysql-connector-odbc.spec
+++ b/mysql-connector-odbc.spec
@@ -1,7 +1,7 @@
 Summary: ODBC driver for MySQL
 Name: mysql-connector-odbc
 Version: 5.1.5r1144
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 URL: http://dev.mysql.com/downloads/connector/odbc/5.1.html
 # exceptions allow library to be linked with most open source SW,
@@ -13,6 +13,7 @@ Source: http://dev.mysql.com/downloads/connector/odbc/mysql-connector-odbc-%{ver
 Patch1: myodbc-my-bool.patch
 Patch2: myodbc-shutdown.patch
 Patch3: myodbc-multilib.patch
+Patch4: myodbc-null-string.patch
 
 Requires: unixODBC
 BuildRequires: mysql-devel unixODBC-devel
@@ -28,6 +29,7 @@ An ODBC (rev 3) driver for MySQL, for use with unixODBC.
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 
 %build
 export CFLAGS="%{optflags} -fno-strict-aliasing"
@@ -80,6 +82,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/lib*so
 
 %changelog
+* Fri Feb 20 2009 Tom Lane <tgl@redhat.com> 5.1.5r1144-2
+- Rebuild for unixODBC 2.2.14.
+- Fix problem with null username/password specifications
+
 * Thu Jan 22 2009 Tom Lane <tgl@redhat.com> 5.1.5r1144-1
 - Update to mysql-connector-odbc 5.1.5r1144, to go with MySQL 5.1.x.
   Note the library name has changed from libmyodbc3 to libmyodbc5.