database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.0 into 10.1

Browse Source
This commit is contained in:
Marko Mäkelä
2018-02-03 12:53:30 +02:00
parent ec03390f9b 0765caa073
commit 8812a2f858
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysys/mf_iocache.c
View File

@ -300,7 +300,7 @@ int init_io_cache(IO_CACHE *info, File file, size_t cachesize,
else else
{ {
/* Clear mutex so that safe_mutex will notice that it's not initialized */ /* Clear mutex so that safe_mutex will notice that it's not initialized */
bzero((char*) &info->append_buffer_lock, sizeof(info)); bzero((char*) &info->append_buffer_lock, sizeof(info->append_buffer_lock));
} }
#endif #endif

2
sql/sql_update.cc
View File

@ -701,6 +701,8 @@ int mysql_update(THD *thd,
if (reinit_io_cache(&tempfile,READ_CACHE,0L,0,0)) if (reinit_io_cache(&tempfile,READ_CACHE,0L,0,0))
error=1; /* purecov: inspected */ error=1; /* purecov: inspected */
select->file=tempfile; // Read row ptrs from this file select->file=tempfile; // Read row ptrs from this file
// select->file was copied, update self-references.
setup_io_cache(&select->file);
if (error >= 0) if (error >= 0)
goto err; goto err;
} }