diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2010-04-08 19:19:01 +0200 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2010-04-08 19:19:01 +0200 |
| commit | cda2c0ced46ceccfcef254ea6ce6a86d066c1341 (patch) | |
| tree | 72c56faa7daa3e36640b4e4c65d6edfac3f3473d /sql/sql_plugin.cc | |
| parent | c277c43a30c8e1d4177ccf7630b9c4c808a20010 (diff) | |
| download | mariadb-git-cda2c0ced46ceccfcef254ea6ce6a86d066c1341.tar.gz | |
fixes for buildbot:
update test results
fix compilation failure on windows
fix for ps-protocol
mysql-test/r/plugin.result:
make sure the PS handle is closed
mysql-test/t/plugin.test:
make sure the PS handle is closed
sql/mysqld.cc:
compilation failure: lable without a statement.
sql/sql_plugin.cc:
make plugin lock and plugin unlock use the same format of the dbug info string.
print the ref_count *after* the lock and *after* the unlock.
Diffstat (limited to 'sql/sql_plugin.cc')
| -rw-r--r-- | sql/sql_plugin.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_plugin.cc b/sql/sql_plugin.cc index a2bb1127839..e8dab5fdbae 100644 --- a/sql/sql_plugin.cc +++ b/sql/sql_plugin.cc @@ -828,7 +828,7 @@ static plugin_ref intern_plugin_lock(LEX *lex, plugin_ref rc CALLER_INFO_PROTO) *plugin= pi; #endif pi->ref_count++; - DBUG_PRINT("info",("thd: 0x%lx plugin: \"%s\" ref_count: %d", + DBUG_PRINT("lock",("thd: 0x%lx plugin: \"%s\" LOCK ref_count: %d", (long) current_thd, pi->name.str, pi->ref_count)); if (lex) @@ -1135,8 +1135,6 @@ static void intern_plugin_unlock(LEX *lex, plugin_ref plugin) my_free((uchar*) plugin, MYF(MY_WME)); #endif - DBUG_PRINT("info",("unlocking plugin, name= %s, ref_count= %d", - pi->name.str, pi->ref_count)); if (lex) { /* @@ -1156,6 +1154,9 @@ static void intern_plugin_unlock(LEX *lex, plugin_ref plugin) DBUG_ASSERT(pi->ref_count); pi->ref_count--; + DBUG_PRINT("lock",("thd: 0x%lx plugin: \"%s\" UNLOCK ref_count: %d", + (long) current_thd, pi->name.str, pi->ref_count)); + if (pi->state == PLUGIN_IS_DELETED && !pi->ref_count) reap_needed= true; |