diff options
| author | Sinisa@sinisa.nasamreza.org <> | 2001-06-16 13:58:01 +0300 |
|---|---|---|
| committer | Sinisa@sinisa.nasamreza.org <> | 2001-06-16 13:58:01 +0300 |
| commit | 6f5c70703ac47f8b20e78b732d259255ec22ffa4 (patch) | |
| tree | 088b85fbe44289eba05e981ee1b87bd80b499109 /sql/sql_delete.cc | |
| parent | a18444412495badef196ae65342e9f9da648d270 (diff) | |
| download | mariadb-git-6f5c70703ac47f8b20e78b732d259255ec22ffa4.tar.gz | |
Changes for multi-table delete and UNION's
Diffstat (limited to 'sql/sql_delete.cc')
| -rw-r--r-- | sql/sql_delete.cc | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/sql/sql_delete.cc b/sql/sql_delete.cc index 30b0f8a82bb..afa75ed6710 100644 --- a/sql/sql_delete.cc +++ b/sql/sql_delete.cc @@ -347,7 +347,7 @@ multi_delete::~multi_delete() for (uint counter = 0; counter < num_of_tables; counter++) if (tempfiles[counter]) #ifdef SINISAS_STRIP -// end_io_cache(tempfiles[counter]); + end_io_cache(tempfiles[counter]); #else delete tempfiles[counter]; #endif @@ -549,12 +549,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;) @@ -809,7 +812,7 @@ int multi_delete::do_deletes (bool from_send_error) #ifdef SINISAS_STRIP delete select; #endif - if (error = -1) error = 0; + if (error == -1) error = 0; #if 0 } #endif |