bk commit into 3.23 tree

[sasha]

Below is the list of changes that have just been commited into a local
3.23. repository of sasha. When sasha does a push, they will be
propogaged to the main repository and within 24 hours after the push into
the public repository. For information on how to access
the public repository see
http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-11-27 18:20:24-07:00, sasha@stripped
  fixed alias drop bug in binlog
  fixed skip counter to do the RightThing (TM) when the user messes up.
  Still do RightThing when he gets it right.

  mysql-test/r/rpl000016.result
    1.11 01/11/27 18:20:24 sasha@stripped +1 -1
    updated test result

  mysql-test/t/rpl000013.test
    1.13 01/11/27 18:20:24 sasha@stripped +1 -1
    test alias bug

  mysql-test/t/rpl000016.test
    1.19 01/11/27 18:20:24 sasha@stripped +3 -2
    test for proper skip when the user messes up

  sql/slave.cc
    1.118 01/11/27 18:20:24 sasha@stripped +6 -1
    proper skip even when the user goofs up

  sql/sql_base.cc
    1.88 01/11/27 18:20:24 sasha@stripped +2 -2
    drop real name, not last used alias in the log

# 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:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql

--- 1.117/sql/slave.cc	Mon Oct 29 18:21:33 2001
+++ 1.118/sql/slave.cc	Tue Nov 27 18:20:24 2001
@@ -885,7 +885,12 @@
 	
       mi->inc_pos(event_len);
       flush_master_info(mi);
-      if(slave_skip_counter)
+      if(slave_skip_counter && /* protect against common user error of
+				  setting the counter to 1 instead of 2
+			          while recovering from an failed
+			          auto-increment insert */
+	 	 !(type_code == INTVAR_EVENT &&
+				 slave_skip_counter == 1))
         --slave_skip_counter;
       delete ev;     
       return 0;					// avoid infinite update loops

--- 1.87/sql/sql_base.cc	Wed Nov 21 10:05:10 2001
+++ 1.88/sql/sql_base.cc	Tue Nov 27 18:20:24 2001
@@ -527,10 +527,10 @@
     if (query) // we might be out of memory, but this is not fatal
     {
       // skip temporary tables not created directly by the user
-      if (table->table_name[0] != '#')
+      if (table->real_name[0] != '#')
       {
 	end = strxmov(end,table->table_cache_key,".",
-		      table->table_name,",", NullS);
+		      table->real_name,",", NullS);
 	// here we assume table_cache_key always starts
 	// with \0 terminated db name
 	found_user_tables = 1;

--- 1.10/mysql-test/r/rpl000016.result	Fri Apr 20 06:18:45 2001
+++ 1.11/mysql-test/r/rpl000016.result	Tue Nov 27 18:20:24 2001
@@ -10,7 +10,7 @@
 Log_name
 master-bin.003
 Master_Host	Master_User	Master_Port	Connect_retry	Log_File	Pos	Slave_Running	Replicate_do_db	Replicate_ignore_db	Last_errno	Last_error	Skip_counter
-127.0.0.1	root	9999	60	master-bin.003	184	Yes			0		0
+127.0.0.1	root	9999	60	master-bin.003	206	Yes			0		0
 m
 34
 65

--- 1.12/mysql-test/t/rpl000013.test	Sat Mar 24 16:02:25 2001
+++ 1.13/mysql-test/t/rpl000013.test	Tue Nov 27 18:20:24 2001
@@ -12,7 +12,7 @@
 connection master1;
 create temporary table t1 (n int);
 insert into t1 values (4),(5);
-insert into t2 select * from t1;
+insert into t2 select * from t1 as t10;
 save_master_pos;
 disconnect master;
 connection slave;

--- 1.18/mysql-test/t/rpl000016.test	Fri Apr 20 06:18:45 2001
+++ 1.19/mysql-test/t/rpl000016.test	Tue Nov 27 18:20:24 2001
@@ -28,7 +28,7 @@
 connection master;
 flush logs;
 drop table if exists t2;
-create table t2(m int not null primary key);
+create table t2(m int not null auto_increment primary key);
 insert into t2 values (34),(67),(123);
 save_master_pos;
 flush logs;
@@ -44,7 +44,8 @@
 #same value on the master
 connection master;
 save_master_pos;
-insert into t2 values(1234);
+set insert_id=1234;
+insert into t2 values(NULL);
 connection slave;
 sync_with_master;