diff options
| author | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-16 14:06:54 +0300 |
|---|---|---|
| committer | unknown <Sinisa@sinisa.nasamreza.org> | 2001-06-16 14:06:54 +0300 |
| commit | cded0f915d7a5cd7677a460743f51a264580a7e3 (patch) | |
| tree | f9ad1e23d7167c00131e94aa45af714642b12777 /sql | |
| parent | 01dc56a5447d8f21224304f8370aee6f41de6160 (diff) | |
| parent | f38e23207e9e876a449300f19139d5d30972ff1f (diff) | |
| download | mariadb-git-cded0f915d7a5cd7677a460743f51a264580a7e3.tar.gz | |
bk resolve changes
sql/sql_class.h:
Auto merged
sql/sql_parse.cc:
Auto merged
sql/sql_delete.cc:
Same as above
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/sql_delete.cc | 7 | ||||
| -rw-r--r-- | sql/sql_parse.cc | 6 |
2 files changed, 11 insertions, 2 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 0376ef09ee1..dc07d81f8f2 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -383,7 +383,7 @@ multi_delete::~multi_delete() if (tempfiles[counter]) { #ifdef SINISAS_STRIP -// end_io_cache(tempfiles[counter]); + end_io_cache(tempfiles[counter]); #else delete tempfiles[counter]; #endif @@ -594,12 +594,15 @@ static IO_CACHE *strip_duplicates_from_temp (byte *memory_lane, IO_CACHE *ptr, u int read_error, write_error, how_many_to_read, total_to_read = *written, pieces_in_memory = 0, mem_count,written_rows; int offset = written_rows=*written=0; int mem_pool_size = MEM_STRIP_BUF_SIZE * MAX_REFLENGTH / ref_length; - IO_CACHE *tempptr = (IO_CACHE *) sql_alloc(sizeof(IO_CACHE)); byte dup_record[MAX_REFLENGTH]; memset(dup_record,'\xFF',MAX_REFLENGTH); if (reinit_io_cache(ptr,READ_CACHE,0L,0,0)) return ptr; + IO_CACHE *tempptr = (IO_CACHE *) my_malloc(sizeof(IO_CACHE), MYF(MY_FAE | MY_ZEROFILL)); if (open_cached_file(tempptr, mysql_tmpdir,TEMP_PREFIX, DISK_BUFFER_SIZE, MYF(MY_WME))) + { + my_free((gptr) tempptr, MYF (0)); return ptr; + } DYNAMIC_ARRAY written_blocks; VOID(init_dynamic_array(&written_blocks,sizeof(struct written_block),20,50)); for (;pieces_in_memory < total_to_read;) diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 6b71d7e3615..88d42cbbebb 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -2438,6 +2438,12 @@ mysql_new_select(LEX *lex) SELECT_LEX *select_lex = (SELECT_LEX *)sql_calloc(sizeof(SELECT_LEX)); lex->select->next=select_lex; lex->select=select_lex; lex->select->select_number = ++select_no; + lex->select->item_list = lex->select_lex.item_list; + lex->select->item_list.empty(); + lex->select->table_list = lex->select_lex.table_list; + lex->select->table_list.elements=0; + lex->select->table_list.first=0; + lex->select->table_list.next= (byte**) &lex->select->table_list.first; } void |