1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge mysql.com:/home/jimw/my/mysql-5.1-18495

Browse Source 
into  mysql.com:/home/jimw/my/mysql-5.1-clean
This commit is contained in:
unknown 2006-05-01 11:22:47 -07:00
commit ae75af8cb7
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
client/mysqltest.c
View File

@ -1956,7 +1956,13 @@ static uint get_errcodes(match_err *to,struct st_query *q)
; ;
for (; e->name; e++) for (; e->name; e++)
{ {
if (!strncmp(start, e->name, (int) (p - start))) /*
If we get a match, we need to check the length of the name we
matched against in case it was longer than what we are checking
(as in ER_WRONG_VALUE vs. ER_WRONG_VALUE_COUNT).
*/
if (!strncmp(start, e->name, (int) (p - start)) &&
strlen(e->name) == (p - start))
{ {
to[count].code.errnum= (uint) e->code; to[count].code.errnum= (uint) e->code;
to[count].type= ERR_ERRNO; to[count].type= ERR_ERRNO;

4
mysql-test/t/events.test
View File

@ -320,9 +320,9 @@ drop event one_event;
create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5; create event e_26 on schedule at '2017-01-01 00:00:00' disable do set @a = 5;
select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event; select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;
drop event e_26; drop event e_26;
--error 1504 --error ER_WRONG_VALUE
create event e_26 on schedule at NULL disabled do set @a = 5; create event e_26 on schedule at NULL disabled do set @a = 5;
--error 1504 --error ER_WRONG_VALUE
create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5; create event e_26 on schedule at 'definitely not a datetime' disabled do set @a = 5;
set names utf8; set names utf8;