1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fixed uninitialized pointer

Browse Source
This commit is contained in:
bell@sanja.is.com.ua 2003-07-01 19:05:08 +03:00
parent 088cd27e74
commit 2a33b0514e
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sql/mysqld.cc
View File

@ -1821,7 +1821,12 @@ extern "C" int my_message_sql(uint error, const char *str,
DBUG_PRINT("error", ("Message: '%s'", str)); DBUG_PRINT("error", ("Message: '%s'", str));
if ((thd= current_thd)) if ((thd= current_thd))
{ {
if (thd->lex.current_select->no_error && !thd->is_fatal_error) /*
thd->lex.current_select equel to zero if lex structure is not inited
(not query command (COM_QUERY))
*/
if (thd->lex.current_select &&
thd->lex.current_select->no_error && !thd->is_fatal_error)
{ {
DBUG_PRINT("error", ("above error converted to warning")); DBUG_PRINT("error", ("above error converted to warning"));
push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, error, str); push_warning(thd, MYSQL_ERROR::WARN_LEVEL_ERROR, error, str);

5
sql/sql_parse.cc
View File

@ -1057,6 +1057,11 @@ bool do_command(THD *thd)
net= &thd->net; net= &thd->net;
thd->current_tablenr=0; thd->current_tablenr=0;
/*
indicator of uninitialized lex => normal flow of errors handling
(see my_message_sql)
*/
thd->lex.current_select= 0;
packet=0; packet=0;
old_timeout=net->read_timeout; old_timeout=net->read_timeout;