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
c33a4508
Commit
c33a4508
authored
21 years ago
by
unknown
Browse files
Options
Browse Files
Download
Plain Diff
Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1
into deer.(none):/home/hf/work/mysql-4.1.2way
parents
8f2c2757
01397f5d
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
6 deletions
+12
-6
libmysqld/lib_sql.cc
libmysqld/lib_sql.cc
+6
-0
libmysqld/libmysqld.c
libmysqld/libmysqld.c
+6
-6
No files found.
libmysqld/lib_sql.cc
View file @
c33a4508
...
@@ -72,6 +72,12 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
...
@@ -72,6 +72,12 @@ emb_advanced_command(MYSQL *mysql, enum enum_server_command command,
mysql
->
field_count
=
0
;
mysql
->
field_count
=
0
;
thd
->
store_globals
();
// Fix if more than one connect
thd
->
store_globals
();
// Fix if more than one connect
/*
We have to call free_old_query before we start to fill mysql->fields
for new query. In the case of embedded server we collect field data
during query execution (not during data retrieval as it is in remote
client). So we have to call free_old_query here
*/
free_old_query
(
mysql
);
free_old_query
(
mysql
);
result
=
dispatch_command
(
command
,
thd
,
(
char
*
)
arg
,
arg_length
+
1
);
result
=
dispatch_command
(
command
,
thd
,
(
char
*
)
arg
,
arg_length
+
1
);
...
...
This diff is collapsed.
Click to expand it.
libmysqld/libmysqld.c
View file @
c33a4508
...
@@ -311,14 +311,14 @@ error:
...
@@ -311,14 +311,14 @@ error:
void
STDCALL
mysql_close
(
MYSQL
*
mysql
)
void
STDCALL
mysql_close
(
MYSQL
*
mysql
)
{
{
DBUG_ENTER
(
"mysql_close"
);
DBUG_ENTER
(
"mysql_close"
);
if
(
mysql
->
methods
!=
&
embedded_methods
)
{
cli_mysql_close
(
mysql
);
DBUG_VOID_RETURN
;
}
if
(
mysql
)
/* Some simple safety */
if
(
mysql
)
/* Some simple safety */
{
{
if
(
mysql
->
methods
!=
&
embedded_methods
)
{
cli_mysql_close
(
mysql
);
DBUG_VOID_RETURN
;
}
my_free
(
mysql
->
options
.
user
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
options
.
user
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
options
.
host
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
options
.
host
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
options
.
password
,
MYF
(
MY_ALLOW_ZERO_PTR
));
my_free
(
mysql
->
options
.
password
,
MYF
(
MY_ALLOW_ZERO_PTR
));
...
...
This diff is collapsed.
Click to expand it.
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