diff options
| author | unknown <kaa@polly.local> | 2006-09-13 16:00:15 +0400 |
|---|---|---|
| committer | unknown <kaa@polly.local> | 2006-09-13 16:00:15 +0400 |
| commit | 3cae41c6f02e17a60ba85a5bbae915c7cf581150 (patch) | |
| tree | 80999145f0c95e3082774abd018db9a3797a0278 /sql/log_event.cc | |
| parent | 910c0075531b594d573589580216a88bb7d02ddb (diff) | |
| parent | b419501e0df3201cb9d188ffd56fe84c468b3d17 (diff) | |
| download | mariadb-git-3cae41c6f02e17a60ba85a5bbae915c7cf581150.tar.gz | |
Merge polly.local:/tmp/20924/bug20294/my50-bug20294
into polly.local:/tmp/20924/bug20294/my51-bug20294
mysql-test/r/case.result:
Auto merged
mysql-test/r/func_if.result:
Auto merged
mysql-test/r/func_test.result:
Auto merged
mysql-test/t/case.test:
Auto merged
sql/item_cmpfunc.cc:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/log_event.cc:
Auto merged
sql/sql_class.h:
Auto merged
mysql-test/r/user_var.result:
Manual merge
mysql-test/t/user_var.test:
Manual merge
sql/item_func.cc:
Manual merge
sql/item_func.h:
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 0768b370ea6..ebd90446a7e 100644 --- a/sql/log_event.cc +++ b/sql/log_event.cc @@ -3923,7 +3923,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(); |