Commit ae75af8c authored by unknown's avatar unknown
Browse files

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

into  mysql.com:/home/jimw/my/mysql-5.1-clean
parents 8c9f60a7 8057e309

client/mysqltest.c

+7 −1
Original line number Diff line number Diff line
@@ -1956,7 +1956,13 @@ static uint get_errcodes(match_err *to,struct st_query *q) 
	;

      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].type= ERR_ERRNO;

mysql-test/t/events.test

+2 −2
Original line number Diff line number Diff line
@@ -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;

select db, name, body, definer, convert_tz(execute_at, 'UTC', 'SYSTEM'), on_completion from mysql.event;

drop event e_26;

--error 1504

--error ER_WRONG_VALUE

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;



set names utf8;