bk commit into 5.1 tree (monty:1.2371) BUG#24529

[monty]

Below is the list of changes that have just been committed into a local
5.1 repository of monty. When monty 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@stripped, 2006-11-27 23:19:53+02:00, monty@stripped +6 -0
  Disabled syncronization test at it fails on multiple platforms. (Bug #24529)
  Fixed that test_thr_alarm works

  mysql-test/mysql-test-run.pl@stripped, 2006-11-27 23:19:51+02:00, monty@stripped +1 -1
    Fixed typo

  mysql-test/r/synchronization.result@stripped, 2006-11-27 23:19:51+02:00, monty@stripped +1 -1
    Updated results

  mysql-test/t/disabled.def@stripped, 2006-11-27 23:19:51+02:00, monty@stripped +1 -0
    Disabled syncronization test at it fails on multiple platforms. (Bug #24529)

  mysql-test/t/synchronization.test@stripped, 2006-11-27 23:19:51+02:00, monty@stripped +1 -1
    Drop used tables

  mysys/Makefile.am@stripped, 2006-11-27 23:19:51+02:00, monty@stripped +1 -1
    Added 'debug' to be able to build test cases

  mysys/thr_alarm.c@stripped, 2006-11-27 23:19:51+02:00, monty@stripped +4 -3
    Fixed test case

# 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:	monty
# Host:	nosik.monty.fi
# Root:	/home/my/mysql-5.1

--- 1.84/mysys/Makefile.am	2006-09-15 08:29:41 +03:00
+++ 1.85/mysys/Makefile.am	2006-11-27 23:19:51 +02:00
@@ -20,7 +20,7 @@
 INCLUDES =		@ZLIB_INCLUDES@ -I$(top_builddir)/include \
 			-I$(top_srcdir)/include -I$(srcdir)
 pkglib_LIBRARIES =	libmysys.a
-LDADD =			libmysys.a $(top_builddir)/strings/libmystrings.a
+LDADD =			libmysys.a $(top_builddir)/strings/libmystrings.a $(top_builddir)/dbug/libdbug.a
 noinst_HEADERS =	mysys_priv.h my_static.h
 libmysys_a_SOURCES =    my_init.c my_getwd.c mf_getdate.c my_mmap.c \
 			mf_path.c mf_loadpath.c my_file.c \

--- 1.51/mysys/thr_alarm.c	2006-10-12 20:41:06 +03:00
+++ 1.52/mysys/thr_alarm.c	2006-11-27 23:19:51 +02:00
@@ -276,7 +276,7 @@
   if (!pthread_equal(pthread_self(),alarm_thread))
   {
 #if defined(MAIN) && !defined(__bsdi__)
-    printf("thread_alarm\n"); fflush(stdout);
+    printf("thread_alarm in process_alarm\n"); fflush(stdout);
 #endif
 #ifdef DONT_REMEMBER_SIGNAL
     my_sigset(THR_CLIENT_ALARM,process_alarm);	/* int. thread system calls */
@@ -848,8 +848,9 @@
   MY_INIT(argv[0]);
 
   if (argc > 1 && argv[1][0] == '-' && argv[1][1] == '#')
+  {
     DBUG_PUSH(argv[1]+2);
-
+  }
   pthread_mutex_init(&LOCK_thread_count,MY_MUTEX_INIT_FAST);
   pthread_cond_init(&COND_thread_count,NULL);
 
@@ -917,8 +918,8 @@
     }
   }
   pthread_mutex_unlock(&LOCK_thread_count);
-  end_thr_alarm(1);
   thr_alarm_info(&alarm_info);
+  end_thr_alarm(1);
   printf("Main_thread:  Alarms: %u  max_alarms: %u  next_alarm_time: %lu\n",
 	 alarm_info.active_alarms, alarm_info.max_used_alarms,
 	 alarm_info.next_alarm_time);

--- 1.236/mysql-test/mysql-test-run.pl	2006-11-27 01:50:54 +02:00
+++ 1.237/mysql-test/mysql-test-run.pl	2006-11-27 23:19:51 +02:00
@@ -1235,7 +1235,7 @@
 # But a fairly safe range seems to be 5001 - 32767
 #
 
-sub set_mtr_build_thread_ports() {
+sub set_mtr_build_thread_ports($) {
   my $mtr_build_thread= shift;
 
   # Up to two masters, up to three slaves

--- 1.214/mysql-test/t/disabled.def	2006-11-27 01:47:22 +02:00
+++ 1.215/mysql-test/t/disabled.def	2006-11-27 23:19:51 +02:00
@@ -30,6 +30,7 @@
 rpl_row_blob_innodb      : BUG#18980 2006-04-10 kent    Test fails randomly
 rpl_sp                   : BUG#16456 2006-02-16 jmiller
 rpl_multi_engine         : BUG#22583 2006-09-23 lars
+synchronization          : Bug#24529  	Test 'synchronization' fails on Mac pushbuild; Also on Linux 64 bit.
 
 # the below testcase have been reworked to avoid the bug, test contains comment, keep bug open
 #ndb_binlog_ddl_multi     : BUG#18976 2006-04-10 kent    CRBR: multiple binlog, second binlog may miss schema log events

--- 1.5/mysql-test/r/synchronization.result	2006-10-04 17:33:24 +03:00
+++ 1.6/mysql-test/r/synchronization.result	2006-11-27 23:19:51 +02:00
@@ -1,4 +1,4 @@
-drop table if exists t1;
+drop table if exists t1,t2;
 CREATE TABLE t1 (x1 int);
 ALTER TABLE t1 CHANGE x1 x2 int;
 CREATE TABLE t2 LIKE t1;

--- 1.6/mysql-test/t/synchronization.test	2005-07-28 16:12:37 +03:00
+++ 1.7/mysql-test/t/synchronization.test	2006-11-27 23:19:51 +02:00
@@ -4,7 +4,7 @@
 #
 
 --disable_warnings
-drop table if exists t1;
+drop table if exists t1,t2;
 --enable_warnings
 
 connect (con1,localhost,root,,);