bzr commit into mysql-5.1-telco-6.3 branch (jonas:3190) Bug#52225 Bug#53409

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3190 Jonas Oreland	2010-05-04
      bug#53409 (part of bug#52225) - fix arguments to mysql_frm_type, pass filename instead of tablename, this as cluster uses table_type for further processing

    modified:
      sql/sql_table.cc
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-04-26 09:16:28 +0000
+++ b/sql/sql_table.cc	2010-05-04 13:02:18 +0000
@@ -7004,7 +7004,7 @@ bool mysql_alter_table(THD *thd,char *ne
     into the main table list, like open_tables does).
     This code is wrong and will be removed, please do not copy.
   */
-  frm_type= mysql_frm_type(thd, new_name_buff, &table_type);
+  frm_type= mysql_frm_type(thd, reg_path, &table_type);
   /* Rename a view */
   /* Sic: there is a race here */
   if (frm_type == FRMTYPE_VIEW && !(alter_info->flags & ~ALTER_RENAME))


Attachment: [text/bzr-bundle] bzr/[e-mail]