List:Commits« Previous MessageNext Message »
From:Georgi Kodinov Date:November 19 2010 2:49pm
Subject:bzr push into mysql-5.5-bugteam branch (Georgi.Kodinov:3134 to 3135)
Bug#57559
View as plain text  
 3135 Georgi Kodinov	2010-11-17
      Bug #57559: Crash in Client plugin api
      
      The plugin code was releasing the plugin and 
      only then was reporting an error referencing it.
      Fixed by first reporting an error and then freeing up
      the plugin.

    modified:
      sql-common/client_plugin.c
 3134 Georgi Kodinov	2010-11-19
      Bug #57551: Live upgrade fails between 5.1.52 -> 5.5.7-rc
      
      Updated the server to treat a missing mysql.proxies_priv table 
      as empty. 
      Added some grants to make sure tables are correctly opened
      when they must be opened.
      Fixed a mysql_upgrade omission not adding rights to root to 
      execute GRANT PROXY on other users.
      Removed a redundant CREATE TABLE from 
      mysql_system_tables_fix.sql since it's always executed after
      mysql_system_tables.sql and the first file has CREATE TABLE 
      in it. 
      Added a test case for the above.
      Fixed error handling code to close the cursor

    modified:
      mysql-test/r/plugin_auth.result
      mysql-test/t/plugin_auth.test
      scripts/mysql_system_tables_fix.sql
      sql/sql_acl.cc
=== modified file 'sql-common/client_plugin.c'
--- a/sql-common/client_plugin.c	2010-10-04 19:25:53 +0000
+++ b/sql-common/client_plugin.c	2010-11-17 13:26:11 +0000
@@ -176,11 +176,11 @@ err2:
   if (plugin->deinit)
     plugin->deinit();
 err1:
-  if (dlhandle)
-    dlclose(dlhandle);
   set_mysql_extended_error(mysql, CR_AUTH_PLUGIN_CANNOT_LOAD, unknown_sqlstate,
                            ER(CR_AUTH_PLUGIN_CANNOT_LOAD), plugin->name,
                            errmsg);
+  if (dlhandle)
+    dlclose(dlhandle);
   return NULL;
 }
 

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.5-bugteam branch (Georgi.Kodinov:3134 to 3135)Bug#57559Georgi Kodinov19 Nov