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, 10 insertions, 5 deletions

diff --git a/myisam/sp_key.c b/myisam/sp_key.c
index 2ab11f993c3..82c2b1f8510 100644
--- a/myisam/sp_key.c
+++ b/myisam/sp_key.c
@@ -1,5 +1,4 @@
-/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin & MySQL Finland AB 
-   & TCX DataKonsult AB
+/* Copyright (C) 2000 MySQL AB & Ramil Kalimullin
    
    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
@@ -30,8 +29,9 @@ static int sp_get_geometry_mbr(uchar *(*wkb), uchar *end, uint n_dims,
                               double *mbr, int top);
 static int sp_mbr_from_wkb(uchar (*wkb), uint size, uint n_dims, double *mbr);
 
+
 uint sp_make_key(register MI_INFO *info, uint keynr, uchar *key,
-              const byte *record, my_off_t filepos)
+		 const byte *record, my_off_t filepos)
 {
   HA_KEYSEG *keyseg;
   MI_KEYDEF *keyinfo = &info->s->keyinfo[keynr];
@@ -91,10 +91,12 @@ static int sp_mbr_from_wkb(uchar *wkb, uint size, uint n_dims, double *mbr)
 }
 
 /*
-Add one point stored in wkb to mbr
+  Add one point stored in wkb to mbr
 */
+
 static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims, 
-                                uchar byte_order, double *mbr)
+			       uchar byte_order __attribute__((unused)),
+			       double *mbr)
 {
   double ord;
   double *mbr_end = mbr + n_dims * 2;
@@ -115,12 +117,14 @@ static int sp_add_point_to_mbr(uchar *(*wkb), uchar *end, uint n_dims,
   return 0;
 }
 
+
 static int sp_get_point_mbr(uchar *(*wkb), uchar *end, uint n_dims, 
                            uchar byte_order, double *mbr)
 {
   return sp_add_point_to_mbr(wkb, end, n_dims, byte_order, mbr);
 }
 
+
 static int sp_get_linestring_mbr(uchar *(*wkb), uchar *end, uint n_dims, 
                                   uchar byte_order, double *mbr)
 {
@@ -137,6 +141,7 @@ static int sp_get_linestring_mbr(uchar *(*wkb), uchar *end, uint n_dims,
   return 0;
 }
 
+
 static int sp_get_polygon_mbr(uchar *(*wkb), uchar *end, uint n_dims, 
                                uchar byte_order, double *mbr)
 {