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

after merge fixes

Browse Source 
sql/sql_base.cc:
  fix a memory leak
storage/xtradb/handler/ha_innodb.cc:
  fix for a visual studio
storage/xtradb/row/row0ins.c:
  valgrind complains about uninitialized variable.
  incorrect errors in the innodb.test too
This commit is contained in:
Sergei Golubchik
2011-11-28 15:08:12 +01:00
parent a293d0788c
commit e79847d16a
6 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
sql/sql_base.cc
View File

@@ -2309,7 +2309,12 @@ bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list, bool link_in)
if (thd->killed || !table)
DBUG_RETURN(TRUE);
orig_table= *table;
/*
make a copy. we may need to restore it later.
don't use orig_table=*table, because we need an exact replica,
not a C++ copy that may modify the data in the copy constructor.
*/
memcpy(&orig_table, table, sizeof(*table));
if (open_unireg_entry(thd, table, table_list, table_name,
table->s->table_cache_key.str,
@@ -2322,9 +2327,10 @@ bool reopen_name_locked_table(THD* thd, TABLE_LIST* table_list, bool link_in)
properly release name-lock in this case we should restore this
object to its original state.
*/
*table= orig_table;
memcpy(table, &orig_table, sizeof(*table));
DBUG_RETURN(TRUE);
}
orig_table.alias.free();
share= table->s;
/*