diff options
author | unknown <kostja@bodhi.(none)> | 2007-10-30 20:08:16 +0300 |
---|---|---|
committer | unknown <kostja@bodhi.(none)> | 2007-10-30 20:08:16 +0300 |
commit | 2437001234eba37ad821be11052e57f04293d5bd (patch) | |
tree | 9ec3bc334876bc45e6590ad238ea740b8192f907 /sql/sql_update.cc | |
parent | f139033063f0af6b5df61c729b5a2a6406f28a64 (diff) | |
download | mariadb-git-2437001234eba37ad821be11052e57f04293d5bd.tar.gz |
Use an inline getter method (thd->is_error()) to query if there is an error
in THD.
In future the error may be stored elsewhere (not in net.report_error) and
it's important to start using an opaque getter to simplify merges.
sql/filesort.cc:
net.report_error -> is_error()
sql/ha_ndbcluster_binlog.cc:
net.report_error -> is_error()
sql/item_func.cc:
net.report_error -> is_error()
sql/item_subselect.cc:
net.report_error -> is_error()
sql/set_var.cc:
net.report_error -> is_error()
sql/sp.cc:
net.report_error -> is_error()
sql/sp_head.cc:
net.report_error -> is_error()
sql/sql_base.cc:
net.report_error -> is_error()
sql/sql_class.cc:
net.report_error -> is_error()
sql/sql_class.h:
net.report_error -> is_error()
sql/sql_connect.cc:
net.report_error -> is_error()
sql/sql_delete.cc:
net.report_error -> is_error()
sql/sql_insert.cc:
net.report_error -> is_error()
sql/sql_parse.cc:
net.report_error -> is_error()
sql/sql_prepare.cc:
net.report_error -> is_error()
sql/sql_select.cc:
net.report_error -> is_error()
sql/sql_union.cc:
net.report_error -> is_error()
sql/sql_update.cc:
net.report_error -> is_error()
sql/sql_view.cc:
net.report_error -> is_error()
sql/sql_yacc.yy:
net.report_error -> is_error()
Diffstat (limited to 'sql/sql_update.cc')
-rw-r--r-- | sql/sql_update.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 4071bb86c90..036d7e06d0e 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -844,7 +844,7 @@ int mysql_update(THD *thd, } thd->count_cuted_fields= CHECK_FIELD_IGNORE; /* calc cuted fields */ thd->abort_on_warning= 0; - DBUG_RETURN((error >= 0 || thd->net.report_error) ? 1 : 0); + DBUG_RETURN((error >= 0 || thd->is_error()) ? 1 : 0); err: delete select; @@ -1193,8 +1193,8 @@ bool mysql_multi_update(THD *thd, OPTION_SETUP_TABLES_DONE, result, unit, select_lex); DBUG_PRINT("info",("res: %d report_error: %d", res, - thd->net.report_error)); - res|= thd->net.report_error; + (int) thd->is_error())); + res|= thd->is_error(); if (unlikely(res)) { /* If we had a another error reported earlier then this will be ignored */ |