diff options
| author | Gleb Shchepa <gshchepa@mysql.com> | 2008-09-30 18:16:11 +0500 |
|---|---|---|
| committer | Gleb Shchepa <gshchepa@mysql.com> | 2008-09-30 18:16:11 +0500 |
| commit | a938da539cf2313dc3c1b94deb099c7d6eab4c5c (patch) | |
| tree | 985ef000a6323c141dba7b919caac613545f2b3c /sql/sql_view.cc | |
| parent | 3bf44a86222cb935f31f28263e54442e9a10693d (diff) | |
| parent | e20b9de18e0e73ba63069c43f780fae0e571f9ab (diff) | |
| download | mariadb-git-a938da539cf2313dc3c1b94deb099c7d6eab4c5c.tar.gz | |
manual merge 5.0-bugteam --> 5.1-bugteam
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index 12b2adf4f13..87b073af078 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -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; } |