diff options
| author | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 17:53:29 +0400 |
|---|---|---|
| committer | unknown <hf@eagle.intranet.mysql.r18.ru> | 2006-01-21 17:53:29 +0400 |
| commit | 32fc6800893ccfa109fa9d69b7ed360c55e70a6d (patch) | |
| tree | a814496a0d8e32cd803c99a110ae1218931dc353 /sql/item_func.cc | |
| parent | 0f1516b98e50d61de960456625a6f65e39047504 (diff) | |
| parent | f7eefc02008739f0776a439e87b293a723babaaa (diff) | |
| download | mariadb-git-32fc6800893ccfa109fa9d69b7ed360c55e70a6d.tar.gz | |
Merge hf@192.168.21.12:work/mysql-4.1.9855
into eagle.intranet.mysql.r18.ru:/home/hf/work/mysql-4.1.mrg
sql/item_func.cc:
Auto merged
Diffstat (limited to 'sql/item_func.cc')
| -rw-r--r-- | sql/item_func.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/item_func.cc b/sql/item_func.cc index 019147e151f..c82d505c1bb 100644 --- a/sql/item_func.cc +++ b/sql/item_func.cc @@ -1983,7 +1983,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); } @@ -3261,7 +3261,6 @@ Item *get_system_var(THD *thd, enum_var_type var_type, LEX_STRING name, LEX_STRING component) { sys_var *var; - char buff[MAX_SYS_VAR_LENGTH*2+4+8], *pos; LEX_STRING *base_name, *component_name; if (component.str == 0 && |