diff options
| author | unknown <dlenev@mysql.com> | 2005-09-15 03:57:59 +0400 |
|---|---|---|
| committer | unknown <dlenev@mysql.com> | 2005-09-15 03:57:59 +0400 |
| commit | dceb8fb2718bb745c1a0840fd127b53958c688c2 (patch) | |
| tree | bee9987f7fc8679aac3ebd91ad355203e906deca /sql/sp_head.cc | |
| parent | 11e0bdd70b2bed07ede9f67b244087c97059af2f (diff) | |
| parent | d5303b8ab8872af54c5947c23b0379d803f96506 (diff) | |
| download | mariadb-git-dceb8fb2718bb745c1a0840fd127b53958c688c2.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/dlenev/src/mysql-5.0-bg12704-2
sql/mysql_priv.h:
Auto merged
sql/sp.cc:
Auto merged
sql/sp_head.cc:
Auto merged
sql/sql_base.cc:
Auto merged
sql/sql_lex.h:
Auto merged
sql/sql_prepare.cc:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_update.cc:
Auto merged
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index a11907373cd..1a7599d7bbc 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -1909,10 +1909,6 @@ sp_lex_keeper::reset_lex_and_exec_core(THD *thd, uint *nextp, attached it above in this function). Now we'll save the 'tail', and detach it. */ - DBUG_ASSERT(!lex_query_tables_own_last || - lex_query_tables_own_last == m_lex->query_tables_own_last && - prelocking_tables == *(m_lex->query_tables_own_last)); - lex_query_tables_own_last= m_lex->query_tables_own_last; prelocking_tables= *lex_query_tables_own_last; *lex_query_tables_own_last= NULL; |