Commit f7ba01f7 authored by unknown's avatar unknown
Browse files

Merge rburnett@bk-internal.mysql.com:/home/bk/mysql-5.1-new 

into  linux.site:/home/reggie/work/mysql-5.1
parents 238c6f6f b38ec6f4

mysql-test/r/binlog_row_blackhole.result

+1 −1
Original line number Diff line number Diff line
@@ -92,7 +92,7 @@ insert into t1 values(1); 
insert ignore into t1 values(1);

replace into t1 values(100);

create table t2 (a varchar(200)) engine=blackhole;

load data infile '../../std_data/words.dat' into table t2;

load data infile '../std_data_ln/words.dat' into table t2;

alter table t1 add b int;

alter table t1 drop b;

create table t3 like t1;

mysql-test/r/federated.result

+42 −0
Original line number Diff line number Diff line
@@ -1517,6 +1517,48 @@ bitty 
drop table federated.t1;

drop table federated.t1;

DROP TABLE IF EXISTS federated.t1;

Warnings:

Note	1051	Unknown table 't1'

CREATE TABLE federated.t1 (

`id` int(20) NOT NULL auto_increment,

PRIMARY KEY  (`id`));

DROP TABLE IF EXISTS federated.t1;

Warnings:

Note	1051	Unknown table 't1'

CREATE TABLE federated.t1 (

`id` int(20) NOT NULL auto_increment,

PRIMARY KEY  (`id`)

)

ENGINE="FEDERATED" DEFAULT CHARSET=latin1

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

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

1

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

2

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

3

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

4

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

LAST_INSERT_ID()

5

SELECT * FROM federated.t1;

id

1

2

3

4

5

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/rpl_row_flsh_tbls.result

+1 −0
Original line number Diff line number Diff line
@@ -30,3 +30,4 @@ flush tables with read lock; 
start slave;

stop slave;

ERROR HY000: Can't execute the given command because you have active locked tables or an active transaction

drop table t3, t4, t5;

mysql-test/r/rpl_row_log.result

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ create table t1(n int not null auto_increment primary key); 
insert into t1 values (NULL);

drop table t1;

create table t1 (word char(20) not null);

load data infile '../../std_data/words.dat' into table t1 ignore 1 lines;

load data infile '../std_data_ln/words.dat' into table t1 ignore 1 lines;

select count(*) from t1;

count(*)

69

mysql-test/t/federated.test

+30 −0
Original line number Diff line number Diff line
@@ -1226,4 +1226,34 @@ drop table federated.t1; 
connection slave;

drop table federated.t1;



#

# BUG# 14768 test auto_increment last_insert_id()

#

connection slave;

DROP TABLE IF EXISTS federated.t1;

CREATE TABLE federated.t1 (

    `id` int(20) NOT NULL auto_increment,

    PRIMARY KEY  (`id`));



connection master;

DROP TABLE IF EXISTS federated.t1;

eval CREATE TABLE federated.t1 (

    `id` int(20) NOT NULL auto_increment,

    PRIMARY KEY  (`id`)

    )

  ENGINE="FEDERATED" DEFAULT CHARSET=latin1

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



INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

INSERT INTO federated.t1 VALUES ();

SELECT LAST_INSERT_ID();

SELECT * FROM federated.t1;



source include/federated_cleanup.inc;