Bug#20600847: COMP_ERR CRASHES WHEN ADDING MORE ERROR MESSAGES

The number of error messages has exceeded 1000, but comp_err is only
prepared for 1000 messages. This causes crashes at build time on some
platforms.

Increase MAX_ROWS from 1000 to 2000 in extra/comp_err.c to allow up to
2000 error messages. Also add a check that prints an error message and
exits, instead of crashing, if the number of error messages exceeds
MAX_ROWS.

Author: kahatlen

extra/comp_err.c

@@ -33,7 +33,7 @@
 #include <my_dir.h>
 #include <mysql_version.h>
 
-#define MAX_ROWS  1000
+#define MAX_ROWS  2000
 #define HEADER_LENGTH 32                /* Length of header in errmsg.sys */
 #define ERRMSG_VERSION 3                /* Version number of errmsg.sys */
 #define DEFAULT_CHARSET_DIR "../sql/share/charsets"
@@ -183,6 +183,12 @@ int main(int argc, char *argv[])
       fprintf(stderr, "Failed to parse input file %s\n", TXTFILE);
       DBUG_RETURN(1);
     }
+    if (row_count > MAX_ROWS)
+    {
+      fprintf(stderr, "Found too many error messages. ");
+      fprintf(stderr, "Increase MAX_ROWS in extra/comp_err.c.\n");
+      DBUG_RETURN(1);
+    }
 #if MYSQL_VERSION_ID >= 50100 && MYSQL_VERSION_ID < 50500
 /* Number of error messages in 5.1 - do not change this number! */
 #define MYSQL_OLD_GA_ERROR_MESSAGE_COUNT 641