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

errors without code removed

Browse Source 
net_printf/send_error calls replaced by my_error family functions
-1/1 (sent/unsent) error reporting removed
(WL#2133)
This commit is contained in:
bell@sanja.is.com.ua
2004-10-20 04:04:37 +03:00
parent 09e9651acc
commit 4714a6e744
86 changed files with 1886 additions and 1566 deletions
Download Patch File Download Diff File Expand all files Collapse all files

52
sql/sql_view.cc
View File

@ -41,13 +41,12 @@ TYPELIB updatable_views_with_limit_typelib=
mode - VIEW_CREATE_NEW, VIEW_ALTER, VIEW_CREATE_OR_REPLACE
RETURN VALUE
0 OK
-1 Error
1 Error and error message given
FALSE OK
TRUE Error
*/
int mysql_create_view(THD *thd,
enum_view_create_mode mode)
bool mysql_create_view(THD *thd,
enum_view_create_mode mode)
{
LEX *lex= thd->lex;
bool link_to_local;
@ -57,7 +56,7 @@ int mysql_create_view(THD *thd,
TABLE_LIST *tbl;
SELECT_LEX *select_lex= &lex->select_lex, *sl;
SELECT_LEX_UNIT *unit= &lex->unit;
int res= 0;
bool res= FALSE;
DBUG_ENTER("mysql_create_view");
if (lex->proc_list.first ||
@ -66,7 +65,7 @@ int mysql_create_view(THD *thd,
my_error(ER_VIEW_SELECT_CLAUSE, MYF(0), (lex->result ?
"INTO" :
"PROCEDURE"));
res= -1;
res= TRUE;
goto err;
}
if (lex->derived_tables ||
@ -75,7 +74,7 @@ int mysql_create_view(THD *thd,
my_error((lex->derived_tables ?
ER_VIEW_SELECT_DERIVED :
ER_VIEW_SELECT_VARIABLE), MYF(0));
res= -1;
res= TRUE;
goto err;
}
@ -101,7 +100,7 @@ int mysql_create_view(THD *thd,
(check_access(thd, DELETE_ACL, view->db, &view->grant.privilege,
0, 0) ||
grant_option && check_grant(thd, DELETE_ACL, view, 0, 1, 0))))
DBUG_RETURN(1);
DBUG_RETURN(TRUE);
for (sl= select_lex; sl; sl= sl->next_select())
{
for (tbl= sl->get_table_list(); tbl; tbl= tbl->next_local)
@ -119,7 +118,7 @@ int mysql_create_view(THD *thd,
thd->priv_user,
thd->host_or_ip,
tbl->real_name);
DBUG_RETURN(-1);
DBUG_RETURN(TRUE);
}
/*
Mark this table as a table which will be checked after the prepare
@ -155,7 +154,7 @@ int mysql_create_view(THD *thd,
&tbl->grant.privilege, 0, 0) ||
grant_option && check_grant(thd, SELECT_ACL, tbl, 0, 1, 0))
{
res= 1;
res= TRUE;
goto err;
}
}
@ -177,8 +176,8 @@ int mysql_create_view(THD *thd,
}
#endif
if ((res= open_and_lock_tables(thd, tables)))
DBUG_RETURN(res);
if (open_and_lock_tables(thd, tables))
DBUG_RETURN(TRUE);
/*
check that tables are not temporary and this VIEW do not used in query
@ -190,7 +189,7 @@ int mysql_create_view(THD *thd,
if (tbl->table->tmp_table != NO_TMP_TABLE && !tbl->view)
{
my_error(ER_VIEW_SELECT_TMPTABLE, MYF(0), tbl->alias);
res= -1;
res= TRUE;
goto err;
}
@ -200,7 +199,7 @@ int mysql_create_view(THD *thd,
strcmp(tbl->view_name.str, view->real_name) == 0)
{
my_error(ER_NO_SUCH_TABLE, MYF(0), tbl->view_db.str, tbl->view_name.str);
res= -1;
res= TRUE;
goto err;
}
@ -220,7 +219,7 @@ int mysql_create_view(THD *thd,
some errors from prepare are reported to user, if is not then
it will be checked after err: label
*/
res= 1;
res= TRUE;
goto err;
}
@ -255,7 +254,7 @@ int mysql_create_view(THD *thd,
if (strcmp(item->name, check->name) == 0)
{
my_error(ER_DUP_FIELDNAME, MYF(0), item->name);
DBUG_RETURN(-1);
DBUG_RETURN(TRUE);
}
}
}
@ -294,7 +293,7 @@ int mysql_create_view(THD *thd,
thd->host_or_ip,
item->name,
view->real_name);
DBUG_RETURN(-1);
DBUG_RETURN(TRUE);
}
}
}
@ -303,7 +302,7 @@ int mysql_create_view(THD *thd,
if (wait_if_global_read_lock(thd, 0, 0))
{
res= -1;
res= TRUE;
goto err;
}
VOID(pthread_mutex_lock(&LOCK_open));
@ -321,9 +320,7 @@ err:
thd->proc_info= "end";
lex->link_first_table_back(view, link_to_local);
unit->cleanup();
if (thd->net.report_error)
res= -1;
DBUG_RETURN(res);
DBUG_RETURN(res || thd->net.report_error);
}
@ -824,12 +821,11 @@ err:
drop_mode - cascade/check
RETURN VALUE
0 OK
-1 Error
1 Error and error message given
FALSE OK
TRUE Error
*/
int mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
{
DBUG_ENTER("mysql_drop_view");
char path[FN_REFLEN];
@ -865,11 +861,11 @@ int mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode)
VOID(pthread_mutex_unlock(&LOCK_open));
}
send_ok(thd);
DBUG_RETURN(0);
DBUG_RETURN(FALSE);
err:
VOID(pthread_mutex_unlock(&LOCK_open));
DBUG_RETURN(-1);
DBUG_RETURN(TRUE);
}