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, 13 insertions, 8 deletions

diff --git a/sql/log_event.cc b/sql/log_event.cc
index 23622bc0141..df5ef4eb7fe 100644
--- a/sql/log_event.cc
+++ b/sql/log_event.cc
@@ -1516,9 +1516,12 @@ void Append_block_log_event::print(FILE* file, bool short_form,
 #ifndef MYSQL_CLIENT
 void Append_block_log_event::pack_info(String* packet)
 {
-  char buf1[256];
-  sprintf(buf1, ";file_id=%u;block_len=%u", file_id, block_len);
-  net_store_data(packet, buf1);
+  char buf[256];
+  uint length;
+  length= (uint) my_sprintf(buf,
+			    (buf, ";file_id=%u;block_len=%u", file_id,
+			     block_len));
+  net_store_data(packet, buf, length);
 }
 
 
@@ -1560,9 +1563,10 @@ void Delete_file_log_event::print(FILE* file, bool short_form,
 #ifndef MYSQL_CLIENT
 void Delete_file_log_event::pack_info(String* packet)
 {
-  char buf1[64];
-  sprintf(buf1, ";file_id=%u", (uint) file_id);
-  net_store_data(packet, buf1);
+  char buf[64];
+  uint length;
+  length= (uint) my_sprintf(buf, (buf, ";file_id=%u", (uint) file_id));
+  net_store_data(packet, buf, length);
 }
 #endif  
 
@@ -1607,8 +1611,9 @@ void Execute_load_log_event::print(FILE* file, bool short_form,
 void Execute_load_log_event::pack_info(String* packet)
 {
   char buf[64];
-  sprintf(buf, ";file_id=%u", (uint) file_id);
-  net_store_data(packet, buf);
+  uint length;
+  length= (uint) my_sprintf(buf, (buf, ";file_id=%u", (uint) file_id));
+  net_store_data(packet, buf, length);
 }
 #endif