Commit ea412fc2 authored by Georgi Kodinov's avatar Georgi Kodinov

merge from 5.0-main

parents a0bea5ee 8f27f46c
[MYSQL] [MYSQL]
post_commit_to = "commits@lists.mysql.com" post_commit_to = "commits@lists.mysql.com"
post_push_to = "commits@lists.mysql.com" post_push_to = "commits@lists.mysql.com"
tree_name = "mysql-5.0" tree_name = "mysql-5.0-bugteam"
...@@ -166,10 +166,16 @@ test-bt: ...@@ -166,10 +166,16 @@ test-bt:
@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \ @PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
fi fi
test-bt-fast:
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=ps --ps-protocol --report-features
test-bt-debug: test-bt-debug:
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=debug --report-features @PERL@ ./mysql-test-run.pl --force --comment=debug --report-features
test-bt-debug-fast:
# Keep these for a while # Keep these for a while
test-pl: test test-pl: test
test-full-pl: test-full test-full-pl: test-full
......
...@@ -6352,6 +6352,10 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, ...@@ -6352,6 +6352,10 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
Need to grab affected rows information before getting Need to grab affected rows information before getting
warnings here warnings here
*/ */
{
ulonglong affected_rows;
LINT_INIT(affected_rows);
if (!disable_info) if (!disable_info)
affected_rows= mysql_affected_rows(mysql); affected_rows= mysql_affected_rows(mysql);
...@@ -6380,7 +6384,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, ...@@ -6380,7 +6384,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
if (!disable_info) if (!disable_info)
append_info(ds, affected_rows, mysql_info(mysql)); append_info(ds, affected_rows, mysql_info(mysql));
}
} }
end: end:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment