diff options
| author | unknown <dli@dev3-164.dev.cn.tlan> | 2006-12-22 10:08:11 +0800 |
|---|---|---|
| committer | unknown <dli@dev3-164.dev.cn.tlan> | 2006-12-22 10:08:11 +0800 |
| commit | b854a22a8c04fbf4b8b4b830520786ac3fe4832c (patch) | |
| tree | 26924823fbf08ef576095f9f14b007b10bcd3b72 /sql/protocol.h | |
| parent | 5f7985d6a83c8a153ded2620a07d2b79bbee1df7 (diff) | |
| parent | c15a2f86a9c497f96df04469cec7c7910363e118 (diff) | |
| download | mariadb-git-b854a22a8c04fbf4b8b4b830520786ac3fe4832c.tar.gz | |
Merge dli@bk-internal.mysql.com:/home/bk/mysql-5.1-new-ndb-bj
into dev3-164.dev.cn.tlan:/home/dli/mysql/mysql-5.1/mysql-5.1-bug-19896
sql/log_event.cc:
Auto merged
sql/protocol.h:
Auto merged
sql/slave.cc:
Auto merged
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index 7e2bc1516ec..c3a2dae4b6f 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -59,6 +59,8 @@ public: String *storage_packet() { return packet; } inline void free() { packet->free(); } virtual bool write(); + inline bool store(int from) + { return store_long((longlong) from); } inline bool store(uint32 from) { return store_long((longlong) from); } inline bool store(longlong from) |