diff --git a/sql/mysqld.cc b/sql/mysqld.cc
|
--- a/sql/mysqld.cc
|
+++ b/sql/mysqld.cc
|
@@ -738,6 +738,8 @@ static char **remaining_argv;
|
int orig_argc;
|
char **orig_argv;
|
|
+#ifndef EMBEDDED_LIBRARY
|
+
|
static struct my_option pfs_early_options[]=
|
{
|
{"performance_schema_instrument", OPT_PFS_INSTRUMENT,
|
@@ -806,6 +808,8 @@ static struct my_option pfs_early_options[]=
|
GET_BOOL, OPT_ARG, TRUE, 0, 0, 0, 0, 0}
|
};
|
|
+#endif
|
+
|
|
|
#ifdef HAVE_PSI_INTERFACE
|
diff --git a/vio/viosocket.c b/vio/viosocket.c
|
--- a/vio/viosocket.c
|
+++ b/vio/viosocket.c
|
@@ -953,7 +953,8 @@ int vio_io_wait(Vio *vio, enum enum_vio_io_event event, int timeout)
|
break;
|
default:
|
/* Ensure that the requested I/O event has completed. */
|
- DBUG_ASSERT(pfd.revents & revents);
|
+ if ((pfd.revents & revents) == 0)
|
+ DBUG_ASSERT(0);
|
break;
|
}
|
|