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
de985fc7
Commit
de985fc7
authored
Oct 05, 2009
by
Frazer Clement
Browse files
Options
Browse Files
Download
Plain Diff
Merge 5.0-bugteam->5.1 bugteam
parents
00968ae1
379d1f19
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
1 deletion
+11
-1
client/mysqltest.cc
client/mysqltest.cc
+11
-1
No files found.
client/mysqltest.cc
View file @
de985fc7
...
@@ -6907,6 +6907,16 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
...
@@ -6907,6 +6907,16 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
*/
*/
}
}
/*
Need to grab affected rows information before getting
warnings here
*/
ulonglong
affected_rows
;
LINT_INIT
(
affected_rows
);
if
(
!
disable_info
)
affected_rows
=
mysql_affected_rows
(
mysql
);
if
(
!
disable_warnings
)
if
(
!
disable_warnings
)
{
{
/* Get the warnings from execute */
/* Get the warnings from execute */
...
@@ -6931,7 +6941,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
...
@@ -6931,7 +6941,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
}
}
if
(
!
disable_info
)
if
(
!
disable_info
)
append_info
(
ds
,
mysql_affected_rows
(
mysql
)
,
mysql_info
(
mysql
));
append_info
(
ds
,
affected_rows
,
mysql_info
(
mysql
));
}
}
...
...
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