Bug#16561 Unknown ERROR msg "ERROR 1186 (HY000): Binlog closed" by perror

 - Since error 1186 is not found among NDB error codes, the message retuned should indicate that.


extra/perror.c:
  Move the !found out one level
mysql-test/t/perror.test:
  Add test case for bug#16561
ndb/src/kernel/error/ndbd_exit_codes.c:
  Check not only for zero size string but also classification "unknown error" when looking for an error mesage for an error code

1 files changed, 15 insertions, 12 deletions

diff --git a/extra/perror.c b/extra/perror.c
index 531d30dae86..b26e516a101 100644
--- a/extra/perror.c
+++ b/extra/perror.c
@@ -261,7 +261,7 @@ int main(int argc,char *argv[])
         found= 1;
         msg= 0;
       }
-      else 
+      else
 #endif
 	msg = strerror(code);
 
@@ -281,20 +281,23 @@ int main(int argc,char *argv[])
 	else
 	  puts(msg);
       }
-      if (!(msg=get_ha_error_msg(code)))
+
+      if (!found)
       {
-	if (!found)
-	{
+        /* Error message still not found, look in handler error codes */
+        if (!(msg=get_ha_error_msg(code)))
+        {
 	  fprintf(stderr,"Illegal error code: %d\n",code);
 	  error=1;
-	}
-      }
-      else
-      {
-	if (verbose)
-	  printf("MySQL error code %3d: %s\n",code,msg);
-	else
-	  puts(msg);
+        }
+        else
+        {
+          found= 1;
+          if (verbose)
+            printf("MySQL error code %3d: %s\n",code,msg);
+          else
+            puts(msg);
+        }
       }
     }
   }