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
da8e9635
Commit
da8e9635
authored
Jan 02, 2003
by
Sinisa@sinisa.nasamreza.org
Browse files
Options
Browse Files
Download
Plain Diff
Merge sinisa@work.mysql.com:/home/bk/mysql-4.0
into sinisa.nasamreza.org:/mnt/work/mysql-4.0
parents
80f5621e
66208fe9
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
24 additions
and
3 deletions
+24
-3
sql/net_serv.cc
sql/net_serv.cc
+18
-3
sql/sql_parse.cc
sql/sql_parse.cc
+6
-0
No files found.
sql/net_serv.cc
View file @
da8e9635
...
@@ -469,6 +469,7 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed)
...
@@ -469,6 +469,7 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed)
ALARM
alarm_buff
;
ALARM
alarm_buff
;
uint
retry_count
=
0
;
uint
retry_count
=
0
;
my_bool
old_mode
;
my_bool
old_mode
;
uint32
old
=
remain
;
if
(
!
thr_alarm_in_use
(
&
alarmed
))
if
(
!
thr_alarm_in_use
(
&
alarmed
))
{
{
...
@@ -490,6 +491,12 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed)
...
@@ -490,6 +491,12 @@ static void my_net_skip_rest(NET *net, uint32 remain, thr_alarm_t *alarmed)
return
;
return
;
}
}
remain
-=
(
uint32
)
length
;
remain
-=
(
uint32
)
length
;
if
(
!
remain
&&
old
==
MAX_THREE_BYTES
&&
(
length
=
vio_read
(
net
->
vio
,(
char
*
)
net
->
buff
,
NET_HEADER_SIZE
)))
{
old
=
remain
=
uint3korr
(
net
->
buff
);
net
->
pkt_nr
++
;
}
statistic_add
(
bytes_received
,
length
,
&
LOCK_bytes_received
);
statistic_add
(
bytes_received
,
length
,
&
LOCK_bytes_received
);
}
}
}
}
...
@@ -647,11 +654,19 @@ my_real_read(NET *net, ulong *complen)
...
@@ -647,11 +654,19 @@ my_real_read(NET *net, ulong *complen)
{
{
if
(
net_realloc
(
net
,
helping
))
if
(
net_realloc
(
net
,
helping
))
{
{
#ifdef MYSQL_SERVER
#ifndef NO_ALARM
#ifndef NO_ALARM
if
(
i
==
1
)
if
(
net
->
compress
)
{
len
=
packet_error
;
goto
end
;
}
my_net_skip_rest
(
net
,
(
uint32
)
len
,
&
alarmed
);
my_net_skip_rest
(
net
,
(
uint32
)
len
,
&
alarmed
);
len
=
0
;
#endif
#endif
#else
len
=
packet_error
;
/* Return error */
len
=
packet_error
;
/* Return error */
#endif
goto
end
;
goto
end
;
}
}
}
}
...
...
sql/sql_parse.cc
View file @
da8e9635
...
@@ -884,6 +884,12 @@ bool do_command(THD *thd)
...
@@ -884,6 +884,12 @@ bool do_command(THD *thd)
vio_description
(
net
->
vio
)
));
vio_description
(
net
->
vio
)
));
return
TRUE
;
return
TRUE
;
}
}
else
if
(
!
packet_length
)
{
send_error
(
net
,
net
->
last_errno
,
NullS
);
net
->
error
=
0
;
DBUG_RETURN
(
FALSE
);
}
else
else
{
{
packet
=
(
char
*
)
net
->
read_pos
;
packet
=
(
char
*
)
net
->
read_pos
;
...
...
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