diff options
| author | unknown <bell@sanja.is.com.ua> | 2003-01-30 22:15:44 +0200 |
|---|---|---|
| committer | unknown <bell@sanja.is.com.ua> | 2003-01-30 22:15:44 +0200 |
| commit | c7c45bf28bb76ddce9aa92c4205ab51cde49197f (patch) | |
| tree | 217655eeaecf53f6696533c8e56d67c74da274b7 /sql/protocol.cc | |
| parent | 7133dab0e742137a1a7299c0203f2b83f7c172b5 (diff) | |
| download | mariadb-git-c7c45bf28bb76ddce9aa92c4205ab51cde49197f.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/protocol.cc')
| -rw-r--r-- | sql/protocol.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/protocol.cc b/sql/protocol.cc index b81aa54af99..3fc3f674d65 100644 --- a/sql/protocol.cc +++ b/sql/protocol.cc @@ -107,7 +107,7 @@ void send_error(THD *thd, uint sql_errno, const char *err) } VOID(net_write_command(net,(uchar) 255, "", 0, (char*) err,length)); #endif /* EMBEDDED_LIBRARY*/ - thd->fatal_error=0; // Error message is given + thd->is_fatal_error=0; // Error message is given thd->net.report_error= 0; DBUG_VOID_RETURN; } @@ -217,7 +217,7 @@ net_printf(THD *thd, uint errcode, ...) This may also happen when we get an error from a slave thread */ fprintf(stderr,"ERROR: %d %s\n",errcode,text_pos); - thd->fatal_error=1; + thd->fatal_error(); } DBUG_VOID_RETURN; } @@ -232,7 +232,7 @@ net_printf(THD *thd, uint errcode, ...) net->last_errno= errcode; strmake(net->last_error, text_pos, length); #endif - thd->fatal_error=0; // Error message is given + thd->is_fatal_error=0; // Error message is given DBUG_VOID_RETURN; } |