diff options
| author | unknown <malff/marcsql@weblab.(none)> | 2007-03-06 10:33:10 -0700 |
|---|---|---|
| committer | unknown <malff/marcsql@weblab.(none)> | 2007-03-06 10:33:10 -0700 |
| commit | 0708859ba8a7490cf3f4ba73c667105d2a6edbd7 (patch) | |
| tree | 89e46d1e53cc7db75cbfc56e2cadc40161bebc1e /sql/sql_update.cc | |
| parent | c155c66da65e3d19b2baec7d141648dfd9b55f52 (diff) | |
| parent | 266a7fff520eb2253226158df236865f2ad16ffe (diff) | |
| download | mariadb-git-0708859ba8a7490cf3f4ba73c667105d2a6edbd7.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_b
into weblab.(none):/home/marcsql/TREE/mysql-5.1-8407-merge
mysql-test/r/information_schema_db.result:
Auto merged
mysql-test/r/view.result:
Auto merged
mysql-test/t/sp.test:
Auto merged
sql/lock.cc:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sp_head.h:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_class.cc:
Auto merged
sql/sql_update.cc:
Auto merged
sql/table.cc:
Auto merged
sql/table.h:
Auto merged
Diffstat (limited to 'sql/sql_update.cc')
| -rw-r--r-- | sql/sql_update.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_update.cc b/sql/sql_update.cc index 02a90b942bf..27a58a295ff 100644 --- a/sql/sql_update.cc +++ b/sql/sql_update.cc @@ -907,7 +907,7 @@ reopen_tables: tl->lock_type= using_update_log ? TL_READ_NO_INSERT : TL_READ; tl->updating= 0; /* Update TABLE::lock_type accordingly. */ - if (!tl->placeholder() && !tl->schema_table && !using_lock_tables) + if (!tl->placeholder() && !using_lock_tables) tl->table->reginfo.lock_type= tl->lock_type; } } |