bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3467) Bug#58986

[Alfranio Correia]

#At file:///home/acorreia/workspace.oracle/repository.mysql/bzrwork/bug-davi/mysql-trunk-bugfixing.merge/ based on revid:alfranio.correia@stripped

 3467 Alfranio Correia	2010-12-22
      Post-push fix for BUG#58986.

    modified:
      sql/mysqld.cc
=== modified file 'sql/mysqld.cc'
--- a/sql/mysqld.cc	2010-12-21 15:27:40 +0000
+++ b/sql/mysqld.cc	2010-12-22 09:28:27 +0000
@@ -3409,8 +3409,10 @@ static int init_common_variables()
     default_collation= get_charset_by_name(default_collation_name, MYF(0));
     if (!default_collation)
     {
+#ifdef WITH_PERFSCHEMA_STORAGE_ENGINE
       buffered_logs.print();
       buffered_logs.cleanup();
+#endif
       sql_print_error(ER_DEFAULT(ER_UNKNOWN_COLLATION), default_collation_name);
       return 1;
     }


Attachment: [text/bzr-bundle] bzr/[e-mail]