bk commit into 5.0 tree (grog:1.2098) BUG#11932

[Greg Lehey]

Below is the list of changes that have just been committed into a local
5.0 repository of grog. When grog does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2098 06/05/03 16:28:11 grog@stripped +2 -0
  rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
    Test case for BUG#11932

  mysql-test/r/rpl_auto_increment_11932.result
    1.1 06/05/03 16:26:40 grog@stripped +46 -0

  mysql-test/t/rpl_auto_increment_11932.test
    1.1 06/05/03 16:26:39 grog@stripped +59 -0

  mysql-test/r/rpl_auto_increment_11932.result
    1.0 06/05/03 16:26:40 grog@stripped +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-11932/mysql-test/r/rpl_auto_increment_11932.result

  mysql-test/t/rpl_auto_increment_11932.test
    1.0 06/05/03 16:26:39 grog@stripped +0 -0
    BitKeeper file /home/MySQL/5.0-Bug-11932/mysql-test/t/rpl_auto_increment_11932.test

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	grog
# Host:	eucla.lemis.com
# Root:	/home/MySQL/5.0-Bug-11932
--- New file ---
+++ mysql-test/r/rpl_auto_increment_11932.result	06/05/03 16:26:40
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;
drop database if exists t1;
create database t1;
use t1;
CREATE TABLE `t` (
`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` (
`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');
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');
END
$
CALL simpleproc3();
select * from test3;
id	comment
1	testtest 1
2	test 2
TRUNCATE TABLE `t`;
CALL simpleproc3();
select * from t;
id	fname
1	testtest 1
2	test
use t1;
select * from t;
id	fname
1	testtest 1
2	test
drop database t1;

--- New file ---
+++ mysql-test/t/rpl_auto_increment_11932.test	06/05/03 16:26:39
#
# Test of auto_increment
# BUG#11932
#
# Test supplied by Are Casilla
#

source include/master-slave.inc;
--disable_warnings
connection master;
drop database if exists t1;
--enable_warnings
create database t1;
use t1;

CREATE TABLE `t` (
  `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` (
  `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');
  
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');
    END
    $
DELIMITER ;$

CALL simpleproc3();

select * from test3;

TRUNCATE TABLE `t`;
CALL simpleproc3();

select * from t;

save_master_pos;
connection slave;
sync_with_master;

use t1;
select * from t;

drop database t1;