Commit 01835841 authored by Alexander Nozdrin's avatar Alexander Nozdrin

Auto-merge from mysql-5.1.

parents e6fffedb 04af81d7
...@@ -198,6 +198,10 @@ test-bt-fast: ...@@ -198,6 +198,10 @@ test-bt-fast:
-cd mysql-test ; MTR_BUILD_THREAD=auto \ -cd mysql-test ; MTR_BUILD_THREAD=auto \
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress $(EXP) @PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress $(EXP)
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 --comment=debug --force --timer \ @PERL@ ./mysql-test-run.pl --comment=debug --force --timer \
...@@ -205,6 +209,8 @@ test-bt-debug: ...@@ -205,6 +209,8 @@ test-bt-debug:
test-bt-debug-fast: test-bt-debug-fast:
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
......
...@@ -6965,35 +6965,39 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, ...@@ -6965,35 +6965,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);
if (!disable_info)
affected_rows= mysql_affected_rows(mysql);
/* Append warnings to ds - if there are any */ if (!disable_warnings)
if (append_warnings(&ds_execute_warnings, mysql) ||
ds_execute_warnings.length ||
ds_prepare_warnings.length ||
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,
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 warnings to ds - if there are any */
append_info(ds, affected_rows, mysql_info(mysql)); if (append_warnings(&ds_execute_warnings, mysql) ||
ds_execute_warnings.length ||
ds_prepare_warnings.length ||
ds_warnings->length)
{
dynstr_append_mem(ds, "Warnings:\n", 10);
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));
}
} }
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