summaryrefslogtreecommitdiff
path: root/sql/field.h
diff options
context:
space:
mode:
authormonty@mysql.com <>2004-04-08 15:02:25 +0300
committermonty@mysql.com <>2004-04-08 15:02:25 +0300
commit00738a2be0f5c8afd086db476e8a286a38c6ad7a (patch)
tree88dba92be198f649f534fac8577c3cdc4a7af842 /sql/field.h
parent3b6c3dd2f5b2416a02b0a878187e977d9bf1d044 (diff)
parent43546e7a82197461953f81f8c7a354f895ab3b56 (diff)
downloadmariadb-git-00738a2be0f5c8afd086db476e8a286a38c6ad7a.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/home/my/mysql-4.1
Diffstat (limited to 'sql/field.h')
-rw-r--r--sql/field.h3
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); }