summaryrefslogtreecommitdiff
path: root/sql/protocol.cc
diff options
context:
space:
mode:
authorbell@sanja.is.com.ua <>2003-01-30 22:15:44 +0200
committerbell@sanja.is.com.ua <>2003-01-30 22:15:44 +0200
commite294751c41b12f7093ef51297af50c3a306f2b6a (patch)
tree217655eeaecf53f6696533c8e56d67c74da274b7 /sql/protocol.cc
parent2f04313db5696f016fedd5abb7c3eaa2cf0c2cb4 (diff)
downloadmariadb-git-e294751c41b12f7093ef51297af50c3a306f2b6a.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
Diffstat (limited to 'sql/protocol.cc')
-rw-r--r--sql/protocol.cc6
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;
}