diff options
| author | unknown <kaa@polly.local> | 2006-09-12 17:57:15 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-12 17:57:15 +0400 |
| commit | db141b6b45ba2a0ea2d7bb8d2f25f105ca0bf867 (patch) | |
| tree | 04bd01bf77e5e54c51d38c38513121bea33e0007 /sql/log_event.cc | |
| parent | bd8309cce6793352cebcf54459fa301eaab0b3b8 (diff) | |
| parent | 5aa6e8615e0aeb3babafcd5e93e67b72027fcdaa (diff) | |
| download | mariadb-git-db141b6b45ba2a0ea2d7bb8d2f25f105ca0bf867.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 cf5dbb1e77c..219434ab218 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); + e.update_hash(val, val_len, type, charset, DERIVATION_IMPLICIT, 0); free_root(thd->mem_root,0); rli->inc_event_relay_log_pos(); |