[Commits] 18b7a7a: Forgoten chares

Oleksandr Byelkin sanja at mariadb.com
Mon May 30 15:10:47 EEST 2016


revision-id: 18b7a7a7b1629c9ea1750365e813fd650a5696b6 (mariadb-10.2.0-55-g18b7a7a)
parent(s): e512f4b9647cacc94b56a26aed8c5dc2d8b6ba80
committer: Oleksandr Byelkin
timestamp: 2016-05-30 14:10:47 +0200
message:

Forgoten chares

---
 sql/protocol.cc        | 1 -
 sql/session_tracker.cc | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/sql/protocol.cc b/sql/protocol.cc
index c56c256..73a704a 100644
--- a/sql/protocol.cc
+++ b/sql/protocol.cc
@@ -276,7 +276,6 @@ net_send_ok(THD *thd,
     /* the info field */
     if (state_changed || (message && message[0]))
     {
-      DBUG_ASSERT(strlen(message) <= MYSQL_ERRMSG_SIZE);
       store.q_net_store_data((uchar*) message, message ? strlen(message) : 0);
     }
 
diff --git a/sql/session_tracker.cc b/sql/session_tracker.cc
index 36a1381..2ae2ca5 100644
--- a/sql/session_tracker.cc
+++ b/sql/session_tracker.cc
@@ -684,7 +684,7 @@ bool Session_sysvars_tracker::store(THD *thd, String *buf)
       mysql_mutex_lock(&LOCK_plugin);
       if (!*node->test_load)
       {
-        mysql_mutex_lock(&LOCK_plugin);
+        mysql_mutex_unlock(&LOCK_plugin);
         continue;
       }
       sys_var *svar= node->m_svar;
@@ -693,7 +693,7 @@ bool Session_sysvars_tracker::store(THD *thd, String *buf)
 
       value= get_one_variable(thd, &show, OPT_SESSION, SHOW_SYS, NULL,
                               &charset, val_buf, &val_length);
-      mysql_mutex_lock(&LOCK_plugin);
+      mysql_mutex_unlock(&LOCK_plugin);
 
       length= net_length_size(svar->name.length) +
               svar->name.length +


More information about the commits mailing list