diff options
| author | unknown <marko@hundin.mysql.fi> | 2005-01-12 14:08:25 +0200 |
|---|---|---|
| committer | unknown <marko@hundin.mysql.fi> | 2005-01-12 14:08:25 +0200 |
| commit | b895e877724fdd1fe6735fd20a74ea439f486582 (patch) | |
| tree | 4eec3dc026c118a91fb5221591634c9a4dbce658 /innobase/row/row0sel.c | |
| parent | 267407e4ab0c2a1089f3f4e19fe5b1ee76116e35 (diff) | |
| parent | e8e48614012d968d59606d4994d9e3ab6aa61eee (diff) | |
| download | mariadb-git-b895e877724fdd1fe6735fd20a74ea439f486582.tar.gz | |
Merge marko@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/marko/k/mysql-4.1
innobase/include/row0mysql.h:
Auto merged
innobase/row/row0sel.c:
Auto merged
sql/ha_innodb.cc:
Auto merged
Diffstat (limited to 'innobase/row/row0sel.c')
| -rw-r--r-- | innobase/row/row0sel.c | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/innobase/row/row0sel.c b/innobase/row/row0sel.c index 61ba0b53172..52228caccb0 100644 --- a/innobase/row/row0sel.c +++ b/innobase/row/row0sel.c @@ -2832,7 +2832,7 @@ row_search_for_mysql( /* out: DB_SUCCESS, DB_RECORD_NOT_FOUND, DB_END_OF_INDEX, DB_DEADLOCK, - DB_LOCK_TABLE_FULL, + DB_LOCK_TABLE_FULL, DB_CORRUPTION, or DB_TOO_BIG_RECORD */ byte* buf, /* in/out: buffer for the fetched row in the MySQL format */ @@ -2884,7 +2884,21 @@ row_search_for_mysql( ut_ad(index && pcur && search_tuple); ut_ad(trx->mysql_thread_id == os_thread_get_curr_id()); - + + if (prebuilt->table->ibd_file_missing) { + ut_print_timestamp(stderr); + fprintf(stderr, " InnoDB: Error:\n" +"InnoDB: MySQL is trying to use a table handle but the .ibd file for\n" +"InnoDB: table %s does not exist.\n" +"InnoDB: Have you deleted the .ibd file from the database directory under\n" +"InnoDB: the MySQL datadir, or have you used DISCARD TABLESPACE?\n" +"InnoDB: Look from\n" +"http://dev.mysql.com/doc/mysql/en/InnoDB_troubleshooting_datadict.html\n" +"InnoDB: how you can resolve the problem.\n", + prebuilt->table->name); + return(DB_ERROR); + } + if (prebuilt->magic_n != ROW_PREBUILT_ALLOCATED) { fprintf(stderr, "InnoDB: Error: trying to free a corrupt\n" |