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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
bc4f7bfd
Commit
bc4f7bfd
authored
Mar 23, 2006
by
msvensson@neptunus.(none)
Browse files
Options
Browse Files
Download
Plain Diff
Merge bk-internal:/home/bk/mysql-5.0
into neptunus.(none):/home/msvensson/mysql/mysql-5.0
parents
c6e6c0d6
905dfa03
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
2 deletions
+11
-2
sql-common/client.c
sql-common/client.c
+11
-2
No files found.
sql-common/client.c
View file @
bc4f7bfd
...
@@ -1428,7 +1428,13 @@ mysql_init(MYSQL *mysql)
...
@@ -1428,7 +1428,13 @@ mysql_init(MYSQL *mysql)
mysql
->
free_me
=
1
;
mysql
->
free_me
=
1
;
}
}
else
else
bzero
((
char
*
)
(
mysql
),
sizeof
(
*
(
mysql
)));
{
#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100
bzero
((
char
*
)
(
mysql
),
sizeof
(
*
(
mysql
)));
#else
bzero
((
char
*
)
(
mysql
),
offsetof
(
MYSQL
,
info_buffer
));
#endif
}
mysql
->
options
.
connect_timeout
=
CONNECT_TIMEOUT
;
mysql
->
options
.
connect_timeout
=
CONNECT_TIMEOUT
;
mysql
->
last_used_con
=
mysql
->
next_slave
=
mysql
->
master
=
mysql
;
mysql
->
last_used_con
=
mysql
->
next_slave
=
mysql
->
master
=
mysql
;
mysql
->
charset
=
default_charset_info
;
mysql
->
charset
=
default_charset_info
;
...
@@ -2341,9 +2347,12 @@ static void mysql_close_free(MYSQL *mysql)
...
@@ -2341,9 +2347,12 @@ static void mysql_close_free(MYSQL *mysql)
my_free
(
mysql
->
user
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
user
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
passwd
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
passwd
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
db
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
db
,
MYF
(
MY_ALLOW_ZERO_PTR
));
#if defined(EMBEDDED_LIBRARY) || MYSQL_VERSION_ID >= 50100
my_free
(
mysql
->
info_buffer
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
info_buffer
,
MYF
(
MY_ALLOW_ZERO_PTR
));
mysql
->
info_buffer
=
0
;
#endif
/* Clear pointers for better safety */
/* Clear pointers for better safety */
mysql
->
info_buffer
=
mysql
->
host_info
=
mysql
->
user
=
mysql
->
passwd
=
mysql
->
db
=
0
;
mysql
->
host_info
=
mysql
->
user
=
mysql
->
passwd
=
mysql
->
db
=
0
;
}
}
...
...
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