diff options
| author | unknown <sasha@mysql.sashanet.com> | 2002-01-31 11:02:11 -0700 |
|---|---|---|
| committer | unknown <sasha@mysql.sashanet.com> | 2002-01-31 11:02:11 -0700 |
| commit | 1d76e90c1b61981e284bd583e54345cce9fe3551 (patch) | |
| tree | e9757e623a6a58c1cd6e97de7906ec6674e23046 /sql/item_func.cc | |
| parent | 6987f146cda13f6b817e4fca105c51beca9d4c9c (diff) | |
| download | mariadb-git-1d76e90c1b61981e284bd583e54345cce9fe3551.tar.gz | |
temporary commit to pull Monty's changes
include/my_global.h:
added dbug_volatile
mysys/mf_iocache2.c:
some debugging code to investigate failed assert in my_b_append_tell()
sql/item_func.cc:
fixed logging bug in DO RELEASE_LOCK()
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 209fbea1674..cc37429c63e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1418,16 +1418,19 @@ void item_user_lock_release(ULL *ull) 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()); 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); |