mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-25 00:04:33 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge mysql.com:/home/mydev/mysql-5.1

Browse source 
into  mysql.com:/home/mydev/mysql-5.1-bug8841
This commit is contained in:
unknown 2006-02-14 18:34:44 +01:00
commit ca3fcf15a4
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
mysql-test/t/disabled.def
View file

@ -33,3 +33,10 @@ rpl_until : Unstable test case, bug#15886
sp-goto : GOTO is currently is disabled - will be fixed in the future sp-goto : GOTO is currently is disabled - will be fixed in the future
subselect : Bug#15706 (ps mode) [PATCH PENDING] subselect : Bug#15706 (ps mode) [PATCH PENDING]
rpl_ndb_log : result not deterministic rpl_ndb_log : result not deterministic
sp-code : Bug #17360
binlog_row_mix_innodb_myisam : Bug #17386
binlog_row_insert_select : Bug #17385
rpl_row_basic_2myisam : Bug #17385
rpl_row_basic_3innodb : Bug #17385
rpl_row_create_table : Bug #17385
mysqldump : Bug #17383 Bug #17384

2
storage/ndb/src/ndbapi/NdbDictionaryImpl.cpp
View file

@ -3468,7 +3468,7 @@ NdbDictionaryImpl::getEvent(const char * eventName)
delete ev; delete ev;
DBUG_RETURN(NULL); DBUG_RETURN(NULL);
} }
if (info->m_table_impl->m_status == NdbDictionary::Object::Invalid) if (info->m_table_impl->m_status != NdbDictionary::Object::Retrieved)
{ {
removeCachedObject(*info->m_table_impl); removeCachedObject(*info->m_table_impl);
info= get_local_table_info(ev->getTableName(), true); info= get_local_table_info(ev->getTableName(), true);