SQL: thd_start_utime() fix [fixes #284]

mysql-test/suite/versioning/common.inc

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 
 delimiter ~~;
 create procedure if not exists verify_vtq()
@@ -9,7 +10,7 @@ begin
     @i:= @i + 1 as No,
     transaction_id > 0 as A,
     commit_id > transaction_id as B,
-    begin_timestamp > '1-1-1 0:0:0' as C,
+    begin_timestamp > @test_start as C,
     commit_timestamp >= begin_timestamp as D
   from information_schema.innodb_vtq
   where transaction_id > @start_trx_id;

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

@@ -249,6 +249,7 @@ t	CREATE TABLE `t` (
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 WITH SYSTEM VERSIONING
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -256,7 +257,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

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

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

mysql-test/suite/versioning/r/select_sp.result

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

mysql-test/suite/versioning/r/update.result

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

mysql-test/suite/versioning/r/view.result

@@ -1,5 +1,6 @@
 set @@session.time_zone='+00:00';
 select ifnull(max(transaction_id), 0) into @start_trx_id from information_schema.innodb_vtq;
+set @test_start=now(6);
 create procedure if not exists verify_vtq()
 begin
 set @i= 0;
@@ -7,7 +8,7 @@ select
 @i:= @i + 1 as No,
 transaction_id > 0 as A,
 commit_id > transaction_id as B,
-begin_timestamp > '1-1-1 0:0:0' as C,
+begin_timestamp > @test_start as C,
 commit_timestamp >= begin_timestamp as D
 from information_schema.innodb_vtq
 where transaction_id > @start_trx_id;

sql/sql_class.cc

@@ -4644,7 +4644,7 @@ extern "C" time_t thd_start_time(const MYSQL_THD thd)
   of the current query. */
 extern "C" unsigned long long thd_start_utime(const MYSQL_THD thd)
 {
-  return thd->start_utime;
+  return thd->start_time * 1000000 + thd->start_time_sec_part;
 }