diff --git a/dbcon/mysql/ha_calpont_impl.cpp b/dbcon/mysql/ha_calpont_impl.cpp
index 42910e98c..6cc7da0fb 100755
--- a/dbcon/mysql/ha_calpont_impl.cpp
+++ b/dbcon/mysql/ha_calpont_impl.cpp
@@ -1824,7 +1824,7 @@ __declspec(dllexport)
 #endif
 // Return 1 if system is ready for reads or 0 if not.
 long long mcssystemready(UDF_INIT* initid, UDF_ARGS* args,
-							char* is_null, char* error)
+                        char* is_null, char* error)
 {
     long long rtn = 0;
     Oam oam;
@@ -1853,7 +1853,7 @@ __declspec(dllexport)
 #endif
 my_bool mcssystemready_init(UDF_INIT* initid, UDF_ARGS* args, char* message)
 {
-	return 0;
+    return 0;
 }
 
 #ifdef _MSC_VER
@@ -1866,19 +1866,23 @@ void mcssystemready_deinit(UDF_INIT* initid)
 #ifdef _MSC_VER
 __declspec(dllexport)
 #endif
-// Return 1 if system is read only; 0 if writeable
+// Return non-zero if system is read only; 0 if writeable
 long long mcssystemreadonly(UDF_INIT* initid, UDF_ARGS* args,
-							char* is_null, char* error)
+                            char* is_null, char* error)
 {
     long long rtn = 0;
     DBRM dbrm(true);
 
     try
     {
-        if (dbrm.isReadWrite()) // Returns 0 for writable, 5 for read only
+        if (dbrm.getSystemSuspended())
         {
             rtn = 1;
         }
+        if (dbrm.isReadWrite() > 0) // Returns 0 for writable, 5 for read only
+        {
+            rtn = 2;
+        }
     }
     catch (...)
     {
@@ -1893,7 +1897,7 @@ __declspec(dllexport)
 #endif
 my_bool mcssystemreadonly_init(UDF_INIT* initid, UDF_ARGS* args, char* message)
 {
-	return 0;
+    return 0;
 }
 
 #ifdef _MSC_VER
@@ -1903,46 +1907,6 @@ void mcssystemreadonly_deinit(UDF_INIT* initid)
 {
 }
 
-#ifdef _MSC_VER
-__declspec(dllexport)
-#endif
-// Return 1 if system is read only; 0 if writeable
-long long mcswritessuspended(UDF_INIT* initid, UDF_ARGS* args,
-							char* is_null, char* error)
-{
-    long long rtn = 0;
-    DBRM dbrm(true);
-
-    try
-    {
-        if (dbrm.getSystemSuspended())
-        {
-            rtn = 1;
-        }
-    }
-    catch (...)
-    {
-        *error = 1;
-        rtn = 1;
-    }
-    return rtn;
-}
-
-#ifdef _MSC_VER
-__declspec(dllexport)
-#endif
-my_bool mcswritessuspended_init(UDF_INIT* initid, UDF_ARGS* args, char* message)
-{
-	return 0;
-}
-
-#ifdef _MSC_VER
-__declspec(dllexport)
-#endif
-void mcswritessuspended_deinit(UDF_INIT* initid)
-{
-}
-
 #define MAXSTRINGLENGTH 50
 
 const char* PmSmallSideMaxMemory = "pmmaxmemorysmallside";
diff --git a/dbcon/mysql/install_calpont_mysql.sh b/dbcon/mysql/install_calpont_mysql.sh
index 17c6e1817..e8eb5b2b0 100755
--- a/dbcon/mysql/install_calpont_mysql.sh
+++ b/dbcon/mysql/install_calpont_mysql.sh
@@ -84,7 +84,6 @@ CREATE FUNCTION idbpartition RETURNS STRING soname 'libcalmysql.so';
 CREATE FUNCTION idblocalpm RETURNS INTEGER soname 'libcalmysql.so';
 CREATE FUNCTION mcssystemready RETURNS INTEGER soname 'libcalmysql.so';
 CREATE FUNCTION mcssystemreadonly RETURNS INTEGER soname 'libcalmysql.so';
-CREATE FUNCTION mcswritessuspended RETURNS INTEGER soname 'libcalmysql.so';
 
 CREATE DATABASE IF NOT EXISTS infinidb_vtable;
 CREATE DATABASE IF NOT EXISTS infinidb_querystats;
diff --git a/utils/winport/win_setup_mysql_part2.sql b/utils/winport/win_setup_mysql_part2.sql
index 0a2a972fb..3ac04dcad 100644
--- a/utils/winport/win_setup_mysql_part2.sql
+++ b/utils/winport/win_setup_mysql_part2.sql
@@ -11,7 +11,6 @@ CREATE FUNCTION calcleartablelock RETURNS STRING SONAME 'libcalmysql.dll';
 CREATE FUNCTION calgetsqlcount RETURNS STRING SONAME 'libcalmysql.dll';
 CREATE FUNCTION mcssystemready RETURNS INTEGER SONAME 'libcalmysql.dll';
 CREATE FUNCTION mcssystemreadonly RETURNS INTEGER SONAME 'libcalmysql.dll';
-CREATE FUNCTION mcswritessuspended RETURNS INTEGER SONAME 'libcalmysql.dll';
 
 create database if not exists calpontsys;
 use calpontsys;