diff options
| author | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
|---|---|---|
| committer | unknown <msvensson@neptunus.(none)> | 2006-11-28 21:11:05 +0100 |
| commit | befbebcfdb0749fc0167a7652900abae6a0060e7 (patch) | |
| tree | 89185b0d10c5b8c12807ce8fcb41122c9cf5c18e /sql/protocol.h | |
| parent | e3a9d9493556d159a580d7e266770fcaf38c7343 (diff) | |
| parent | 0fb7649940c849f4df4ceca7d01f5e8946ffbb0d (diff) | |
| download | mariadb-git-befbebcfdb0749fc0167a7652900abae6a0060e7.tar.gz | |
Merge neptunus.(none):/home/msvensson/mysql/mysql-4.1
into neptunus.(none):/home/msvensson/mysql/mysql-4.1-maint
client/mysqltest.c:
Auto merged
Makefile.am:
Manual merge
mysql-test/mysql-test-run.pl:
Manual merge
Diffstat (limited to 'sql/protocol.h')
| -rw-r--r-- | sql/protocol.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sql/protocol.h b/sql/protocol.h index 32d6acccddf..ce3adb41df5 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -177,7 +177,6 @@ void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L, const char *info=0); void send_eof(THD *thd, bool no_flush=0); bool send_old_password_request(THD *thd); -char *net_store_length(char *packet,uint length); char *net_store_data(char *to,const char *from, uint length); char *net_store_data(char *to,int32 from); char *net_store_data(char *to,longlong from); |