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
632f3506
Commit
632f3506
authored
Jul 21, 2004
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0
into mysql.com:/space/my/mysql-4.0
parents
a082ff35
e217b2fd
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
libmysqld/libmysqld.c
libmysqld/libmysqld.c
+7
-6
No files found.
libmysqld/libmysqld.c
View file @
632f3506
...
...
@@ -412,8 +412,8 @@ mysql_free_result(MYSQL_RES *result)
DBUG_PRINT
(
"warning"
,(
"Not all rows in set were read; Ignoring rows"
));
for
(;;)
{
u
int
pkt_len
;
if
((
pkt_len
=
(
uint
)
net_safe_read
(
result
->
handle
))
==
packet_error
)
u
long
pkt_len
;
if
((
pkt_len
=
net_safe_read
(
result
->
handle
))
==
packet_error
)
break
;
if
(
pkt_len
==
1
&&
result
->
handle
->
net
.
read_pos
[
0
]
==
254
)
break
;
/* End of data */
...
...
@@ -611,7 +611,8 @@ unpack_fields(MYSQL_DATA *data,MEM_ROOT *alloc,uint fields,
static
MYSQL_DATA
*
read_rows
(
MYSQL
*
mysql
,
MYSQL_FIELD
*
mysql_fields
,
uint
fields
)
{
uint
field
,
pkt_len
;
uint
field
;
ulong
pkt_len
;
ulong
len
;
uchar
*
cp
;
char
*
to
;
...
...
@@ -620,7 +621,7 @@ static MYSQL_DATA *read_rows(MYSQL *mysql,MYSQL_FIELD *mysql_fields,
NET
*
net
=
&
mysql
->
net
;
DBUG_ENTER
(
"read_rows"
);
if
((
pkt_len
=
(
uint
)
net_safe_read
(
mysql
))
==
packet_error
)
if
((
pkt_len
=
net_safe_read
(
mysql
))
==
packet_error
)
DBUG_RETURN
(
0
);
if
(
!
(
result
=
(
MYSQL_DATA
*
)
my_malloc
(
sizeof
(
MYSQL_DATA
),
MYF
(
MY_WME
|
MY_ZEROFILL
))))
...
...
@@ -805,7 +806,7 @@ mysql_real_connect(MYSQL *mysql,const char *host, const char *user,
uint
port
,
const
char
*
unix_socket
,
uint
client_flag
)
{
char
buff
[
100
],
charset_name_buff
[
16
],
*
end
,
*
host_info
,
*
charset_name
;
u
int
pkt_length
;
u
long
pkt_length
;
ulong
max_allowed_packet
;
NET
*
net
=
&
mysql
->
net
;
DBUG_ENTER
(
"mysql_real_connect"
);
...
...
@@ -1153,7 +1154,7 @@ mysql_read_query_result(MYSQL *mysql)
uchar
*
pos
;
ulong
field_count
;
MYSQL_DATA
*
fields
;
u
int
length
;
u
long
length
;
DBUG_ENTER
(
"mysql_read_query_result"
);
if
((
length
=
net_safe_read
(
mysql
))
==
packet_error
)
...
...
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