Fix some test failures found during RPM package building:

 - mysqlslap result file update after merge.
 - Fix skipping certain tests when running test suite as root, got broken somehow.

mysql-test/mysql-test-run.pl:
  Somehow skipping tests when running as root got broken. The mysqltest if() no longer seems
  to accept YES as a true value, so use 1 for true value instead.
mysql-test/r/mysqlslap.result:
  Result file update after change in engine behaviour of mysqlslap.
mysql-test/t/mysqld_option_err.test:
  This test does not work when run as root.

mysql-test/mysql-test-run.pl

@@ -2288,7 +2288,7 @@ sub  check_running_as_root () {
   {
     mtr_warning("running this script as _root_ will cause some " .
                 "tests to be skipped");
-    $ENV{'MYSQL_TEST_ROOT'}= "YES";
+    $ENV{'MYSQL_TEST_ROOT'}= "1";
   }
 
   chmod(oct("0755"), $test_file);

mysql-test/r/mysqlslap.result

@@ -122,8 +122,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`;
 DROP SCHEMA IF EXISTS `mysqlslap`;
 CREATE SCHEMA `mysqlslap`;
 use mysqlslap;
-set storage_engine=`heap`;
-CREATE TABLE t1 (id int, name varchar(64));
+CREATE TABLE t1 (id int, name varchar(64)) Engine = heap;
 create table t2(foo1 varchar(32), foo2 varchar(32));
 INSERT INTO t1 VALUES (1, 'This is a test');
 insert into t2 values ('test', 'test2');
@@ -133,8 +132,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`;
 DROP SCHEMA IF EXISTS `mysqlslap`;
 CREATE SCHEMA `mysqlslap`;
 use mysqlslap;
-set storage_engine=`myisam`;
-CREATE TABLE t1 (id int, name varchar(64));
+CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam;
 create table t2(foo1 varchar(32), foo2 varchar(32));
 INSERT INTO t1 VALUES (1, 'This is a test');
 insert into t2 values ('test', 'test2');
@@ -144,8 +142,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`;
 DROP SCHEMA IF EXISTS `mysqlslap`;
 CREATE SCHEMA `mysqlslap`;
 use mysqlslap;
-set storage_engine=`heap`;
-CREATE TABLE t1 (id int, name varchar(64));
+CREATE TABLE t1 (id int, name varchar(64)) Engine = heap;
 create table t2(foo1 varchar(32), foo2 varchar(32));
 INSERT INTO t1 VALUES (1, 'This is a test');
 insert into t2 values ('test', 'test2');
@@ -157,8 +154,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`;
 DROP SCHEMA IF EXISTS `mysqlslap`;
 CREATE SCHEMA `mysqlslap`;
 use mysqlslap;
-set storage_engine=`myisam`;
-CREATE TABLE t1 (id int, name varchar(64));
+CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam;
 create table t2(foo1 varchar(32), foo2 varchar(32));
 INSERT INTO t1 VALUES (1, 'This is a test');
 insert into t2 values ('test', 'test2');
@@ -170,8 +166,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`;
 DROP SCHEMA IF EXISTS `mysqlslap`;
 CREATE SCHEMA `mysqlslap`;
 use mysqlslap;
-set storage_engine=`heap`;
-CREATE TABLE t1 (id int, name varchar(64));
+CREATE TABLE t1 (id int, name varchar(64)) Engine = heap;
 create table t2(foo1 varchar(32), foo2 varchar(32));
 INSERT INTO t1 VALUES (1, 'This is a test');
 insert into t2 values ('test', 'test2');
@@ -196,8 +191,7 @@ DROP SCHEMA IF EXISTS `mysqlslap`;
 DROP SCHEMA IF EXISTS `mysqlslap`;
 CREATE SCHEMA `mysqlslap`;
 use mysqlslap;
-set storage_engine=`myisam`;
-CREATE TABLE t1 (id int, name varchar(64));
+CREATE TABLE t1 (id int, name varchar(64)) Engine = myisam;
 create table t2(foo1 varchar(32), foo2 varchar(32));
 INSERT INTO t1 VALUES (1, 'This is a test');
 insert into t2 values ('test', 'test2');

mysql-test/t/mysqld_option_err.test

@@ -10,6 +10,9 @@
 
 --source include/not_embedded.inc
 
+# mysqld refuses to run as root normally.
+-- source include/not_as_root.inc
+
 # We have not run (and do not need) bootstrap of the server. We just
 # give it a dummy data directory (for log files etc).