diff options
| author | ingo/istruewing@chilla.local <> | 2006-08-02 18:10:51 +0200 |
|---|---|---|
| committer | ingo/istruewing@chilla.local <> | 2006-08-02 18:10:51 +0200 |
| commit | c20030ef26abdb255bbb202253a01fc5ec87a2cc (patch) | |
| tree | 376ef2cb6c75057dd05993c3db0e65e82dd33e4d /sql/sql_view.cc | |
| parent | b1bfdbfd2e07ef0507f605d266c306882c40e1d4 (diff) | |
| parent | 8e4c36ad4afa35b07b15f3ebbcd51007e925125c (diff) | |
| download | mariadb-git-c20030ef26abdb255bbb202253a01fc5ec87a2cc.tar.gz | |
Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines
into chilla.local:/home/mydev/mysql-5.1-bug18775
Diffstat (limited to 'sql/sql_view.cc')
| -rw-r--r-- | sql/sql_view.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/sql_view.cc b/sql/sql_view.cc index d24b247a22f..9919e66c14e 100644 --- a/sql/sql_view.cc +++ b/sql/sql_view.cc @@ -606,11 +606,11 @@ static int mysql_register_view(THD *thd, TABLE_LIST *view, /* print file name */ dir.length= build_table_filename(dir_buff, sizeof(dir_buff), - view->db, "", ""); + view->db, "", "", 0); dir.str= dir_buff; path.length= build_table_filename(path_buff, sizeof(path_buff), - view->db, view->table_name, reg_ext); + view->db, view->table_name, reg_ext, 0); path.str= path_buff; file.str= path.str + dir.length; @@ -1246,7 +1246,7 @@ bool mysql_drop_view(THD *thd, TABLE_LIST *views, enum_drop_mode drop_mode) TABLE_SHARE *share; bool type= 0; build_table_filename(path, sizeof(path), - view->db, view->table_name, reg_ext); + view->db, view->table_name, reg_ext, 0); VOID(pthread_mutex_lock(&LOCK_open)); if (access(path, F_OK) || (type= (mysql_frm_type(thd, path, ¬_used) != FRMTYPE_VIEW))) |