diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-01-15 19:13:32 +0100 |
| commit | d3935adf7a4ea943583e9e51fe8fa8a2c14521dd (patch) | |
| tree | 4125365a32fa25dde9e79ccfb4dcd10269071607 /sql/sp_head.cc | |
| parent | 85ea99dcaf8fd91fa566a78062dbfa416c2309fe (diff) | |
| parent | 14ba37f76f87cc48cae62eb6bdf3cda294dff78d (diff) | |
| download | mariadb-git-d3935adf7a4ea943583e9e51fe8fa8a2c14521dd.tar.gz | |
mysql-5.5.29 merge
Diffstat (limited to 'sql/sp_head.cc')
| -rw-r--r-- | sql/sp_head.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sp_head.cc b/sql/sp_head.cc index 22bce1dad4f..be6dc935dcc 100644 --- a/sql/sp_head.cc +++ b/sql/sp_head.cc @@ -4110,9 +4110,9 @@ sp_head::merge_table_list(THD *thd, TABLE_LIST *table, LEX *lex_for_tmp_check) (and therefore should not be prelocked). Otherwise we will erroneously treat table with same name but with different alias as non-temporary. */ - if ((tab= (SP_TABLE *)my_hash_search(&m_sptabs, (uchar *)tname.ptr(), + if ((tab= (SP_TABLE*) my_hash_search(&m_sptabs, (uchar *)tname.ptr(), tname.length())) || - ((tab= (SP_TABLE *)my_hash_search(&m_sptabs, (uchar *)tname.ptr(), + ((tab= (SP_TABLE*) my_hash_search(&m_sptabs, (uchar *)tname.ptr(), temp_table_key_length)) && tab->temp)) { |