diff options
| author | unknown <karen.langford@sun.com> | 2009-10-26 19:20:02 +0100 |
|---|---|---|
| committer | MySQL Build Team <build@mysql.com> | 2009-10-26 19:20:02 +0100 |
| commit | 37743aedda91ca18a408ed934cf68e5b02f962dd (patch) | |
| tree | 43a0679c9713c2f233fc69c4fdada59103205ff8 /client | |
| parent | ce0a06935b0bfde25a8fdbad1d6474559b6b7260 (diff) | |
| parent | 7df70d09a90ca9cd9b30c773074cfa7d44e1f9eb (diff) | |
| download | mariadb-git-37743aedda91ca18a408ed934cf68e5b02f962dd.tar.gz | |
Merge from mysql-5.0.87-release
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.c | 52 |
1 files changed, 28 insertions, 24 deletions
diff --git a/client/mysqltest.c b/client/mysqltest.c index 442b2020a56..0e18dacd4f1 100644 --- a/client/mysqltest.c +++ b/client/mysqltest.c @@ -6352,35 +6352,39 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, Need to grab affected rows information before getting 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 (append_warnings(&ds_execute_warnings, mysql) || - ds_execute_warnings.length || - ds_prepare_warnings.length || - ds_warnings->length) + if (!disable_warnings) { - 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); - } - } + /* Get the warnings from execute */ - if (!disable_info) - append_info(ds, affected_rows, mysql_info(mysql)); + /* Append warnings to ds - if there are any */ + 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: |