diff options
| author | unknown <sergefp@mysql.com> | 2004-05-25 08:15:50 +0400 |
|---|---|---|
| committer | unknown <sergefp@mysql.com> | 2004-05-25 08:15:50 +0400 |
| commit | 4cca7db74676837f260938df000d06a82f6d9314 (patch) | |
| tree | 91ea91bc9ba096d29b7dfc31b6ede53ff562bac2 /sql/sql_parse.cc | |
| parent | c54f3ba680f6a1fe74e937dfe7b14da04220cba3 (diff) | |
| parent | 093d62922b326cec1a05bd8baba2d9ed96137488 (diff) | |
| download | mariadb-git-4cca7db74676837f260938df000d06a82f6d9314.tar.gz | |
Manually merged, requirees more merging
sql/mysql_priv.h:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
Diffstat (limited to 'sql/sql_parse.cc')
| -rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 7dcc45457e3..9573e8be43e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -1815,7 +1815,10 @@ bool alloc_query(THD *thd, char *packet, ulong packet_length) return 1; thd->query[packet_length]=0; thd->query_length= packet_length; - thd->packet.shrink(thd->variables.net_buffer_length);// Reclaim some memory + + /* Reclaim some memory */ + thd->packet.shrink(thd->variables.net_buffer_length); + thd->convert_buffer.shrink(thd->variables.net_buffer_length); if (!(specialflag & SPECIAL_NO_PRIOR)) my_pthread_setprio(pthread_self(),QUERY_PRIOR); |