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
430a4ad3
Commit
430a4ad3
authored
Oct 24, 2006
by
unknown
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
WL#3475 merging
client/mysqltest.c: merging fixes
parent
bda4032f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
7 deletions
+8
-7
client/mysqltest.c
client/mysqltest.c
+8
-7
No files found.
client/mysqltest.c
View file @
430a4ad3
...
...
@@ -496,7 +496,7 @@ static void handle_no_error(struct st_query *q);
by mysql_send_query. It's technically possible, though
i don't see where it is needed.
*/
pthread_handler_
decl
(
send_one_query
,
arg
)
pthread_handler_
t
send_one_query
(
void
*
arg
)
{
struct
connection
*
cn
=
(
struct
connection
*
)
arg
;
...
...
@@ -2097,7 +2097,7 @@ int close_connection(struct st_query *q)
#ifndef EMBEDDED_LIBRARY
if
(
q
->
type
==
Q_DIRTY_CLOSE
)
{
while
(
con
->
mysql
.
net
.
vio
)
if
(
con
->
mysql
.
net
.
vio
)
{
vio_delete
(
con
->
mysql
.
net
.
vio
);
con
->
mysql
.
net
.
vio
=
0
;
...
...
@@ -3684,7 +3684,7 @@ static void run_query_normal(struct connection *cn, struct st_query *command,
else
if
(
flags
&
QUERY_REAP
)
{
pthread_mutex_lock
(
&
cn
->
mutex
);
if
(
!
cn
->
query_done
)
while
(
!
cn
->
query_done
)
pthread_cond_wait
(
&
cn
->
cond
,
&
cn
->
mutex
);
pthread_mutex_unlock
(
&
cn
->
mutex
);
}
...
...
@@ -3939,11 +3939,10 @@ static void handle_no_error(struct st_query *q)
error - function will not return
*/
static
void
run_query_stmt
(
struct
connection
*
cn
,
struct
st_query
*
command
,
static
void
run_query_stmt
(
MYSQL
*
mysql
,
struct
st_query
*
command
,
char
*
query
,
int
query_len
,
DYNAMIC_STRING
*
ds
,
DYNAMIC_STRING
*
ds_warnings
)
{
MYSQL
*
mysql
=
&
cn
->
mysql
;
MYSQL_RES
*
res
=
NULL
;
/* Note that here 'res' is meta data result set */
MYSQL_STMT
*
stmt
;
DYNAMIC_STRING
ds_prepare_warnings
;
...
...
@@ -4175,8 +4174,10 @@ static int util_query(MYSQL* org_mysql, const char* query){
*/
static
void
run_query
(
MYSQL
*
mysql
,
struct
st_query
*
command
,
int
flags
)
static
void
run_query
(
struct
connection
*
cn
,
struct
st_query
*
command
,
int
flags
)
{
MYSQL
*
mysql
=
&
cn
->
mysql
;
DYNAMIC_STRING
*
ds
;
DYNAMIC_STRING
ds_result
;
DYNAMIC_STRING
ds_warnings
;
...
...
@@ -4329,7 +4330,7 @@ static void run_query(MYSQL *mysql, struct st_query *command, int flags)
match_re
(
&
ps_re
,
query
))
run_query_stmt
(
mysql
,
command
,
query
,
query_len
,
ds
,
&
ds_warnings
);
else
run_query_normal
(
mysql
,
command
,
flags
,
query
,
query_len
,
run_query_normal
(
cn
,
command
,
flags
,
query
,
query_len
,
ds
,
&
ds_warnings
);
if
(
sp_created
)
...
...
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