summaryrefslogtreecommitdiff
path: root/sql/field.cc
diff options
context:
space:
mode:
authorunknown <baker@bk-internal.mysql.com>2006-11-28 22:22:52 +0100
committerunknown <baker@bk-internal.mysql.com>2006-11-28 22:22:52 +0100
commit19daf5d970740713b6f07d6a64d404f4d2ab8e7f (patch)
tree17cbf7ddda5df51cd125e1aa56feb16b130192da /sql/field.cc
parentdd7e49e0197f78051250ef1b4465c836dc068525 (diff)
parentfe99bda872fd51b07e1ebb0dc506e26d195edec7 (diff)
downloadmariadb-git-19daf5d970740713b6f07d6a64d404f4d2ab8e7f.tar.gz
Merge bk-internal.mysql.com:/data0/bk/mysql-5.1
into bk-internal.mysql.com:/data0/bk/mysql-5.1-arch sql/field.cc: Auto merged sql/mysql_priv.h: Auto merged sql/set_var.cc: Auto merged storage/federated/ha_federated.cc: Auto merged storage/myisammrg/ha_myisammrg.cc: Auto merged plugin/fulltext/plugin_example.c: e C sql/field.h: e
Diffstat (limited to 'sql/field.cc')
-rw-r--r--sql/field.cc10
1 files changed, 2 insertions, 8 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 6f1168e7b38..acee53c7571 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -1237,12 +1237,6 @@ Field::Field(char *ptr_arg,uint32 length_arg,uchar *null_ptr_arg,
}
-uint Field::offset()
-{
- return (uint) (ptr - (char*) table->record[0]);
-}
-
-
void Field::hash(ulong *nr, ulong *nr2)
{
if (is_null())
@@ -8186,8 +8180,8 @@ Field_bit::do_last_null_byte() const
bits. On systems with CHAR_BIT > 8 (not very common), the storage
will lose the extra bits.
*/
- DBUG_PRINT("debug", ("bit_ofs=%d, bit_len=%d, bit_ptr=%p",
- bit_ofs, bit_len, bit_ptr));
+ DBUG_PRINT("test", ("bit_ofs: %d, bit_len: %d bit_ptr: 0x%lx",
+ bit_ofs, bit_len, (long) bit_ptr));
uchar *result;
if (bit_len == 0)
result= null_ptr;