merge

BitKeeper/etc/logging_ok:
  auto-union
include/my_sys.h:
  Auto merged
innobase/include/dyn0dyn.h:
  Auto merged
innobase/include/dyn0dyn.ic:
  Auto merged
myisam/mi_check.c:
  Auto merged
sql/ha_berkeley.h:
  Auto merged
sql/ha_innodb.h:
  Auto merged
sql/item_func.cc:
  Auto merged
sql/item_func.h:
  Auto merged
sql/item_timefunc.h:
  Auto merged
sql/lex.h:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/mysqld.cc:
  Auto merged
sql/set_var.cc:
  Auto merged
sql/sql_cache.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_parse.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
sql/sql_update.cc:
  Auto merged
sql/sql_yacc.yy:
  Auto merged

1 files changed, 1 insertions, 6 deletions

diff --git a/sql/item_func.cc b/sql/item_func.cc
index 618eb259bd0..3e5c082033b 100644
--- a/sql/item_func.cc
+++ b/sql/item_func.cc
@@ -1466,20 +1466,15 @@ void item_user_lock_release(ULL *ull)
   ull->locked=0;
   if (mysql_bin_log.is_open())
   {
-    THD *thd = current_thd;
-    uint save_query_length;
     char buf[256];
     String tmp(buf,sizeof(buf));
     tmp.length(0);
     tmp.append("DO RELEASE_LOCK(\"");
     tmp.append(ull->key,ull->key_length);
     tmp.append("\")");
-    save_query_length=thd->query_length;
-    thd->query_length=tmp.length();
-    Query_log_event qev(thd,tmp.ptr());
+    Query_log_event qev(current_thd,tmp.ptr(), tmp.length());
     qev.error_code=0; // this query is always safe to run on slave
     mysql_bin_log.write(&qev);
-    thd->query_length=save_query_length;
   }
   if (--ull->count)
     pthread_cond_signal(&ull->cond);