1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge from mysql-5.0.87-release

Browse Source
This commit is contained in:
unknown 2009-10-26 19:20:02 +01:00 committed by MySQL Build Team
commit 37743aedda
2 changed files with 34 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile.am
View File

@ -166,10 +166,16 @@ test-bt:
@PERL@ ./mysql-test-run.pl --comment=NIST+ps --force --suite=nist --ps-protocol ; \
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:
-cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=debug --report-features
test-bt-debug-fast:
# Keep these for a while
test-pl: test
test-full-pl: test-full

6
client/mysqltest.c
View File

@ -6352,6 +6352,10 @@ 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);
@ -6380,7 +6384,7 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command,
if (!disable_info)
append_info(ds, affected_rows, mysql_info(mysql));
}
}
end: