Merge 192.168.0.10:mysql/mysql-4.1-maint

into  pilot.mysql.com:/home/msvensson/mysql/mysql-4.1-maint

1 files changed, 4 insertions, 1 deletions

diff --git a/extra/perror.c b/extra/perror.c
index 69cd6f87aab..764f54eafe3 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -217,8 +217,11 @@ int main(int argc,char *argv[])
       On some system, like NETWARE, strerror(unknown_error) returns a
       string 'Unknown Error'.  To avoid printing it we try to find the
       error string by asking for an impossible big error message.
+
+      On Solaris 2.8 it might return NULL
     */
-    msg= strerror(10000);
+    if ((msg= strerror(10000)) == NULL)
+      msg= "Unknown Error";
 
     /*
       Allocate a buffer for unknown_error since strerror always returns