diff options
| author | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-16 23:16:44 +0400 |
|---|---|---|
| committer | unknown <holyfoot/hf@mysql.com/deer.(none)> | 2006-11-16 23:16:44 +0400 |
| commit | 28c97d6a1e0f2a027d06841d6b09492d083e3731 (patch) | |
| tree | 5400912843b70b171dc06c8cdc96a6f3329a25db /sql/protocol.h | |
| parent | a26d31d5dd34bc00eeb13a48073d9fe337b45955 (diff) | |
| parent | 5a0cf28a597cc843b1591f63009fe1caa1984ae1 (diff) | |
| download | mariadb-git-28c97d6a1e0f2a027d06841d6b09492d083e3731.tar.gz | |
Merge mysql.com:/home/hf/work/mysql-4.1-mrg
into mysql.com:/home/hf/work/mysql-5.0-mrg
client/mysqltest.c:
Auto merged
mysql-test/t/flush.test:
Auto merged
mysql-test/t/flush_block_commit.test:
Auto merged
mysql-test/t/innodb-deadlock.test:
Auto merged
mysql-test/t/innodb-lock.test:
Auto merged
mysql-test/t/lock_multi.test:
Auto merged
mysql-test/t/rename.test:
Auto merged
mysql-test/t/show_check.test:
Auto merged
mysql-test/t/status.test:
Auto merged
sql/item.cc:
Auto merged
sql/protocol.h:
Auto merged
sql-common/client.c:
Auto merged
Makefile.am:
merging
BitKeeper/deleted/.del-mysql_client.test:
merging
include/mysql.h:
SCCS merged
libmysql/libmysql.c:
merging
libmysqld/lib_sql.cc:
merging
mysql-test/r/order_by.result:
SCCS merged
mysql-test/r/subselect.result:
SCCS merged
mysql-test/t/order_by.test:
merging
mysql-test/t/subselect.test:
SCCS merged
sql/item_subselect.cc:
merging
sql/item_subselect.h:
merging
sql/protocol.cc:
merging
sql/sql_class.h:
merging
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 85c22724b74..7e2bc1516ec 100644 --- a/sql/protocol.h +++ b/sql/protocol.h @@ -166,7 +166,6 @@ void send_ok(THD *thd, ha_rows affected_rows=0L, ulonglong id=0L, const char *info=0); void send_eof(THD *thd); 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); |