summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorunknown <mkindahl@dl145h.mysql.com>2008-01-30 11:25:54 +0100
committerunknown <mkindahl@dl145h.mysql.com>2008-01-30 11:25:54 +0100
commit206770562d2e3bd33599d5ea2aedfb31154c1487 (patch)
tree09a25ebdb100cc9b38eef8149c29eae0b6daa411 /include
parent4abbaf31df94131e9b44dbed535f745a45fa1eb4 (diff)
parent7faa7d60aa3d7df5b0617103559d1e3df41dba0b (diff)
downloadmariadb-git-206770562d2e3bd33599d5ea2aedfb31154c1487.tar.gz
Merge dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl
into dl145h.mysql.com:/data0/mkindahl/mysql-5.0-rpl-merge include/my_sys.h: Auto merged mysql-test/r/blackhole.result: Auto merged mysql-test/r/case.result: Auto merged mysql-test/r/mysqlbinlog2.result: Auto merged mysql-test/t/blackhole.test: Auto merged mysql-test/t/case.test: Auto merged sql/set_var.cc: Auto merged sql/sql_acl.cc: Auto merged sql/sql_parse.cc: Auto merged
Diffstat (limited to 'include')
-rw-r--r--include/my_sys.h6
1 files changed, 6 insertions, 0 deletions
diff --git a/include/my_sys.h b/include/my_sys.h
index f72aef13989..d656326e968 100644
--- a/include/my_sys.h
+++ b/include/my_sys.h
@@ -530,6 +530,12 @@ typedef int (*qsort2_cmp)(const void *, const void *, const void *);
#define my_b_tell(info) ((info)->pos_in_file + \
(uint) (*(info)->current_pos - (info)->request_pos))
+#define my_b_get_buffer_start(info) (info)->request_pos
+#define my_b_get_bytes_in_buffer(info) (char*) (info)->read_end - \
+ (char*) my_b_get_buffer_start(info)
+#define my_b_get_pos_in_file(info) (info)->pos_in_file
+
+
/* tell write offset in the SEQ_APPEND cache */
my_off_t my_b_append_tell(IO_CACHE* info);
my_off_t my_b_safe_tell(IO_CACHE* info); /* picks the correct tell() */