bk commit into 5.0 tree (georg:1.1910) BUG#6859

[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.1910 05/07/27 17:21:17 georg@stripped +1 -0
  Fix for bug#6859
  
  When .frm contains TYPE= (new format) we should throw a more 
  informative errormessage. Added errortype 7 for that case.

  sql/table.cc
    1.175 05/07/27 17:21:07 georg@stripped +14 -0
    Fix for bug#6859
    
    When .frm contains TYPE= (new format) we should throw a more informative
    errormessage. Added errortype 7 for that case.

# 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/prod/mysql-5.0

--- 1.174/sql/table.cc	2005-07-22 21:39:43 +02:00
+++ 1.175/sql/table.cc	2005-07-27 17:21:07 +02:00
@@ -60,6 +60,7 @@
    4    Error (see frm_error)
    5    Error (see frm_error: charset unavailable)
    6    Unknown .frm version
+   7    Error (see frm_error: invalid table type)
 */
 
 int openfrm(THD *thd, const char *name, const char *alias, uint db_stat,
@@ -119,6 +120,7 @@
       DBUG_RETURN(5);
     file= -1;
     // caller can't process new .frm
+	error= 7;
     goto err;
   }
 
@@ -1148,6 +1150,18 @@
                     "of MySQL and cannot be read",
                     MYF(0), name);
     break;
+  case 7:
+  {
+    char *db;
+    uint length=dirname_part(buff,name);
+    buff[length-1]=0;
+    db=buff+dirname_length(buff);
+    my_printf_error(ER_NOT_FORM_FILE,
+                    "Table '%-.64s.%-.64s' has invalid table type and cannot "
+                    "be read",
+                    MYF(0), db, real_name);
+  }
+  break;
   default:				/* Better wrong error than none */
   case 4:
     my_error(ER_NOT_FORM_FILE, errortype,