mirror of
https://github.com/MariaDB/server.git
synced 2025-07-05 12:42:17 +03:00
2a663359a4
Manually merge some InnoDB changes into XtraDB. Fix ALTER TABLE bug in XtraDB with wrong comparison of row type. mysql-test/include/varchar.inc: Fix in test case that which of several duplicate keys triggers an error is not deterministic. mysql-test/mysql-test-run.pl: InnoDB does not bother to free resources individually during shutdown, but due to using its own memory tracking it nevertheless can free everything at exit. But XtraDB adds an option, on by default, to skip this extra tracking. This causes lots of Valgrind warnings, so needs to be disabled for Valgrind testing. mysql-test/r/innodb.result: Fix in test case that which of several duplicate keys triggers an error is not deterministic. mysql-test/t/innodb-use-sys-malloc.test: InnoDB does not bother to free resources individually during shutdown, but due to using its own memory tracking it nevertheless can free everything at exit. But XtraDB adds an option, on by default, to skip this extra tracking. This causes lots of Valgrind warnings, so needs to be disabled for Valgrind testing. sql/sql_table.cc: Add some useful DBUG while debugging alter table. storage/xtradb/handler/ha_innodb.cc: Fix that check_if_incompatible_data did not realise that ROW_TYPE_DEFAULT is identical to the default row format ROW_TYPE_COMPACT, causing excessive table copying in ALTER TABLE Add some useful DBUG while debugging alter table. Manually merge into XtraDB a few small changes for InnoDB from upstream MySQL. storage/xtradb/include/pars0pars.h: Manually merge into XtraDB a few small changes for InnoDB from upstream MySQL. storage/xtradb/include/univ.i: Manually merge a MariaDB fix in InnoDB into XtraDB.
52 lines
1.3 KiB
Plaintext
52 lines
1.3 KiB
Plaintext
--source include/have_innodb.inc
|
|
# XtraDB has lots of memory leak warnings at shutdown when
|
|
# --innodb-use-sys-malloc
|
|
--source include/not_valgrind.inc
|
|
|
|
#display current value of innodb_use_sys_malloc
|
|
SELECT @@GLOBAL.innodb_use_sys_malloc;
|
|
--echo 1 Expected
|
|
|
|
#try changing it. Should fail.
|
|
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
|
SET @@GLOBAL.innodb_use_sys_malloc=0;
|
|
--echo Expected error 'Read only variable'
|
|
|
|
SELECT @@GLOBAL.innodb_use_sys_malloc;
|
|
--echo 1 Expected
|
|
|
|
|
|
#do some stuff to see if it works.
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
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;
|
|
drop table t1;
|
|
--source include/have_innodb.inc
|
|
|
|
#display current value of innodb_use_sys_malloc
|
|
SELECT @@GLOBAL.innodb_use_sys_malloc;
|
|
--echo 1 Expected
|
|
|
|
#try changing it. Should fail.
|
|
--error ER_INCORRECT_GLOBAL_LOCAL_VAR
|
|
SET @@GLOBAL.innodb_use_sys_malloc=0;
|
|
--echo Expected error 'Read only variable'
|
|
|
|
SELECT @@GLOBAL.innodb_use_sys_malloc;
|
|
--echo 1 Expected
|
|
|
|
|
|
#do some stuff to see if it works.
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
|
|
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;
|
|
drop table t1;
|