summaryrefslogtreecommitdiff
path: root/sql/item.cc
diff options
context:
space:
mode:
authorunknown <bell@sanja.is.com.ua>2003-01-30 22:15:44 +0200
committerunknown <bell@sanja.is.com.ua>2003-01-30 22:15:44 +0200
commitc5bd8cda247f883b0e018d1202fa2a9e355d1eb3 (patch)
tree217655eeaecf53f6696533c8e56d67c74da274b7 /sql/item.cc
parent6608bd8967e21ca83417d8f78bf86fdb8ebc6318 (diff)
downloadmariadb-git-c5bd8cda247f883b0e018d1202fa2a9e355d1eb3.tar.gz
fixed bug in determinating uncacheable queries
new fatal_error interface to assign is_fatal_error and ne.report_error commant about Item_row mysql-test/r/subselect.result: test of inheritence of uncacheability mysql-test/t/subselect.test: test of inheritence of uncacheability sql/item.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/item_func.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/item_row.cc: comment about row sql/item_subselect.cc: new fatal_error interface to assign is_fatal_error and ne.report_error (message should be sent by allocate routine sql/log_event.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/mysqld.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/protocol.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_base.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_class.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_class.h: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_delete.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_insert.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_lex.h: fixed bug in determinating uncacheable queries sql/sql_parse.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_prepare.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_select.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_show.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_union.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/sql_update.cc: new fatal_error interface to assign is_fatal_error and ne.report_error sql/thr_malloc.cc: new fatal_error interface to assign is_fatal_error and ne.report_error
Diffstat (limited to 'sql/item.cc')
-rw-r--r--sql/item.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/item.cc b/sql/item.cc
index ba50039cc72..4c2a0b37aab 100644
--- a/sql/item.cc
+++ b/sql/item.cc
@@ -544,7 +544,7 @@ bool Item_asterisk_remover::fix_fields(THD *thd,
tb->used_fields= tb->fields;
}
else
- thd->fatal_error= 1; // can't create Item => out of memory
+ thd->fatal_error(); // can't create Item => out of memory
}
else
my_error(ER_CARDINALITY_COL, MYF(0), 1);
@@ -560,7 +560,7 @@ bool Item_asterisk_remover::fix_fields(THD *thd,
else
res= item->fix_fields(thd, list, &item);
else
- thd->fatal_error= 1; // no item given => out of memory
+ thd->fatal_error(); // no item given => out of memory
DBUG_RETURN(res);
}