diff options
| author | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-30 19:41:27 +0500 |
|---|---|---|
| committer | unknown <holyfoot/hf@hfmain.(none)> | 2007-04-30 19:41:27 +0500 |
| commit | cbaf262616af184428caa31e8464edc3911d826c (patch) | |
| tree | b17c75c534a81e973fe16560783152620ce76852 /sql/field.cc | |
| parent | 9be5c10fca989ff9d8efdd2cc12b57c62dcaefb6 (diff) | |
| parent | 611456362f520bd5b3380e7cf90cfb2aaadd18be (diff) | |
| download | mariadb-git-cbaf262616af184428caa31e8464edc3911d826c.tar.gz | |
Merge bk@192.168.21.1:mysql-5.1-opt
into mysql.com:/home/hf/work/27123/my51-27123
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/field.cc:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/key.cc:
Auto merged
sql/field.h:
merging
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index e8718c9e407..dca2d7137e0 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -7006,7 +7006,7 @@ Field_blob::Field_blob(char *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg, } -void Field_blob::store_length(uint32 number) +void Field_blob::store_length(char *ptr, uint packlength, uint32 number) { switch (packlength) { case 1: |