bzr push into mysql-5.6 branch (joerg.bruehe:4563 to 4564)

[Joerg Bruehe]

 4564 Joerg Bruehe	2012-11-09
      Building RPMs for ULN:
      
      The patch "mysql-5.5-stack-guard.patch" needs to be adapted
      to code changes in "sql/mysqld.cc" which were
      done in MySQL 5.6.
      
      Also, reflect that in a name change: "5.5" -> "5.6".

    renamed:
      packaging/rpm-uln/mysql-5.5-stack-guard.patch => packaging/rpm-uln/mysql-5.6-stack-guard.patch
    modified:
      packaging/rpm-uln/CMakeLists.txt
      packaging/rpm-uln/mysql.spec.sh
      packaging/rpm-uln/mysql-5.6-stack-guard.patch
 4563 Joerg Bruehe	2012-11-09
      Keep MTZR to a minimum

    modified:
      mysql-test/collections/default.push
=== modified file 'packaging/rpm-uln/CMakeLists.txt'
--- a/packaging/rpm-uln/CMakeLists.txt	2012-06-12 15:18:09 +0000
+++ b/packaging/rpm-uln/CMakeLists.txt	2012-11-09 19:36:09 +0000
@@ -28,7 +28,7 @@ IF(UNIX)
 
   FOREACH(ulnfile filter-requires-mysql.sh generate-tarball.sh my.cnf my_config.h
           mysql-5.5-errno.patch mysql-5.5-fix-tests.patch mysql-5.5-libdir.patch
-          mysql-5.5-mtr1.patch mysql-5.5-stack-guard.patch mysql-5.5-testing.patch
+          mysql-5.5-mtr1.patch mysql-5.6-stack-guard.patch mysql-5.5-testing.patch
           mysql-chain-certs.patch mysql-embedded-check.c mysql-expired-certs.patch
           mysql.init mysql-install-test.patch mysql-strmov.patch scriptstub.c
           README.mysql-docs)

=== renamed file 'packaging/rpm-uln/mysql-5.5-stack-guard.patch' => 'packaging/rpm-uln/mysql-5.6-stack-guard.patch'
--- a/packaging/rpm-uln/mysql-5.5-stack-guard.patch	2012-06-08 17:44:06 +0000
+++ b/packaging/rpm-uln/mysql-5.6-stack-guard.patch	2012-11-09 19:36:09 +0000
@@ -7,11 +7,14 @@ mysqld.cc; is it important to fix any of
 
 Filed upstream at http://bugs.mysql.com/bug.php?id=35019
 
+   ===
 
-diff -Naur mysql-5.1.30.orig/sql/mysqld.cc mysql-5.1.30/sql/mysqld.cc
---- mysql-5.1.30.orig/sql/mysqld.cc	2008-11-14 11:37:13.000000000 -0500
-+++ mysql-5.1.30/sql/mysqld.cc	2009-01-13 12:08:35.000000000 -0500
-@@ -2653,6 +2653,70 @@
+Joerg Bruehe, MySQL Build Team at Oracle: Third hunk adapted to code changes in MySQL 5.6
+
+diff -Naur mysql-5.6.9.orig/sql/mysqld.cc mysql-5.6.9/sql/mysqld.cc
+--- mysql-5.6.9.orig/sql/mysqld.cc	2008-11-14 11:37:13.000000000 -0500
++++ mysql-5.6.9/sql/mysqld.cc	2009-01-13 12:08:35.000000000 -0500
+@@ -2970,6 +2970,70 @@
  }
  
  
@@ -82,7 +85,7 @@ diff -Naur mysql-5.1.30.orig/sql/mysqld.
  static void start_signal_handler(void)
  {
    int error;
-@@ -2663,15 +2727,7 @@
+@@ -2980,15 +3044,7 @@
  #if !defined(HAVE_DEC_3_2_THREADS)
    pthread_attr_setscope(&thr_attr,PTHREAD_SCOPE_SYSTEM);
    (void) pthread_attr_setdetachstate(&thr_attr,PTHREAD_CREATE_DETACHED);
@@ -99,10 +102,10 @@ diff -Naur mysql-5.1.30.orig/sql/mysqld.
  #endif
  
    mysql_mutex_lock(&LOCK_thread_count);
-@@ -4445,37 +4501,7 @@
-     unireg_abort(1);				// Will do exit
-
-   init_signals();
+@@ -5243,37 +5307,7 @@
+     unireg_abort(1);        // Will do exit
+ 
+   my_init_signals();
 -#if defined(__ia64__) || defined(__ia64)
 -  /*
 -    Peculiar things with ia64 platforms - it seems we only have half the
@@ -123,9 +126,9 @@ diff -Naur mysql-5.1.30.orig/sql/mysqld.
 -    /* We must check if stack_size = 0 as Solaris 2.9 can return 0 here */
 -    if (stack_size && stack_size < my_thread_stack_size)
 -    {
--      if (global_system_variables.log_warnings)
--	sql_print_warning("Asked for %lu thread stack, but got %ld",
--			  my_thread_stack_size, (long) stack_size);
+-      if (log_warnings)
+-  sql_print_warning("Asked for %lu thread stack, but got %ld",
+-        my_thread_stack_size, (long) stack_size);
 -#if defined(__ia64__) || defined(__ia64)
 -      my_thread_stack_size= stack_size*2;
 -#else
@@ -136,5 +139,5 @@ diff -Naur mysql-5.1.30.orig/sql/mysqld.
 -#endif
 +  my_thread_stack_size = my_setstacksize(&connection_attrib,my_thread_stack_size);
  
-   (void) thr_setconcurrency(concurrency);	// 10 by default
+   (void) thr_setconcurrency(concurrency); // 10 by default
  

=== modified file 'packaging/rpm-uln/mysql.spec.sh'
--- a/packaging/rpm-uln/mysql.spec.sh	2012-11-08 14:49:28 +0000
+++ b/packaging/rpm-uln/mysql.spec.sh	2012-11-09 19:36:09 +0000
@@ -233,7 +233,7 @@ Source999: filter-requires-mysql.sh
 Patch2: mysql-5.5-errno.patch
 Patch4: mysql-5.5-testing.patch
 Patch5: mysql-install-test.patch
-Patch6: mysql-5.5-stack-guard.patch
+Patch6: mysql-5.6-stack-guard.patch
 # Patch7: mysql-disable-test.patch           Already fixed in current 5.1
 # Patch8: mysql-setschedparam.patch          Will not work in 5.5 (cmake)
 # Patch9: mysql-no-docs.patch                Will not work in 5.5 (cmake)
@@ -964,6 +964,10 @@ fi
 %{_mandir}/man1/mysql_client_test.1*
 
 %changelog
+* Fri Nov  9 2012 Joerg Bruehe <joerg.bruehe@stripped>
+  The "stack-guard.patch" needs to be adapted for MySQL 5.6,
+  reflect that in a name change "5.5" -> "5.6".
+
 * Tue Sep 18 2012 Joerg Bruehe <joerg.bruehe@stripped>
 - Restrict the vendor check to Oracle: There is no history here
   which we have to allow for.

No bundle (reason: useless for push emails).