WL#8206: Introduce separate error code range for 5.7

This patch introduces support for separate error code
ranges where errors in each range is consecutively numbered.

This means that it is possible to have separate error code ranges
for each GA release.

All new error codes in 5.7 are changed so that that they start at
3000.

Author: jhauglid

extra/comp_err.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -246,7 +246,6 @@ static void print_escaped_string(FILE *f, const char *str)
 
 static int create_header_files(struct errors *error_head)
 {
-  uint er_last= 0;
   FILE *er_definef, *sql_statef, *er_namef;
   struct errors *tmp_error;
   struct message *er_msg;
@@ -274,7 +273,40 @@ static int create_header_files(struct errors *error_head)
   fprintf(sql_statef, "/* Autogenerated file, please don't edit */\n\n");
   fprintf(er_namef, "/* Autogenerated file, please don't edit */\n\n");
 
-  fprintf(er_definef, "#define ER_ERROR_FIRST %d\n", error_head->d_code);
+  fprintf(er_definef, "#ifndef MYSQLD_ERROR_INCLUDED\n");
+  fprintf(er_definef, "#define MYSQLD_ERROR_INCLUDED\n\n");
+
+  /*
+    Find out how many sections of error messages we have, what the first
+    number in each section is and the number of messages in each section.
+  */
+  {
+    int error_code= error_head->d_code;
+    int section_size[100]; /* Assume that 100 sections is enough. */
+    int current_section= 0;
+    int section_nr;
+    section_size[0]= 0;
+    fprintf(er_definef,
+            "static const int errmsg_section_start[] = { %d", error_code);
+    for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
+    {
+      if (tmp_error->d_code != error_code) /* Starting new section? */
+      {
+        fprintf(er_definef, ", %d", tmp_error->d_code);
+        error_code= tmp_error->d_code;
+        section_size[++current_section]= 0;
+      }
+      error_code++;
+      section_size[current_section]++;
+    }
+    fprintf(er_definef, " };\n");
+
+    fprintf(er_definef,
+            "static const int errmsg_section_size[] = { %d", section_size[0]);
+    for (section_nr= 1; section_nr <= current_section; section_nr++)
+      fprintf(er_definef, ", %d", section_size[section_nr]);
+    fprintf(er_definef, " };\n\n");
+  }
 
   for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)
   {
@@ -284,7 +316,6 @@ static int create_header_files(struct errors *error_head)
     */
     fprintf(er_definef, "#define %s %d\n", tmp_error->er_name,
 	    tmp_error->d_code);
-    er_last= tmp_error->d_code;
 
     /* generating sql_state.h file */
     if (tmp_error->sql_code1[0] || tmp_error->sql_code2[0])
@@ -300,7 +331,7 @@ static int create_header_files(struct errors *error_head)
     fprintf(er_namef, "\" },\n");
   }
   /* finishing off with mysqld_error.h */
-  fprintf(er_definef, "#define ER_ERROR_LAST %d\n", er_last);
+  fprintf(er_definef, "#endif\n");
   my_fclose(er_definef, MYF(0));
   my_fclose(sql_statef, MYF(0));
   my_fclose(er_namef, MYF(0));
@@ -454,7 +485,8 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
   char *str, buff[1000];
   struct errors *current_error= 0, **tail_error= top_error;
   struct message current_message;
-  int rcount= 0;
+  int rcount= 0; /* Number of error codes in current section. */
+  int ecount= 0; /* Number of error codes in total. */
   DBUG_ENTER("parse_input_file");
 
   *top_error= 0;
@@ -480,6 +512,7 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
 	fprintf(stderr, "Failed to parse the error offset string!\n");
 	DBUG_RETURN(0);
       }
+      rcount= 0; /* Reset count if a fixed number is set. */
       continue;
     }
     if (is_prefix(str, "default-language"))
@@ -533,7 +566,8 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
 	fprintf(stderr, "Failed to parse the error name string\n");
 	DBUG_RETURN(0);
       }
-      rcount++;                         /* Count number of unique errors */
+      rcount++;
+      ecount++;                         /* Count number of unique errors */
 
       /* add error to the list */
       *tail_error= current_error;
@@ -549,7 +583,7 @@ static int parse_input_file(const char *file_name, struct errors **top_error,
   *tail_error= 0;				/* Mark end of list */
 
   my_fclose(file, MYF(0));
-  DBUG_RETURN(rcount);
+  DBUG_RETURN(ecount);
 }
 
 

