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 | b391a52284d4aa8f5eff9d253e042eb572ffbf56 (patch) | |
| tree | 26924823fbf08ef576095f9f14b007b10bcd3b72 /sql/protocol.h | |
| parent | a75003287d9f3b7ad5141f8f04525d98ac87a18b (diff) | |
| parent | 727ffbf37613c516cdb78d32b4ebd23cec4c83aa (diff) | |
| download | mariadb-git-b391a52284d4aa8f5eff9d253e042eb572ffbf56.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) |