diff options
| author | heikki@hundin.mysql.fi <> | 2004-12-27 04:11:26 +0200 |
|---|---|---|
| committer | heikki@hundin.mysql.fi <> | 2004-12-27 04:11:26 +0200 |
| commit | 0e28bb071a9101d3fbe6b60d59dc33a22e80771e (patch) | |
| tree | 25b49b040c2764a40ffd397f8accee6688c67dd1 /sql | |
| parent | 8f602f2af84dffc6327af05459e9567778f19c94 (diff) | |
| parent | 7ad5e20461d04809a7e3bf1f966fe51c707f5332 (diff) | |
| download | mariadb-git-0e28bb071a9101d3fbe6b60d59dc33a22e80771e.tar.gz | |
Merge heikki@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/heikki/mysql-4.1
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/ha_innodb.cc | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc index 552f2676bdd..b8ac40cee92 100644 --- a/sql/ha_innodb.cc +++ b/sql/ha_innodb.cc @@ -4977,7 +4977,7 @@ the SQL statement in case of an error. */ int ha_innobase::external_lock( /*=======================*/ - /* out: 0 */ + /* out: 0 or HA_ERR_CRASHED */ THD* thd, /* in: handle to the user thread */ int lock_type) /* in: lock type */ { @@ -4989,19 +4989,6 @@ ha_innobase::external_lock( update_thd(thd); - if (prebuilt->table->ibd_file_missing && !current_thd->tablespace_op) { - ut_print_timestamp(stderr); - fprintf(stderr, " InnoDB error:\n" -"MySQL is trying to use a table handle but the .ibd file for\n" -"table %s does not exist.\n" -"Have you deleted the .ibd file from the database directory under\n" -"the MySQL datadir, or have you used DISCARD TABLESPACE?\n" -"Look from section 15.1 of http://www.innodb.com/ibman.html\n" -"how you can resolve the problem.\n", - prebuilt->table->name); - DBUG_RETURN(HA_ERR_CRASHED); - } - trx = prebuilt->trx; prebuilt->sql_stat_start = TRUE; |