mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Eliminating some warnings.

Browse source 
sql/field.h:
  Using my_ptrdiff_t for offset instead of uint.
sql/log_event.cc:
  Removing debug code that generated warnings on Windows build.
This commit is contained in:
unknown 2007-03-28 15:30:03 +02:00
parent 88d2792a42
commit 8de46d0d53
2 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/field.h
View file

@ -193,9 +193,9 @@ public:
*/
virtual void sql_type(String &str) const =0;
virtual uint size_of() const =0; // For new field
inline bool is_null(uint row_offset=0)
inline bool is_null(my_ptrdiff_t row_offset= 0)
{ return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : table->null_row; }
inline bool is_real_null(uint row_offset=0)
inline bool is_real_null(my_ptrdiff_t row_offset= 0)
{ return null_ptr ? (null_ptr[row_offset] & null_bit ? 1 : 0) : 0; }
inline bool is_null_in_record(const uchar *record)
{
@ -210,9 +210,9 @@ public:
return 0;
return test(null_ptr[offset] & null_bit);
}
inline void set_null(int row_offset=0)
inline void set_null(my_ptrdiff_t row_offset= 0)
{ if (null_ptr) null_ptr[row_offset]|= null_bit; }
inline void set_notnull(int row_offset=0)
inline void set_notnull(my_ptrdiff_t row_offset= 0)
{ if (null_ptr) null_ptr[row_offset]&= (uchar) ~null_bit; }
inline bool maybe_null(void) { return null_ptr != 0 || table->maybe_null; }
inline bool real_maybe_null(void) { return null_ptr != 0; }

5
sql/log_event.cc
View file

@ -5906,12 +5906,7 @@ unpack_row(RELAY_LOG_INFO const *rli,
/*
We only unpack the field if it was non-null
*/
#ifndef DBUG_OFF
const char *const old_ptr= pack_ptr;
#endif
pack_ptr= f->unpack(f->ptr, pack_ptr);
DBUG_PRINT("debug", ("Unpacking field '%s' from %d bytes",
f->field_name, pack_ptr - old_ptr));
}
bitmap_set_bit(rw_set, f->field_index);