From 46ee271e8fce4d42b999890477f3590b47a3038d Mon Sep 17 00:00:00 2001
From: "tnurnberg@mysql.com/white.intern.koehntopp.de" <>
Date: Tue, 27 Nov 2007 18:24:24 +0100
Subject: Bug#32707: misdimensioned buffer in protocol layer

Miscalculation in protocol-layer: size buffer correctly so
even really long error messages cannot overflow our buffer.
---
 sql/protocol.cc | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'sql/protocol.cc')

diff --git a/sql/protocol.cc b/sql/protocol.cc
index 7c7dfaf7bef..f7a34fde94a 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -56,7 +56,10 @@ void send_error(THD *thd, uint sql_errno, const char *err)
 {
 #ifndef EMBEDDED_LIBRARY 
   uint length;
-  char buff[MYSQL_ERRMSG_SIZE+2], *pos;
+  /*
+    buff[]: sql_errno:2 + ('#':1 + SQLSTATE_LENGTH:5) + MYSQL_ERRMSG_SIZE:512
+  */
+  char buff[2+1+SQLSTATE_LENGTH+MYSQL_ERRMSG_SIZE], *pos;
 #endif
   const char *orig_err= err;
   NET *net= &thd->net;
-- 
cgit v1.2.1


From 9786ccd0a06dfd10f662a88cdff43eed763af92c Mon Sep 17 00:00:00 2001
From: "holyfoot/hf@mysql.com/hfmain.(none)" <>
Date: Thu, 29 Nov 2007 10:37:07 +0400
Subject: Bug #32624 Error with multi queries in MySQL embedded server 5.1.22.

server status wasn't properly sent to the client after the error
by the embedded server. Wasn't noticed before as one usually stopped
retrieving results after he gets an error.
---
 sql/protocol.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'sql/protocol.cc')

diff --git a/sql/protocol.cc b/sql/protocol.cc
index 2bdbe83eea1..ac562a9f5ab 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -110,13 +110,14 @@ void net_send_error(THD *thd, uint sql_errno, const char *err)
     push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, sql_errno, err);
   }
 
+  /* Abort multi-result sets */
+  thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
+
   net_send_error_packet(thd, sql_errno, err);
 
   thd->is_fatal_error=0;			// Error message is given
   thd->net.report_error= 0;
 
-  /* Abort multi-result sets */
-  thd->server_status&= ~SERVER_MORE_RESULTS_EXISTS;
   DBUG_VOID_RETURN;
 }
 
-- 
cgit v1.2.1