Commit 17da0553 authored by unknown's avatar unknown

fixed Solaris compilation failure


sql/field.cc:
  parameters fixed to not interfere with the Field_blob members
sql/field.h:
  BIGENDIAN machine will require 'table' member. so cannot be static
parent 0c835da8
......@@ -7006,34 +7006,34 @@ Field_blob::Field_blob(char *ptr_arg, uchar *null_ptr_arg, uchar null_bit_arg,
}
void Field_blob::store_length(char *ptr, uint packlength, uint32 number)
void Field_blob::store_length(char *i_ptr, uint i_packlength, uint32 i_number)
{
switch (packlength) {
switch (i_packlength) {
case 1:
ptr[0]= (uchar) number;
i_ptr[0]= (uchar) i_number;
break;
case 2:
#ifdef WORDS_BIGENDIAN
if (table->s->db_low_byte_first)
{
int2store(ptr,(unsigned short) number);
int2store(i_ptr,(unsigned short) i_number);
}
else
#endif
shortstore(ptr,(unsigned short) number);
shortstore(i_ptr,(unsigned short) i_number);
break;
case 3:
int3store(ptr,number);
int3store(i_ptr,i_number);
break;
case 4:
#ifdef WORDS_BIGENDIAN
if (table->s->db_low_byte_first)
{
int4store(ptr,number);
int4store(i_ptr,i_number);
}
else
#endif
longstore(ptr,number);
longstore(i_ptr,i_number);
}
}
......
......@@ -1307,7 +1307,10 @@ class Field_blob :public Field_longstr {
}
int reset(void) { bzero(ptr, packlength+sizeof(char*)); return 0; }
void reset_fields() { bzero((char*) &value,sizeof(value)); }
static void store_length(char *ptr, uint packlength, uint32 number);
#ifndef WORDS_BIGENDIAN
static
#endif
void store_length(char *i_ptr, uint i_packlength, uint32 i_number);
inline void store_length(uint32 number)
{
store_length(ptr, packlength, number);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment