database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

fixed problem with freeing stack memory

Browse Source
This commit is contained in:
bell@sanja.is.com.ua
2004-10-04 12:34:41 +03:00
parent da71f76910
commit 03394ebe12
1 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/sql_base.cc
View File

@ -913,14 +913,13 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
*/ */
{ {
char path[FN_REFLEN]; char path[FN_REFLEN];
TABLE tab;
if (!table)
table= &tab;
strxnmov(path, FN_REFLEN, mysql_data_home, "/", table_list->db, "/", strxnmov(path, FN_REFLEN, mysql_data_home, "/", table_list->db, "/",
table_list->real_name, reg_ext, NullS); table_list->real_name, reg_ext, NullS);
(void) unpack_filename(path, path); (void) unpack_filename(path, path);
if (mysql_frm_type(path) == FRMTYPE_VIEW) if (mysql_frm_type(path) == FRMTYPE_VIEW)
{ {
TABLE tab;// will not be used (because it's VIEW) but have to be passed
table= &tab;
VOID(pthread_mutex_lock(&LOCK_open)); VOID(pthread_mutex_lock(&LOCK_open));
if (open_unireg_entry(thd, table, table_list->db, if (open_unireg_entry(thd, table, table_list->db,
table_list->real_name, table_list->real_name,
@ -932,7 +931,6 @@ TABLE *open_table(THD *thd, TABLE_LIST *table_list, MEM_ROOT *mem_root,
else else
{ {
DBUG_ASSERT(table_list->view); DBUG_ASSERT(table_list->view);
my_free((gptr)table, MYF(0));
VOID(pthread_mutex_unlock(&LOCK_open)); VOID(pthread_mutex_unlock(&LOCK_open));
DBUG_RETURN(0); // VIEW DBUG_RETURN(0); // VIEW
} }