From: Jon Olav Hauglid
Date: July 21 2011 4:24pm
Subject: bzr push into mysql-trunk branch (jon.hauglid:3286 to 3287)
List-Archive: http://lists.mysql.com/commits/140412
Message-Id: <201107211625.p6LGP4bp027299@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3287 Jon Olav Hauglid	2011-07-21 [merge]
      Merge from mysql-5.5 to mysql-trunk.
      No conflicts.

    modified:
      config.h.cmake
      configure.cmake
      dbug/dbug_analyze.c
      dbug/my_main.c
      dbug/tests.c
      mysys/my_init.c
 3286 Tor Didriksen	2011-07-21
      Bug#12532830 - SIGFPE OR ASSERTION (PRECISION <= ((9 * 9) - 8*2)) && (DEC <= 30)
     @ mysql-test/r/func_if.result
        New test case.
     @ mysql-test/suite/innodb/r/innodb_bug54044.result
        If(xxxx, null, null) now returns binary(0) rater than null.
        Add tests from bug#54044.
     @ mysql-test/t/func_if.test
        New test case.
     @ sql/field.cc
        Catch wrong value for decimals a bit earlier: when we create 'pack_flag'
        rather than when we use it later to create Field_new_decimal.
     @ sql/item_cmpfunc.cc
        In Item_func_if::fix_length_and_dec(): save decimals (in addition to misc other properties) whenever one of the branches is a null_item.
        Let other expressions (even if they evaluate to const-null) be handled
        by the general mechanisms.

    modified:
      mysql-test/r/func_if.result
      mysql-test/suite/innodb/r/innodb_bug54044.result
      mysql-test/suite/innodb/t/innodb_bug54044.test
      mysql-test/t/func_if.test
      sql/field.cc
      sql/item_cmpfunc.cc
      sql/item_cmpfunc.h
=== modified file 'config.h.cmake'
--- a/config.h.cmake	2011-07-19 15:11:15 +0000
+++ b/config.h.cmake	2011-07-21 16:22:39 +0000
@@ -216,7 +216,6 @@
 #cmakedefine HAVE_PTHREAD_ATTR_SETSTACKSIZE 1
 #cmakedefine HAVE_PTHREAD_CONDATTR_CREATE 1
 #cmakedefine HAVE_PTHREAD_CONDATTR_SETCLOCK 1
-#cmakedefine HAVE_PTHREAD_INIT 1
 #cmakedefine HAVE_PTHREAD_KEY_DELETE 1
 #cmakedefine HAVE_PTHREAD_KEY_DELETE 1
 #cmakedefine HAVE_PTHREAD_KILL 1

=== modified file 'configure.cmake'
--- a/configure.cmake	2011-07-03 23:56:47 +0000
+++ b/configure.cmake	2011-07-21 16:22:39 +0000
@@ -384,7 +384,6 @@ CHECK_FUNCTION_EXISTS (pthread_attr_sets
 CHECK_FUNCTION_EXISTS (pthread_attr_setstacksize HAVE_PTHREAD_ATTR_SETSTACKSIZE)
 CHECK_FUNCTION_EXISTS (pthread_condattr_create HAVE_PTHREAD_CONDATTR_CREATE)
 CHECK_FUNCTION_EXISTS (pthread_condattr_setclock HAVE_PTHREAD_CONDATTR_SETCLOCK)
-CHECK_FUNCTION_EXISTS (pthread_init HAVE_PTHREAD_INIT)
 CHECK_FUNCTION_EXISTS (pthread_key_delete HAVE_PTHREAD_KEY_DELETE)
 CHECK_FUNCTION_EXISTS (pthread_rwlock_rdlock HAVE_PTHREAD_RWLOCK_RDLOCK)
 CHECK_FUNCTION_EXISTS (pthread_sigmask HAVE_PTHREAD_SIGMASK)

=== modified file 'dbug/dbug_analyze.c'
--- a/dbug/dbug_analyze.c	2011-01-11 09:09:21 +0000
+++ b/dbug/dbug_analyze.c	2011-07-21 16:22:39 +0000
@@ -571,9 +571,6 @@ int main (int argc, char **argv)
     FILE *infile;
     FILE *outfile = {stdout};
 
-#if defined(HAVE_PTHREAD_INIT)
-  pthread_init();                       /* Must be called before DBUG_ENTER */
-#endif
   my_thread_global_init(); 
   {
     DBUG_ENTER ("main");

=== modified file 'dbug/my_main.c'
--- a/dbug/my_main.c	2011-01-11 09:09:21 +0000
+++ b/dbug/my_main.c	2011-07-21 16:22:39 +0000
@@ -16,9 +16,6 @@ char *argv[];
 {
   register int result, ix;
   extern int factorial(int);
-#if defined(HAVE_PTHREAD_INIT)
-  pthread_init();			/* Must be called before DBUG_ENTER */
-#endif
   my_thread_global_init();
 
   {

=== modified file 'dbug/tests.c'
--- a/dbug/tests.c	2011-01-11 09:09:21 +0000
+++ b/dbug/tests.c	2011-07-21 16:22:39 +0000
@@ -44,9 +44,6 @@ int main (int argc, char *argv[])
   if (argc == 1)
     return 0;
 
-#if defined(HAVE_PTHREAD_INIT)
-  pthread_init();                       /* Must be called before DBUG_ENTER */
-#endif
   my_thread_global_init();
 
   dup2(1, 2);

=== modified file 'mysys/my_init.c'
--- a/mysys/my_init.c	2011-06-30 15:50:45 +0000
+++ b/mysys/my_init.c	2011-07-21 16:22:39 +0000
@@ -99,10 +99,6 @@ my_bool my_init(void)
   fastmutex_global_init();              /* Must be called early */
 #endif
 
-#if defined(HAVE_PTHREAD_INIT)
-  pthread_init();			/* Must be called before DBUG_ENTER */
-#endif
-
   /* $HOME is needed early to parse configuration files located in ~/ */
   if ((home_dir= getenv("HOME")) != 0)
     home_dir= intern_filename(home_dir_buff, home_dir);

No bundle (reason: useless for push emails).