diff options
| author | unknown <monty@mysql.com> | 2004-04-08 15:02:25 +0300 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2004-04-08 15:02:25 +0300 |
| commit | 46bd7be2409e80b36de3cd0d49af33557ffa74a9 (patch) | |
| tree | 88dba92be198f649f534fac8577c3cdc4a7af842 /sql/field.h | |
| parent | 94002eb59512e78df76922ae5c2204359fc306e4 (diff) | |
| parent | 16845a71aa333bd43522a90652c87dcd953f9191 (diff) | |
| download | mariadb-git-46bd7be2409e80b36de3cd0d49af33557ffa74a9.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
sql/field.cc:
Auto merged
sql/field.h:
Auto merged
sql/handler.h:
Auto merged
sql/opt_range.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_select.cc:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'sql/field.h')
| -rw-r--r-- | sql/field.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.h b/sql/field.h index 8ebc7412c35..4efabcead18 100644 --- a/sql/field.h +++ b/sql/field.h @@ -212,7 +212,8 @@ public: { memcpy(buff,ptr,length); } inline void set_image(char *buff,uint length, CHARSET_INFO *cs) { memcpy(ptr,buff,length); } - virtual void get_key_image(char *buff,uint length, CHARSET_INFO *cs, imagetype type) + virtual void get_key_image(char *buff,uint length, CHARSET_INFO *cs, + imagetype type) { get_image(buff,length,cs); } virtual void set_key_image(char *buff,uint length, CHARSET_INFO *cs) { set_image(buff,length,cs); } |