bzr push into mysql-trunk-bugfixing branch (Georgi.Kodinov:3369 to 3370)

[Georgi Kodinov]

 3370 Georgi Kodinov	2010-11-19 [merge]
      merge

    modified:
      sql-common/client_plugin.c
 3369 Georgi Kodinov	2010-11-19 [merge]
      merge

    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).