mirror of
https://github.com/MariaDB/server.git
synced 2025-12-12 08:01:43 +03:00
662002fc8f
found in pushbuild on sapsrv1. Some not fixed as not repeatable
on my machine (32/64 bit issue?).
Fixes for some test failures:
- "maria-connect" now passes;
- "maria": after fixing the obvious reasons for failures, the test
went further and hit a more complex issues: difference in the output
of EXPLAIN output; not fixed;
- "ps_maria" still crashes in assertion
mysqld: ha_maria.cc:1627: virtual int ha_maria::index_read(uchar*, const uchar*, uint, ha_rkey_function): Ass
ertion `inited == INDEX' failed, as already observable in pushbuild.
All this might just be due to an incomplete merge of MyISAM changes
into Maria when 5.1 was last merged to mysql-maria.
include/my_global.h:
temporary fix until next merge of 5.1; without this it does not build
mysql-test/r/maria-connect.result:
position changed
mysql-test/t/maria-connect.test:
If one wants to use the binlog it has to ask for it.
1582 is not used for dup entry error anymore (it was in older 5.1).
Size of first event in binlog was increased by 4 (when the new type
of event "gap" was added).
mysql-test/t/maria.test:
1582 not used anymore in this case
storage/maria/ha_maria.cc:
engine now has to say what binlogging it supports
storage/maria/ma_blockrec.c:
fix for compiler warnings ("comparison is always true" or "always
false")
storage/maria/ma_loghandler.c:
fix for compiler warnings (comparing char* to uchar*)
storage/maria/ma_packrec.c:
fix for compiler warning (fix simply merged from MyISAM)
storage/maria/ma_pagecache.c:
info_check_pin() was not used so gave a compiler warning.
storage/maria/ma_pagecache.h:
fixing typo from the last 5.1->maria merge.
storage/maria/ma_recovery.c:
my_free() has a void* argument, so why cast. byte->uchar.
storage/maria/ma_search.c:
fix for compiler warning (fix simply merged from MyISAM)
storage/maria/maria_read_log.c:
gptr->uchar*
storage/maria/trnman.c:
probable fix for warning found in pushbuild (but not on my machine):
storage/maria/trnman.c: 142
passing argument 6 of \u2018lf_hash_init\u2019 from incompatible pointer type
on sapsrv1.
24 lines
685 B
Plaintext
24 lines
685 B
Plaintext
set global storage_engine=maria;
|
|
set session storage_engine=maria;
|
|
drop table if exists t1;
|
|
SET SQL_WARNINGS=1;
|
|
RESET MASTER;
|
|
set binlog_format=statement;
|
|
CREATE TABLE t1 (a int primary key);
|
|
insert t1 values (1),(2),(3);
|
|
insert t1 values (4),(2),(5);
|
|
ERROR 23000: Duplicate entry '2' for key 'PRIMARY'
|
|
select * from t1;
|
|
a
|
|
1
|
|
2
|
|
3
|
|
4
|
|
SHOW BINLOG EVENTS FROM 106;
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
master-bin.000001 106 Query 1 204 use `test`; CREATE TABLE t1 (a int primary key)
|
|
master-bin.000001 204 Query 1 295 use `test`; insert t1 values (1),(2),(3)
|
|
master-bin.000001 295 Query 1 386 use `test`; insert t1 values (4),(2),(5)
|
|
drop table t1;
|
|
set binlog_format=default;
|