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

merge from 5.0-main

Browse Source
This commit is contained in:
Georgi Kodinov 2009-10-30 16:34:54 +02:00
commit ecef6c3308
3 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.bzr-mysql/default.conf
View File

@ -1,4 +1,4 @@
[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"

6
Makefile.am
View File

@ -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

52
client/mysqltest.c
View File

@ -6352,35 +6352,39 @@ 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
*/ */
if (!disable_info)
affected_rows= mysql_affected_rows(mysql);
if (!disable_warnings)
{ {
/* Get the warnings from execute */ ulonglong affected_rows;
LINT_INIT(affected_rows);
/* Append warnings to ds - if there are any */ if (!disable_info)
if (append_warnings(&ds_execute_warnings, mysql) || affected_rows= mysql_affected_rows(mysql);
ds_execute_warnings.length ||
ds_prepare_warnings.length || if (!disable_warnings)
ds_warnings->length)
{ {
dynstr_append_mem(ds, "Warnings:\n", 10); /* Get the warnings from execute */
if (ds_warnings->length)
dynstr_append_mem(ds, ds_warnings->str, /* Append warnings to ds - if there are any */
ds_warnings->length); if (append_warnings(&ds_execute_warnings, mysql) ||
if (ds_prepare_warnings.length) ds_execute_warnings.length ||
dynstr_append_mem(ds, ds_prepare_warnings.str, ds_prepare_warnings.length ||
ds_prepare_warnings.length); ds_warnings->length)
if (ds_execute_warnings.length) {
dynstr_append_mem(ds, ds_execute_warnings.str, dynstr_append_mem(ds, "Warnings:\n", 10);
ds_execute_warnings.length); if (ds_warnings->length)
dynstr_append_mem(ds, ds_warnings->str,
ds_warnings->length);
if (ds_prepare_warnings.length)
dynstr_append_mem(ds, ds_prepare_warnings.str,
ds_prepare_warnings.length);
if (ds_execute_warnings.length)
dynstr_append_mem(ds, ds_execute_warnings.str,
ds_execute_warnings.length);
}
} }
if (!disable_info)
append_info(ds, affected_rows, mysql_info(mysql));
} }
if (!disable_info)
append_info(ds, affected_rows, mysql_info(mysql));
} }
end: end: