diff options
| author | unknown <sasha@asksasha.com> | 2005-11-07 15:10:48 -0700 |
|---|---|---|
| committer | unknown <sasha@asksasha.com> | 2005-11-07 15:10:48 -0700 |
| commit | ee84f5c7281c70a0ec2bfbe034809b08266c212e (patch) | |
| tree | 29582f2e7394a92ee713febd9741371a2a2b26fa /sql/item_func.cc | |
| parent | 01cad6395e852e431b1a66ec9f7034e0aee98b71 (diff) | |
| parent | 3004c8de2dfc822375202a16e07c3cad196301d8 (diff) | |
| download | mariadb-git-ee84f5c7281c70a0ec2bfbe034809b08266c212e.tar.gz | |
Merge spachev@bk-internal.mysql.com:/home/bk/mysql-4.1
into asksasha.com:/reiser-data/mysql-dev/mysql-4.1-bug7947
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index df32672e12b..d0a68e9f93e 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1974,7 +1974,7 @@ void item_user_lock_release(User_level_lock *ull) tmp.copy(command, strlen(command), tmp.charset()); tmp.append(ull->key,ull->key_length); tmp.append("\")", 2); - Query_log_event qev(current_thd, tmp.ptr(), tmp.length(),1, FALSE); + Query_log_event qev(current_thd, tmp.ptr(), tmp.length(),0, FALSE); qev.error_code=0; // this query is always safe to run on slave mysql_bin_log.write(&qev); } |