Cleanup of alarm macros.

Fixed data corruption bug in query cache.
Made queries be dependent of the database in use.


Docs/manual.texi:
  Update binary log reference
client/mysql.cc:
  Removed warning
include/thr_alarm.h:
  Cleanup of alarm macros.
libmysql/libmysql.c:
  Portabiliy fix
libmysql/net.c:
  Cleanup of alarm macros.
mysql-test/t/rpl_get_lock.test:
  Fixed results after merge.
mysys/my_bitmap.c:
  Removed warning.
sql/log_event.cc:
  Use thd->db_length
sql/mini_client.cc:
  Cleanup of alarm macros.
sql/net_serv.cc:
  Cleanup of alarm macros.
sql/sql_acl.cc:
  Use thd->db_length
sql/sql_cache.cc:
  Store used database together with the query.
sql/sql_class.cc:
  Use thd->db_length
sql/sql_class.h:
  Use thd->db_length
sql/sql_db.cc:
  Use thd->db_length
sql/sql_parse.cc:
  Use thd->db_length
sql/sql_udf.cc:
  Use thd->db_length

1 files changed, 8 insertions, 0 deletions

diff --git a/sql/sql_class.h b/sql/sql_class.h
index 803c1df9dd9..1eac7843e96 100644
--- a/sql/sql_class.h
+++ b/sql/sql_class.h
@@ -288,6 +288,7 @@ public:
   uint	     current_tablenr,tmp_table,cond_count,col_access;
   uint	     server_status,open_options;
   uint32     query_length;
+  uint32     db_length;
   enum_tx_isolation tx_isolation, session_tx_isolation;
   char	     scramble[9];
   uint8	     query_cache_type;		// type of query cache processing
@@ -400,6 +401,13 @@ public:
   { return strmake_root(&mem_root,str,size); }
   inline char *memdup(const char *str, uint size)
   { return memdup_root(&mem_root,str,size); }
+  inline char *memdup_w_gap(const char *str, uint size, uint gap)
+  {
+    gptr ptr;
+    if ((ptr=alloc_root(&mem_root,size+gap)))
+      memcpy(ptr,str,size);
+    return ptr;
+  }
 };