diff options
| author | unknown <kaa@polly.local> | 2006-09-13 15:18:14 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-13 15:18:14 +0400 |
| commit | b419501e0df3201cb9d188ffd56fe84c468b3d17 (patch) | |
| tree | dcd7f028408454113afb7f3e54560e4d265eae1d /sql/log_event.cc | |
| parent | d31a3434650a9991bcc16478e65efd7d2ea23c76 (diff) | |
| parent | 418ae41b4867e53e770d79f66e6d9ba3f7b8974b (diff) | |
| download | mariadb-git-b419501e0df3201cb9d188ffd56fe84c468b3d17.tar.gz | |
Merge polly.local:/tmp/20924/bug20294/my41-bug20294
into polly.local:/tmp/20924/bug20294/my50-bug20294
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_func.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/case.result:
Manual merge
mysql-test/r/func_if.result:
Manual merge
mysql-test/r/func_test.result:
Manual merge
mysql-test/r/user_var.result:
Manual merge
mysql-test/t/case.test:
Manual merge
mysql-test/t/func_if.test:
Manual merge
mysql-test/t/func_test.test:
Manual merge
mysql-test/t/user_var.test:
Manual merge
sql/item_func.cc:
Manual merge
Diffstat (limited to 'sql/log_event.cc')
| -rw-r--r-- | sql/log_event.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/log_event.cc b/sql/log_event.cc index 219434ab218..cf5dbb1e77c 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3846,7 +3846,7 @@ int User_var_log_event::exec_event(struct st_relay_log_info* rli) a single record and with a single column. Thus, like a column value, it could always have IMPLICIT derivation. */ - e.update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT, 0); + e.update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT); free_root(thd->mem_root,0); rli->inc_event_relay_log_pos(); |