database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-12-24 11:21:21 +03:00
Code Activity

Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1

Browse Source 
into  mysql.com:/home/kent/bk/main/mysql-5.1


sql/ha_ndbcluster_binlog.cc:
  Auto merged
sql/sql_plugin.cc:
  Auto merged
storage/ndb/include/kernel/signaldata/Extent.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/dbtup/DbtupDiskAlloc.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/diskpage.hpp:
  Auto merged
storage/ndb/src/kernel/blocks/lgman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/print_file.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.cpp:
  Auto merged
storage/ndb/src/kernel/blocks/tsman.hpp:
  Auto merged
storage/ndb/ndbapi-examples/mgmapi_logevent2/mgmapi_logevent2.cpp:
  Auto merged
This commit is contained in:
unknown
2006-12-31 01:04:59 +01:00
parent 3099886cda 0968cc9dec
commit 002d7efa47
74 changed files with 1796 additions and 524 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_plugin.cc
View File

@@ -982,7 +982,7 @@ my_bool plugin_foreach_with_mask(THD *thd, plugin_foreach_func *func,
{
rw_rdlock(&THR_LOCK_plugin);
for (uint i=idx; i < total; i++)
if (plugins[i]->state & state_mask)
if (plugins[i] && plugins[i]->state & state_mask)
plugins[i]=0;
rw_unlock(&THR_LOCK_plugin);
}