diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-08-05 18:59:44 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-08-05 18:59:44 +0300 |
| commit | f0f21036951f6fed2fddeb58375425f957751fd5 (patch) | |
| tree | daa7b242e0803311cbe3d7a881e7bbe095b60b26 /mysql-test | |
| parent | 7d1ce2e8324581b7f60e377b92bff86da1c53c34 (diff) | |
| parent | f66d2500c410ea6cf4e08b992cf485958098e9b2 (diff) | |
| download | mariadb-git-f0f21036951f6fed2fddeb58375425f957751fd5.tar.gz | |
Automatic merge
Diffstat (limited to 'mysql-test')
| -rw-r--r-- | mysql-test/r/innodb-use-sys-malloc.result | 48 | ||||
| -rw-r--r-- | mysql-test/t/innodb-use-sys-malloc-master.opt | 1 |
2 files changed, 0 insertions, 49 deletions
diff --git a/mysql-test/r/innodb-use-sys-malloc.result b/mysql-test/r/innodb-use-sys-malloc.result deleted file mode 100644 index 2ec4c7c8130..00000000000 --- a/mysql-test/r/innodb-use-sys-malloc.result +++ /dev/null @@ -1,48 +0,0 @@ -SELECT @@GLOBAL.innodb_use_sys_malloc; -@@GLOBAL.innodb_use_sys_malloc -1 -1 Expected -SET @@GLOBAL.innodb_use_sys_malloc=0; -ERROR HY000: Variable 'innodb_use_sys_malloc' is a read only variable -Expected error 'Read only variable' -SELECT @@GLOBAL.innodb_use_sys_malloc; -@@GLOBAL.innodb_use_sys_malloc -1 -1 Expected -drop table if exists t1; -create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; -insert into t1 values (1),(2),(3),(4),(5),(6),(7); -select * from t1; -a -1 -2 -3 -4 -5 -6 -7 -drop table t1; -SELECT @@GLOBAL.innodb_use_sys_malloc; -@@GLOBAL.innodb_use_sys_malloc -1 -1 Expected -SET @@GLOBAL.innodb_use_sys_malloc=0; -ERROR HY000: Variable 'innodb_use_sys_malloc' is a read only variable -Expected error 'Read only variable' -SELECT @@GLOBAL.innodb_use_sys_malloc; -@@GLOBAL.innodb_use_sys_malloc -1 -1 Expected -drop table if exists t1; -create table t1(a int not null) engine=innodb DEFAULT CHARSET=latin1; -insert into t1 values (1),(2),(3),(4),(5),(6),(7); -select * from t1; -a -1 -2 -3 -4 -5 -6 -7 -drop table t1; diff --git a/mysql-test/t/innodb-use-sys-malloc-master.opt b/mysql-test/t/innodb-use-sys-malloc-master.opt deleted file mode 100644 index fc8582b5887..00000000000 --- a/mysql-test/t/innodb-use-sys-malloc-master.opt +++ /dev/null @@ -1 +0,0 @@ ---loose-innodb-use-sys-malloc=true |