summaryrefslogtreecommitdiff
path: root/sql/lock.cc
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-16 20:19:10 +0200
committermonty@mashka.mysql.fi <>2002-11-16 20:19:10 +0200
commit1a96948e81b079b1f84f98be9c6569e57f47a5a9 (patch)
tree9cac640546f7a1615d184835e8fea1d18456e4e5 /sql/lock.cc
parentaa67a7963266468927490cc3fc37089b721dc474 (diff)
downloadmariadb-git-1a96948e81b079b1f84f98be9c6569e57f47a5a9.tar.gz
Small improvement to alloc_root
Add support for LIMIT # OFFSET # Changed lock handling: Now all locks should be stored in TABLE_LIST instead of passed to functions. Don't call query_cache_invalidate() twice in some cases mysql_change_user() now clears states to be equal to close + connect. Fixed a bug with multi-table-update and multi-table-delete when used with LOCK TABLES Fixed a bug with replicate-do and UPDATE
Diffstat (limited to 'sql/lock.cc')
-rw-r--r--sql/lock.cc1
1 files changed, 1 insertions, 0 deletions
diff --git a/sql/lock.cc b/sql/lock.cc
index 9063b1273e0..15878fe7d15 100644
--- a/sql/lock.cc
+++ b/sql/lock.cc
@@ -167,6 +167,7 @@ static int lock_external(THD *thd, TABLE **tables, uint count)
for (i=1 ; i <= count ; i++, tables++)
{
+ DBUG_ASSERT((*tables)->reginfo.lock_type >= TL_READ);
lock_type=F_WRLCK; /* Lock exclusive */
if ((*tables)->db_stat & HA_READ_ONLY ||
((*tables)->reginfo.lock_type >= TL_READ &&