database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Fix some test failures found during RPM package building:

Browse Source 
- 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.
This commit is contained in:
unknown
2009-09-25 16:38:02 +02:00
parent 44718ad445
commit faaace2fdd
3 changed files with 10 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/mysql-test-run.pl
View File

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

18
mysql-test/r/mysqlslap.result
View File

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

3
mysql-test/t/mysqld_option_err.test
View File

@ -10,6 +10,9 @@
--source include/not_embedded.inc --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 # We have not run (and do not need) bootstrap of the server. We just
# give it a dummy data directory (for log files etc). # give it a dummy data directory (for log files etc).