mirror of
				https://github.com/MariaDB/server.git
				synced 2025-10-28 17:15:19 +03:00 
			
		
		
		
	Anoter fix for moved IO_CACHE object
This commit is contained in:
		| @@ -686,7 +686,10 @@ int merge_many_buff(SORTPARAM *param, uchar *sort_buffer, | |||||||
|   } |   } | ||||||
|   close_cached_file(to_file);			// This holds old result |   close_cached_file(to_file);			// This holds old result | ||||||
|   if (to_file == t_file) |   if (to_file == t_file) | ||||||
|  |   { | ||||||
|     *t_file=t_file2;				// Copy result file |     *t_file=t_file2;				// Copy result file | ||||||
|  |     setup_io_cache(t_file); | ||||||
|  |   } | ||||||
|  |  | ||||||
|   DBUG_RETURN(*maxbuffer >= MERGEBUFF2);	/* Return 1 if interrupted */ |   DBUG_RETURN(*maxbuffer >= MERGEBUFF2);	/* Return 1 if interrupted */ | ||||||
| } /* merge_many_buff */ | } /* merge_many_buff */ | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user