bk commit into 5.0 tree (georg:1.1965)

[Georg Richter]

Below is the list of changes that have just been committed into a local
5.0 repository of georg. When georg does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1965 05/09/15 16:13:27 georg@stripped +2 -0
  Changes after Sanja's review for bug 5508

  sql/sql_view.cc
    1.65 05/09/15 16:13:22 georg@stripped +7 -1
    changes after Sanja's review: 
      added source_number_position and read source explicitly in mysql_rename_view

  sql/sql_rename.cc
    1.30 05/09/15 16:13:22 georg@stripped +1 -0
    changes after Sanja's review:
      added FRMTYPE_ERROR in switch

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/bugs/5508

--- 1.64/sql/sql_view.cc	2005-09-15 12:16:14 +02:00
+++ 1.65/sql/sql_view.cc	2005-09-15 16:13:22 +02:00
@@ -479,8 +479,9 @@
 
 /* index of revision number in following table */
 static const int revision_number_position= 8;
+static const int source_number_position= 9;
 /* index of last required parameter for making view */
-static const int required_view_parameters= 11;
+static const int required_view_parameters= 10;
 
 /*
   table of VIEW .frm field descriptors
@@ -1394,6 +1395,11 @@
       char new_path[FN_REFLEN], file_buff[FN_REFLEN];
 
       if (mysql_make_view(parser, view))
+        goto err;
+
+      /* additionally we need source information */
+      if (parser->parse((gptr)view, thd->mem_root,
+                        view_parameters + source_number_position, 1))
         goto err;
 
       /* create new view */

--- 1.29/sql/sql_rename.cc	2005-09-15 12:16:14 +02:00
+++ 1.30/sql/sql_rename.cc	2005-09-15 16:13:22 +02:00
@@ -188,6 +188,7 @@
           else
             rc= mysql_rename_view(thd, new_alias, ren_table);
           break;
+        case FRMTYPE_ERROR:
         default:
           my_error(ER_FILE_NOT_FOUND, MYF(0), name, my_errno);
       }