database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fixed Solaris compilation failure

Browse Source
This commit is contained in:
holyfoot/hf@mysql.com/hfmain.(none)
2007-05-07 13:29:59 +05:00
parent 306371a850
commit d61da11eab
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
sql/field.cc
View File

@ -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: case 1:
ptr[0]= (uchar) number; i_ptr[0]= (uchar) i_number;
break; break;
case 2: case 2:
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
if (table->s->db_low_byte_first) if (table->s->db_low_byte_first)
{ {
int2store(ptr,(unsigned short) number); int2store(i_ptr,(unsigned short) i_number);
} }
else else
#endif #endif
shortstore(ptr,(unsigned short) number); shortstore(i_ptr,(unsigned short) i_number);
break; break;
case 3: case 3:
int3store(ptr,number); int3store(i_ptr,i_number);
break; break;
case 4: case 4:
#ifdef WORDS_BIGENDIAN #ifdef WORDS_BIGENDIAN
if (table->s->db_low_byte_first) if (table->s->db_low_byte_first)
{ {
int4store(ptr,number); int4store(i_ptr,i_number);
} }
else else
#endif #endif
longstore(ptr,number); longstore(i_ptr,i_number);
} }
} }

5
sql/field.h
View File

@ -1307,7 +1307,10 @@ public:
} }
int reset(void) { bzero(ptr, packlength+sizeof(char*)); return 0; } int reset(void) { bzero(ptr, packlength+sizeof(char*)); return 0; }
void reset_fields() { bzero((char*) &value,sizeof(value)); } 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) inline void store_length(uint32 number)
{ {
store_length(ptr, packlength, number); store_length(ptr, packlength, number);