summaryrefslogtreecommitdiff
path: root/sql/sql_base.cc
diff options
context:
space:
mode:
authorunknown <monty@donna.mysql.fi>2001-03-27 13:05:48 +0300
committerunknown <monty@donna.mysql.fi>2001-03-27 13:05:48 +0300
commitb2c0b7ce0acf65fbef22d1ef15f158e0f18526e4 (patch)
tree79556751870ab82c0f898e5350ffa270c21f1519 /sql/sql_base.cc
parent33ec68e127d515bc98be3ba0d9f88ec0d4e2b5f3 (diff)
downloadmariadb-git-b2c0b7ce0acf65fbef22d1ef15f158e0f18526e4.tar.gz
Fixed bug in lock tables introduced by shared locks.
New lock test Docs/manual.texi: Small update sql/sql_base.cc: Fixed bug in lock tables introduced by shared locks.
Diffstat (limited to 'sql/sql_base.cc')
-rw-r--r--sql/sql_base.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc
index 0024e80219b..04ed72aec92 100644
--- a/sql/sql_base.cc
+++ b/sql/sql_base.cc
@@ -1362,7 +1362,7 @@ int open_tables(THD *thd,TABLE_LIST *start)
result= -1; // Fatal error
break;
}
- if (tables->lock_type != TL_UNLOCK)
+ if (tables->lock_type != TL_UNLOCK && ! thd->locked_tables)
tables->table->reginfo.lock_type=tables->lock_type;
tables->table->grant= tables->grant;
}