diff options
| author | monty@hundin.mysql.fi <> | 2001-10-17 19:39:39 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-10-17 19:39:39 +0300 |
| commit | 0bfec316ce62bf5f46b55888a0a9d593171c4eb5 (patch) | |
| tree | a99a119a594cef911c36b9e84ddb7975f5747e05 /sql/field.cc | |
| parent | faa51dc2854d2a2e0fe09cad44702f57d26109ae (diff) | |
| download | mariadb-git-0bfec316ce62bf5f46b55888a0a9d593171c4eb5.tar.gz | |
Don't do signal() on windows (Causes instability problems)
Safer, a bit faster filesort.
Code changes to avoid calls to current_thd() (faster code).
Removed all compiler warnings from readline.
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/field.cc b/sql/field.cc index 85a5076e09a..07f521abf3e 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -248,7 +248,7 @@ void Field::copy_from_tmp(int row_offset) } -bool Field::send(String *packet) +bool Field::send(THD *thd, String *packet) { if (is_null()) return net_store_null(packet); @@ -256,7 +256,7 @@ bool Field::send(String *packet) String tmp(buff,sizeof(buff)); val_str(&tmp,&tmp); CONVERT *convert; - if ((convert=current_thd->convert_set)) + if ((convert=thd->convert_set)) return convert->store(packet,tmp.ptr(),tmp.length()); return net_store_data(packet,tmp.ptr(),tmp.length()); } |