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 | 6a8fcca87eaf83a99846fdc3939b856ae1bc5c43 (patch) | |
tree | 9ec3bc334876bc45e6590ad238ea740b8192f907 /sql/sql_class.cc | |
parent | 52ddd7a02e8f131d4e7f45e6fb6079ce61592629 (diff) | |
download | mariadb-git-6a8fcca87eaf83a99846fdc3939b856ae1bc5c43.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_class.cc')
-rw-r--r-- | sql/sql_class.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index d77e531ec13..707c8e83007 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -1368,7 +1368,7 @@ bool select_send::send_data(List<Item> &items) thd->sent_row_count++; if (!thd->vio_ok()) DBUG_RETURN(0); - if (!thd->net.report_error) + if (! thd->is_error()) DBUG_RETURN(protocol->write()); protocol->remove_last_row(); DBUG_RETURN(1); @@ -1389,7 +1389,7 @@ bool select_send::send_eof() mysql_unlock_tables(thd, thd->lock); thd->lock=0; } - if (!thd->net.report_error) + if (! thd->is_error()) { ::send_eof(thd); status= 0; |