mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +03:00
manual merge 5.0-bugteam --> 5.1-bugteam
This commit is contained in:
@ -1947,7 +1947,7 @@ mysql_rename_view(THD *thd,
|
||||
goto err;
|
||||
|
||||
/* rename view and it's backups */
|
||||
if (rename_in_schema_file(view->db, view->table_name, new_name,
|
||||
if (rename_in_schema_file(thd, view->db, view->table_name, new_name,
|
||||
view_def.revision - 1, num_view_backups))
|
||||
goto err;
|
||||
|
||||
@ -1967,7 +1967,7 @@ mysql_rename_view(THD *thd,
|
||||
num_view_backups))
|
||||
{
|
||||
/* restore renamed view in case of error */
|
||||
rename_in_schema_file(view->db, new_name, view->table_name,
|
||||
rename_in_schema_file(thd, view->db, new_name, view->table_name,
|
||||
view_def.revision - 1, num_view_backups);
|
||||
goto err;
|
||||
}
|
||||
|
Reference in New Issue
Block a user