summaryrefslogtreecommitdiff
path: root/sql/ha_innodb.cc
diff options
context:
space:
mode:
authorunknown <heikki@hundin.mysql.fi>2003-10-14 14:53:16 +0300
committerunknown <heikki@hundin.mysql.fi>2003-10-14 14:53:16 +0300
commit3e428dab1cda34ef2bc7062a0e1100f3b357b00b (patch)
tree3cf504e1ec2e788c5f42e09b9604498da048e7e2 /sql/ha_innodb.cc
parentec9b2ea05caaa3991f5d0ba1790f246f9cf73d5f (diff)
downloadmariadb-git-3e428dab1cda34ef2bc7062a0e1100f3b357b00b.tar.gz
row0purge.c, row0mysql.c, os0file.c, os0file.h, fil0fil.h, fil0fil.c:
IMPORT TABLESPACE must reset lsns if they are too high ha_innodb.cc: DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table sql/ha_innodb.cc: DISCARD/IMPORT TABLESPACE must have a TL_WRITE lock on the table innobase/fil/fil0fil.c: IMPORT TABLESPACE must reset lsns if they are too high innobase/include/fil0fil.h: IMPORT TABLESPACE must reset lsns if they are too high innobase/include/os0file.h: IMPORT TABLESPACE must reset lsns if they are too high innobase/os/os0file.c: IMPORT TABLESPACE must reset lsns if they are too high innobase/row/row0mysql.c: IMPORT TABLESPACE must reset lsns if they are too high innobase/row/row0purge.c: IMPORT TABLESPACE must reset lsns if they are too high
Diffstat (limited to 'sql/ha_innodb.cc')
-rw-r--r--sql/ha_innodb.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_innodb.cc b/sql/ha_innodb.cc
index d07b166d9e2..7f8c99f7c15 100644
--- a/sql/ha_innodb.cc
+++ b/sql/ha_innodb.cc
@@ -4572,8 +4572,7 @@ ha_innobase::external_lock(
update_thd(thd);
- if (lock_type != F_UNLCK && prebuilt->table->ibd_file_missing
- && !current_thd->tablespace_op) {
+ 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"