← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to storage/innobase/row/row0mysql.c

  • Committer: Stewart Smith
  • Date: 2008-11-21 16:06:07 UTC
  • mto: This revision was merged to the branch mainline in revision 593.
  • Revision ID: stewart@flamingspork.com-20081121160607-n6gdlt013spuo54r
remove mysql_frm_type
and fix engines to return correct value from delete_table when table doesn't exist.
(it should be ENOENT).

Also fix up some tests that manipulated frm files by hand. These tests are no longer valid and will need to be rewritten in the not too distant future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
storage/innobase/row/row0mysql.c
3042
3042
        table = dict_table_get_low(name);
3043
3043
 
3044
3044
        if (!table) {
3045
 
                err = DB_TABLE_NOT_FOUND;
3046
 
                ut_print_timestamp(stderr);
3047
 
 
3048
 
                fputs("  InnoDB: Error: table ", stderr);
3049
 
                ut_print_name(stderr, trx, TRUE, name);
3050
 
                fputs(" does not exist in the InnoDB internal\n"
3051
 
                      "InnoDB: data dictionary though MySQL is"
3052
 
                      " trying to drop it.\n"
3053
 
                      "InnoDB: Have you copied the .frm file"
3054
 
                      " of the table to the\n"
3055
 
                      "InnoDB: MySQL database directory"
3056
 
                      " from another database?\n"
3057
 
                      "InnoDB: You can look for further help from\n"
3058
 
                      "InnoDB: http://dev.mysql.com/doc/refman/5.1/en/"
3059
 
                      "innodb-troubleshooting.html\n",
3060
 
                      stderr);
 
3045
                err = ENOENT;
3061
3046
                goto funct_exit;
3062
3047
        }
3063
3048