From 2dcc6cbea3d27ff7c60e27d59e4b11843596d2d4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Nov 2005 21:57:24 +0200 Subject: [PATCH 1/2] Add missing return Compile max with --yassl instead of --with-openssl sql/table.cc: Add missing return BUILD/SETUP.sh: Compile max with --yassl instead of --with-openssl --- BUILD/SETUP.sh | 4 ++-- sql/table.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/BUILD/SETUP.sh b/BUILD/SETUP.sh index 96ec5803b63..d598ab94fd0 100755 --- a/BUILD/SETUP.sh +++ b/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" diff --git a/sql/table.cc b/sql/table.cc index a18ff4397d1..0ea153fa1f2 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -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); } From 78ebed64361be7a7194f53ee7ac6e946a1022904 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 1 Nov 2005 21:59:24 +0200 Subject: [PATCH 2/2] Added missing DBUG_ENTER (bug in last push) --- sql/table.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sql/table.cc b/sql/table.cc index 0ea153fa1f2..cbc4342f123 100644 --- a/sql/table.cc +++ b/sql/table.cc @@ -2511,9 +2511,9 @@ bool st_table_list::prepare_security(THD *thd) { List_iterator_fast 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))