diff options
| author | serg@janus.mylan <> | 2007-12-20 22:11:37 +0100 |
|---|---|---|
| committer | serg@janus.mylan <> | 2007-12-20 22:11:37 +0100 |
| commit | d9ca7b670ea4fe72357fb13af2ccd6a5b25e80f3 (patch) | |
| tree | 8e1c37da4cf89e91d901badb1c2e5f100be39ec1 /sql/protocol.h | |
| parent | 6accbba0c0fbe6d5154002c148ee02a475ead109 (diff) | |
| parent | d902f4d3d634fa17021ecd99cd8982cfb2352ffb (diff) | |
| download | mariadb-git-d9ca7b670ea4fe72357fb13af2ccd6a5b25e80f3.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-maint
into janus.mylan:/usr/home/serg/Abk/mysql-5.1
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index 7c0ba858ea3..a4770e9b6e3 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -75,6 +75,7 @@ public: return 0; } virtual bool flush(); + virtual void end_partial_result_set(THD *thd); virtual void prepare_for_resend()=0; virtual bool store_null()=0; @@ -173,9 +174,7 @@ public: void send_warning(THD *thd, uint sql_errno, const char *err=0); void net_send_error(THD *thd, uint sql_errno=0, const char *err=0); -void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L, - const char *info=0); -void send_eof(THD *thd); +void net_end_statement(THD *thd); bool send_old_password_request(THD *thd); uchar *net_store_data(uchar *to,const uchar *from, size_t length); uchar *net_store_data(uchar *to,int32 from); |