diff options
| author | Alexander Nozdrin <alik@sun.com> | 2009-11-09 18:13:11 +0300 |
|---|---|---|
| committer | Alexander Nozdrin <alik@sun.com> | 2009-11-09 18:13:11 +0300 |
| commit | 831c8434a7732019b7d20c2497f8059d2b8538fe (patch) | |
| tree | 3f5e5f818be15fc8a94e5031d9a13462cd0fff9e /client | |
| parent | 966e0d9df48855eb68bd204aec8ca89c8a86d149 (diff) | |
| download | mariadb-git-831c8434a7732019b7d20c2497f8059d2b8538fe.tar.gz | |
Fix manual-merge.
Diffstat (limited to 'client')
| -rw-r--r-- | client/mysqltest.cc | 49 |
1 files changed, 21 insertions, 28 deletions
diff --git a/client/mysqltest.cc b/client/mysqltest.cc index fa31c0a7b4b..85adb445185 100644 --- a/client/mysqltest.cc +++ b/client/mysqltest.cc @@ -6933,38 +6933,31 @@ void run_query_stmt(MYSQL *mysql, struct st_command *command, Fetch info before fetching warnings, since it will be reset otherwise. */ - { - ulonglong affected_rows; - LINT_INIT(affected_rows); - if (!disable_info) - append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql)); + if (!disable_info) + append_info(ds, mysql_stmt_affected_rows(stmt), mysql_info(mysql)); - if (!disable_warnings) - { - /* Get the warnings from execute */ + if (!disable_warnings) + { + /* Get the warnings from execute */ - /* 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); - } + /* 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)); } } |