mysql-test/mysql-test-run

    cleanup - remove unneeded daeamon restarts
sql/log_event.cc
    fixed bug - do not confuse confused slaves even further if they try to 
    read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc
    give error if constructor fails
sql/mysqld.cc
    --disconnect-slave-event-count for replication debugging
sql/slave.cc
    --disconnect-slave-event-count
    cleanup to remove unneeded sleeps when things go wrong - sleep only 
    when we have to
sql/slave.h
    --disconnect-slave-event-count

test cases for ALTER TABLE ORDER BY and replication offset off by 22 
confusion mystery bug (both pass)


mysql-test/mysql-test-run:
  cleanup - remove unneeded daeamon restarts
sql/log_event.cc:
  fixed bug - do not confuse confused slaves even further if they try to 
  read less than LOG_EVENT_HEADER_LEN before the end of file
sql/mysqlbinlog.cc:
  give error if constructor fails
sql/mysqld.cc:
  --disconnect-slave-event-count for replication debugging
sql/slave.cc:
  --disconnect-slave-event-count
  cleanup to remove unneeded sleeps when things go wrong - sleep only 
  when we have to
sql/slave.h:
  --disconnect-slave-event-count
sql/sql_repl.cc:
  added unknown error

6 files changed, 33 insertions, 2 deletions

diff --git a/mysql-test/mysql-test-run b/mysql-test/mysql-test-run
index 4354cd23fd9..740f10f1cad 100755
--- a/mysql-test/mysql-test-run
+++ b/mysql-test/mysql-test-run
@@ -278,6 +278,7 @@ start_master()
 
 start_slave()
 {
+    [ x$SKIP_SLAVE = x1 ] && return
     [ -d $GCOV_SLAVE_SRC ] && cd $GCOV_SLAVE_SRC
     slave_args="--no-defaults --server-id=2 \
 	    --master-user=root \
@@ -362,7 +363,7 @@ run_testcase ()
  tname=`$ECHO $tname | $CUT -d . -f 1`
  master_opt_file=$TESTDIR/$tname-master.opt
  slave_opt_file=$TESTDIR/$tname-slave.opt
-
+ SKIP_SLAVE=`$EXPR \( match $tname rpl \) = 0`
  
  if [ -f $master_opt_file ] ;
  then
@@ -443,7 +444,9 @@ run_testcase ()
 
 mysql_install_db
 
-if [ -z $DO_GDB ]
+#do not automagically start deamons if we are in gdb or running only one test
+#case
+if [ -z $DO_GDB ] && [ -z $1 ]
 then
  $SETCOLOR_NORMAL && $ECHO -n "Starting mysqld for Testing" 
  mysql_start
diff --git a/mysql-test/r/3.23/alt000001.result b/mysql-test/r/3.23/alt000001.result
new file mode 100644
index 00000000000..cc95b808d23
--- /dev/null
+++ b/mysql-test/r/3.23/alt000001.result
@@ -0,0 +1,5 @@
+n	
+3	
+9	
+10	
+12	
diff --git a/mysql-test/r/3.23/rpl000010.result b/mysql-test/r/3.23/rpl000010.result
new file mode 100644
index 00000000000..982e0523cfb
--- /dev/null
+++ b/mysql-test/r/3.23/rpl000010.result
@@ -0,0 +1,3 @@
+n	
+1	
+2	
diff --git a/mysql-test/t/3.23/alt000001.test b/mysql-test/t/3.23/alt000001.test
new file mode 100644
index 00000000000..c6c767b8d5d
--- /dev/null
+++ b/mysql-test/t/3.23/alt000001.test
@@ -0,0 +1,6 @@
+use test;
+drop table if exists x;
+create table x (n int);
+insert into x values(9),(3),(12),(10);
+alter table x order by n;
+@r/3.23/alt000001.result select * from x;
diff --git a/mysql-test/t/3.23/rpl000010-slave.opt b/mysql-test/t/3.23/rpl000010-slave.opt
new file mode 100644
index 00000000000..429a7f63f7b
--- /dev/null
+++ b/mysql-test/t/3.23/rpl000010-slave.opt
@@ -0,0 +1 @@
+--disconnect-slave-event-count=1 
diff --git a/mysql-test/t/3.23/rpl000010.test b/mysql-test/t/3.23/rpl000010.test
new file mode 100644
index 00000000000..3bb55dc854a
--- /dev/null
+++ b/mysql-test/t/3.23/rpl000010.test
@@ -0,0 +1,13 @@
+#this tests the offset off by 22 mystery bug
+#must run slave with --disconnect-slave-event-count=1 --master-connect-retry=1
+source t/include/master-slave.inc;
+connection slave;
+drop table if exists foo;
+connection master;
+drop table if exists foo;
+create table foo (n int not null auto_increment primary key);
+insert into foo values(NULL);
+insert into foo values(2);
+connection slave;
+sleep 5;
+@r/3.23/rpl000010.result select n from foo;