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, 4 insertions, 3 deletions

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index b476a8b1797..dd8ed634011 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -317,19 +317,19 @@ static long mysql_rm_known_files(THD *thd, MY_DIR *dirp, const char *db,
 
 bool mysql_change_db(THD *thd,const char *name)
 {
-  int length;
+  int length, db_length;
   char *dbname=my_strdup((char*) name,MYF(MY_WME));
   char	path[FN_REFLEN];
   uint db_access;
   DBUG_ENTER("mysql_change_db");
 
-  if (!dbname || !(length=stripp_sp(dbname)))
+  if (!dbname || !(db_length=stripp_sp(dbname)))
   {
     x_free(dbname);				/* purecov: inspected */
     send_error(&thd->net,ER_NO_DB_ERROR);	/* purecov: inspected */
     DBUG_RETURN(1);				/* purecov: inspected */
   }
-  if ((length > NAME_LEN) || check_db_name(dbname))
+  if ((db_length > NAME_LEN) || check_db_name(dbname))
   {
     net_printf(&thd->net,ER_WRONG_DB_NAME, dbname);
     x_free(dbname);
@@ -369,6 +369,7 @@ bool mysql_change_db(THD *thd,const char *name)
   send_ok(&thd->net);
   x_free(thd->db);
   thd->db=dbname;
+  thd->db_length=db_length;
   thd->db_access=db_access;
   DBUG_RETURN(0);
 }