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_union.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_union.cc')
-rw-r--r-- | sql/sql_union.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_union.cc b/sql/sql_union.cc index 5da4b97cc5d..a48cff82715 100644 --- a/sql/sql_union.cc +++ b/sql/sql_union.cc @@ -58,7 +58,7 @@ bool select_union::send_data(List<Item> &values) return 0; } fill_record(thd, table->field, values, 1); - if (thd->net.report_error) + if (thd->is_error()) return 1; if ((error= table->file->ha_write_row(table->record[0]))) |