diff options
| author | malff/marcsql@weblab.(none) <> | 2007-03-06 10:33:10 -0700 |
|---|---|---|
| committer | malff/marcsql@weblab.(none) <> | 2007-03-06 10:33:10 -0700 |
| commit | 8643745d3edf68eed46c48649d32918846f18e13 (patch) | |
| tree | 89e46d1e53cc7db75cbfc56e2cadc40161bebc1e /sql/lock.cc | |
| parent | 3d488d496d66a310de0849ca55be4a6d6ddb7c09 (diff) | |
| parent | b216d959bbf41c2a2cc86e874e414dd59c3e8d34 (diff) | |
| download | mariadb-git-8643745d3edf68eed46c48649d32918846f18e13.tar.gz | |
Merge weblab.(none):/home/marcsql/TREE/mysql-5.0-8407_b
into weblab.(none):/home/marcsql/TREE/mysql-5.1-8407-merge
Diffstat (limited to 'sql/lock.cc')
| -rw-r--r-- | sql/lock.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/lock.cc b/sql/lock.cc index edef3b3b67f..a93033bfdd0 100644 --- a/sql/lock.cc +++ b/sql/lock.cc @@ -604,7 +604,7 @@ TABLE_LIST *mysql_lock_have_duplicate(THD *thd, TABLE_LIST *needle, for (; haystack; haystack= haystack->next_global) { - if (haystack->placeholder() || haystack->schema_table) + if (haystack->placeholder()) continue; table2= haystack->table; if (table2->s->tmp_table == TMP_TABLE) |