merge
This commit is contained in:
commit
27c2af97f7
@ -196,6 +196,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
|
@PERL@ ./mysql-test-run.pl --force --comment=stress --suite=stress
|
||||||
|
|
||||||
|
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 \
|
||||||
@ -203,6 +207,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
|
||||||
|
@ -6913,35 +6913,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:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user