diff options
author | unknown <guilhem@gbichot3.local> | 2006-10-10 16:59:50 +0200 |
---|---|---|
committer | unknown <guilhem@gbichot3.local> | 2006-10-10 16:59:50 +0200 |
commit | abdc4682cdcb26b6980d4999ab6137a53643afbd (patch) | |
tree | bd7955fb3af7ecb029891063d865ab76db91fcac /storage/myisam/mi_packrec.c | |
parent | ef0ee7642ad986551495bd891ad78bcdb11c7fcf (diff) | |
parent | 8e04cdb2dd1b5102e578c9c98b220a07857bfcbb (diff) | |
download | mariadb-git-abdc4682cdcb26b6980d4999ab6137a53643afbd.tar.gz |
Merge gbichot3.local:/home/mysql_src/mysql-5.1-clean
into gbichot3.local:/home/mysql_src/mysql-maria
BitKeeper/etc/ignore:
auto-union
BUILD/SETUP.sh:
Auto merged
Makefile.am:
Auto merged
configure.in:
Auto merged
config/ac-macros/plugins.m4:
Auto merged
storage/myisammrg/ha_myisammrg.h:
Auto merged
unittest/Makefile.am:
Auto merged
BitKeeper/triggers/post-commit:
merge
include/my_base.h:
merge
libmysqld/Makefile.am:
merge
mysql-test/mysql-test-run.pl:
merge
mysys/Makefile.am:
merge
sql/Makefile.am:
merge
sql/handler.h:
merge
sql/item_func.h:
merge
sql/mysql_priv.h:
merge
sql/mysqld.cc:
merge
sql/set_var.cc:
merge
sql/set_var.h:
merge
sql/sql_class.h:
merge
storage/csv/ha_tina.cc:
merge
storage/myisam/Makefile.am:
merge
storage/myisam/ha_myisam.cc:
merge
storage/myisam/ha_myisam.h:
merge
storage/myisam/mi_check.c:
merge
storage/myisam/mi_delete.c:
merge
storage/myisam/mi_dynrec.c:
merge
storage/myisam/mi_packrec.c:
merge
storage/myisam/mi_unique.c:
merge
storage/myisam/mi_write.c:
merge
storage/myisam/myisamdef.h:
merge
Diffstat (limited to 'storage/myisam/mi_packrec.c')
-rw-r--r-- | storage/myisam/mi_packrec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/myisam/mi_packrec.c b/storage/myisam/mi_packrec.c index 67c8b25878f..1e9e98db283 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -102,6 +102,7 @@ static void init_bit_buffer(MI_BIT_BUFF *bit_buff,uchar *buffer,uint length); static uint fill_and_get_bits(MI_BIT_BUFF *bit_buff,uint count); static void fill_buffer(MI_BIT_BUFF *bit_buff); static uint max_bit(uint value); +static uint read_pack_length(uint version, const uchar *buf, ulong *length); #ifdef HAVE_MMAP static uchar *_mi_mempack_get_block_info(MI_INFO *myisam,MI_BLOCK_INFO *info, uchar *header); @@ -783,7 +784,7 @@ static void uf_blob(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, return; } decode_bytes(rec,bit_buff,bit_buff->blob_pos,bit_buff->blob_pos+length); - _my_store_blob_length((byte*) to,pack_length,length); + _mi_store_blob_length((byte*) to,pack_length,length); memcpy_fixed((char*) to+pack_length,(char*) &bit_buff->blob_pos, sizeof(char*)); bit_buff->blob_pos+=length; @@ -1322,7 +1323,7 @@ uint save_pack_length(uint version, byte *block_buff, ulong length) } -uint read_pack_length(uint version, const uchar *buf, ulong *length) +static uint read_pack_length(uint version, const uchar *buf, ulong *length) { if (buf[0] < 254) { |