database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Added possibility to use --error <name> instead of --error <number>

Browse Source 
The old syntax works as well. WL#2356.
This commit is contained in:
jani@ua141d10.elisa.omakaista.fi
2005-01-18 20:16:21 +02:00
parent a55f4a5da4
commit 625ae2c5a0
3 changed files with 46 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
client/mysqltest.c
View File

@ -123,6 +123,17 @@ typedef struct
} code;
} match_err;
typedef struct
{
const char *name;
long code;
} st_error;
static st_error global_error[] = {
#include <mysqld_ername.h>
{ 0, 0 }
};
static match_err global_expected_errno[MAX_EXPECTED_ERRORS];
static uint global_expected_errors;
@ -1340,6 +1351,7 @@ static uint get_errcodes(match_err *to,struct st_query* q)
{
char* p= q->first_argument;
uint count= 0;
DBUG_ENTER("get_errcodes");
if (!*p)
@ -1350,19 +1362,41 @@ static uint get_errcodes(match_err *to,struct st_query* q)
if (*p == 'S')
{
/* SQLSTATE string */
int i;
p++;
for (i = 0; my_isalnum(charset_info, *p) && i < SQLSTATE_LENGTH; p++, i++)
to[count].code.sqlstate[i]= *p;
to[count].code.sqlstate[i]= '\0';
char *end= ++p + SQLSTATE_LENGTH;
char *to_ptr= to[count].code.sqlstate;
for (; my_isalnum(charset_info, *p) && p != end; p++)
*to_ptr++= *p;
*to_ptr= 0;
to[count].type= ERR_SQLSTATE;
}
else if (*p == 'E')
{
/* SQL error as string */
st_error *e= global_error;
char *start= p++;
for (; *p == '_' || my_isalnum(charset_info, *p); p++)
;
for (; e->name; e++)
{
if (!strncmp(start, e->name, (int) (p - start)))
{
to[count].code.errnum= (uint) e->code;
to[count].type= ERR_ERRNO;
break;
}
}
if (!e->name)
die("Unknown SQL error '%s'\n", start);
}
else
{
long val;
p=str2int(p,10,(long) INT_MIN, (long) INT_MAX, &val);
if (p == NULL)
die("Invalid argument in %s\n", q->query);
if (!(p= str2int(p,10,(long) INT_MIN, (long) INT_MAX, &val)))
die("Invalid argument in %s\n", q->query);
to[count].code.errnum= (uint) val;
to[count].type= ERR_ERRNO;
}
@ -2855,6 +2889,7 @@ static int normal_handle_error(const char *query, struct st_query *q,
mysql_error(mysql));
DBUG_RETURN(0);
}
return 0; /* Keep compiler happy */
}