Commit 6528be27 authored by unknown's avatar unknown
Browse files

Merge neptunus.(none):/home/msvensson/mysql/my50-m-bug20145 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
parents b03b6c86 595fdd6b

extra/perror.c

+15 −12
Original line number Diff line number Diff line
@@ -281,16 +281,18 @@ int main(int argc,char *argv[]) 
	else

	  puts(msg);

      }

      if (!(msg=get_ha_error_msg(code)))

      {



      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

        {

          found= 1;

          if (verbose)

            printf("MySQL error code %3d: %s\n",code,msg);

          else
@@ -298,6 +300,7 @@ int main(int argc,char *argv[]) 
        }

      }

    }

  }



  /* if we allocated a buffer for unknown_error, free it now */

  if (unknown_error)

mysql-test/r/perror.result

+2 −3
Original line number Diff line number Diff line 
MySQL error code 150: Foreign key constraint is incorrectly formed

Is a named type file

Didn't find key on read or update
 
Illegal ndb error code: 1186

Illegal error code: 1186

mysql-test/t/perror.test

+14 −2
Original line number Diff line number Diff line
@@ -6,6 +6,18 @@ disable_query_log; 
eval select LENGTH("$MY_PERROR") > 0 as "have_perror";

enable_query_log;



--exec $MY_PERROR 150

--exec $MY_PERROR --silent 120

--exec $MY_PERROR 150 > /dev/null

--exec $MY_PERROR --silent 120 > /dev/null



#

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

#



# As long there is no error code 1186 defined by NDB

# we should get a message "Illegal ndb error code: 1186"

--error 1

--exec $MY_PERROR --ndb 1186 2>&1



# As there is an error code defined for 1186, expect error

--error 1

--exec $MY_PERROR 1186 2>&1

ndb/src/kernel/error/ndbd_exit_codes.c

+1 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ int ndbd_exit_string(int err_no, char *str, unsigned int size) 
  ndbd_exit_classification cl;

  ndbd_exit_status st;

  const char *msg = ndbd_exit_message(err_no, &cl);

  if (msg[0] != '\0')

  if (msg[0] != '\0' && cl != XUE)

  {

    const char *cl_msg = ndbd_exit_classification_message(cl, &st);

    const char *st_msg = ndbd_exit_status_message(st);