bk commit into 5.0 tree (grog:1.2099)

[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.2099 06/05/22 10:08:13 grog@stripped +2 -0
  rpl_auto_increment_11932.result, rpl_auto_increment_11932.test:
    Update with correct table and database names.

  mysql-test/r/rpl_auto_increment_11932.result
    1.2 06/05/22 09:20:47 grog@stripped +16 -16
    Update with correct table and database names.

  mysql-test/t/rpl_auto_increment_11932.test
    1.2 06/05/22 09:20:33 grog@stripped +19 -17
    Update with correct table and database names.

# 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-old

--- 1.1/mysql-test/r/rpl_auto_increment_11932.result	2006-05-03 16:26:40 +09:30
+++ 1.2/mysql-test/r/rpl_auto_increment_11932.result	2006-05-22 09:20:47 +09:30
@@ -4,43 +4,43 @@
 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;

--- 1.1/mysql-test/t/rpl_auto_increment_11932.test	2006-05-03 16:26:39 +09:30
+++ 1.2/mysql-test/t/rpl_auto_increment_11932.test	2006-05-22 09:20:33 +09:30
@@ -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;