Commit bfeb65d0 authored by acurtis/antony@ltamd64.xiphis.org's avatar acurtis/antony@ltamd64.xiphis.org
Browse files

Merge xiphis.org:/anubis/antony/work/p2-bug25714.1 

into  xiphis.org:/anubis/antony/work/p2-bug25714.1.merge-5.0
parents 7c7ccc2f 6b38c5b7

mysql-test/include/have_bug25714.inc

0 → 100644
+7 −0
Original line number Diff line number Diff line 
#

# Check if the variable MYSQL_BUG25714 is set

#

--require r/have_bug25714.require

disable_query_log;

eval select LENGTH("MYSQL_BUG25714") > 0 as "have_bug25714_exe";

enable_query_log;

mysql-test/mysql-test-run.pl

+12 −0
Original line number Diff line number Diff line
@@ -144,6 +144,7 @@ our $exe_mysqladmin; 
our $exe_mysql_upgrade;

our $exe_mysqlbinlog;

our $exe_mysql_client_test;

our $exe_bug25714;

our $exe_mysqld;

our $exe_mysqlcheck;

our $exe_mysqldump;
@@ -1630,6 +1631,12 @@ sub executable_setup () { 
                           "$glob_basedir/tests/mysql_client_test",

                           "$glob_basedir/bin/mysql_client_test");

  }



  # Look for bug25714 executable which may _not_ exist in

  # some versions, test using it should be skipped

  $exe_bug25714=

      mtr_exe_maybe_exists(vs_config_dirs('tests', 'bug25714'),

                           "$glob_basedir/tests/bug25714");

}
@@ -2010,6 +2017,11 @@ sub environment_setup () { 


  $ENV{'MYSQL'}= $cmdline_mysql;



  # ----------------------------------------------------

  # Setup env so childs can execute bug25714

  # ----------------------------------------------------

  $ENV{'MYSQL_BUG25714'}=  $exe_bug25714;



  # ----------------------------------------------------

  # Setup env so childs can execute mysql_client_test

  # ----------------------------------------------------

mysql-test/r/federated_bug_25714.result

0 → 100644
+56 −0
Original line number Diff line number Diff line 
stop slave;

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

reset master;

reset slave;

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

start slave;

stop slave;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

DROP DATABASE IF EXISTS federated;

CREATE DATABASE federated;

DROP TABLE IF EXISTS federated.bug_13118_table;

CREATE TABLE federated.t1 (

`id` int auto_increment primary key, 

`value` int

) ENGINE=MyISAM;

INSERT INTO federated.t1 SET value=1;

INSERT INTO federated.t1 SET value=2;

INSERT INTO federated.t1 SET value=2;

DROP TABLE IF EXISTS federated.t1;

CREATE TABLE federated.t1 (

`id` int auto_increment primary key, 

`value` int

) ENGINE=FEDERATED

CONNECTION='mysql://root@127.0.0.1:SLAVE_PORT/federated/t1';

SELECT * from federated.t1;

id	value

1	1

2	2

3	2

INSERT INTO federated.t1 SET value=4;

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

4



5 inserted

6 inserted



7 inserted

8 inserted

SELECT * from federated.t1;

id	value

1	1

2	2

3	2

4	4

5	54

6	55

7	54

8	55

DROP TABLE federated.t1;

DROP TABLE federated.t1;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

DROP TABLE IF EXISTS federated.t1;

DROP DATABASE IF EXISTS federated;

mysql-test/r/have_bug25714.require

0 → 100644
+2 −0
Original line number Diff line number Diff line 
have_bug25714_exe

1

mysql-test/t/federated_bug_25714.test

0 → 100644
+47 −0
Original line number Diff line number Diff line 
--source include/have_bug25714.inc

source include/federated.inc;





connection slave;

--disable_warnings

DROP TABLE IF EXISTS federated.bug_13118_table;

--enable_warnings



CREATE TABLE federated.t1 (

    `id` int auto_increment primary key, 

	`value` int

    ) ENGINE=MyISAM;

INSERT INTO federated.t1 SET value=1;

INSERT INTO federated.t1 SET value=2;

INSERT INTO federated.t1 SET value=2;



connection master;

--disable_warnings

DROP TABLE IF EXISTS federated.t1;

--enable_warnings



--replace_result $SLAVE_MYPORT SLAVE_PORT

eval CREATE TABLE federated.t1 (

    `id` int auto_increment primary key, 

	`value` int

    ) ENGINE=FEDERATED

    CONNECTION='mysql://root@127.0.0.1:$SLAVE_MYPORT/federated/t1';



SELECT * from federated.t1;



INSERT INTO federated.t1 SET value=4;



SELECT LAST_INSERT_ID();



--exec $MYSQL_BUG25714 $SLAVE_MYPORT

--exec $MYSQL_BUG25714 $MASTER_MYPORT



SELECT * from federated.t1;



DROP TABLE federated.t1;

connection slave;

DROP TABLE federated.t1;





source include/federated_cleanup.inc;