Merge mysql.com:/home/gluh/MySQL/Merge/5.0-opt

into  mysql.com:/home/gluh/MySQL/Merge/5.1-opt


sql/sql_show.cc:
  Auto merged

sql/sql_show.cc

@@ -4391,7 +4391,9 @@ static int get_schema_triggers_record(THD *thd, TABLE_LIST *tables,
       }
     }
   }
+#ifndef NO_EMBEDDED_ACCESS_CHECKS
 ret:
+#endif
   DBUG_RETURN(0);
 }