2005-12-22 06:39:02 +01:00
|
|
|
drop table if exists t1, t2;
|
|
|
|
|
create table t1 (a int) engine=innodb;
|
|
|
|
|
create table t2 (a int) engine=myisam;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(1);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
commit;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(2);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
rollback;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 316 Query 1 # use `test`; ROLLBACK
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(3);
|
|
|
|
|
savepoint my_savepoint;
|
|
|
|
|
insert into t1 values(4);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
rollback to savepoint my_savepoint;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
commit;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 243 Query 1 # use `test`; savepoint my_savepoint
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 328 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 367 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 401 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 440 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 479 Query 1 # use `test`; rollback to savepoint my_savepoint
|
|
|
|
|
master-bin.000001 576 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(5);
|
|
|
|
|
savepoint my_savepoint;
|
|
|
|
|
insert into t1 values(6);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
rollback to savepoint my_savepoint;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
insert into t1 values(7);
|
|
|
|
|
commit;
|
|
|
|
|
select a from t1 order by a;
|
|
|
|
|
a
|
|
|
|
|
5
|
|
|
|
|
7
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 243 Query 1 # use `test`; savepoint my_savepoint
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 328 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 367 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 401 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 440 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 479 Query 1 # use `test`; rollback to savepoint my_savepoint
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 576 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 615 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 649 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
select get_lock("a",10);
|
|
|
|
|
get_lock("a",10)
|
|
|
|
|
1
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(8);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
select get_lock("a",10);
|
|
|
|
|
get_lock("a",10)
|
|
|
|
|
1
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 316 Query 1 # use `test`; ROLLBACK
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
insert into t1 values(9);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 102 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 141 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 175 Xid 1 # COMMIT /* xid= */
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 202 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 241 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
insert into t1 values(10);
|
|
|
|
|
begin;
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 102 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 141 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 175 Xid 1 # COMMIT /* xid= */
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 202 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 241 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
insert into t1 values(11);
|
|
|
|
|
commit;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 102 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 141 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 175 Xid 1 # COMMIT /* xid= */
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 202 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 241 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 275 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 343 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 382 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 416 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
alter table t2 engine=INNODB;
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(12);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
commit;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 243 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(13);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
rollback;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(14);
|
|
|
|
|
savepoint my_savepoint;
|
|
|
|
|
insert into t1 values(15);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
rollback to savepoint my_savepoint;
|
|
|
|
|
commit;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 243 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
|
|
|
|
reset master;
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(16);
|
|
|
|
|
savepoint my_savepoint;
|
|
|
|
|
insert into t1 values(17);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
rollback to savepoint my_savepoint;
|
|
|
|
|
insert into t1 values(18);
|
|
|
|
|
commit;
|
|
|
|
|
select a from t1 order by a;
|
|
|
|
|
a
|
|
|
|
|
16
|
|
|
|
|
18
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 243 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
delete from t1;
|
|
|
|
|
delete from t2;
|
2006-02-24 16:19:55 +01:00
|
|
|
alter table t2 engine=MyISAM;
|
2005-12-22 06:39:02 +01:00
|
|
|
insert into t1 values (1);
|
|
|
|
|
begin;
|
|
|
|
|
select * from t1 for update;
|
|
|
|
|
a
|
|
|
|
|
1
|
|
|
|
|
select (@before:=unix_timestamp())*0;
|
|
|
|
|
(@before:=unix_timestamp())*0
|
|
|
|
|
0
|
|
|
|
|
begin;
|
|
|
|
|
select * from t1 for update;
|
|
|
|
|
insert into t2 values (20);
|
|
|
|
|
ERROR HY000: Lock wait timeout exceeded; try restarting transaction
|
|
|
|
|
select (@after:=unix_timestamp())*0;
|
|
|
|
|
(@after:=unix_timestamp())*0
|
|
|
|
|
0
|
|
|
|
|
select (@after-@before) >= 2;
|
|
|
|
|
(@after-@before) >= 2
|
|
|
|
|
1
|
|
|
|
|
drop table t1,t2;
|
|
|
|
|
commit;
|
|
|
|
|
begin;
|
|
|
|
|
create temporary table ti (a int) engine=innodb;
|
|
|
|
|
rollback;
|
|
|
|
|
insert into ti values(1);
|
|
|
|
|
set autocommit=0;
|
|
|
|
|
create temporary table t1 (a int) engine=myisam;
|
|
|
|
|
commit;
|
|
|
|
|
insert t1 values (1);
|
|
|
|
|
rollback;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
create table t0 (n int);
|
|
|
|
|
insert t0 select * from t1;
|
|
|
|
|
set autocommit=1;
|
|
|
|
|
insert into t0 select GET_LOCK("lock1",null);
|
|
|
|
|
set autocommit=0;
|
|
|
|
|
create table t2 (n int) engine=innodb;
|
|
|
|
|
insert into t2 values (3);
|
|
|
|
|
select get_lock("lock1",60);
|
|
|
|
|
get_lock("lock1",60)
|
|
|
|
|
1
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Query 1 # use `test`; BEGIN
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 170 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 209 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 243 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 282 Write_rows 1 # table_id: # flags: STMT_END_F
|
2005-12-22 06:39:02 +01:00
|
|
|
master-bin.000001 316 Xid 1 # COMMIT /* xid= */
|
2006-02-24 16:19:55 +01:00
|
|
|
master-bin.000001 343 Table_map 1 # table_id: # (test.t1)
|
2006-06-01 11:53:27 +02:00
|
|
|
master-bin.000001 382 Delete_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 421 Xid 1 # COMMIT /* xid= */
|
2006-06-13 22:10:01 +02:00
|
|
|
master-bin.000001 448 Query 1 # use `test`; alter table t2 engine=MyISAM
|
|
|
|
|
master-bin.000001 539 Table_map 1 # table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 578 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 612 Xid 1 # COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 639 Table_map 1 # table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 678 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 712 Query 1 # use `test`; drop table t1,t2
|
|
|
|
|
master-bin.000001 791 Query 1 # use `test`; create table t0 (n int)
|
|
|
|
|
master-bin.000001 877 Table_map 1 # table_id: # (test.t0)
|
|
|
|
|
master-bin.000001 916 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 950 Table_map 1 # table_id: # (test.t0)
|
|
|
|
|
master-bin.000001 989 Write_rows 1 # table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 1023 Query 1 # use `test`; create table t2 (n int) engine=innodb
|
2005-12-22 06:39:02 +01:00
|
|
|
do release_lock("lock1");
|
|
|
|
|
drop table t0,t2;
|
This changeset is largely a handler cleanup changeset (WL#3281), but includes fixes and cleanups that was found necessary while testing the handler changes
Changes that requires code changes in other code of other storage engines.
(Note that all changes are very straightforward and one should find all issues
by compiling a --debug build and fixing all compiler errors and all
asserts in field.cc while running the test suite),
- New optional handler function introduced: reset()
This is called after every DML statement to make it easy for a handler to
statement specific cleanups.
(The only case it's not called is if force the file to be closed)
- handler::extra(HA_EXTRA_RESET) is removed. Code that was there before
should be moved to handler::reset()
- table->read_set contains a bitmap over all columns that are needed
in the query. read_row() and similar functions only needs to read these
columns
- table->write_set contains a bitmap over all columns that will be updated
in the query. write_row() and update_row() only needs to update these
columns.
The above bitmaps should now be up to date in all context
(including ALTER TABLE, filesort()).
The handler is informed of any changes to the bitmap after
fix_fields() by calling the virtual function
handler::column_bitmaps_signal(). If the handler does caching of
these bitmaps (instead of using table->read_set, table->write_set),
it should redo the caching in this code. as the signal() may be sent
several times, it's probably best to set a variable in the signal
and redo the caching on read_row() / write_row() if the variable was
set.
- Removed the read_set and write_set bitmap objects from the handler class
- Removed all column bit handling functions from the handler class.
(Now one instead uses the normal bitmap functions in my_bitmap.c instead
of handler dedicated bitmap functions)
- field->query_id is removed. One should instead instead check
table->read_set and table->write_set if a field is used in the query.
- handler::extra(HA_EXTRA_RETRIVE_ALL_COLS) and
handler::extra(HA_EXTRA_RETRIEVE_PRIMARY_KEY) are removed. One should now
instead use table->read_set to check for which columns to retrieve.
- If a handler needs to call Field->val() or Field->store() on columns
that are not used in the query, one should install a temporary
all-columns-used map while doing so. For this, we provide the following
functions:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->read_set);
field->val();
dbug_tmp_restore_column_map(table->read_set, old_map);
and similar for the write map:
my_bitmap_map *old_map= dbug_tmp_use_all_columns(table, table->write_set);
field->val();
dbug_tmp_restore_column_map(table->write_set, old_map);
If this is not done, you will sooner or later hit a DBUG_ASSERT
in the field store() / val() functions.
(For not DBUG binaries, the dbug_tmp_restore_column_map() and
dbug_tmp_restore_column_map() are inline dummy functions and should
be optimized away be the compiler).
- If one needs to temporary set the column map for all binaries (and not
just to avoid the DBUG_ASSERT() in the Field::store() / Field::val()
methods) one should use the functions tmp_use_all_columns() and
tmp_restore_column_map() instead of the above dbug_ variants.
- All 'status' fields in the handler base class (like records,
data_file_length etc) are now stored in a 'stats' struct. This makes
it easier to know what status variables are provided by the base
handler. This requires some trivial variable names in the extra()
function.
- New virtual function handler::records(). This is called to optimize
COUNT(*) if (handler::table_flags() & HA_HAS_RECORDS()) is true.
(stats.records is not supposed to be an exact value. It's only has to
be 'reasonable enough' for the optimizer to be able to choose a good
optimization path).
- Non virtual handler::init() function added for caching of virtual
constants from engine.
- Removed has_transactions() virtual method. Now one should instead return
HA_NO_TRANSACTIONS in table_flags() if the table handler DOES NOT support
transactions.
- The 'xxxx_create_handler()' function now has a MEM_ROOT_root argument
that is to be used with 'new handler_name()' to allocate the handler
in the right area. The xxxx_create_handler() function is also
responsible for any initialization of the object before returning.
For example, one should change:
static handler *myisam_create_handler(TABLE_SHARE *table)
{
return new ha_myisam(table);
}
->
static handler *myisam_create_handler(TABLE_SHARE *table, MEM_ROOT *mem_root)
{
return new (mem_root) ha_myisam(table);
}
- New optional virtual function: use_hidden_primary_key().
This is called in case of an update/delete when
(table_flags() and HA_PRIMARY_KEY_REQUIRED_FOR_DELETE) is defined
but we don't have a primary key. This allows the handler to take precisions
in remembering any hidden primary key to able to update/delete any
found row. The default handler marks all columns to be read.
- handler::table_flags() now returns a ulonglong (to allow for more flags).
- New/changed table_flags()
- HA_HAS_RECORDS Set if ::records() is supported
- HA_NO_TRANSACTIONS Set if engine doesn't support transactions
- HA_PRIMARY_KEY_REQUIRED_FOR_DELETE
Set if we should mark all primary key columns for
read when reading rows as part of a DELETE
statement. If there is no primary key,
all columns are marked for read.
- HA_PARTIAL_COLUMN_READ Set if engine will not read all columns in some
cases (based on table->read_set)
- HA_PRIMARY_KEY_ALLOW_RANDOM_ACCESS
Renamed to HA_PRIMARY_KEY_REQUIRED_FOR_POSITION.
- HA_DUPP_POS Renamed to HA_DUPLICATE_POS
- HA_REQUIRES_KEY_COLUMNS_FOR_DELETE
Set this if we should mark ALL key columns for
read when when reading rows as part of a DELETE
statement. In case of an update we will mark
all keys for read for which key part changed
value.
- HA_STATS_RECORDS_IS_EXACT
Set this if stats.records is exact.
(This saves us some extra records() calls
when optimizing COUNT(*))
- Removed table_flags()
- HA_NOT_EXACT_COUNT Now one should instead use HA_HAS_RECORDS if
handler::records() gives an exact count() and
HA_STATS_RECORDS_IS_EXACT if stats.records is exact.
- HA_READ_RND_SAME Removed (no one supported this one)
- Removed not needed functions ha_retrieve_all_cols() and ha_retrieve_all_pk()
- Renamed handler::dupp_pos to handler::dup_pos
- Removed not used variable handler::sortkey
Upper level handler changes:
- ha_reset() now does some overall checks and calls ::reset()
- ha_table_flags() added. This is a cached version of table_flags(). The
cache is updated on engine creation time and updated on open.
MySQL level changes (not obvious from the above):
- DBUG_ASSERT() added to check that column usage matches what is set
in the column usage bit maps. (This found a LOT of bugs in current
column marking code).
- In 5.1 before, all used columns was marked in read_set and only updated
columns was marked in write_set. Now we only mark columns for which we
need a value in read_set.
- Column bitmaps are created in open_binary_frm() and open_table_from_share().
(Before this was in table.cc)
- handler::table_flags() calls are replaced with handler::ha_table_flags()
- For calling field->val() you must have the corresponding bit set in
table->read_set. For calling field->store() you must have the
corresponding bit set in table->write_set. (There are asserts in
all store()/val() functions to catch wrong usage)
- thd->set_query_id is renamed to thd->mark_used_columns and instead
of setting this to an integer value, this has now the values:
MARK_COLUMNS_NONE, MARK_COLUMNS_READ, MARK_COLUMNS_WRITE
Changed also all variables named 'set_query_id' to mark_used_columns.
- In filesort() we now inform the handler of exactly which columns are needed
doing the sort and choosing the rows.
- The TABLE_SHARE object has a 'all_set' column bitmap one can use
when one needs a column bitmap with all columns set.
(This is used for table->use_all_columns() and other places)
- The TABLE object has 3 column bitmaps:
- def_read_set Default bitmap for columns to be read
- def_write_set Default bitmap for columns to be written
- tmp_set Can be used as a temporary bitmap when needed.
The table object has also two pointer to bitmaps read_set and write_set
that the handler should use to find out which columns are used in which way.
- count() optimization now calls handler::records() instead of using
handler->stats.records (if (table_flags() & HA_HAS_RECORDS) is true).
- Added extra argument to Item::walk() to indicate if we should also
traverse sub queries.
- Added TABLE parameter to cp_buffer_from_ref()
- Don't close tables created with CREATE ... SELECT but keep them in
the table cache. (Faster usage of newly created tables).
New interfaces:
- table->clear_column_bitmaps() to initialize the bitmaps for tables
at start of new statements.
- table->column_bitmaps_set() to set up new column bitmaps and signal
the handler about this.
- table->column_bitmaps_set_no_signal() for some few cases where we need
to setup new column bitmaps but don't signal the handler (as the handler
has already been signaled about these before). Used for the momement
only in opt_range.cc when doing ROR scans.
- table->use_all_columns() to install a bitmap where all columns are marked
as use in the read and the write set.
- table->default_column_bitmaps() to install the normal read and write
column bitmaps, but not signaling the handler about this.
This is mainly used when creating TABLE instances.
- table->mark_columns_needed_for_delete(),
table->mark_columns_needed_for_delete() and
table->mark_columns_needed_for_insert() to allow us to put additional
columns in column usage maps if handler so requires.
(The handler indicates what it neads in handler->table_flags())
- table->prepare_for_position() to allow us to tell handler that it
needs to read primary key parts to be able to store them in
future table->position() calls.
(This replaces the table->file->ha_retrieve_all_pk function)
- table->mark_auto_increment_column() to tell handler are going to update
columns part of any auto_increment key.
- table->mark_columns_used_by_index() to mark all columns that is part of
an index. It will also send extra(HA_EXTRA_KEYREAD) to handler to allow
it to quickly know that it only needs to read colums that are part
of the key. (The handler can also use the column map for detecting this,
but simpler/faster handler can just monitor the extra() call).
- table->mark_columns_used_by_index_no_reset() to in addition to other columns,
also mark all columns that is used by the given key.
- table->restore_column_maps_after_mark_index() to restore to default
column maps after a call to table->mark_columns_used_by_index().
- New item function register_field_in_read_map(), for marking used columns
in table->read_map. Used by filesort() to mark all used columns
- Maintain in TABLE->merge_keys set of all keys that are used in query.
(Simplices some optimization loops)
- Maintain Field->part_of_key_not_clustered which is like Field->part_of_key
but the field in the clustered key is not assumed to be part of all index.
(used in opt_range.cc for faster loops)
- dbug_tmp_use_all_columns(), dbug_tmp_restore_column_map()
tmp_use_all_columns() and tmp_restore_column_map() functions to temporally
mark all columns as usable. The 'dbug_' version is primarily intended
inside a handler when it wants to just call Field:store() & Field::val()
functions, but don't need the column maps set for any other usage.
(ie:: bitmap_is_set() is never called)
- We can't use compare_records() to skip updates for handlers that returns
a partial column set and the read_set doesn't cover all columns in the
write set. The reason for this is that if we have a column marked only for
write we can't in the MySQL level know if the value changed or not.
The reason this worked before was that MySQL marked all to be written
columns as also to be read. The new 'optimal' bitmaps exposed this 'hidden
bug'.
- open_table_from_share() does not anymore setup temporary MEM_ROOT
object as a thread specific variable for the handler. Instead we
send the to-be-used MEMROOT to get_new_handler().
(Simpler, faster code)
Bugs fixed:
- Column marking was not done correctly in a lot of cases.
(ALTER TABLE, when using triggers, auto_increment fields etc)
(Could potentially result in wrong values inserted in table handlers
relying on that the old column maps or field->set_query_id was correct)
Especially when it comes to triggers, there may be cases where the
old code would cause lost/wrong values for NDB and/or InnoDB tables.
- Split thd->options flag OPTION_STATUS_NO_TRANS_UPDATE to two flags:
OPTION_STATUS_NO_TRANS_UPDATE and OPTION_KEEP_LOG.
This allowed me to remove some wrong warnings about:
"Some non-transactional changed tables couldn't be rolled back"
- Fixed handling of INSERT .. SELECT and CREATE ... SELECT that wrongly reset
(thd->options & OPTION_STATUS_NO_TRANS_UPDATE) which caused us to loose
some warnings about
"Some non-transactional changed tables couldn't be rolled back")
- Fixed use of uninitialized memory in ha_ndbcluster.cc::delete_table()
which could cause delete_table to report random failures.
- Fixed core dumps for some tests when running with --debug
- Added missing FN_LIBCHAR in mysql_rm_tmp_tables()
(This has probably caused us to not properly remove temporary files after
crash)
- slow_logs was not properly initialized, which could maybe cause
extra/lost entries in slow log.
- If we get an duplicate row on insert, change column map to read and
write all columns while retrying the operation. This is required by
the definition of REPLACE and also ensures that fields that are only
part of UPDATE are properly handled. This fixed a bug in NDB and
REPLACE where REPLACE wrongly copied some column values from the replaced
row.
- For table handler that doesn't support NULL in keys, we would give an error
when creating a primary key with NULL fields, even after the fields has been
automaticly converted to NOT NULL.
- Creating a primary key on a SPATIAL key, would fail if field was not
declared as NOT NULL.
Cleanups:
- Removed not used condition argument to setup_tables
- Removed not needed item function reset_query_id_processor().
- Field->add_index is removed. Now this is instead maintained in
(field->flags & FIELD_IN_ADD_INDEX)
- Field->fieldnr is removed (use field->field_index instead)
- New argument to filesort() to indicate that it should return a set of
row pointers (not used columns). This allowed me to remove some references
to sql_command in filesort and should also enable us to return column
results in some cases where we couldn't before.
- Changed column bitmap handling in opt_range.cc to be aligned with TABLE
bitmap, which allowed me to use bitmap functions instead of looping over
all fields to create some needed bitmaps. (Faster and smaller code)
- Broke up found too long lines
- Moved some variable declaration at start of function for better code
readability.
- Removed some not used arguments from functions.
(setup_fields(), mysql_prepare_insert_check_table())
- setup_fields() now takes an enum instead of an int for marking columns
usage.
- For internal temporary tables, use handler::write_row(),
handler::delete_row() and handler::update_row() instead of
handler::ha_xxxx() for faster execution.
- Changed some constants to enum's and define's.
- Using separate column read and write sets allows for easier checking
of timestamp field was set by statement.
- Remove calls to free_io_cache() as this is now done automaticly in ha_reset()
- Don't build table->normalized_path as this is now identical to table->path
(after bar's fixes to convert filenames)
- Fixed some missed DBUG_PRINT(.."%lx") to use "0x%lx" to make it easier to
do comparision with the 'convert-dbug-for-diff' tool.
Things left to do in 5.1:
- We wrongly log failed CREATE TABLE ... SELECT in some cases when using
row based logging (as shown by testcase binlog_row_mix_innodb_myisam.result)
Mats has promised to look into this.
- Test that my fix for CREATE TABLE ... SELECT is indeed correct.
(I added several test cases for this, but in this case it's better that
someone else also tests this throughly).
Lars has promosed to do this.
2006-06-04 17:52:22 +02:00
|
|
|
set autocommit=0;
|
|
|
|
|
CREATE TABLE t1 (a int, b int) engine=myisam;
|
|
|
|
|
reset master;
|
|
|
|
|
INSERT INTO t1 values (1,1),(1,2);
|
|
|
|
|
CREATE TABLE t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
DROP TABLE if exists t2;
|
|
|
|
|
Warnings:
|
|
|
|
|
Note 1051 Unknown table 't2'
|
|
|
|
|
INSERT INTO t1 values (3,3);
|
|
|
|
|
CREATE TEMPORARY TABLE t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
ROLLBACK;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
DROP TABLE IF EXISTS t2;
|
|
|
|
|
Warnings:
|
|
|
|
|
Note 1051 Unknown table 't2'
|
|
|
|
|
CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb;
|
|
|
|
|
INSERT INTO t1 VALUES (4,4);
|
|
|
|
|
CREATE TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
SELECT * from t2;
|
|
|
|
|
a b
|
|
|
|
|
TRUNCATE table t2;
|
|
|
|
|
INSERT INTO t1 VALUES (5,5);
|
|
|
|
|
INSERT INTO t2 select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
SELECT * FROM t2;
|
|
|
|
|
a b
|
|
|
|
|
DROP TABLE t2;
|
|
|
|
|
INSERT INTO t1 values (6,6);
|
|
|
|
|
CREATE TEMPORARY TABLE t2 (a int, b int, primary key (a)) engine=innodb ;
|
|
|
|
|
INSERT INTO t1 values (7,7);
|
|
|
|
|
ROLLBACK;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
INSERT INTO t1 values (8,8);
|
|
|
|
|
CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
COMMIT;
|
|
|
|
|
INSERT INTO t1 values (9,9);
|
|
|
|
|
CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
ROLLBACK;
|
|
|
|
|
Warnings:
|
|
|
|
|
Warning 1196 Some non-transactional changed tables couldn't be rolled back
|
|
|
|
|
SELECT * from t2;
|
|
|
|
|
a b
|
|
|
|
|
TRUNCATE table t2;
|
|
|
|
|
INSERT INTO t1 values (10,10);
|
|
|
|
|
INSERT INTO t2 select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
SELECT * from t1;
|
|
|
|
|
a b
|
|
|
|
|
1 1
|
|
|
|
|
1 2
|
|
|
|
|
3 3
|
|
|
|
|
4 4
|
|
|
|
|
5 5
|
|
|
|
|
6 6
|
|
|
|
|
7 7
|
|
|
|
|
8 8
|
|
|
|
|
9 9
|
|
|
|
|
10 10
|
|
|
|
|
INSERT INTO t2 values (100,100);
|
|
|
|
|
CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
COMMIT;
|
|
|
|
|
INSERT INTO t2 values (101,101);
|
|
|
|
|
CREATE TEMPORARY TABLE IF NOT EXISTS t2 (primary key (a)) engine=innodb select * from t1;
|
|
|
|
|
ERROR 23000: Duplicate entry '1' for key 'PRIMARY'
|
|
|
|
|
ROLLBACK;
|
|
|
|
|
SELECT * from t2;
|
|
|
|
|
a b
|
|
|
|
|
100 100
|
|
|
|
|
DROP TABLE t1,t2;
|
|
|
|
|
show binlog events from 102;
|
|
|
|
|
Log_name Pos Event_type Server_id End_log_pos Info
|
|
|
|
|
master-bin.000001 102 Table_map 1 142 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 142 Write_rows 1 189 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 189 Query 1 257 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 257 Query 1 182 use `test`; CREATE TABLE `t2` (
|
|
|
|
|
`a` int(11) NOT NULL DEFAULT '0',
|
|
|
|
|
`b` int(11) DEFAULT NULL,
|
|
|
|
|
PRIMARY KEY (`a`)
|
|
|
|
|
) ENGINE=InnoDB
|
|
|
|
|
master-bin.000001 439 Table_map 1 222 table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 479 Write_rows 1 260 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 517 Xid 1 544 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 544 Query 1 630 use `test`; DROP TABLE if exists t2
|
|
|
|
|
master-bin.000001 630 Table_map 1 670 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 670 Write_rows 1 708 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 708 Query 1 776 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 776 Query 1 192 use `test`; CREATE TEMPORARY TABLE `t2` (
|
|
|
|
|
`a` int(11) NOT NULL DEFAULT '0',
|
|
|
|
|
`b` int(11) DEFAULT NULL,
|
|
|
|
|
PRIMARY KEY (`a`)
|
|
|
|
|
) ENGINE=InnoDB
|
|
|
|
|
master-bin.000001 968 Query 1 1039 use `test`; ROLLBACK
|
|
|
|
|
master-bin.000001 1039 Query 1 1125 use `test`; DROP TABLE IF EXISTS t2
|
|
|
|
|
master-bin.000001 1125 Query 1 1249 use `test`; CREATE TABLE t2 (a int, b int, primary key (a)) engine=innodb
|
|
|
|
|
master-bin.000001 1249 Table_map 1 1289 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 1289 Write_rows 1 1327 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 1327 Query 1 1395 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 1395 Query 1 182 use `test`; CREATE TABLE `t2` (
|
|
|
|
|
`a` int(11) NOT NULL DEFAULT '0',
|
|
|
|
|
`b` int(11) DEFAULT NULL,
|
|
|
|
|
PRIMARY KEY (`a`)
|
|
|
|
|
) ENGINE=InnoDB
|
|
|
|
|
master-bin.000001 1577 Table_map 1 222 table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 1617 Write_rows 1 260 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 1655 Xid 1 1682 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 1682 Query 1 80 use `test`; TRUNCATE table t2
|
|
|
|
|
master-bin.000001 1762 Xid 1 1789 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 1789 Table_map 1 1829 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 1829 Write_rows 1 1867 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 1867 Query 1 1935 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 1935 Table_map 1 40 table_id: # (test.t2)
|
|
|
|
|
master-bin.000001 1975 Write_rows 1 78 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 2013 Xid 1 2040 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 2040 Query 1 2116 use `test`; DROP TABLE t2
|
|
|
|
|
master-bin.000001 2116 Table_map 1 2156 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 2156 Write_rows 1 2194 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 2194 Table_map 1 2234 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 2234 Write_rows 1 2272 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 2272 Table_map 1 2312 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 2312 Write_rows 1 2350 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 2350 Query 1 2418 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 2418 Query 1 192 use `test`; CREATE TEMPORARY TABLE `t2` (
|
|
|
|
|
`a` int(11) NOT NULL DEFAULT '0',
|
|
|
|
|
`b` int(11) DEFAULT NULL,
|
|
|
|
|
PRIMARY KEY (`a`)
|
|
|
|
|
) ENGINE=InnoDB
|
|
|
|
|
master-bin.000001 2610 Xid 1 2637 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 2637 Table_map 1 2677 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 2677 Write_rows 1 2715 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 2715 Query 1 2783 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 2783 Query 1 192 use `test`; CREATE TEMPORARY TABLE `t2` (
|
|
|
|
|
`a` int(11) NOT NULL DEFAULT '0',
|
|
|
|
|
`b` int(11) DEFAULT NULL,
|
|
|
|
|
PRIMARY KEY (`a`)
|
|
|
|
|
) ENGINE=InnoDB
|
|
|
|
|
master-bin.000001 2975 Query 1 3046 use `test`; ROLLBACK
|
|
|
|
|
master-bin.000001 3046 Query 1 80 use `test`; TRUNCATE table t2
|
|
|
|
|
master-bin.000001 3126 Xid 1 3153 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 3153 Table_map 1 3193 table_id: # (test.t1)
|
|
|
|
|
master-bin.000001 3193 Write_rows 1 3231 table_id: # flags: STMT_END_F
|
|
|
|
|
master-bin.000001 3231 Query 1 3299 use `test`; BEGIN
|
|
|
|
|
master-bin.000001 3299 Query 1 192 use `test`; CREATE TEMPORARY TABLE `t2` (
|
|
|
|
|
`a` int(11) NOT NULL DEFAULT '0',
|
|
|
|
|
`b` int(11) DEFAULT NULL,
|
|
|
|
|
PRIMARY KEY (`a`)
|
|
|
|
|
) ENGINE=InnoDB
|
|
|
|
|
master-bin.000001 3491 Xid 1 3518 COMMIT /* xid= */
|
|
|
|
|
master-bin.000001 3518 Query 1 3622 use `test`; DROP TABLE `t1` /* generated by server */
|
2006-03-08 14:12:26 +01:00
|
|
|
reset master;
|
|
|
|
|
create table t1 (a int) engine=innodb;
|
|
|
|
|
create table t2 (a int) engine=myisam;
|
|
|
|
|
select get_lock("a",10);
|
|
|
|
|
get_lock("a",10)
|
|
|
|
|
1
|
|
|
|
|
begin;
|
|
|
|
|
insert into t1 values(8);
|
|
|
|
|
insert into t2 select * from t1;
|
|
|
|
|
select get_lock("a",10);
|
|
|
|
|
get_lock("a",10)
|
|
|
|
|
1
|
|
|
|
|
select
|
|
|
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
|
|
|
|
|
is not null;
|
|
|
|
|
(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
|
|
|
|
|
is not null
|
|
|
|
|
1
|
|
|
|
|
select
|
|
|
|
|
@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
|
|
|
|
|
@a not like "%#%error_code=%error_code=%";
|
|
|
|
|
@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%" @a not like "%#%error_code=%error_code=%"
|
|
|
|
|
1 1
|
|
|
|
|
drop table t1, t2;
|