From 84a2f06fb205df203476af16594176d83e0873b7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vicen=C8=9Biu=20Ciorbaru?= <cvicentiu@gmail.com>
Date: Fri, 18 Oct 2013 05:11:40 -0700
Subject: [PATCH] Fixed always true condition that caused crash on database
 initialisation.

---
 sql/sql_db.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sql/sql_db.cc b/sql/sql_db.cc
index dabb6b84e26..47c2e3bd406 100644
--- a/sql/sql_db.cc
+++ b/sql/sql_db.cc
@@ -1478,7 +1478,7 @@ bool mysql_change_db(THD *thd, const LEX_STRING *new_db_name, bool force_switch)
             sctx->priv_user,
             new_db_file_name.str,
             FALSE) | sctx->master_access;
-  if (sctx->priv_role)
+  if (sctx->priv_role[0])
   {
     /* include a possible currently set role for access */
     db_access|= acl_get("", "", sctx->priv_role, new_db_file_name.str, FALSE);