Commit 5bd46150 authored by unknown's avatar unknown
Browse files

Merge joreland@bk-internal.mysql.com:/home/bk/mysql-5.0 

into mysql.com:/home/jonas/src/mysql-5.0
parents 1f337107 7ce58bef

extra/comp_err.c

+6 −3
Original line number Diff line number Diff line
@@ -191,10 +191,11 @@ int main(int argc, char *argv[]) 


static int create_header_files(struct errors *error_head)

{

  uint er_count= 0;

  uint er_last;

  FILE *er_definef, *sql_statef;

  struct errors *tmp_error;

  DBUG_ENTER("create_header_files");

  LINT_INIT(er_last);



  if (!(er_definef= my_fopen(HEADERFILE, O_WRONLY, MYF(MY_WME))))

  {
@@ -209,6 +210,8 @@ static int create_header_files(struct errors *error_head) 
  fprintf(er_definef, "/* Autogenerated file, please don't edit */\n\n");

  fprintf(sql_statef, "/* Autogenerated file, please don't edit */\n\n");



  fprintf(er_definef, "#define ER_ERROR_FIRST %d\n", error_head->d_code);



  for (tmp_error= error_head; tmp_error; tmp_error= tmp_error->next_error)

  {

    /*
@@ -217,16 +220,16 @@ 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])

      fprintf(sql_statef,

	      "%-40s,\"%s\", \"%s\",\n", tmp_error->er_name,

	      tmp_error->sql_code1, tmp_error->sql_code2);

    er_count++;

  }

  /* finishing off with mysqld_error.h */

  fprintf(er_definef, "#define ER_ERROR_MESSAGES %d\n", er_count);

  fprintf(er_definef, "#define ER_ERROR_LAST %d\n", er_last);

  my_fclose(er_definef, MYF(0));

  my_fclose(sql_statef, MYF(0));

  DBUG_RETURN(0);

include/errmsg.h

+7 −0
Original line number Diff line number Diff line
@@ -21,6 +21,7 @@ 
extern "C" {

#endif

void	init_client_errs(void);

void	finish_client_errs(void);

extern const char *client_errors[];	/* Error messages */

#ifdef	__cplusplus

}
@@ -35,6 +36,9 @@ extern const char *client_errors[]; /* Error messages */ 
#endif

#define CLIENT_ERRMAP		2	/* Errormap used by my_error() */



/* Do not add error numbers before CR_ERROR_FIRST. */

/* If necessary to add lower numbers, change CR_ERROR_FIRST accordingly. */

#define CR_ERROR_FIRST  	2000 /*Copy first error nr.*/

#define CR_UNKNOWN_ERROR	2000

#define CR_SOCKET_CREATE_ERROR	2001

#define CR_CONNECTION_ERROR	2002
@@ -90,3 +94,6 @@ extern const char *client_errors[]; /* Error messages */ 
#define CR_SECURE_AUTH                          2049

#define CR_FETCH_CANCELED                       2050

#define CR_NO_DATA                              2051

#define CR_ERROR_LAST  /*Copy last error nr:*/  2051

/* Add error numbers before CR_ERROR_LAST and change it accordingly. */

include/my_base.h

+23 −0
Original line number Diff line number Diff line
@@ -273,6 +273,9 @@ enum ha_base_keytype { 
	/* Errorcodes given by functions */



/* opt_sum_query() assumes these codes are > 1 */

/* Do not add error numbers before HA_ERR_FIRST. */

/* If necessary to add lower numbers, change HA_ERR_FIRST accordingly. */

#define HA_ERR_FIRST            120 /*Copy first error nr.*/

#define HA_ERR_KEY_NOT_FOUND	120	/* Didn't find key on read or update */

#define HA_ERR_FOUND_DUPP_KEY	121	/* Dupplicate key on write */

#define HA_ERR_RECORD_CHANGED	123	/* Uppdate with is recoverable */
@@ -308,6 +311,9 @@ enum ha_base_keytype { 
#define HA_ERR_NO_SUCH_TABLE     155  /* The table does not exist in engine */

#define HA_ERR_TABLE_EXIST       156  /* The table existed in storage engine */

#define HA_ERR_NO_CONNECTION     157  /* Could not connect to storage engine */

#define HA_ERR_LAST              157 /*Copy last error nr.*/

/* Add error numbers before HA_ERR_LAST and change it accordingly. */

#define HA_ERR_ERRORS            (HA_ERR_LAST - HA_ERR_FIRST + 1)



	/* Other constants */
@@ -370,6 +376,15 @@ enum data_file_type { 


/* For key ranges */



#define NO_MIN_RANGE	1

#define NO_MAX_RANGE	2

#define NEAR_MIN	4

#define NEAR_MAX	8

#define UNIQUE_RANGE	16

#define EQ_RANGE	32

#define NULL_RANGE	64

#define GEOM_FLAG      128



typedef struct st_key_range

{

  const byte *key;
@@ -377,6 +392,14 @@ typedef struct st_key_range 
  enum ha_rkey_function flag;

} key_range;



typedef struct st_key_multi_range

{

  key_range start_key;

  key_range end_key;

  char  *ptr;                 /* Free to use by caller (ptr to row etc) */

  uint  range_flag;           /* key range flags see above */

} KEY_MULTI_RANGE;





/* For number of records */

#ifdef BIG_TABLES

include/my_sys.h

+2 −3
Original line number Diff line number Diff line
@@ -43,8 +43,6 @@ extern int NEAR my_errno; /* Last error in mysys */ 
#define MYSYS_PROGRAM_DONT_USE_CURSES()  { error_handler_hook = my_message_no_curses; mysys_uses_curses=0;}

#define MY_INIT(name);		{ my_progname= name; my_init(); }



#define MAXMAPS		(4)	/* Number of error message maps */

#define ERRMOD		(1000)	/* Max number of errors in a map */

#define ERRMSGSIZE	(SC_MAXWIDTH)	/* Max length of a error message */

#define NRERRBUFFS	(2)	/* Buffers for parameters */

#define MY_FILE_ERROR	((uint) ~0)
@@ -213,7 +211,6 @@ void __CDECL hfree(void *ptr); 
#else

extern int errno;			/* declare errno */

#endif

extern const char ** NEAR my_errmsg[];

extern char NEAR errbuff[NRERRBUFFS][ERRMSGSIZE];

extern char *home_dir;			/* Home directory for user */

extern char *my_progname;		/* program-name (printed in errors) */
@@ -610,6 +607,8 @@ extern int my_error _VARARGS((int nr,myf MyFlags, ...)); 
extern int my_printf_error _VARARGS((uint my_err, const char *format,

				     myf MyFlags, ...)

				    __attribute__ ((format (printf, 2, 4))));

extern int my_error_register(const char **errmsgs, int first, int last);

extern const char **my_error_unregister(int first, int last);

extern int my_message(uint my_err, const char *str,myf MyFlags);

extern int my_message_no_curses(uint my_err, const char *str,myf MyFlags);

extern int my_message_curses(uint my_err, const char *str,myf MyFlags);

include/mysys_err.h

+7 −3
Original line number Diff line number Diff line
@@ -20,13 +20,15 @@ 
extern "C" {

#endif



#define GLOB		0	/* Error maps */

#define GLOBERRS	28	/* Max number of error messages in map's */

#define EE(X)	globerrs[ X ]	/* Defines to add error to right map */

#define GLOBERRS (EE_ERROR_LAST - EE_ERROR_FIRST + 1) /* Nr of global errors */

#define EE(X)    (globerrs[(X) - EE_ERROR_FIRST])



extern const char * NEAR globerrs[];	/* my_error_messages is here */



/* Error message numbers in global map */

/* Do not add error numbers before EE_ERROR_FIRST. */

/* If necessary to add lower numbers, change EE_ERROR_FIRST accordingly. */

#define EE_ERROR_FIRST          0 /*Copy first error nr.*/

#define EE_FILENOTFOUND		0

#define EE_CANTCREATEFILE	1

#define EE_READ			2
@@ -54,6 +56,8 @@ extern const char * NEAR globerrs[]; /* my_error_messages is here */ 
#define EE_CANT_SYMLINK		25

#define EE_REALPATH		26

#define EE_SYNC			27

#define EE_ERROR_LAST           27 /*Copy last error nr.*/

/* Add error numbers before EE_ERROR_LAST and change it accordingly. */



  /* exit codes for all MySQL programs */