Skip to content

Commit bdcce58

Browse files
midenokmidenok
committed
IB: long names in information_schema
1 parent 72de772 commit bdcce58

File tree

13 files changed

+137
-117
lines changed

13 files changed

+137
-117
lines changed

‎mysql-test/suite/versioning/common.inc‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33

44
delimiter ~~;
55
create procedure if not exists verify_vtq()
66
begin
77
set @i= 0;
88
select
99
@i:= @i + 1 as No,
10-
trx_id > 0 as A,
11-
commit_id > trx_id as B,
12-
begin_ts > '1-1-1 0:0:0' as C,
13-
commit_ts >= begin_ts as D
10+
transaction_id > 0 as A,
11+
commit_id > transaction_id as B,
12+
begin_timestamp > '1-1-1 0:0:0' as C,
13+
commit_timestamp >= begin_timestamp as D
1414
from information_schema.innodb_vtq
15-
where trx_id > @start_trx_id;
16-
select ifnull(max(trx_id), 0)
15+
where transaction_id > @start_trx_id;
16+
select ifnull(max(transaction_id), 0)
1717
into @start_trx_id
1818
from information_schema.innodb_vtq;
1919
end~~

‎mysql-test/suite/versioning/r/alter.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -251,19 +251,19 @@ t CREATE TABLE `t` (
251251
PERIOD FOR SYSTEM_TIME (`sys_trx_start`, `sys_trx_end`)
252252
) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
253253
set @@session.time_zone='+00:00';
254-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
254+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
255255
create procedure if not exists verify_vtq()
256256
begin
257257
set @i= 0;
258258
select
259259
@i:= @i + 1 as No,
260-
trx_id > 0 as A,
261-
commit_id > trx_id as B,
262-
begin_ts > '1-1-1 0:0:0' as C,
263-
commit_ts >= begin_ts as D
260+
transaction_id > 0 as A,
261+
commit_id > transaction_id as B,
262+
begin_timestamp > '1-1-1 0:0:0' as C,
263+
commit_timestamp >= begin_timestamp as D
264264
from information_schema.innodb_vtq
265-
where trx_id > @start_trx_id;
266-
select ifnull(max(trx_id), 0)
265+
where transaction_id > @start_trx_id;
266+
select ifnull(max(transaction_id), 0)
267267
into @start_trx_id
268268
from information_schema.innodb_vtq;
269269
end~~

‎mysql-test/suite/versioning/r/auto_increment.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

‎mysql-test/suite/versioning/r/commit_id.result‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~
@@ -68,20 +68,20 @@ insert into t1 values ();
6868
set @ts0= now(6);
6969
insert into t1 values ();
7070
select sys_trx_start from t1 where id = last_insert_id() into @tx0;
71-
select trx_id = @tx0 from information_schema.innodb_vtq limit 1;
72-
trx_id = @tx0
71+
select transaction_id = @tx0 from information_schema.innodb_vtq limit 1;
72+
transaction_id = @tx0
7373
1
7474
set @ts1= now(6);
7575
insert into t1 values ();
7676
select sys_trx_start from t1 where id = last_insert_id() into @tx1;
77-
select trx_id = @tx1 from information_schema.innodb_vtq limit 1;
78-
trx_id = @tx1
77+
select transaction_id = @tx1 from information_schema.innodb_vtq limit 1;
78+
transaction_id = @tx1
7979
1
8080
set @ts2= now(6);
8181
insert into t1 values ();
8282
select sys_trx_start from t1 where id = last_insert_id() into @tx2;
83-
select trx_id = @tx2 from information_schema.innodb_vtq limit 1;
84-
trx_id = @tx2
83+
select transaction_id = @tx2 from information_schema.innodb_vtq limit 1;
84+
transaction_id = @tx2
8585
1
8686
set @ts3= now(6);
8787
select
@@ -119,26 +119,26 @@ A B C D E F H
119119
set transaction isolation level read uncommitted;
120120
insert into t1 values ();
121121
select sys_trx_start from t1 where id = last_insert_id() into @tx3;
122-
select iso_level = 'RU' from information_schema.innodb_vtq where trx_id = @tx3;
123-
iso_level = 'RU'
122+
select isolation_level = 'READ-UNCOMMITTED' from information_schema.innodb_vtq where transaction_id = @tx3;
123+
isolation_level = 'READ-UNCOMMITTED'
124124
1
125125
set transaction isolation level read committed;
126126
insert into t1 values ();
127127
select sys_trx_start from t1 where id = last_insert_id() into @tx4;
128-
select iso_level = 'RC' from information_schema.innodb_vtq where trx_id = @tx4;
129-
iso_level = 'RC'
128+
select isolation_level = 'READ-COMMITTED' from information_schema.innodb_vtq where transaction_id = @tx4;
129+
isolation_level = 'READ-COMMITTED'
130130
1
131131
set transaction isolation level serializable;
132132
insert into t1 values ();
133133
select sys_trx_start from t1 where id = last_insert_id() into @tx5;
134-
select iso_level = 'S' from information_schema.innodb_vtq where trx_id = @tx5;
135-
iso_level = 'S'
134+
select isolation_level = 'SERIALIZABLE' from information_schema.innodb_vtq where transaction_id = @tx5;
135+
isolation_level = 'SERIALIZABLE'
136136
1
137137
set transaction isolation level repeatable read;
138138
insert into t1 values ();
139139
select sys_trx_start from t1 where id = last_insert_id() into @tx6;
140-
select iso_level = 'RR' from information_schema.innodb_vtq where trx_id = @tx6;
141-
iso_level = 'RR'
140+
select isolation_level = 'REPEATABLE-READ' from information_schema.innodb_vtq where transaction_id = @tx6;
141+
isolation_level = 'REPEATABLE-READ'
142142
1
143143
drop table t1;
144144
call verify_vtq;

‎mysql-test/suite/versioning/r/create.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

‎mysql-test/suite/versioning/r/ddl.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

‎mysql-test/suite/versioning/r/delete.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

‎mysql-test/suite/versioning/r/insert.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

‎mysql-test/suite/versioning/r/partition.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

‎mysql-test/suite/versioning/r/select.result‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
set @@session.time_zone='+00:00';
2-
select ifnull(max(trx_id), 0) into @start_trx_id from information_schema.innodb_vtq;
2+
select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
33
create procedure if not exists verify_vtq()
44
begin
55
set @i= 0;
66
select
77
@i:= @i + 1 as No,
8-
trx_id > 0 as A,
9-
commit_id > trx_id as B,
10-
begin_ts > '1-1-1 0:0:0' as C,
11-
commit_ts >= begin_ts as D
8+
transaction_id > 0 as A,
9+
commit_id > transaction_id as B,
10+
begin_timestamp > '1-1-1 0:0:0' as C,
11+
commit_timestamp >= begin_timestamp as D
1212
from information_schema.innodb_vtq
13-
where trx_id > @start_trx_id;
14-
select ifnull(max(trx_id), 0)
13+
where transaction_id > @start_trx_id;
14+
select ifnull(max(transaction_id), 0)
1515
into @start_trx_id
1616
from information_schema.innodb_vtq;
1717
end~~

0 commit comments

Comments
 (0)