Commit 2790aceb authored by Magnus Svensson's avatar Magnus Svensson
Browse files

Merge

parents 89f28a77 97b0eb92

mysql-test/include/rpl_multi_engine.inc

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id; 
sync_slave_with_master;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

connection master;

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

sync_slave_with_master;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

mysql-test/lib/mtr_report.pm

+14 −3
Original line number Diff line number Diff line 
# -*- cperl -*-

# Copyright (C) 2004-2006 MySQL AB

# Copyright (C) 2004-2006 MySQL AB, 2008 Sun Microsystems, Inc.

# 

# This program is free software; you can redistribute it and/or modify

# it under the terms of the GNU General Public License as published by
@@ -110,22 +110,26 @@ sub mtr_report_test ($) { 


  if ($result eq 'MTR_RES_FAILED'){



    my $timest = format_time();



    if ( $warnings )

    {

      mtr_report("[ fail ]  Found warnings in server log file!");

      mtr_report("        Test ended at $timest");

      mtr_report($warnings);

      return;

    }

    my $timeout= $tinfo->{'timeout'};

    if ( $timeout )

    {

      mtr_report("[ fail ]  timeout after $timeout minutes");

      mtr_report("[ fail ]  timeout after $timeout seconds");

      mtr_report("        Test ended at $timest");

      mtr_report("\n$tinfo->{'comment'}");

      return;

    }

    else

    {

      mtr_report("[ fail ]");

      mtr_report("[ fail ]\n        Test ended at $timest");

    }



    if ( $logfile )
@@ -372,6 +376,13 @@ use Time::localtime; 


use Time::HiRes qw(gettimeofday);



sub format_time {

  my $tm= localtime();

  return sprintf("%4d-%02d-%02d %02d:%02d:%02d",

		 $tm->year + 1900, $tm->mon+1, $tm->mday,

		 $tm->hour, $tm->min, $tm->sec);

}



my $t0= gettimeofday();



sub _timestamp {

mysql-test/mysql-test-run.pl

+6 −2
Original line number Diff line number Diff line
@@ -2810,8 +2810,12 @@ sub check_testcase($$) 
	  # Test failed, grab the report mysqltest has created

	  my $report= mtr_grab_file($err_file);

	  $tinfo->{check}.=

	    "\nThe check of testcase '$tname' failed, this is the\n".

	      "diff between before and after:\n";

	    "\nMTR's internal check of the test case '$tname' failed.

This means that the test case does not preserve the state that existed

before the test case was executed.  Most likely the test case did not

do a proper clean-up.

This is the diff of the states of the servers before and after the

test case was executed:\n";

	  $tinfo->{check}.= $report;



	  # Check failed, mark the test case with that info

mysql-test/r/general_log_func.result

+4 −3
Original line number Diff line number Diff line
@@ -27,9 +27,10 @@ INSERT into t1(name) values('Record_3'); 
INSERT into t1(name) values('Record_4');

## There should be a difference ##

SET @@session.max_allowed_packet= 1024*1024*1024;

select

STRCMP(load_file('MYSQLD_LOGFILE.orig'), load_file('MYSQLD_LOGFILE.copy'));

STRCMP(load_file('MYSQLD_LOGFILE.orig'), load_file('MYSQLD_LOGFILE.copy'))

SET @orig_file= load_file('MYSQLD_LOGFILE.orig');

SET @copy_file= load_file('MYSQLD_LOGFILE.copy');

SELECT STRCMP(@orig_file, @copy_file);

STRCMP(@orig_file, @copy_file)

1

## Dropping tables ##

DROP TABLE t1;

mysql-test/suite/rpl/r/rpl_multi_engine.result

+9 −13
Original line number Diff line number Diff line
@@ -4,13 +4,10 @@ reset master; 
reset slave;

drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;

start slave;

create database if not exists mysqltest1;

use mysqltest1;

drop table if exists t1;

CREATE TABLE t1 (id MEDIUMINT NOT NULL, b1 BIT(8), vc

VARCHAR(255), bc CHAR(255), d DECIMAL(10,4) DEFAULT 0, f FLOAT DEFAULT

0, total BIGINT UNSIGNED, y YEAR, t TIMESTAMP,PRIMARY KEY(id));

use mysqltest1;

alter table t1 engine=myisam;

show create table t1;

Table	Create Table
@@ -55,7 +52,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -89,7 +86,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -123,7 +120,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -172,7 +169,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -206,7 +203,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -240,7 +237,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -289,7 +286,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -323,7 +320,7 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;
@@ -357,10 +354,9 @@ id hex(b1) vc bc d f total y t 
select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

42	0	Testing MySQL databases is a cool 	Must make it bug free for the customer	654321.4321	15.21	0	1965	2005-09-09 00:00:00

DELETE FROM mysqltest1.t1 WHERE id = 42;

DELETE FROM t1 WHERE id = 42;

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

select id,hex(b1),vc,bc,d,f,total,y,t from t1 order by id;

id	hex(b1)	vc	bc	d	f	total	y	t

DROP TABLE t1;
 
DROP DATABASE mysqltest1;