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

Fixed references to uninitialized memory

Browse Source
This commit is contained in:
monty@mysql.com
2005-05-19 04:48:22 +03:00
parent 96d649d04b
commit 6cca51f06a
2 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
sql/sp.cc
View File

@@ -72,6 +72,9 @@ db_find_routine_aux(THD *thd, int type, sp_name *name,
DBUG_PRINT("enter", ("type: %d name: %*s", DBUG_PRINT("enter", ("type: %d name: %*s",
type, name->m_name.length, name->m_name.str)); type, name->m_name.length, name->m_name.str));
*opened= FALSE;
*tablep= 0;
/* /*
Speed up things if mysql.proc doesn't exists. mysql_proc_table_exists Speed up things if mysql.proc doesn't exists. mysql_proc_table_exists
is set when we create or read stored procedure or on flush privileges. is set when we create or read stored procedure or on flush privileges.
@@ -88,9 +91,7 @@ db_find_routine_aux(THD *thd, int type, sp_name *name,
strcmp(table->s->table_name, "proc") == 0) strcmp(table->s->table_name, "proc") == 0)
break; break;
} }
if (table) if (!table)
*opened= FALSE;
else
{ {
TABLE_LIST tables; TABLE_LIST tables;
@@ -99,7 +100,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name,
tables.table_name= tables.alias= (char*)"proc"; tables.table_name= tables.alias= (char*)"proc";
if (! (table= open_ltable(thd, &tables, ltype))) if (! (table= open_ltable(thd, &tables, ltype)))
{ {
*tablep= NULL;
/* /*
Under explicit LOCK TABLES or in prelocked mode we should not Under explicit LOCK TABLES or in prelocked mode we should not
say that mysql.proc table does not exist if we are unable to say that mysql.proc table does not exist if we are unable to
@@ -131,7 +131,6 @@ db_find_routine_aux(THD *thd, int type, sp_name *name,
key, table->key_info->key_length, key, table->key_info->key_length,
HA_READ_KEY_EXACT)) HA_READ_KEY_EXACT))
{ {
*tablep= NULL;
DBUG_RETURN(SP_KEY_NOT_FOUND); DBUG_RETURN(SP_KEY_NOT_FOUND);
} }
*tablep= table; *tablep= table;

2
sql/sql_lex.cc
View File

@@ -1101,7 +1101,7 @@ void st_select_lex::init_query()
embedding= leaf_tables= 0; embedding= leaf_tables= 0;
item_list.empty(); item_list.empty();
join= 0; join= 0;
where= prep_where= 0; having= where= prep_where= 0;
olap= UNSPECIFIED_OLAP_TYPE; olap= UNSPECIFIED_OLAP_TYPE;
having_fix_field= 0; having_fix_field= 0;
resolve_mode= NOMATTER_MODE; resolve_mode= NOMATTER_MODE;