extra/perror.c

@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -207,6 +207,13 @@ static my_bool print_win_error_msg(DWORD error, my_bool verbose)
 }
 #endif
 
+
+static const char *get_handler_error_message(int nr)
+{
+  return handler_error_messages[nr - HA_ERR_FIRST];
+}
+
+
 /*
   Register handler error messages for usage with my_error()
 
@@ -215,12 +222,7 @@ static my_bool print_win_error_msg(DWORD error, my_bool verbose)
     will ignore calls to register already registered error numbers.
 */
 
-static const char **get_handler_error_messages()
-{
-  return handler_error_messages;
-}
-
-void my_handler_error_register(void)
+void my_handler_error_register()
 {
   /*
     If you got compilation error here about compile_time_assert array, check
@@ -230,7 +232,7 @@ void my_handler_error_register(void)
   */
   compile_time_assert(HA_ERR_FIRST + array_elements(handler_error_messages) ==
                       HA_ERR_LAST + 1);
-  my_error_register(get_handler_error_messages, HA_ERR_FIRST,
+  my_error_register(get_handler_error_message, HA_ERR_FIRST,
                     HA_ERR_FIRST+ array_elements(handler_error_messages)-1);
 }
 

include/my_sys.h

@@ -587,8 +587,7 @@ extern HANDLE   my_get_osfhandle(File fd);
 extern void     my_osmaperr(unsigned long last_error);
 #endif
 
-extern void init_glob_errs(void);
-extern const char** get_global_errmsgs();
+extern const char* get_global_errmsg(int nr);
 extern void wait_for_free_space(const char *filename, int errors);
 extern FILE *my_fopen(const char *FileName,int Flags,myf MyFlags);
 extern FILE *my_fdopen(File Filedes,const char *name, int Flags,myf MyFlags);
@@ -609,9 +608,9 @@ extern void my_printf_error(uint my_err, const char *format,
   __attribute__((format(printf, 2, 4)));
 extern void my_printv_error(uint error, const char *format, myf MyFlags,
                             va_list ap);
-extern int my_error_register(const char** (*get_errmsgs) (),
+extern int my_error_register(const char* (*get_errmsg) (int),
                              int first, int last);
-extern const char **my_error_unregister(int first, int last);
+extern my_bool my_error_unregister(int first, int last);
 extern void my_message(uint my_err, const char *str,myf MyFlags);
 extern void my_message_stderr(uint my_err, const char *str, myf MyFlags);
 void my_message_local_stderr(enum loglevel ll,

libmysql/errmsg.c

@@ -1,4 +1,4 @@
-/* Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved.
+/* Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -90,9 +90,9 @@ const char *client_errors[]=
   ""
 };
 
-const char** get_client_errmsgs()
+const char* get_client_errmsg(int nr)
 {
-  return client_errors;
+  return client_errors[nr - CR_ERROR_FIRST];
 }
 
 /*
@@ -109,7 +109,7 @@ void init_client_errs(void)
 {
   compile_time_assert(array_elements(client_errors) ==
                       (CR_ERROR_LAST - CR_ERROR_FIRST + 2));
-  (void) my_error_register(get_client_errmsgs, CR_ERROR_FIRST, CR_ERROR_LAST);
+  (void) my_error_register(get_client_errmsg, CR_ERROR_FIRST, CR_ERROR_LAST);
 }
 
 

mysql-test/r/events_bugs.result

@@ -729,9 +729,9 @@ drop procedure if exists p;
 set @old_mode= @@sql_mode;
 set @@sql_mode= cast(pow(2,32)-1 as unsigned integer);
 Warnings:
-Warning	1913	'ERROR_FOR_DIVISION_BY_ZERO' mode no longer has any effect. Use STRICT_ALL_TABLES or STRICT_TRANS_TABLES instead.
-Warning	1913	'NO_ZERO_DATE' mode no longer has any effect. Use STRICT_ALL_TABLES or STRICT_TRANS_TABLES instead.
-Warning	1913	'NO_ZERO_IN_DATE' mode no longer has any effect. Use STRICT_ALL_TABLES or STRICT_TRANS_TABLES instead.
+Warning	3027	'ERROR_FOR_DIVISION_BY_ZERO' mode no longer has any effect. Use STRICT_ALL_TABLES or STRICT_TRANS_TABLES instead.
+Warning	3027	'NO_ZERO_DATE' mode no longer has any effect. Use STRICT_ALL_TABLES or STRICT_TRANS_TABLES instead.
+Warning	3027	'NO_ZERO_IN_DATE' mode no longer has any effect. Use STRICT_ALL_TABLES or STRICT_TRANS_TABLES instead.
 create event e1 on schedule every 1 day do select 1;
 select @@sql_mode into @full_mode;
 set @@sql_mode= @old_mode;

mysql-test/r/func_math.result

@@ -51,9 +51,9 @@ select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log
 log(exp(10))	exp(log(sqrt(10))*2)	log(-1)	log(NULL)	log(1,1)	log(3,9)	log(-1,2)	log(NULL,2)
 10	10.000000000000002	NULL	NULL	NULL	2	NULL	NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 explain extended select log(exp(10)),exp(log(sqrt(10))*2),log(-1),log(NULL),log(1,1),log(3,9),log(-1,2),log(NULL,2);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -64,8 +64,8 @@ select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
 ln(exp(10))	exp(ln(sqrt(10))*2)	ln(-1)	ln(0)	ln(NULL)
 10	10.000000000000002	NULL	NULL	NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 explain extended select ln(exp(10)),exp(ln(sqrt(10))*2),ln(-1),ln(0),ln(NULL);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -76,8 +76,8 @@ select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
 log2(8)	log2(15)	log2(-2)	log2(0)	log2(NULL)
 3	3.9068905956085187	NULL	NULL	NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 explain extended select log2(8),log2(15),log2(-2),log2(0),log2(NULL);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -88,8 +88,8 @@ select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
 log10(100)	log10(18)	log10(-4)	log10(0)	log10(NULL)
 2	1.255272505103306	NULL	NULL	NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 explain extended select log10(100),log10(18),log10(-4),log10(0),log10(NULL);
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
 1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	No tables used
@@ -255,27 +255,27 @@ select ln(-1);
 ln(-1)
 NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 select log10(-1);
 log10(-1)
 NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 select log2(-1);
 log2(-1)
 NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 select log(2,-1);
 log(2,-1)
 NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 select log(-2,1);
 log(-2,1)
 NULL
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 set sql_mode='';
 select round(111,-10);
 round(111,-10)
@@ -791,22 +791,22 @@ SET sql_mode='';
 INSERT INTO t1 VALUES (ln(1));
 INSERT INTO t1 VALUES (ln(0));
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 INSERT INTO t1 VALUES (ln(-1));
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 INSERT INTO t1 VALUES (log(0));
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 INSERT INTO t1 VALUES (log(1,0));
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 INSERT INTO t1 VALUES (log2(0));
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 INSERT INTO t1 VALUES (log10(0));
 Warnings:
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 SELECT * FROM t1 ORDER BY a;
 a
 NULL
@@ -856,14 +856,14 @@ NULL
 SET sql_mode='';
 UPDATE t1 SET a = ln(0);
 Warnings:
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 SELECT * FROM t1 ORDER BY a;
 a
 NULL
@@ -890,14 +890,14 @@ NULL
 SET sql_mode='';
 DELETE FROM t1 WHERE a <=> ln(0);
 Warnings:
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
-Warning	1906	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
+Warning	3020	Invalid argument for logarithm
 SELECT * FROM t1 ORDER BY a;
 a
 DROP TABLE t1;

mysql-test/r/func_str.result

@@ -3026,7 +3026,7 @@ sha1('P'),
 )
 );
 Warnings:
-Error	1923	Invalid GIS data provided to function st_geometryfromwkb.
+Error	3037	Invalid GIS data provided to function st_geometryfromwkb.
 Warning	1292	Truncated incorrect DECIMAL value: '[.DC2.]'
 SET @@global.max_allowed_packet:= @tmp_max;
 #

mysql-test/r/func_time.result

@@ -1819,7 +1819,7 @@ DROP TABLE t1;
 #
 DO contains(1, if(0, coalesce(NULL), now()));
 Warnings:
-Error	1923	Invalid GIS data provided to function mbrcontains.
+Error	3037	Invalid GIS data provided to function mbrcontains.
 CREATE TABLE t1 AS SELECT IF(0, coalesce(NULL), now(0)) + 0;
 SHOW CREATE TABLE t1;
 Table	Create Table