Commit 450a6385 authored by gkodinov/kgeorge@macbook.gmz's avatar gkodinov/kgeorge@macbook.gmz
Browse files

fixed a hand in 5.1-marvel : 

Removed a double release of the mutex on error
parent 090d1396

sql/sql_plugin.cc

+0 −5
Original line number Diff line number Diff line
@@ -1446,8 +1446,6 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv, 


            free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));

            if (plugin_add(tmp_root, &name, &dl, argc, argv, REPORT_TO_LOG))

            {

              pthread_mutex_unlock(&LOCK_plugin);

              goto error;

            }

          }
@@ -1459,11 +1457,8 @@ static bool plugin_load_list(MEM_ROOT *tmp_root, int *argc, char **argv, 
        free_root(tmp_root, MYF(MY_MARK_BLOCKS_FREE));

        pthread_mutex_lock(&LOCK_plugin);

        if (plugin_add(tmp_root, &name, &dl, argc, argv, REPORT_TO_LOG))

        {

          pthread_mutex_unlock(&LOCK_plugin);

          goto error;

      }

      }

      pthread_mutex_unlock(&LOCK_plugin);

      name.length= dl.length= 0;

      dl.str= NULL; name.str= p= buffer;