diff options
| author | monty@mashka.mysql.fi <> | 2003-01-28 08:38:28 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2003-01-28 08:38:28 +0200 |
| commit | 689578a0997f54c590bcf4791e30710602851bc4 (patch) | |
| tree | b916d4acfbe4f32ab06b052fd06c072f858bdce1 /sql/sql_select.h | |
| parent | 1bdd1d0626fdb8f858a3c4bf82e0064ee19b042d (diff) | |
| download | mariadb-git-689578a0997f54c590bcf4791e30710602851bc4.tar.gz | |
Fixes for Netware
Call pthread_mutex_destroy() on not used mutex.
Changed comments in .h and .c files from // -> /* */
Added detection of mutex on which one didn't call pthread_mutex_destroy()
Fixed bug in create_tmp_field() which causes a memory overrun in queries that uses "ORDER BY constant_expression"
Added optimisation for ORDER BY NULL
Diffstat (limited to 'sql/sql_select.h')
| -rw-r--r-- | sql/sql_select.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_select.h b/sql/sql_select.h index 40eb4d8ef51..332778aafe6 100644 --- a/sql/sql_select.h +++ b/sql/sql_select.h @@ -122,7 +122,7 @@ class TMP_TABLE_PARAM :public Sql_alloc List_iterator_fast<Item> copy_funcs_it; Copy_field *copy_field, *copy_field_end; byte *group_buff; - Item_result_field **funcs; + Item **items_to_copy; /* Fields in tmp table */ MI_COLUMNDEF *recinfo,*start_recinfo; KEY *keyinfo; ha_rows end_write_records; @@ -194,7 +194,7 @@ void count_field_types(TMP_TABLE_PARAM *param, List<Item> &fields, bool reset_with_sum_func); bool setup_copy_fields(THD *thd, TMP_TABLE_PARAM *param,List<Item> &fields); void copy_fields(TMP_TABLE_PARAM *param); -void copy_funcs(Item_result_field **func_ptr); +void copy_funcs(Item **func_ptr); bool create_myisam_from_heap(TABLE *table, TMP_TABLE_PARAM *param, int error, bool ignore_last_dupp_error); |