Merge istruewing@bk-internal.mysql.com:/home/bk/mysql-5.1-engines

into  chilla.local:/home/mydev/mysql-5.1-bug18775


sql/ha_myisam.cc:
  Auto merged
sql/ha_myisammrg.cc:
  Auto merged
sql/ha_ndbcluster.cc:
  Auto merged
sql/mysql_priv.h:
  Auto merged
sql/sql_acl.cc:
  Auto merged
sql/sql_base.cc:
  Auto merged
sql/sql_delete.cc:
  Auto merged
sql/sql_insert.cc:
  Auto merged
sql/sql_partition.cc:
  Auto merged
sql/sql_show.cc:
  Auto merged
sql/sql_table.cc:
  Auto merged
sql/sql_trigger.cc:
  Auto merged
sql/sql_view.cc:
  Auto merged
sql/table.cc:
  Auto merged
sql/sql_db.cc:
  Bug#18775 - Temporary table from alter table visible to other threads
  Manual merge

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, &not_used) != FRMTYPE_VIEW)))