diff options
| author | unknown <serg@serg.mylan> | 2005-01-11 14:29:22 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-01-11 14:29:22 +0100 |
| commit | 64b4131cf07060a4cf25cb809f984667cd24a898 (patch) | |
| tree | 3965fe6059852a8fb058a56c02072e48882f986b /sql | |
| parent | 3cde206040151704c926b444907976965733082c (diff) | |
| parent | 7233b5d56357a9ce91dcffa737d0118b6101eca1 (diff) | |
| download | mariadb-git-64b4131cf07060a4cf25cb809f984667cd24a898.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/net_serv.cc | 2 | ||||
| -rw-r--r-- | sql/sql_class.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sql/net_serv.cc b/sql/net_serv.cc index ca82c49b62d..5699b5a2f55 100644 --- a/sql/net_serv.cc +++ b/sql/net_serv.cc @@ -251,7 +251,7 @@ my_bool my_net_write(NET *net,const char *packet,ulong len) { uchar buff[NET_HEADER_SIZE]; - if (unlikely(!net->vio)) // nowhere to write + if (unlikely(!net->vio)) /* nowhere to write */ return 0; /* Big packets are handled by splitting them in packets of MAX_PACKET_LENGTH diff --git a/sql/sql_class.h b/sql/sql_class.h index 169835f3324..7978aec8f1d 100644 --- a/sql/sql_class.h +++ b/sql/sql_class.h @@ -648,8 +648,8 @@ public: /* Erase all statements (calls Statement destructor) */ void reset() { - hash_reset(&names_hash); - hash_reset(&st_hash); + my_hash_reset(&names_hash); + my_hash_reset(&st_hash); last_found_statement= 0; } |