Commit c935e678 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/MySQL/5.0-Bug-11932-old 

into  mysql.com:/home/MySQL/5.0-Bug-11932
parents 90baaed2 345cd57a

mysql-test/r/rpl_auto_increment_11932.result

+16 −16
Original line number Diff line number Diff line
@@ -4,43 +4,43 @@ reset master; 
reset slave;

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

start slave;

drop database if exists t1;

create database t1;

use t1;

CREATE TABLE `t` (

drop database if exists test1;

create database test1;

use test1;

CREATE TABLE `t1` (

`id` int(10) unsigned NOT NULL auto_increment,

`fname` varchar(100) default NULL,

PRIMARY KEY  (`id`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;

INSERT INTO `t` VALUES (1, 'blablabla');

CREATE TABLE `test3` (

INSERT INTO `t1` VALUES (1, 'blablabla');

CREATE TABLE `t2` (

`id` int(10) NOT NULL auto_increment,

`comment` varchar(255) NOT NULL default '',

PRIMARY KEY  (`id`)

) ENGINE=MyISAM  AUTO_INCREMENT=3 ;

INSERT INTO `test3` VALUES (1, 'testtest 1');

INSERT INTO `test3` VALUES (2, 'test 2');

INSERT INTO `t2` VALUES (1, 'testtest 1');

INSERT INTO `t2` VALUES (2, 'test 2');

CREATE PROCEDURE simpleproc3 ()

NOT DETERMINISTIC

BEGIN

INSERT INTO t (fname) (SELECT test3.comment FROM test3 WHERE test3.id = '1');

INSERT INTO t (fname) VALUES('test');

INSERT INTO t1 (fname) (SELECT t2.comment FROM t2 WHERE t2.id = '1');

INSERT INTO t1 (fname) VALUES('test');

END

$

CALL simpleproc3();

select * from test3;

select * from t2;

id	comment

1	testtest 1

2	test 2

TRUNCATE TABLE `t`;

TRUNCATE TABLE `t1`;

CALL simpleproc3();

select * from t;

select * from t1;

id	fname

1	testtest 1

2	test

use t1;

select * from t;

use test1;

select * from t1;

id	fname

1	testtest 1

2	test

drop database t1;
 
drop database test1;

mysql-test/t/rpl_auto_increment_11932.test

+19 −17
Original line number Diff line number Diff line
@@ -2,58 +2,60 @@ 
# Test of auto_increment

# BUG#11932

#

# Test supplied by Are Casilla

# Bug reported that master and slave get out of sync after TRUNCATE

# TABLE.

#

# Test supplied by Are Casilla



source include/master-slave.inc;

--disable_warnings

connection master;

drop database if exists t1;

drop database if exists test1;

--enable_warnings

create database t1;

use t1;

create database test1;

use test1;



CREATE TABLE `t` (

CREATE TABLE `t1` (

  `id` int(10) unsigned NOT NULL auto_increment,

  `fname` varchar(100) default NULL,

  PRIMARY KEY  (`id`)

) ENGINE=MyISAM DEFAULT CHARSET=latin1 AUTO_INCREMENT=2 ;



INSERT INTO `t` VALUES (1, 'blablabla');

INSERT INTO `t1` VALUES (1, 'blablabla');



CREATE TABLE `test3` (

CREATE TABLE `t2` (

  `id` int(10) NOT NULL auto_increment,

  `comment` varchar(255) NOT NULL default '',

  PRIMARY KEY  (`id`)

) ENGINE=MyISAM  AUTO_INCREMENT=3 ;



INSERT INTO `test3` VALUES (1, 'testtest 1');

INSERT INTO `test3` VALUES (2, 'test 2');

INSERT INTO `t2` VALUES (1, 'testtest 1');

INSERT INTO `t2` VALUES (2, 'test 2');

  

DELIMITER $;

CREATE PROCEDURE simpleproc3 ()

    NOT DETERMINISTIC

    BEGIN

    INSERT INTO t (fname) (SELECT test3.comment FROM test3 WHERE test3.id = '1');

    INSERT INTO t (fname) VALUES('test');

    INSERT INTO t1 (fname) (SELECT t2.comment FROM t2 WHERE t2.id = '1');

    INSERT INTO t1 (fname) VALUES('test');

    END

    $

DELIMITER ;$



CALL simpleproc3();



select * from test3;

select * from t2;



TRUNCATE TABLE `t`;

TRUNCATE TABLE `t1`;

CALL simpleproc3();



select * from t;

select * from t1;



save_master_pos;

connection slave;

sync_with_master;



use t1;

select * from t;

use test1;

select * from t1;



drop database t1;
 
drop database test1;