database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-07 00:04:31 +03:00
Code Activity

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

Browse Source 
into  neptunus.(none):/home/msvensson/mysql/mysql-5.0-maint
This commit is contained in:
unknown
2006-07-26 14:22:23 +02:00
parent b03b6c868e 595fdd6ba0
commit 6528be27b5
4 changed files with 32 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
extra/perror.c
View File

@@ -281,16 +281,18 @@ int main(int argc,char *argv[])
else else
puts(msg); 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); fprintf(stderr,"Illegal error code: %d\n",code);
error=1; error=1;
} }
}
else else
{ {
found= 1;
if (verbose) if (verbose)
printf("MySQL error code %3d: %s\n",code,msg); printf("MySQL error code %3d: %s\n",code,msg);
else else
@@ -298,6 +300,7 @@ int main(int argc,char *argv[])
} }
} }
} }
}
/* if we allocated a buffer for unknown_error, free it now */ /* if we allocated a buffer for unknown_error, free it now */
if (unknown_error) if (unknown_error)

5
mysql-test/r/perror.result
View File

@@ -1,3 +1,2 @@
MySQL error code 150: Foreign key constraint is incorrectly formed Illegal ndb error code: 1186
Is a named type file Illegal error code: 1186
Didn't find key on read or update

16
mysql-test/t/perror.test
View File

@@ -6,6 +6,18 @@ disable_query_log;
eval select LENGTH("$MY_PERROR") > 0 as "have_perror"; eval select LENGTH("$MY_PERROR") > 0 as "have_perror";
enable_query_log; enable_query_log;
--exec $MY_PERROR 150 --exec $MY_PERROR 150 > /dev/null
--exec $MY_PERROR --silent 120 --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

2
ndb/src/kernel/error/ndbd_exit_codes.c
View File

@@ -247,7 +247,7 @@ int ndbd_exit_string(int err_no, char *str, unsigned int size)
ndbd_exit_classification cl; ndbd_exit_classification cl;
ndbd_exit_status st; ndbd_exit_status st;
const char *msg = ndbd_exit_message(err_no, &cl); 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 *cl_msg = ndbd_exit_classification_message(cl, &st);
const char *st_msg = ndbd_exit_status_message(st); const char *st_msg = ndbd_exit_status_message(st);