database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge bk@192.168.21.1:mysql-5.1-opt

Browse Source 
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
This commit is contained in:
unknown
2007-04-30 19:41:27 +05:00
parent 9be5c10fca 611456362f
commit cbaf262616
6 changed files with 52 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/field.h
View File

@@ -1307,7 +1307,12 @@ public:
}
int reset(void) { bzero(ptr, packlength+sizeof(char*)); return 0; }
void reset_fields() { bzero((char*) &value,sizeof(value)); }
void store_length(uint32 number);
static void store_length(char *ptr, uint packlength, uint32 number);
inline void store_length(uint32 number)
{
store_length(ptr, packlength, number);
}
inline uint32 get_length(uint row_offset=0)
{ return get_length(ptr+row_offset); }
uint32 get_length(const char *ptr);
@@ -1325,10 +1330,15 @@ public:
memcpy(ptr,length,packlength);
memcpy_fixed(ptr+packlength,&data,sizeof(char*));
}
void set_ptr_offset(my_ptrdiff_t ptr_diff, uint32 length,char *data)
{
char *ptr_ofs= ADD_TO_PTR(ptr,ptr_diff,char*);
store_length(ptr_ofs, packlength, length);
memcpy_fixed(ptr_ofs+packlength,&data,sizeof(char*));
}
inline void set_ptr(uint32 length,char *data)
{
store_length(length);
memcpy_fixed(ptr+packlength,&data,sizeof(char*));
set_ptr_offset(0, length, data);
}
uint get_key_image(char *buff,uint length, imagetype type);
void set_key_image(char *buff,uint length);