Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
MariaDB
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
eebb5662
Commit
eebb5662
authored
May 01, 2006
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge mysql.com:/home/jimw/my/mysql-5.1-18495
into mysql.com:/home/jimw/my/mysql-5.1-clean
parents
8edf885a
337aec48
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
3 deletions
+9
-3
client/mysqltest.c
client/mysqltest.c
+7
-1
mysql-test/t/events.test
mysql-test/t/events.test
+2
-2
No files found.
client/mysqltest.c
View file @
eebb5662
...
@@ -1956,7 +1956,13 @@ static uint get_errcodes(match_err *to,struct st_query *q)
...
@@ -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
;
...
...
mysql-test/t/events.test
View file @
eebb5662
...
@@ -320,9 +320,9 @@ drop event one_event;
...
@@ -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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment