Fixed result for embedded server

- Revert wrongly record embedded result files. These were either
  recorded with normal server (not embedded) or an embedded server
  with not default compile option. This can be seen that the committed
  result file had replication variables which should never happen.

- Reverted back change of include/is_embedded.inc. One cannot check for
  $MYSQL_EMBEDDED as this only tells if there exists an embedded
  server, not if the current server we are testing is the embedded
  server. This could easily be verified by doing
  'mtr sys_vars.sysvars_server_embedded'. This would fail with a wrong
  result instead of being marked as skipped as --embedded was not
  used.

mysql-test/include/is_embedded.inc

-if(!$MYSQL_EMBEDDED)
+#
+# Check if the current used server is an embedded server#
+#
+if (`SELECT VERSION() NOT LIKE '%embedded%'`)
 {
    --skip Test requires: embedded server
 }
-

mysql-test/include/is_embedded_no_privileges.inc

+#
+# Test that we do not have an embedded server compiled with privileges.
+# This is not a regular setup, but we are running this in buildbot for
+# testing of embedded + privileges.
+# Some funcs_1 test cannot handle this combination, which is why we have this
+# file to disable them
+#
+
+--source include/is_embedded.inc
+
+let priv=`SELECT privileges FROM information_schema.columns limit 1`;
+
+if (`SELECT "$priv" <> ""`)
+{
+   --skip Embedded server is compiled with privileges; Test disabled.
+}

mysql-test/suite/funcs_1/datadict/columns.inc

@@ -25,6 +25,10 @@
 #
 
 --source suite/funcs_1/datadict/datadict_bug_12777.inc
+
+# The following is needed as embedded server can be compiled with and without
+# privlege tables
+
 eval
 SELECT * FROM information_schema.columns
 $my_where

mysql-test/suite/funcs_1/t/is_columns_is_embedded.test

@@ -14,7 +14,7 @@
 #
 
 --source include/have_innodb.inc
---source include/is_embedded.inc
+--source include/is_embedded_no_privileges.inc
 
 let $my_where = WHERE table_schema = 'information_schema'
 AND table_name <> 'profiling' AND table_name not like 'innodb_%';

mysql-test/suite/funcs_1/t/is_columns_myisam_embedded.test

@@ -10,10 +10,8 @@
 # 2008-06-06 mleich Create this this variant for the embedded server.
 #
 
-if (`SELECT VERSION() NOT LIKE '%embedded%'`)
-{
-   --skip Test requires: embedded server
-}
+--source include/is_embedded_no_privileges.inc
+
 let $engine_type= MyISAM;
 SET @@session.sql_mode = 'NO_ENGINE_SUBSTITUTION';
 --source suite/funcs_1/datadict/datadict_load.inc

mysql-test/suite/funcs_1/t/is_columns_mysql_embedded.test

@@ -10,10 +10,7 @@
 # 2008-06-06 mleich Create this variant for the embedded server
 #
 
-if (`SELECT VERSION() NOT LIKE '%embedded%'`)
-{
-   --skip Test requires: embedded server
-}
+--source include/is_embedded_no_privileges.inc
 
 let $my_where = WHERE table_schema = 'mysql';
 --source suite/funcs_1/datadict/columns.inc