mirror of
https://github.com/MariaDB/server.git
synced 2025-01-31 11:01:52 +01:00
389dcccbed
- Merge fixes - "make test" for maria - Replaced ma_test_all with a perl version, which now can be run in unittest mode. include/my_sys.h: Added clean up function for my_uuid() mysql-test/r/create.result: Fixed result file. mysql-test/r/maria-big.result: Changed not to get a warning. mysql-test/r/maria-connect.result: Not to get a warning. mysql-test/r/maria-recovery.result: Not to get a warning. mysql-test/r/maria.result: Fixed result file. Added test for warning on log file. mysql-test/r/ps_maria.result: Fixed result file. New bit was added to source. mysql-test/t/maria-big.test: To avoid a warning. mysql-test/t/maria-connect.test: To avoid a warning. mysql-test/t/maria-recovery.test: To avoid a warning. mysql-test/t/maria.test: To avoid a warning. mysql-test/t/ps_maria.test: To avoid a warning. mysys/my_uuid.c: Added clean up function for my_uuid() sql/mysqld.cc: Manual merge. storage/maria/Makefile.am: Added "make test" for maria. storage/maria/ma_key_recover.c: Fix for maria_recovery storage/maria/ma_test_all.sh: Deprecated file. Functionality moved to unittest/ma_test_all-t BitKeeper/deleted/.del-unit.pl: BitKeeper file /home/my/mysql-maria/storage/maria/unit.pl
42 lines
855 B
Text
42 lines
855 B
Text
#
|
|
# Test that can't be run with --extern
|
|
#
|
|
|
|
-- source include/have_maria.inc
|
|
-- source include/have_log_bin.inc
|
|
|
|
let $default=`select @@global.storage_engine`;
|
|
set global storage_engine=maria;
|
|
set session storage_engine=maria;
|
|
|
|
set global maria_log_file_size=4294967295;
|
|
|
|
# Initialise
|
|
--disable_warnings
|
|
drop table if exists t1;
|
|
--enable_warnings
|
|
SET SQL_WARNINGS=1;
|
|
|
|
#
|
|
# UNIQUE key test
|
|
#
|
|
# as long as maria cannot rollback, binlog should contain both inserts
|
|
#
|
|
RESET MASTER;
|
|
set binlog_format=statement;
|
|
CREATE TABLE t1 (a int primary key);
|
|
insert t1 values (1),(2),(3);
|
|
--error ER_DUP_ENTRY
|
|
insert t1 values (4),(2),(5);
|
|
select * from t1;
|
|
SHOW BINLOG EVENTS FROM 106;
|
|
drop table t1;
|
|
set binlog_format=default;
|
|
|
|
# End of 5.2 tests
|
|
|
|
--disable_result_log
|
|
--disable_query_log
|
|
eval set global storage_engine=$default;
|
|
--enable_result_log
|
|
--enable_query_log
|