Fixes and code cleanups after merge with 4.0.3

Warning handling and initial prepared statement handling (last not complete yet)
Changed a lot of functions that returned 0/1 to my_bool type.
GRANT handling now uses read/write locks instead of mutex
Change basic net functions to use THD instead of NET
(needed for 4.1 protocol)
Use my_sprintf instead of sprintf() + strlen()
Added alloc_query() to be able to chare query initialization code with
prepared statements.
Cleanup handling of SHOW COUNT(*) WARNINGS and SELECT LAST_INSERT_ID()

Note that the following test fails (will be fixed ASAP):
sub_select, union, rpl_rotate_logs and rpl_mystery22

1 files changed, 24 insertions, 16 deletions

diff --git a/sql/gstream.h b/sql/gstream.h
index f8df6e337b0..f26ef8899f8 100644
--- a/sql/gstream.h
+++ b/sql/gstream.h
@@ -1,11 +1,19 @@
-#ifndef GSTREAM_H
-#define GSTREAM_H
+/* Copyright (C) 2000 MySQL AB & MySQL Finland AB & TCX DataKonsult AB
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA */
 
-#ifdef WITHOUT_MYSQL
-  #include ".\rtree\myisamdef.h"
-#else
-  #include "mysql_priv.h"
-#endif
 
 class GTextReadStream
 {
@@ -20,9 +28,13 @@ public:
     r_bra,
     comma,
   };
-  GTextReadStream(const char *buffer, int size) : 
-    m_cur(buffer), m_limit(buffer + size), m_last_text_position(buffer), m_err_msg(NULL) {}
-  GTextReadStream() : m_cur(NULL), m_limit(NULL), m_err_msg(NULL) {}
+
+  GTextReadStream(const char *buffer, int size)
+    :m_cur(buffer), m_limit(buffer + size), m_last_text_position(buffer),
+    m_err_msg(NULL)
+  {}
+  GTextReadStream(): m_cur(NULL), m_limit(NULL), m_err_msg(NULL)
+  {}
 
   ~GTextReadStream()
   {
@@ -41,21 +53,17 @@ public:
 
   void set_error_msg(const char *msg);
 
-// caller should free this pointer
+  // caller should free this pointer
   char *get_error_msg()
   {
     char *err_msg = m_err_msg;
     m_err_msg = NULL;
     return err_msg;
   }
+
 protected:
   const char *m_cur;
   const char *m_limit;
   const char *m_last_text_position;
   char *m_err_msg;
 };
-
-#endif
-
-
-