diff options
| author | unknown <monty@tik.mysql.fi> | 2002-04-12 21:35:46 +0300 |
|---|---|---|
| committer | unknown <monty@tik.mysql.fi> | 2002-04-12 21:35:46 +0300 |
| commit | 6326ec9944e8ab44fceff629d6681700573ab686 (patch) | |
| tree | 0060cbed8a1f7a8adaca0a4dc2e74b3372e28361 /sql/net_serv.cc | |
| parent | 40a27740878e945bbdf667c3735a41727d343ed1 (diff) | |
| download | mariadb-git-6326ec9944e8ab44fceff629d6681700573ab686.tar.gz | |
Update for BTREE keys in HEAP tables
Split handler->option_flag() to handler->table_flags() and handler->index_flags()
Docs/manual.texi:
Updated standard binary options
include/my_base.h:
Update for BTREE keys in HEAP tables
libmysql/net.c:
merge with net_serv.cc
mysql-test/r/func_misc.result:
Update for new behaviour of inet_ntoa
sql/field.cc:
Update for BTREE keys in HEAP tables
sql/field.h:
Update for BTREE keys in HEAP tables
sql/filesort.cc:
Update for BTREE keys in HEAP tables
sql/ha_berkeley.h:
Update for BTREE keys in HEAP tables
sql/ha_heap.h:
Update for BTREE keys in HEAP tables
sql/ha_innodb.h:
Update for BTREE keys in HEAP tables
sql/ha_isam.cc:
Update for BTREE keys in HEAP tables
sql/ha_isam.h:
Update for BTREE keys in HEAP tables
sql/ha_isammrg.h:
Update for BTREE keys in HEAP tables
sql/ha_myisam.cc:
Update for BTREE keys in HEAP tables
sql/ha_myisam.h:
Update for BTREE keys in HEAP tables
sql/ha_myisammrg.h:
Update for BTREE keys in HEAP tables
sql/handler.cc:
Update for BTREE keys in HEAP tables
sql/handler.h:
Update for BTREE keys in HEAP tables
sql/log.cc:
Update for BTREE keys in HEAP tables
sql/net_serv.cc:
Update for BTREE keys in HEAP tables
sql/opt_range.cc:
Update for BTREE keys in HEAP tables
sql/opt_sum.cc:
Update for BTREE keys in HEAP tables
sql/records.cc:
Update for BTREE keys in HEAP tables
sql/sql_class.h:
Update for BTREE keys in HEAP tables
sql/sql_handler.cc:
Update for BTREE keys in HEAP tables
sql/sql_insert.cc:
Update for BTREE keys in HEAP tables
sql/sql_select.cc:
Update for BTREE keys in HEAP tables
sql/sql_show.cc:
Update for BTREE keys in HEAP tables
sql/sql_table.cc:
Update for BTREE keys in HEAP tables
sql/structs.h:
Update for BTREE keys in HEAP tables
sql/table.cc:
Update for BTREE keys in HEAP tables
sql/unireg.cc:
Update for BTREE keys in HEAP tables
Diffstat (limited to 'sql/net_serv.cc')
| -rw-r--r-- | sql/net_serv.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index 9884adf9b46..0d6e548a873 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -329,12 +329,10 @@ net_real_write(NET *net,const char *packet,ulong len) my_bool net_blocking = vio_is_blocking(net->vio); DBUG_ENTER("net_real_write"); -#ifdef MYSQL_SERVER -#ifdef HAVE_QUERY_CACHE +#if defined(MYSQL_SERVER) && defined(HAVE_QUERY_CACHE) if (net->query_cache_query != 0) query_cache_insert(net, packet, len); #endif -#endif if (net->error == 2) DBUG_RETURN(-1); /* socket can't be used */ @@ -824,6 +822,5 @@ int net_request_file(NET* net, const char* fname) tmp[0] = (char) 251; /* NULL_LENGTH */ end=strnmov(tmp+1,fname,sizeof(tmp)-2); DBUG_RETURN(my_net_write(net,tmp,(uint) (end-tmp)) || - net_flush(net)); + net_flush(net)); } - |