2 files changed, 11 insertions, 6 deletions

diff --git a/src/mysql_inc.h b/src/mysql_inc.h
index ca055ca..4912682 100644
--- a/src/mysql_inc.h
+++ b/src/mysql_inc.h
@@ -5,7 +5,10 @@
 #define HAVE_CONFIG_H
 #endif
 
+#ifndef MYSQL_DYNAMIC_PLUGIN
 #define MYSQL_DYNAMIC_PLUGIN
+#endif
+
 #define MYSQL_SERVER 1
 
 #include <mysql_version.h>
diff --git a/src/table_sizes.cc b/src/table_sizes.cc
index b1fd8b0..bfa0106 100644
--- a/src/table_sizes.cc
+++ b/src/table_sizes.cc
@@ -13,10 +13,10 @@
   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "mysql_inc.h"
-#include <sql/sql_show.h>
-#include <sql/sql_table.h>
-#include <sql/sql_parse.h>
-#include <sql/sql_db.h>
+#include <sql_show.h>
+#include <sql_table.h>
+#include <sql_parse.h>
+#include <sql_db.h>
 
 #define STR_OR_NIL(S) ((S) ? (S) : "<nil>")
 
@@ -292,13 +292,15 @@ static int fill_table(THD *thd, TABLE_LIST *tables, COND *cond)
     goto err;
 
   LEX_STRING *db_name;
-  while (db_name = it++)
+  while ((db_name = it++))
   {
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
     if ((check_access(thd, SELECT_ACL, db_name->str, &thd->col_access, NULL, 0, 1)
           || (!thd->col_access && check_grant_db(thd, db_name->str)))
         && !sctx->master_access & (DB_ACLS | SHOW_DB_ACL)
         && !acl_get(sctx->host, sctx->ip, sctx->priv_user, db_name->str, 0))
       continue;
+#endif
 
     List<TABLE_DATA> tables;
     int res = make_table_list(thd, &tables, lex, db_name);
@@ -312,7 +314,7 @@ static int fill_table(THD *thd, TABLE_LIST *tables, COND *cond)
 
     TABLE_DATA *table_data;
     List_iterator_fast<TABLE_DATA> it_tables(tables);
-    while (table_data = it_tables++)
+    while ((table_data = it_tables++))
     {
       table->field[0]->store(db_name->str, db_name->length,
           system_charset_info);