Merge monty@bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/my/mysql-5.0

BUILD/SETUP.sh

@@ -52,9 +52,9 @@ global_warnings="-Wimplicit -Wreturn-type -Wswitch -Wtrigraphs -Wcomment -W -Wch
 #debug_extra_warnings="-Wuninitialized"
 c_warnings="$global_warnings -Wunused"
 cxx_warnings="$global_warnings -Woverloaded-virtual -Wsign-promo -Wreorder -Wctor-dtor-privacy -Wnon-virtual-dtor"
-base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
+base_max_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine --with-yassl"
 base_max_no_ndb_configs="--with-innodb --with-berkeley-db --without-ndbcluster --with-archive-storage-engine --with-openssl --with-big-tables --with-blackhole-storage-engine --with-federated-storage-engine --with-csv-storage-engine"
-max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-openssl --with-embedded-server --with-big-tables"
+max_leave_isam_configs="--with-innodb --with-berkeley-db --with-ndbcluster --with-archive-storage-engine --with-federated-storage-engine --with-blackhole-storage-engine --with-csv-storage-engine --with-yassl --with-embedded-server --with-big-tables"
 max_configs="$base_max_configs --with-embedded-server"
 max_no_ndb_configs="$base_max_no_ndb_configs --with-embedded-server"
 

sql/table.cc

@@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd)
 {
   List_iterator_fast<TABLE_LIST> tb(*view_tables);
   TABLE_LIST *tbl;
+  DBUG_ENTER("st_table_list::prepare_security");
 #ifndef NO_EMBEDDED_ACCESS_CHECKS
   Security_context *save_security_ctx= thd->security_ctx;
-  DBUG_ENTER("st_table_list::prepare_security");
 
   DBUG_ASSERT(!prelocking_placeholder);
   if (prepare_view_securety_context(thd))
@@ -2538,11 +2538,11 @@ bool st_table_list::prepare_security(THD *thd)
       tbl->table->grant= grant;
   }
   thd->security_ctx= save_security_ctx;
-  DBUG_RETURN(FALSE);
 #else
   while ((tbl= tb++))
     tbl->grant.privilege= ~NO_ACCESS;
 #endif
+  DBUG_RETURN(FALSE);
 }