summaryrefslogtreecommitdiff
path: root/sql/sql_plugin.cc
diff options
context:
space:
mode:
authortomas@poseidon. <>2006-12-27 11:01:54 +0100
committertomas@poseidon. <>2006-12-27 11:01:54 +0100
commit044c410968afbae9d96eee3928fcac176f6ed289 (patch)
tree694a692ab769c1326162c8eb2bebed6dd273cd52 /sql/sql_plugin.cc
parent54133c7e38a14847b5d2efe2e553c9affe846cd5 (diff)
parentfa3397125230917f22f6a268398957d6ce179789 (diff)
downloadmariadb-git-044c410968afbae9d96eee3928fcac176f6ed289.tar.gz
Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.1
into poseidon.:/home/tomas/mysql-5.1-new-ndb
Diffstat (limited to 'sql/sql_plugin.cc')
-rw-r--r--sql/sql_plugin.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc
index 6385791a3db..158525f63c3 100644
--- a/sql/sql_plugin.cc
+++ b/sql/sql_plugin.cc
@@ -983,7 +983,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);
}